xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-03-11 12:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grenade enhancements, asphalt, more textures, desh

Browse Source
This commit is contained in:
HbmMods 2017-06-06 14:30:27 +02:00
parent f67fe7a19d
commit da17dfb2c6
50 changed files with 2082 additions and 488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/hbm/lang/de_DE.lang
View File

@ -3,6 +3,9 @@ itemGroup.tabParts=Nuclear Tech Mod Bauteile
itemGroup.tabBlocks=Nuclear Tech Mod Blöcke
itemGroup.tabNuke=Nuclear Tech Mod Bomben
achievement.getTitanium=Es ist ein Anfang
achievement.getTitanium.desc=Finde etwas Titanerz
item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core
item.record.ss.desc=Valve - Sector Sweep
item.record.vc.desc=Valve - Vortal Combat
@ -163,7 +166,7 @@ tile.oil_duct_solid.name=Verstärktes Ölrohr
tile.machine_flare.name=Abfackelturm
container.gasFlare=Abfackelturm
tile.gas_duct.name=Gasleitung
tile.gas_duct_solid.name=Verstärkter Gasleitung
tile.gas_duct_solid.name=Verstärkte Gasleitung
tile.rail_highspeed.name=Hochgeschwindigkeitsschienen
tile.rail_booster.name=Hochgeschwindigkeits-Boosterschienen
@ -476,6 +479,7 @@ item.pellet_rtg.name=Plutonium 238 Pellet
item.pellet_rtg_weak.name=Schwaches Uran RTG-Pellet
item.rtg_unit.name=RTG Einheit
item.hazmat_cloth.name=Strahlenschutzanzugsstoff
item.asbestos_cloth.name=Hitzeschutzanzugsstoff
item.filter_coal.name=Aktivkohlefilter
item.tritium_deuterium_cake.name=Tritium-Deuterium-Kuchen
item.telepad.name=Teleplatte
@ -901,6 +905,10 @@ item.hazmat_paa_helmet.name=PaA-Kampfschutzanzug Helm
item.hazmat_paa_plate.name=PaA-Kampfschutzanzug Brustplatte
item.hazmat_paa_legs.name=PaA-Kampfschutzanzug Hose
item.hazmat_paa_boots.name=PaA-Kampfschutzanzug Stiefel
item.asbestos_helmet.name=Hitzeschutzhelm
item.asbestos_plate.name=Hitzeschutzbrustplatte
item.asbestos_legs.name=Hitzeschutzhose
item.asbestos_boots.name=Hitzeschutzstiefel
item.paa_plate.name=PaA-Brustschutzplatte
item.paa_legs.name=PaA-Beinverstärkungsschienen

8
assets/hbm/lang/en_US.lang
View File

@ -3,6 +3,9 @@ itemGroup.tabParts=Nuclear Tech Mod Parts
itemGroup.tabBlocks=Nuclear Tech Mod Blocks
itemGroup.tabNuke=Nuclear Tech Mod Nukes
achievement.getTitanium=It's A Start
achievement.getTitanium.desc=Collect titanium ore
item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core
item.record.ss.desc=Valve - Sector Sweep
item.record.vc.desc=Valve - Vortal Combat
@ -476,6 +479,7 @@ item.pellet_rtg.name=Plutonium 238 Fuel Pellet
item.pellet_rtg_weak.name=Weak Uranium RTG Pellet
item.rtg_unit.name=RTG Unit
item.hazmat_cloth.name=Hazmat Cloth
item.asbestos_cloth.name=Fire Proximity Cloth
item.filter_coal.name=Activated Carbon Filter
item.tritium_deuterium_cake.name=Tritium-Deuterium-Cake
item.telepad.name=Telepad
@ -901,6 +905,10 @@ item.hazmat_paa_helmet.name=PaA Battle Hazmat Suit Helmet
item.hazmat_paa_plate.name=PaA Battle Hazmat Suit Chestplate
item.hazmat_paa_legs.name=PaA Battle Hazmat Suit Leggings
item.hazmat_paa_boots.name=PaA Battle Hazmat Suit Boots
item.asbestos_helmet.name=Fire Proximity Helmet
item.asbestos_plate.name=Fire Proximity Chestplate
item.asbestos_legs.name=Fire Proximity Leggings
item.asbestos_boots.name=Fire Proximity Boots
item.paa_plate.name=PaA Chest Protection Plate
item.paa_legs.name=PaA Leg Reinforcements

BIN
assets/hbm/textures/blocks/asphalt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 575 B

BIN
assets/hbm/textures/blocks/block_desh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 412 B

BIN
assets/hbm/textures/items/asbestos_boots.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 B

BIN
assets/hbm/textures/items/asbestos_cloth.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 343 B

BIN
assets/hbm/textures/items/asbestos_helmet.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 232 B

BIN
assets/hbm/textures/items/asbestos_legs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 191 B

BIN
assets/hbm/textures/items/asbestos_plate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 B

BIN
assets/hbm/textures/items/polaroid_folded.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

BIN
assets/hbm/textures/models/ModelDefabricator.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
assets/hbm/textures/models/ModelHP.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 855 B

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
assets/hbm/textures/models/ModelSpark.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 931 B

After

Width:  |  Height:  |  Size: 1.2 KiB

6
com/hbm/blocks/ModBlocks.java
View File

@ -198,6 +198,7 @@ public class ModBlocks {
public static Block block_advanced_alloy;
public static Block block_magnetized_tungsten;
public static Block block_combine_steel;
public static Block block_desh;
public static Block block_australium;
public static Block block_weidanium;
@ -207,6 +208,7 @@ public class ModBlocks {
public static Block block_verticium;
public static Block gravel_obsidian;
public static Block asphalt;
public static Block reinforced_brick;
public static Block reinforced_glass;
@ -566,6 +568,7 @@ public class ModBlocks {
block_advanced_alloy = new BlockGeneric(Material.iron).setBlockName("block_advanced_alloy").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_advanced_alloy");
block_magnetized_tungsten = new BlockGeneric(Material.iron).setBlockName("block_magnetized_tungsten").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(35.0F).setBlockTextureName(RefStrings.MODID + ":block_magnetized_tungsten");
block_combine_steel = new BlockGeneric(Material.iron).setBlockName("block_combine_steel").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_combine_steel");
block_desh = new BlockGeneric(Material.iron).setBlockName("block_desh").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_desh");
block_australium = new BlockGeneric(Material.iron).setBlockName("block_australium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_australium");
block_weidanium = new BlockGeneric(Material.iron).setBlockName("block_weidanium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_weidanium");
@ -575,6 +578,7 @@ public class ModBlocks {
block_verticium = new BlockGeneric(Material.iron).setBlockName("block_verticium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_verticium");
gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian");
asphalt = new BlockGeneric(Material.rock).setBlockName("asphalt").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":asphalt");
reinforced_brick = new BlockGeneric(Material.rock).setBlockName("reinforced_brick").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(15).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_brick");
reinforced_glass = new ReinforcedBlock(Material.glass).setBlockName("reinforced_glass").setCreativeTab(MainRegistry.tabBlock).setLightOpacity(0).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_glass");
@ -877,6 +881,7 @@ public class ModBlocks {
GameRegistry.registerBlock(block_schrabidium, ItemSchrabidiumBlock.class, block_schrabidium.getUnlocalizedName());
GameRegistry.registerBlock(block_magnetized_tungsten, block_magnetized_tungsten.getUnlocalizedName());
GameRegistry.registerBlock(block_combine_steel, block_combine_steel.getUnlocalizedName());
GameRegistry.registerBlock(block_desh, block_desh.getUnlocalizedName());
GameRegistry.registerBlock(block_australium, ItemOreBlock.class, block_australium.getUnlocalizedName());
GameRegistry.registerBlock(block_weidanium, ItemOreBlock.class, block_weidanium.getUnlocalizedName());
GameRegistry.registerBlock(block_reiium, ItemOreBlock.class, block_reiium.getUnlocalizedName());
@ -888,6 +893,7 @@ public class ModBlocks {
GameRegistry.registerBlock(gravel_obsidian, gravel_obsidian.getUnlocalizedName());
//Reinforced Blocks
GameRegistry.registerBlock(asphalt, asphalt.getUnlocalizedName());
GameRegistry.registerBlock(reinforced_brick, reinforced_brick.getUnlocalizedName());
GameRegistry.registerBlock(reinforced_glass, reinforced_glass.getUnlocalizedName());
GameRegistry.registerBlock(reinforced_light, reinforced_light.getUnlocalizedName());

21
com/hbm/entity/grenade/EntityGrenadeASchrab.java
View File

@ -14,7 +14,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeASchrab extends EntityThrowable
public class EntityGrenadeASchrab extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -28,25 +28,8 @@ public class EntityGrenadeASchrab extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeASchrab(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

51
com/hbm/entity/grenade/EntityGrenadeBase.java Normal file
View File

@ -0,0 +1,51 @@
package com.hbm.entity.grenade;
import com.hbm.entity.effect.EntityCloudFleija;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
import com.hbm.explosion.ExplosionChaos;
import com.hbm.main.MainRegistry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityBlaze;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public abstract class EntityGrenadeBase extends EntityThrowable
{
private static final String __OBFID = "CL_00001722";
public EntityGrenadeBase(World p_i1773_1_)
{
super(p_i1773_1_);
}
public EntityGrenadeBase(World p_i1774_1_, EntityLivingBase p_i1774_2_)
{
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeBase(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
this.explode();
}
public abstract void explode();
}

21
com/hbm/entity/grenade/EntityGrenadeBlackHole.java
View File

@ -10,7 +10,7 @@ import net.minecraft.world.World;
import com.hbm.entity.effect.EntityBlackHole;
import com.hbm.explosion.ExplosionChaos;
public class EntityGrenadeBlackHole extends EntityThrowable
public class EntityGrenadeBlackHole extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -24,25 +24,8 @@ public class EntityGrenadeBlackHole extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeBlackHole(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadeCluster.java
View File

@ -9,7 +9,7 @@ import net.minecraft.world.World;
import com.hbm.explosion.ExplosionChaos;
public class EntityGrenadeCluster extends EntityThrowable
public class EntityGrenadeCluster extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -23,25 +23,8 @@ public class EntityGrenadeCluster extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeCluster(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadeElectric.java
View File

@ -8,7 +8,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeElectric extends EntityThrowable
public class EntityGrenadeElectric extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -22,25 +22,8 @@ public class EntityGrenadeElectric extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeElectric(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadeFire.java
View File

@ -10,7 +10,7 @@ import net.minecraft.world.World;
import com.hbm.explosion.ExplosionChaos;
public class EntityGrenadeFire extends EntityThrowable
public class EntityGrenadeFire extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
public Entity shooter;
@ -25,25 +25,8 @@ public class EntityGrenadeFire extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeFire(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadeFrag.java
View File

@ -10,7 +10,7 @@ import net.minecraft.world.World;
import com.hbm.explosion.ExplosionChaos;
public class EntityGrenadeFrag extends EntityThrowable
public class EntityGrenadeFrag extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
public Entity shooter;
@ -25,25 +25,8 @@ public class EntityGrenadeFrag extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeFrag(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

35
com/hbm/entity/grenade/EntityGrenadeGas.java
View File

@ -9,11 +9,15 @@ import net.minecraft.world.World;
import java.util.Random;
import com.hbm.entity.particle.EntityGasFX;
import com.hbm.entity.particle.EntityOilSpillFX;
import com.hbm.explosion.ExplosionChaos;
import com.hbm.explosion.ExplosionLarge;
public class EntityGrenadeGas extends EntityThrowable
public class EntityGrenadeGas extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
Random rand = new Random();
public EntityGrenadeGas(World p_i1773_1_)
{
@ -25,36 +29,21 @@ public class EntityGrenadeGas extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeGas(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{
this.setDead();
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true);
ExplosionChaos.poison(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5);
}
//for(int i = 0; 0 < 15; i++) {
for (int i = 0; i < 10; i++) {
for(int j = 0; j < 10; j++)
this.worldObj.spawnParticle("cloud", this.posX - 2.5D + (((double)i) / 2), this.posY + 0.5D, this.posZ - 2.5D + (((double)j) / 2), 0, rand.nextDouble() * 0.1D, 0);
ExplosionLarge.spawnParticles(worldObj, posX, posY, posZ, 15);
ExplosionLarge.spawnParticles(worldObj, posX, posY, posZ, 15);
ExplosionLarge.spawnParticles(worldObj, posX, posY, posZ, 15);
//}
}
}

21
com/hbm/entity/grenade/EntityGrenadeGeneric.java
View File

@ -7,7 +7,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeGeneric extends EntityThrowable
public class EntityGrenadeGeneric extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -21,25 +21,8 @@ public class EntityGrenadeGeneric extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeGeneric(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadeLemon.java
View File

@ -11,7 +11,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeLemon extends EntityThrowable
public class EntityGrenadeLemon extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -25,25 +25,8 @@ public class EntityGrenadeLemon extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeLemon(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

51
com/hbm/entity/grenade/EntityGrenadeMk2.java
View File

@ -11,44 +11,25 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeMk2 extends EntityThrowable {
public class EntityGrenadeMk2 extends EntityGrenadeBase {
private static final String __OBFID = "CL_00001722";
private static final String __OBFID = "CL_00001722";
public EntityGrenadeMk2(World p_i1773_1_)
{
super(p_i1773_1_);
}
public EntityGrenadeMk2(World p_i1773_1_) {
super(p_i1773_1_);
}
public EntityGrenadeMk2(World p_i1774_1_, EntityLivingBase p_i1774_2_)
{
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeMk2(World p_i1774_1_, EntityLivingBase p_i1774_2_)
{
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeMk2(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
public void explode() {
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
if (!this.worldObj.isRemote)
{
this.setDead();
ExplosionLarge.explode(worldObj, posX, posY, posZ, 7.5F, true, false, false);
}
}
if (!this.worldObj.isRemote) {
this.setDead();
ExplosionLarge.explode(worldObj, posX, posY, posZ, 7.5F, true, false, false);
}
}
}

16
com/hbm/entity/grenade/EntityGrenadeNuclear.java
View File

@ -15,7 +15,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeNuclear extends EntityThrowable
public class EntityGrenadeNuclear extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -29,20 +29,8 @@ public class EntityGrenadeNuclear extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeNuclear(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
int b0 = 1000;
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadeNuke.java
View File

@ -7,7 +7,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeNuke extends EntityThrowable
public class EntityGrenadeNuke extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
public int count = 2;
@ -22,25 +22,8 @@ public class EntityGrenadeNuke extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeNuke(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadePlasma.java
View File

@ -12,7 +12,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadePlasma extends EntityThrowable
public class EntityGrenadePlasma extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -26,25 +26,8 @@ public class EntityGrenadePlasma extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadePlasma(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

20
com/hbm/entity/grenade/EntityGrenadePoison.java
View File

@ -9,7 +9,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadePoison extends EntityThrowable
public class EntityGrenadePoison extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -23,25 +23,9 @@ public class EntityGrenadePoison extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadePoison(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
public void explode() {
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
if (!this.worldObj.isRemote)
{

25
com/hbm/entity/grenade/EntityGrenadePulse.java
View File

@ -11,7 +11,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadePulse extends EntityThrowable {
public class EntityGrenadePulse extends EntityGrenadeBase {
private static final String __OBFID = "CL_00001722";
@ -19,30 +19,19 @@ public class EntityGrenadePulse extends EntityThrowable {
super(p_i1773_1_);
}
public EntityGrenadePulse(World p_i1774_1_, EntityLivingBase p_i1774_2_) {
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadePulse(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) {
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
public EntityGrenadePulse(World p_i1774_1_, EntityLivingBase p_i1774_2_)
{
super(p_i1774_1_, p_i1774_2_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_) {
if (p_70184_1_.entityHit != null) {
byte b0 = 0;
public void explode() {
if (p_70184_1_.entityHit instanceof EntityBlaze) {
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
if (!this.worldObj.isRemote) {
this.setDead();
ExplosionChaos.pulse(this.worldObj, (int) this.posX, (int) this.posY, (int) this.posZ, 7);
this.worldObj.playSoundEffect((int)this.posX, (int)this.posY, (int)this.posZ, "random.explode", 4.0F, (1.0F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.2F) * 0.7F);
}
}
}
}

21
com/hbm/entity/grenade/EntityGrenadeSchrabidium.java
View File

@ -9,7 +9,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeSchrabidium extends EntityThrowable
public class EntityGrenadeSchrabidium extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -23,25 +23,8 @@ public class EntityGrenadeSchrabidium extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeSchrabidium(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

22
com/hbm/entity/grenade/EntityGrenadeShrapnel.java
View File

@ -11,7 +11,7 @@ import net.minecraft.world.World;
import com.hbm.explosion.ExplosionChaos;
import com.hbm.explosion.ExplosionLarge;
public class EntityGrenadeShrapnel extends EntityThrowable
public class EntityGrenadeShrapnel extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
public Entity shooter;
@ -26,29 +26,13 @@ public class EntityGrenadeShrapnel extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeShrapnel(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{
this.setDead();
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true);
for(int i = 0; i < 5; i++) {
ExplosionLarge.spawnShrapnels(worldObj, this.posX, this.posY, this.posZ, 5);
}

21
com/hbm/entity/grenade/EntityGrenadeStrong.java
View File

@ -9,7 +9,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeStrong extends EntityThrowable
public class EntityGrenadeStrong extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -23,25 +23,8 @@ public class EntityGrenadeStrong extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeStrong(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadeTau.java
View File

@ -11,7 +11,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeTau extends EntityThrowable
public class EntityGrenadeTau extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -25,25 +25,8 @@ public class EntityGrenadeTau extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeTau(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

21
com/hbm/entity/grenade/EntityGrenadeZOMG.java
View File

@ -11,7 +11,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class EntityGrenadeZOMG extends EntityThrowable
public class EntityGrenadeZOMG extends EntityGrenadeBase
{
private static final String __OBFID = "CL_00001722";
@ -25,25 +25,8 @@ public class EntityGrenadeZOMG extends EntityThrowable
super(p_i1774_1_, p_i1774_2_);
}
public EntityGrenadeZOMG(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
{
super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_)
{
if (p_70184_1_.entityHit != null)
{
byte b0 = 0;
if (p_70184_1_.entityHit instanceof EntityBlaze)
{
b0 = 3;
}
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
}
public void explode() {
if (!this.worldObj.isRemote)
{

1380
com/hbm/entity/item/EntityMinecartModBase.java Normal file
View File

File diff suppressed because it is too large Load Diff

4
com/hbm/entity/item/EntityMinecartTest.java
View File

@ -15,7 +15,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
public class EntityMinecartTest extends EntityMinecart
public class EntityMinecartTest extends EntityMinecartModBase
{
private int minecartTNTFuse = -1;
private static final String __OBFID = "CL_00001680";
@ -66,6 +66,8 @@ public class EntityMinecartTest extends EntityMinecart
this.explodeCart(d0);
}
}
System.out.println(this.rotationYaw);
}
public void killMinecart(DamageSource p_94095_1_)

5
com/hbm/explosion/ExplosionNukeGeneric.java
View File

@ -30,10 +30,12 @@ import com.hbm.entity.missile.EntityMIRV;
import com.hbm.entity.projectile.EntityMiniMIRV;
import com.hbm.entity.projectile.EntityMiniNuke;
import com.hbm.interfaces.IConsumer;
import com.hbm.interfaces.IDummy;
import com.hbm.interfaces.ISource;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.lib.ModDamageSource;
import com.hbm.tileentity.TileEntityDummy;
public class ExplosionNukeGeneric {
@ -585,7 +587,8 @@ public class ExplosionNukeGeneric {
if (!world.isRemote) {
if (world.getTileEntity(x, y, z) != null && (world.getTileEntity(x, y, z) instanceof ISource
|| world.getTileEntity(x, y, z) instanceof IConsumer)) {
|| world.getTileEntity(x, y, z) instanceof IConsumer
|| world.getTileEntity(x, y, z) instanceof TileEntityDummy)) {
world.setBlock(x, y, z, ModBlocks.block_electrical_scrap);
}

56
com/hbm/items/ModItems.java
View File

@ -198,6 +198,7 @@ public class ModItems {
public static Item nugget_beryllium;
public static Item plate_gold;
public static Item hazmat_cloth;
public static Item asbestos_cloth;
public static Item filter_coal;
public static Item plate_advanced_alloy;
public static Item plate_combine_steel;
@ -643,12 +644,14 @@ public class ModItems {
public static Item gun_emp_ammo;
public static Item gun_jack;
public static Item gun_jack_ammo;
//public static Item gun_spark;
//public static Item gun_spark_ammo;
//public static Item gun_hp;
//public static Item gun_hp_ammo;
public static Item gun_spark;
public static Item gun_spark_ammo;
public static Item gun_hp;
public static Item gun_hp_ammo;
public static Item gun_euthanasia;
public static Item gun_euthanasia_ammo;
public static Item gun_defabricator;
public static Item gun_defabricator_ammo;
public static Item gun_waluigi;
public static Item grenade_generic;
@ -1118,6 +1121,7 @@ public class ModItems {
nugget_schrabidium = new ItemCustomLore().setUnlocalizedName("nugget_schrabidium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_schrabidium");
nugget_beryllium = new Item().setUnlocalizedName("nugget_beryllium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_beryllium");
hazmat_cloth = new Item().setUnlocalizedName("hazmat_cloth").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":hazmat_cloth");
asbestos_cloth = new Item().setUnlocalizedName("asbestos_cloth").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":asbestos_cloth");
filter_coal = new Item().setUnlocalizedName("filter_coal").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":filter_coal");
ingot_hes = new ItemRadioactive().setUnlocalizedName("ingot_hes").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_hes");
ingot_les = new ItemRadioactive().setUnlocalizedName("ingot_les").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_les");
@ -1150,23 +1154,23 @@ public class ModItems {
powder_steel = new Item().setUnlocalizedName("powder_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_steel");
powder_lithium = new Item().setUnlocalizedName("powder_lithium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium");
powder_power = new ItemCustomLore().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_energy");
powder_iodine = new ItemCustomLore().setUnlocalizedName("powder_iodine").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_iodine");
powder_thorium = new ItemCustomLore().setUnlocalizedName("powder_thorium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_thorium");
powder_neodymium = new ItemCustomLore().setUnlocalizedName("powder_neodymium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neodymium");
powder_astatine = new ItemCustomLore().setUnlocalizedName("powder_astatine").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_astatine");
powder_caesium = new ItemCustomLore().setUnlocalizedName("powder_caesium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_caesium");
powder_iodine = new ItemCustomLore().setUnlocalizedName("powder_iodine").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_iodine");
powder_thorium = new ItemCustomLore().setUnlocalizedName("powder_thorium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_thorium");
powder_neodymium = new ItemCustomLore().setUnlocalizedName("powder_neodymium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_neodymium");
powder_astatine = new ItemCustomLore().setUnlocalizedName("powder_astatine").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_astatine");
powder_caesium = new ItemCustomLore().setUnlocalizedName("powder_caesium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_caesium");
powder_australium = new ItemCustomLore().setUnlocalizedName("powder_australium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_australium");
powder_weidanium = new ItemCustomLore().setUnlocalizedName("powder_weidanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_weidanium");
powder_reiium = new ItemCustomLore().setUnlocalizedName("powder_reiium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_reiium");
powder_unobtainium = new ItemCustomLore().setUnlocalizedName("powder_unobtainium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_unobtainium");
powder_daffergon = new ItemCustomLore().setUnlocalizedName("powder_daffergon").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_daffergon");
powder_verticium = new ItemCustomLore().setUnlocalizedName("powder_verticium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_verticium");
powder_strontium = new ItemCustomLore().setUnlocalizedName("powder_strontium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_strontium");
powder_cobalt = new ItemCustomLore().setUnlocalizedName("powder_cobalt").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_cobalt");
powder_bromine = new ItemCustomLore().setUnlocalizedName("powder_bromine").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_bromine");
powder_niobium = new ItemCustomLore().setUnlocalizedName("powder_niobium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_niobium");
powder_tennessine = new ItemCustomLore().setUnlocalizedName("powder_tennessine").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_tennessine");
powder_cerium = new ItemCustomLore().setUnlocalizedName("powder_cerium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_cerium");
powder_strontium = new ItemCustomLore().setUnlocalizedName("powder_strontium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_strontium");
powder_cobalt = new ItemCustomLore().setUnlocalizedName("powder_cobalt").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_cobalt");
powder_bromine = new ItemCustomLore().setUnlocalizedName("powder_bromine").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_bromine");
powder_niobium = new ItemCustomLore().setUnlocalizedName("powder_niobium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_niobium");
powder_tennessine = new ItemCustomLore().setUnlocalizedName("powder_tennessine").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_tennessine");
powder_cerium = new ItemCustomLore().setUnlocalizedName("powder_cerium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":powder_cerium");
powder_dura_steel = new ItemCustomLore().setUnlocalizedName("powder_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_dura_steel");
powder_polymer = new ItemCustomLore().setUnlocalizedName("powder_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_polymer");
powder_lanthanium = new ItemCustomLore().setUnlocalizedName("powder_lanthanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lanthanium");
@ -1532,12 +1536,14 @@ public class ModItems {
gun_emp = new GunEMPRay().setUnlocalizedName("gun_emp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_emp");
gun_jack_ammo = new Item().setUnlocalizedName("gun_jack_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_jack_ammo");
gun_jack = new GunJack().setUnlocalizedName("gun_jack").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_jack");
//gun_spark_ammo = new Item().setUnlocalizedName("gun_spark_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_spark_ammo");
//gun_spark = new GunJack().setUnlocalizedName("gun_spark").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_spark");
//gun_hp_ammo = new Item().setUnlocalizedName("gun_hp_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp_ammo");
//gun_hp = new GunJack().setUnlocalizedName("gun_hp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp");
gun_spark_ammo = new Item().setUnlocalizedName("gun_spark_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_spark_ammo");
gun_spark = new GunJack().setUnlocalizedName("gun_spark").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_spark");
gun_hp_ammo = new Item().setUnlocalizedName("gun_hp_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp_ammo");
gun_hp = new GunJack().setUnlocalizedName("gun_hp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp");
gun_euthanasia_ammo = new Item().setUnlocalizedName("gun_euthanasia_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_euthanasia_ammo");
gun_euthanasia = new GunEuthanasia().setUnlocalizedName("gun_euthanasia").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_euthanasia");
gun_defabricator_ammo = new Item().setUnlocalizedName("gun_defabricator_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator_ammo");
gun_defabricator = new GunJack().setUnlocalizedName("gun_defabricator").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator");
gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_super_shotgun");
gun_moist_nugget = new ItemNugget(3, false).setUnlocalizedName("gun_moist_nugget").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_moist_nugget");
@ -2075,6 +2081,7 @@ public class ModItems {
//Other Plates
GameRegistry.registerItem(hazmat_cloth, hazmat_cloth.getUnlocalizedName());
GameRegistry.registerItem(asbestos_cloth, asbestos_cloth.getUnlocalizedName());
GameRegistry.registerItem(filter_coal, filter_coal.getUnlocalizedName());
//Wires
@ -2466,10 +2473,10 @@ public class ModItems {
GameRegistry.registerItem(gun_emp, gun_emp.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_inverted, gun_revolver_inverted.getUnlocalizedName());
GameRegistry.registerItem(gun_jack, gun_jack.getUnlocalizedName());
//TODO: Fix dat shit
//GameRegistry.registerItem(gun_spark, gun_spark.getUnlocalizedName());
//GameRegistry.registerItem(gun_hp, gun_hp.getUnlocalizedName());
GameRegistry.registerItem(gun_spark, gun_spark.getUnlocalizedName());
GameRegistry.registerItem(gun_hp, gun_hp.getUnlocalizedName());
GameRegistry.registerItem(gun_euthanasia, gun_euthanasia.getUnlocalizedName());
GameRegistry.registerItem(gun_defabricator, gun_defabricator.getUnlocalizedName());
GameRegistry.registerItem(gun_super_shotgun, gun_super_shotgun.getUnlocalizedName());
GameRegistry.registerItem(gun_moist_nugget, gun_moist_nugget.getUnlocalizedName());
@ -2496,8 +2503,9 @@ public class ModItems {
GameRegistry.registerItem(gun_mp_ammo, gun_mp_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_emp_ammo, gun_emp_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_jack_ammo, gun_jack_ammo.getUnlocalizedName());
//GameRegistry.registerItem(gun_spark_ammo, gun_spark_ammo.getUnlocalizedName());
//GameRegistry.registerItem(gun_hp_ammo, gun_hp_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_spark_ammo, gun_spark_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_hp_ammo, gun_hp_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_defabricator, gun_defabricator.getUnlocalizedName());
GameRegistry.registerItem(gun_euthanasia_ammo, gun_euthanasia_ammo.getUnlocalizedName());
//-C-l-i-p-s- Magazines

14
com/hbm/items/special/ItemBattery.java
View File

@ -27,7 +27,7 @@ public class ItemBattery extends Item {
if(itemstack.getItem() != ModItems.fusion_core && itemstack.getItem() != ModItems.factory_core_titanium && itemstack.getItem() != ModItems.factory_core_advanced && itemstack.getItem() != ModItems.energy_core)
{
list.add("Energy stored: " + (charge * 100) + " HE");
list.add("Energy stored: " + (charge * 100) + "/" + (maxCharge * 100) + " HE");
} else {
long charge1 = (charge * 100) / this.maxCharge;
list.add("Charge: " + charge1 + "%");
@ -101,4 +101,16 @@ public class ItemBattery extends Item {
return maxCharge;
}
public static ItemStack getEmptyBattery(Item item) {
if(item instanceof ItemBattery) {
ItemStack stack = new ItemStack(item);
stack.stackTagCompound = new NBTTagCompound();
stack.stackTagCompound.setLong("charge", 0);
return stack.copy();
}
return null;
}
}

2
com/hbm/items/special/ItemCustomLore.java
View File

@ -432,7 +432,7 @@ public class ItemCustomLore extends ItemRadioactive {
return EnumRarity.rare;
}
if(this == ModItems.gun_revolver_cursed_ammo || this == ModItems.plate_paa || this == ModItems.gun_mp_ammo || this == ModItems.powder_power || this == ModItems.ingot_australium || this == ModItems.ingot_weidanium || this == ModItems.ingot_reiium || this == ModItems.ingot_unobtainium || this == ModItems.ingot_daffergon || this == ModItems.ingot_verticium || this == ModItems.nugget_australium || this == ModItems.nugget_weidanium || this == ModItems.nugget_reiium || this == ModItems.nugget_unobtainium || this == ModItems.nugget_daffergon || this == ModItems.nugget_verticium)
if(this == ModItems.gun_revolver_cursed_ammo || this == ModItems.plate_paa || this == ModItems.gun_mp_ammo || this == ModItems.powder_power || this == ModItems.ingot_australium || this == ModItems.ingot_weidanium || this == ModItems.ingot_reiium || this == ModItems.ingot_unobtainium || this == ModItems.ingot_daffergon || this == ModItems.ingot_verticium || this == ModItems.nugget_australium || this == ModItems.nugget_weidanium || this == ModItems.nugget_reiium || this == ModItems.nugget_unobtainium || this == ModItems.nugget_daffergon || this == ModItems.nugget_verticium || this == ModItems.powder_australium || this == ModItems.powder_weidanium || this == ModItems.powder_reiium || this == ModItems.powder_unobtainium || this == ModItems.powder_daffergon || this == ModItems.powder_verticium)
{
return EnumRarity.uncommon;
}

2
com/hbm/lib/RefStrings.java
View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings {
public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.25 BETA (Astatine-Lyra-X01)";
public static final String VERSION = "1.0.25 BETA (Tennessine-Luna-X02)";
//HBM's Beta Naming Convention:
//V T (X-Y-Z)
//V -> next release version

5
com/hbm/main/ClientProxy.java
View File

@ -350,9 +350,10 @@ public class ClientProxy extends ServerProxy
MinecraftForgeClient.registerItemRenderer(ModItems.gun_cryolator, new ItemRenderCryolator());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_uboinik, new ItemRenderUboinik());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_jack, new ItemRenderOverkill());
//MinecraftForgeClient.registerItemRenderer(ModItems.gun_spark, new ItemRenderOverkill());
//MinecraftForgeClient.registerItemRenderer(ModItems.gun_hp, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_spark, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_hp, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_euthanasia, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_defabricator, new ItemRenderOverkill());
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool());
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool());

53
com/hbm/main/CraftingManager.java
View File

@ -2,6 +2,7 @@ package com.hbm.main;
import com.hbm.blocks.ModBlocks;
import com.hbm.items.ModItems;
import com.hbm.items.special.ItemBattery;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.init.Blocks;
@ -481,13 +482,13 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_conductor), 1), new Object[] { "SWS", "FFF", "SWS", 'S', "ingotTitanium", 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse }));
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_core), 1), new Object[] { "HPH", "PCP", "HPH", 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 'C', ModItems.circuit_aluminium, 'P', Item.getItemFromBlock(Blocks.piston) });
GameRegistry.addRecipe(new ItemStack(ModItems.factory_core_titanium, 1, ModItems.factory_core_titanium.getMaxDamage()), new Object[] { "BRB", "RHR", "BRB", 'B', ModItems.battery_generic, 'R', Item.getItemFromBlock(Blocks.redstone_block), 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull) });
GameRegistry.addRecipe(ItemBattery.getEmptyBattery(ModItems.factory_core_titanium), new Object[] { "BRB", "RHR", "BRB", 'B', ItemBattery.getEmptyBattery(ModItems.battery_generic), 'R', Item.getItemFromBlock(Blocks.redstone_block), 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull) });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', ModItems.plate_advanced_alloy, 'I', ModItems.ingot_advanced_alloy });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_conductor), 1), new Object[] { "SWS", "FFF", "SWS", 'S', ModItems.ingot_advanced_alloy, 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_advanced_core), 1), new Object[] { "HPH", "PCP", "HPH", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'C', ModItems.circuit_red_copper, 'P', Item.getItemFromBlock(Blocks.piston) });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.factory_core_advanced), new Object[] { "BLB", "SHS", "BLB", 'B', ModItems.battery_advanced, 'S', "blockSulfur", 'L', "blockLead", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull) }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.factory_core_advanced), new Object[] { "BSB", "LHL", "BSB", 'B', ModItems.battery_advanced, 'S', "blockSulfur", 'L', "blockLead", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.factory_core_advanced), new Object[] { "BLB", "SHS", "BLB", 'B', ItemBattery.getEmptyBattery(ModItems.battery_advanced), 'S', "blockSulfur", 'L', "blockLead", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.factory_core_advanced), new Object[] { "BSB", "LHL", "BSB", 'B', ItemBattery.getEmptyBattery(ModItems.battery_advanced), 'S', "blockSulfur", 'L', "blockLead", 'H', Item.getItemFromBlock(ModBlocks.factory_advanced_hull) }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fuse, 1), new Object[] { " S ", "GAG", " S ", 'S', "plateSteel", 'G', Item.getItemFromBlock(Blocks.glass_pane), 'A', ModItems.wire_aluminium }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.redcoil_capacitor, 1), new Object[] { "PFP", "CBC", "CBC", 'P', "plateGold", 'B', Item.getItemFromBlock(Blocks.redstone_block), 'C', ModItems.coil_advanced_alloy, 'F', ModItems.fuse }));
@ -762,30 +763,30 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.fleija_propellant, 1), new Object[] { "PPP", "TST", "PPP", 'P', ModItems.plate_schrabidium, 'S', ModItems.ingot_schrabidium, 'T', Item.getItemFromBlock(Blocks.tnt) });
GameRegistry.addRecipe(new ItemStack(ModItems.fleija_core, 1), new Object[] { "NUU", "BHW", "NUU", 'N', ModItems.nugget_neptunium, 'B', ModItems.nugget_beryllium, 'U', ModItems.nugget_u235, 'H', ModItems.coil_copper, 'W', ModItems.wire_red_copper });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_generic, 1), new Object[] { " A ", "PRP", "PRP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'R', Items.redstone }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_advanced, 1), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_advanced, 1), new Object[] { " A ", "PLP", "PSP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_advanced, 1), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "dustSulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_advanced, 1), new Object[] { " A ", "PLP", "PSP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "dustSulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_lithium, 1), new Object[] { "A A", "PSP", "PLP", 'A', ModItems.wire_gold, 'P', "plateTitanium", 'S', "dustLithium", 'L', ModItems.powder_cobalt }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_lithium, 1), new Object[] { "A A", "PLP", "PSP", 'A', ModItems.wire_gold, 'P', "plateTitanium", 'S', "dustLithium", 'L', ModItems.powder_cobalt }));
GameRegistry.addRecipe(new ItemStack(ModItems.battery_schrabidium, 1), new Object[] { " A ", "PNP", "PSP", 'A', ModItems.wire_schrabidium, 'P', ModItems.plate_schrabidium, 'S', ModItems.powder_schrabidium, 'N', ModItems.powder_neptunium });
GameRegistry.addRecipe(new ItemStack(ModItems.battery_schrabidium, 1), new Object[] { " A ", "PSP", "PNP", 'A', ModItems.wire_schrabidium, 'P', ModItems.plate_schrabidium, 'S', ModItems.powder_schrabidium, 'N', ModItems.powder_neptunium });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.energy_core, 1), new Object[] { "PCW", "TRD", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.energy_core, 1), new Object[] { "PCW", "TDR", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_generic), new Object[] { " A ", "PRP", "PRP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'R', Items.redstone }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PLP", "PSP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "dustSulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PLP", "PSP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "dustSulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium), new Object[] { "A A", "PSP", "PLP", 'A', ModItems.wire_gold, 'P', "plateTitanium", 'S', "dustLithium", 'L', ModItems.powder_cobalt }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium), new Object[] { "A A", "PLP", "PSP", 'A', ModItems.wire_gold, 'P', "plateTitanium", 'S', "dustLithium", 'L', ModItems.powder_cobalt }));
GameRegistry.addRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PNP", "PSP", 'A', ModItems.wire_schrabidium, 'P', ModItems.plate_schrabidium, 'S', ModItems.powder_schrabidium, 'N', ModItems.powder_neptunium });
GameRegistry.addRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PSP", "PNP", 'A', ModItems.wire_schrabidium, 'P', ModItems.plate_schrabidium, 'S', ModItems.powder_schrabidium, 'N', ModItems.powder_neptunium });
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.energy_core), new Object[] { "PCW", "TRD", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.energy_core), new Object[] { "PCW", "TDR", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_red_cell, 1), new Object[] { "WBW", "PBP", "WBW", 'W', ModItems.wire_aluminium, 'P', "plateAluminum", 'B', ModItems.battery_generic }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_advanced_cell, 1), new Object[] { "WBW", "PBP", "WBW", 'W', ModItems.wire_red_copper, 'P', "plateCopper", 'B', ModItems.battery_advanced }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_lithium_cell, 1), new Object[] { "WBW", "PBP", "WBW", 'W', ModItems.wire_gold, 'P', "plateTitanium", 'B', ModItems.battery_lithium }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_schrabidium_cell, 1), new Object[] { "WBW", "PBP", "WBW", 'W', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'B', ModItems.battery_schrabidium }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_red_cell_6, 1), new Object[] { "BBB", "WPW", "BBB", 'W', ModItems.wire_aluminium, 'P', "plateAluminum", 'B', ModItems.battery_red_cell }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_advanced_cell_4, 1), new Object[] { "BWB", "WPW", "BWB", 'W', ModItems.wire_red_copper, 'P', "plateCopper", 'B', ModItems.battery_advanced_cell }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_lithium_cell_3, 1), new Object[] { "WPW", "BBB", "WPW", 'W', ModItems.wire_gold, 'P', "plateTitanium", 'B', ModItems.battery_lithium_cell }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_schrabidium_cell_2, 1), new Object[] { "WPW", "BWB", "WPW", 'W', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'B', ModItems.battery_schrabidium_cell }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_red_cell_24, 1), new Object[] { "BWB", "WPW", "BWB", 'W', ModItems.wire_aluminium, 'P', "plateAluminum", 'B', ModItems.battery_red_cell_6 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_advanced_cell_12, 1), new Object[] { "WPW", "BBB", "WPW", 'W', ModItems.wire_red_copper, 'P', "plateCopper", 'B', ModItems.battery_advanced_cell_4 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_lithium_cell_6, 1), new Object[] { "WPW", "BWB", "WPW", 'W', ModItems.wire_gold, 'P', "plateTitanium", 'B', ModItems.battery_lithium_cell_3 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.battery_schrabidium_cell_4, 1), new Object[] { "WPW", "BWB", "WPW", 'W', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'B', ModItems.battery_schrabidium_cell_2 }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_red_cell), new Object[] { "WBW", "PBP", "WBW", 'W', ModItems.wire_aluminium, 'P', "plateAluminum", 'B', ItemBattery.getEmptyBattery(ModItems.battery_generic) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced_cell), new Object[] { "WBW", "PBP", "WBW", 'W', ModItems.wire_red_copper, 'P', "plateCopper", 'B', ItemBattery.getEmptyBattery(ModItems.battery_advanced) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium_cell), new Object[] { "WBW", "PBP", "WBW", 'W', ModItems.wire_gold, 'P', "plateTitanium", 'B', ItemBattery.getEmptyBattery(ModItems.battery_lithium) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium_cell), new Object[] { "WBW", "PBP", "WBW", 'W', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'B', ItemBattery.getEmptyBattery(ModItems.battery_schrabidium) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_red_cell_6), new Object[] { "BBB", "WPW", "BBB", 'W', ModItems.wire_aluminium, 'P', "plateAluminum", 'B', ItemBattery.getEmptyBattery(ModItems.battery_red_cell) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced_cell_4), new Object[] { "BWB", "WPW", "BWB", 'W', ModItems.wire_red_copper, 'P', "plateCopper", 'B', ItemBattery.getEmptyBattery(ModItems.battery_advanced_cell) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium_cell_3), new Object[] { "WPW", "BBB", "WPW", 'W', ModItems.wire_gold, 'P', "plateTitanium", 'B', ItemBattery.getEmptyBattery(ModItems.battery_lithium_cell) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium_cell_2), new Object[] { "WPW", "BWB", "WPW", 'W', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'B', ItemBattery.getEmptyBattery(ModItems.battery_schrabidium_cell) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_red_cell_24), new Object[] { "BWB", "WPW", "BWB", 'W', ModItems.wire_aluminium, 'P', "plateAluminum", 'B', ItemBattery.getEmptyBattery(ModItems.battery_red_cell_6) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced_cell_12), new Object[] { "WPW", "BBB", "WPW", 'W', ModItems.wire_red_copper, 'P', "plateCopper", 'B', ItemBattery.getEmptyBattery(ModItems.battery_advanced_cell_4) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium_cell_6), new Object[] { "WPW", "BWB", "WPW", 'W', ModItems.wire_gold, 'P', "plateTitanium", 'B', ItemBattery.getEmptyBattery(ModItems.battery_lithium_cell_3) }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium_cell_4), new Object[] { "WPW", "BWB", "WPW", 'W', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'B', ItemBattery.getEmptyBattery(ModItems.battery_schrabidium_cell_2) }));
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_schrabidium });
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_schrabidium });

57
com/hbm/main/MainRegistry.java
View File

@ -8,6 +8,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraftforge.common.AchievementPage;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
@ -147,6 +149,7 @@ import com.hbm.tileentity.TileEntityMachineElectricFurnace;
import com.hbm.tileentity.TileEntityMachineGasFlare;
import com.hbm.tileentity.TileEntityMachineGenerator;
import com.hbm.tileentity.TileEntityMachinePuF6Tank;
import com.hbm.tileentity.TileEntityMachineRTG;
import com.hbm.tileentity.TileEntityMachineReactor;
import com.hbm.tileentity.TileEntityMachineRefinery;
import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator;
@ -240,6 +243,47 @@ public class MainRegistry
public static CreativeTabs tabBlock = new BlockTab(CreativeTabs.getNextID(), "tabBlocks");
public static CreativeTabs tabNuke = new NukeTab(CreativeTabs.getNextID(), "tabNuke");
//Achievements
public static Achievement achievementGetTitanium;
public static Achievement achievementGetCopper;
public static Achievement achievementCraftAlloyFurnace;
public static Achievement achievementCraftElectricFurnace;
public static Achievement achievementCraftDerrick;
public static Achievement achievementCraftRefinery;
public static Achievement achievementCraftFactoryTitanium;
public static Achievement achievementCraftFactoryAdvanced;
public static Achievement achievementCraftGeneratorCoal;
public static Achievement achievementCraftGeneratorDiesel;
public static Achievement achievementCraftGeneratorIndustrial;
public static Achievement achievementGetLead;
public static Achievement achievementCraftBreedingReactor;
public static Achievement achievementCraftAtomicFurnace;
public static Achievement achievementCraftCentrifuge;
public static Achievement achievementCraftMissile;
public static Achievement achievementCraftMIRV;
public static Achievement achievementCraftNuclearReactor;
public static Achievement achievementCraftRTGFurnace;
public static Achievement achievementCraftRTG;
public static Achievement achievementCraftReactor;
public static Achievement achievementCraftTransmutator;
public static Achievement achievementCraftWatz;
public static Achievement achievementCraftCMB;
public static Achievement achievementCraftTeleporter;
public static Achievement achievementCraftFWatz;
public static Achievement achievementCraftDeuterium;
public static Achievement achievementCraftFusion;
public static Achievement achievementCraftCyclotron;
public static Achievement achievementCraftNuke;
public static Achievement achievementCraftFLEIJA;
public static Achievement achievementCraftHammer;
public static Achievement achievementCraftOutlaw;
public static Achievement achievementGetReiium;
public static Achievement achievementGetWeidanium;
public static Achievement achievementGetAustalium;
public static Achievement achievementGetVerticium;
public static Achievement achievementGetUnobtainium;
public static Achievement achievementGetDaffergon;
public static boolean enableDebugMode = true;
public static boolean enableMycelium = false;
public static boolean enablePlutoniumOre = false;
@ -398,6 +442,7 @@ public class MainRegistry
GameRegistry.registerTileEntity(TileEntityOilDuctSolid.class, "tileentity_oil_duct_solid");
GameRegistry.registerTileEntity(TileEntityGasDuct.class, "tileentity_gas_duct");
GameRegistry.registerTileEntity(TileEntityGasDuctSolid.class, "tileentity_gas_duct_solid");
GameRegistry.registerTileEntity(TileEntityMachineRTG.class, "tileentity_machine_rtg");
EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);
@ -484,6 +529,17 @@ public class MainRegistry
@EventHandler
public static void load(FMLInitializationEvent event)
{
achievementGetTitanium = new Achievement("achievement.getTitanium", "getTitanium", 0, -6, ModItems.ingot_titanium, (Achievement)null).initIndependentStat() .registerStat();
achievementCraftAlloyFurnace = new Achievement("achievement.craftAlloyFurnace", "craftAlloyFurnace", -2, -4, Item.getItemFromBlock(ModBlocks.machine_difurnace_off), (Achievement)null).initIndependentStat() .registerStat();
achievementCraftBreedingReactor = new Achievement("achievement.craftBreedingReactor", "craftBreedingReactor", 2, -4, Item.getItemFromBlock(ModBlocks.machine_reactor), (Achievement)null).initIndependentStat() .registerStat();
achievementCraftCentrifuge = new Achievement("achievement.craftCentrifuge", "craftCentrifuge", 2, -2, Item.getItemFromBlock(ModBlocks.machine_centrifuge), achievementCraftBreedingReactor).initIndependentStat() .registerStat();
AchievementPage.registerAchievementPage(new AchievementPage("NTM Achievements", new Achievement[]{
achievementGetTitanium,
achievementCraftAlloyFurnace,
achievementCraftBreedingReactor,
achievementCraftCentrifuge
}));
OreDictionary.registerOre("ingotUranium", ModItems.ingot_uranium);
OreDictionary.registerOre("ingotUranium235", ModItems.ingot_u235);
OreDictionary.registerOre("ingotUranium238", ModItems.ingot_u238);
@ -511,6 +567,7 @@ public class MainRegistry
OreDictionary.registerOre("ingotAdvancedAlloy", ModItems.ingot_advanced_alloy);
OreDictionary.registerOre("ingotTungsten", ModItems.ingot_tungsten);
OreDictionary.registerOre("ingotAluminum", ModItems.ingot_aluminium);
OreDictionary.registerOre("ingotBeryllium", ModItems.ingot_beryllium);
OreDictionary.registerOre("ingotNeptunium", ModItems.ingot_neptunium);
OreDictionary.registerOre("ingotLead", ModItems.ingot_lead);
OreDictionary.registerOre("ingotLithium", ModItems.lithium);

33
com/hbm/main/ModEventHandler.java
View File

@ -1,10 +1,13 @@
package com.hbm.main;
import com.hbm.blocks.ModBlocks;
import com.hbm.items.ModItems;
import com.hbm.lib.RefStrings;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import net.minecraft.client.Minecraft;
import net.minecraft.item.Item;
import net.minecraft.util.ChatComponentText;
public class ModEventHandler
@ -20,4 +23,34 @@ public class ModEventHandler
showMessage = !showMessage;
}
@SubscribeEvent
public void itemSmelted(PlayerEvent.ItemSmeltedEvent e) {
if(e.smelting.getItem().equals(ModItems.ingot_titanium)) {
e.player.addStat(MainRegistry.achievementGetTitanium, 1);
}
}
@SubscribeEvent
public void itemCrafted(PlayerEvent.ItemCraftedEvent e) {
Item item = e.crafting.getItem();
if(item.equals(Item.getItemFromBlock(ModBlocks.machine_difurnace_off))) {
e.player.addStat(MainRegistry.achievementCraftAlloyFurnace, 1);
}
if(item.equals(Item.getItemFromBlock(ModBlocks.machine_reactor))) {
e.player.addStat(MainRegistry.achievementCraftBreedingReactor, 1);
}
if(item.equals(Item.getItemFromBlock(ModBlocks.machine_centrifuge))) {
e.player.addStat(MainRegistry.achievementCraftCentrifuge, 1);
}
}
@SubscribeEvent
public void itemCollected(PlayerEvent.ItemPickupEvent e) {
if(e.pickedUp.getEntityItem().equals(ModItems.nothing)) {
//e.player.addStat(MainRegistry.achievementGetAmblygonite, 1);
}
}
}

116
com/hbm/render/entity/RenderMinecartTest.java
View File

@ -4,18 +4,123 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.entity.RenderMinecart;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.entity.item.EntityMinecartTNT;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.item.EntityMinecartTest;
import com.hbm.lib.RefStrings;
public class RenderMinecartTest extends RenderMinecart
{
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/LilBoy1.obj");
private IModelCustom boyModel;
private ResourceLocation boyTexture;
private static final String __OBFID = "CL_00001029";
public RenderMinecartTest() {
boyModel = AdvancedModelLoader.loadModel(objTesterModelRL);
boyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/LilBoy2.png");
}
public void doRender(EntityMinecart p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
{
GL11.glPushMatrix();
this.bindEntityTexture(p_76986_1_);
long i = (long)p_76986_1_.getEntityId() * 493286711L;
i = i * i * 4392167121L + i * 98761L;
float f2 = (((float)(i >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
float f3 = (((float)(i >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
float f4 = (((float)(i >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
GL11.glTranslatef(f2, f3, f4);
double d3 = p_76986_1_.lastTickPosX + (p_76986_1_.posX - p_76986_1_.lastTickPosX) * (double)p_76986_9_;
double d4 = p_76986_1_.lastTickPosY + (p_76986_1_.posY - p_76986_1_.lastTickPosY) * (double)p_76986_9_;
double d5 = p_76986_1_.lastTickPosZ + (p_76986_1_.posZ - p_76986_1_.lastTickPosZ) * (double)p_76986_9_;
double d6 = 0.30000001192092896D;
Vec3 vec3 = p_76986_1_.func_70489_a(d3, d4, d5);
float f5 = p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_;
if (vec3 != null)
{
Vec3 vec31 = p_76986_1_.func_70495_a(d3, d4, d5, d6);
Vec3 vec32 = p_76986_1_.func_70495_a(d3, d4, d5, -d6);
if (vec31 == null)
{
vec31 = vec3;
}
if (vec32 == null)
{
vec32 = vec3;
}
p_76986_2_ += vec3.xCoord - d3;
p_76986_4_ += (vec31.yCoord + vec32.yCoord) / 2.0D - d4;
p_76986_6_ += vec3.zCoord - d5;
Vec3 vec33 = vec32.addVector(-vec31.xCoord, -vec31.yCoord, -vec31.zCoord);
if (vec33.lengthVector() != 0.0D)
{
vec33 = vec33.normalize();
p_76986_8_ = (float)(Math.atan2(vec33.zCoord, vec33.xCoord) * 180.0D / Math.PI);
f5 = (float)(Math.atan(vec33.yCoord) * 73.0D);
}
}
GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
GL11.glRotatef(180.0F - p_76986_8_, 0.0F, 1.0F, 0.0F);
//
if(p_76986_1_.getDataWatcher().getWatchableObjectInt(23) < 0 || p_76986_1_.getDataWatcher().getWatchableObjectInt(24) < 0)
GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
//
GL11.glRotatef(-f5, 0.0F, 0.0F, 1.0F);
float f7 = (float)p_76986_1_.getRollingAmplitude() - p_76986_9_;
float f8 = p_76986_1_.getDamage() - p_76986_9_;
if (f8 < 0.0F)
{
f8 = 0.0F;
}
if (f7 > 0.0F)
{
GL11.glRotatef(MathHelper.sin(f7) * f7 * f8 / 10.0F * (float)p_76986_1_.getRollingDirection(), 1.0F, 0.0F, 0.0F);
}
int k = p_76986_1_.getDisplayTileOffset();
Block block = p_76986_1_.func_145820_n();
int j = p_76986_1_.getDisplayTileData();
if (block.getRenderType() != -1)
{
GL11.glPushMatrix();
this.bindTexture(TextureMap.locationBlocksTexture);
float f6 = 0.75F;
GL11.glScalef(f6, f6, f6);
GL11.glTranslatef(0.0F, (float)k / 16.0F, 0.0F);
this.func_147910_a(p_76986_1_, p_76986_9_, block, j);
GL11.glPopMatrix();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.bindEntityTexture(p_76986_1_);
}
GL11.glScalef(-1.0F, -1.0F, 1.0F);
this.modelMinecart.render(p_76986_1_, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
}
protected void func_147910_a(EntityMinecartTest p_147910_1_, float p_147910_2_, Block p_147910_3_, int p_147910_4_)
{
int j = p_147910_1_.func_94104_d();
@ -40,7 +145,12 @@ public class RenderMinecartTest extends RenderMinecart
GL11.glScalef(f2, f2, f2);
}
super.func_147910_a(p_147910_1_, p_147910_2_, p_147910_3_, p_147910_4_);
GL11.glPushMatrix();
//this.field_94145_f.renderBlockAsItem(ModBlocks.crate, 0, 1.0F);
bindTexture(boyTexture);
boyModel.renderAll();
GL11.glPopMatrix();
//super.func_147910_a(p_147910_1_, p_147910_2_, p_147910_3_, p_147910_4_);
if (j > -1 && j / 5 % 2 == 0)
{
@ -50,7 +160,9 @@ public class RenderMinecartTest extends RenderMinecart
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA);
GL11.glColor4f(1.0F, 1.0F, 1.0F, (1.0F - ((float)j - p_147910_2_ + 1.0F) / 100.0F) * 0.8F);
GL11.glPushMatrix();
this.field_94145_f.renderBlockAsItem(ModBlocks.crate, 0, 1.0F);
//this.field_94145_f.renderBlockAsItem(ModBlocks.crate, 0, 1.0F);
bindTexture(boyTexture);
boyModel.renderAll();
GL11.glPopMatrix();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glDisable(GL11.GL_BLEND);

43
com/hbm/render/item/ItemRenderOverkill.java
View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.items.ModItems;
import com.hbm.lib.RefStrings;
import com.hbm.render.model.ModelDefabricator;
import com.hbm.render.model.ModelEuthanasia;
import com.hbm.render.model.ModelHP;
import com.hbm.render.model.ModelJack;
@ -24,12 +25,14 @@ public class ItemRenderOverkill implements IItemRenderer {
protected ModelSpark sparkPlug;
protected ModelHP hppLaserjet;
protected ModelEuthanasia euthanasia;
protected ModelDefabricator defab;
public ItemRenderOverkill() {
powerJack = new ModelJack();
sparkPlug = new ModelSpark();
hppLaserjet = new ModelHP();
euthanasia = new ModelEuthanasia();
defab = new ModelDefabricator();
}
@Override
@ -57,12 +60,14 @@ public class ItemRenderOverkill implements IItemRenderer {
if(item.getItem() == ModItems.gun_jack)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelJack.png"));
//if(item.getItem() == ModItems.gun_spark)
// Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSpark.png"));
//if(item.getItem() == ModItems.gun_hp)
// Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelHP.png"));
if(item.getItem() == ModItems.gun_spark)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSpark.png"));
if(item.getItem() == ModItems.gun_hp)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelHP.png"));
if(item.getItem() == ModItems.gun_euthanasia)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEuthanasia.png"));
if(item.getItem() == ModItems.gun_defabricator)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDefabricator.png"));
GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(-0.5F, 0.0F, -0.2F);
@ -73,12 +78,14 @@ public class ItemRenderOverkill implements IItemRenderer {
if(item.getItem() == ModItems.gun_jack)
powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
//if(item.getItem() == ModItems.gun_spark)
// sparkPlug.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
//if(item.getItem() == ModItems.gun_hp)
// hppLaserjet.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_spark)
sparkPlug.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_hp)
hppLaserjet.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_euthanasia)
euthanasia.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_defabricator)
defab.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
break;
case EQUIPPED:
@ -87,12 +94,14 @@ public class ItemRenderOverkill implements IItemRenderer {
GL11.glEnable(GL11.GL_CULL_FACE);
if(item.getItem() == ModItems.gun_jack)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelJack.png"));
//if(item.getItem() == ModItems.gun_spark)
// Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSpark.png"));
//if(item.getItem() == ModItems.gun_hp)
// Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelHP.png"));
if(item.getItem() == ModItems.gun_spark)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSpark.png"));
if(item.getItem() == ModItems.gun_hp)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelHP.png"));
if(item.getItem() == ModItems.gun_euthanasia)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelEuthanasia.png"));
if(item.getItem() == ModItems.gun_defabricator)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelDefabricator.png"));
GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F);
@ -105,12 +114,14 @@ public class ItemRenderOverkill implements IItemRenderer {
if(item.getItem() == ModItems.gun_jack)
powerJack.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
//if(item.getItem() == ModItems.gun_spark)
// sparkPlug.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
//if(item.getItem() == ModItems.gun_hp)
// hppLaserjet.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_spark)
sparkPlug.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_hp)
hppLaserjet.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_euthanasia)
euthanasia.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
if(item.getItem() == ModItems.gun_defabricator)
defab.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix();
default: break;
}

224
com/hbm/render/model/ModelDefabricator.java Executable file
View File

@ -0,0 +1,224 @@
//This File was created with the Minecraft-SMP Modelling Toolbox 2.3.0.0
// Copyright (C) 2017 Minecraft-SMP.de
// This file is for Flan's Flying Mod Version 4.0.x+
// Model: Defabricator
// Model Creator:
// Created on:05.06.2017 - 11:21:40
// Last changed on: 05.06.2017 - 11:21:40
package com.hbm.render.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelDefabricator extends ModelBase
{
int textureX = 128;
int textureY = 64;
ModelRenderer[] modeldefabricatorModel;
public ModelDefabricator()
{
textureWidth = 128;
textureHeight = 64;
modeldefabricatorModel = new ModelRenderer[40];
modeldefabricatorModel[0] = new ModelRenderer(this, 1, 1); // Box 0
modeldefabricatorModel[1] = new ModelRenderer(this, 25, 1); // Box 1
modeldefabricatorModel[2] = new ModelRenderer(this, 41, 1); // Box 2
modeldefabricatorModel[3] = new ModelRenderer(this, 57, 1); // Box 3
modeldefabricatorModel[4] = new ModelRenderer(this, 89, 1); // Box 4
modeldefabricatorModel[5] = new ModelRenderer(this, 105, 1); // Box 5
modeldefabricatorModel[6] = new ModelRenderer(this, 1, 9); // Box 6
modeldefabricatorModel[7] = new ModelRenderer(this, 25, 9); // Box 7
modeldefabricatorModel[8] = new ModelRenderer(this, 49, 1); // Box 8
modeldefabricatorModel[9] = new ModelRenderer(this, 57, 9); // Box 9
modeldefabricatorModel[10] = new ModelRenderer(this, 33, 9); // Box 10
modeldefabricatorModel[11] = new ModelRenderer(this, 89, 9); // Box 11
modeldefabricatorModel[12] = new ModelRenderer(this, 113, 9); // Box 12
modeldefabricatorModel[13] = new ModelRenderer(this, 17, 1); // Box 13
modeldefabricatorModel[14] = new ModelRenderer(this, 1, 17); // Box 14
modeldefabricatorModel[15] = new ModelRenderer(this, 17, 17); // Box 15
modeldefabricatorModel[16] = new ModelRenderer(this, 41, 17); // Box 16
modeldefabricatorModel[17] = new ModelRenderer(this, 73, 17); // Box 17
modeldefabricatorModel[18] = new ModelRenderer(this, 97, 17); // Box 18
modeldefabricatorModel[19] = new ModelRenderer(this, 113, 17); // Box 19
modeldefabricatorModel[20] = new ModelRenderer(this, 1, 25); // Box 20
modeldefabricatorModel[21] = new ModelRenderer(this, 9, 25); // Box 21
modeldefabricatorModel[22] = new ModelRenderer(this, 17, 25); // Box 22
modeldefabricatorModel[23] = new ModelRenderer(this, 33, 25); // Box 23
modeldefabricatorModel[24] = new ModelRenderer(this, 49, 25); // Box 24
modeldefabricatorModel[25] = new ModelRenderer(this, 65, 25); // Box 25
modeldefabricatorModel[26] = new ModelRenderer(this, 81, 25); // Box 26
modeldefabricatorModel[27] = new ModelRenderer(this, 97, 1); // Box 27
modeldefabricatorModel[28] = new ModelRenderer(this, 1, 33); // Box 28
modeldefabricatorModel[29] = new ModelRenderer(this, 105, 17); // Box 29
modeldefabricatorModel[30] = new ModelRenderer(this, 89, 25); // Box 30
modeldefabricatorModel[31] = new ModelRenderer(this, 49, 33); // Box 31
modeldefabricatorModel[32] = new ModelRenderer(this, 1, 41); // Box 32
modeldefabricatorModel[33] = new ModelRenderer(this, 89, 25); // Box 33
modeldefabricatorModel[34] = new ModelRenderer(this, 89, 33); // Box 34
modeldefabricatorModel[35] = new ModelRenderer(this, 41, 41); // Box 35
modeldefabricatorModel[36] = new ModelRenderer(this, 105, 25); // Box 36
modeldefabricatorModel[37] = new ModelRenderer(this, 113, 25); // Box 39
modeldefabricatorModel[38] = new ModelRenderer(this, 121, 25); // Box 40
modeldefabricatorModel[39] = new ModelRenderer(this, 57, 41); // Box 41
modeldefabricatorModel[0].addBox(0F, 0F, 0F, 5, 2, 3); // Box 0
modeldefabricatorModel[0].setRotationPoint(0F, 0.5F, -1.5F);
modeldefabricatorModel[1].addBox(0F, 0F, 0F, 5, 3, 2); // Box 1
modeldefabricatorModel[1].setRotationPoint(0F, 0F, -1F);
modeldefabricatorModel[2].addBox(0F, 0F, 0F, 2, 7, 3); // Box 2
modeldefabricatorModel[2].setRotationPoint(-2F, -2F, -1.5F);
modeldefabricatorModel[3].addBox(0F, 0F, 0F, 11, 1, 3); // Box 3
modeldefabricatorModel[3].setRotationPoint(0F, -2F, -1.5F);
modeldefabricatorModel[4].addBox(0F, 0F, 0F, 1, 3, 3); // Box 4
modeldefabricatorModel[4].setRotationPoint(10F, -1F, -1.5F);
modeldefabricatorModel[5].addBox(0F, 0F, 0F, 6, 1, 2); // Box 5
modeldefabricatorModel[5].setRotationPoint(0F, 4F, -1F);
modeldefabricatorModel[6].addBox(0F, -1F, 0F, 6, 1, 2); // Box 6
modeldefabricatorModel[6].setRotationPoint(6F, 5F, -1F);
modeldefabricatorModel[6].rotateAngleZ = -0.61086524F;
modeldefabricatorModel[7].addBox(0F, 0F, 0F, 1, 2, 2); // Box 7
modeldefabricatorModel[7].setRotationPoint(5F, 0.5F, -1F);
modeldefabricatorModel[8].addBox(0F, 0F, 0F, 4, 1, 1); // Box 8
modeldefabricatorModel[8].setRotationPoint(6F, 1F, -0.5F);
modeldefabricatorModel[9].addBox(0F, 0F, 0F, 12, 1, 2); // Box 9
modeldefabricatorModel[9].setRotationPoint(11F, 0F, -1F);
modeldefabricatorModel[10].addBox(0F, 0F, 0F, 1, 6, 2); // Box 10
modeldefabricatorModel[10].setRotationPoint(22F, -6F, -1F);
modeldefabricatorModel[11].addBox(0F, 0F, 0F, 8, 2, 2); // Box 11
modeldefabricatorModel[11].setRotationPoint(14F, -2.5F, -1F);
modeldefabricatorModel[12].addBox(0F, 0F, 0F, 3, 1, 1); // Box 12
modeldefabricatorModel[12].setRotationPoint(11F, -2F, -0.5F);
modeldefabricatorModel[13].addBox(0F, 0F, 0F, 1, 1, 1); // Box 13
modeldefabricatorModel[13].setRotationPoint(1F, 3.5F, -0.5F);
modeldefabricatorModel[14].addBox(0F, 0F, 0F, 5, 1, 2); // Box 14
modeldefabricatorModel[14].setRotationPoint(13.5F, -4.5F, -1F);
modeldefabricatorModel[15].addBox(0F, 0F, 0F, 4, 1, 2); // Box 15
modeldefabricatorModel[15].setRotationPoint(18F, -5F, -1F);
modeldefabricatorModel[16].addBox(0F, 0F, 0F, 10, 1, 2); // Box 16
modeldefabricatorModel[16].setRotationPoint(4F, -5F, -1F);
modeldefabricatorModel[17].addBox(-6F, 0F, 0F, 6, 1, 2); // Box 17
modeldefabricatorModel[17].setRotationPoint(4F, -5F, -1F);
modeldefabricatorModel[17].rotateAngleZ = -0.52359878F;
modeldefabricatorModel[18].addBox(0F, 0F, 0F, 1, 3, 3); // Box 18
modeldefabricatorModel[18].setRotationPoint(22F, -9F, -1.5F);
modeldefabricatorModel[19].addBox(0F, 0F, 0F, 5, 2, 2); // Box 19
modeldefabricatorModel[19].setRotationPoint(17F, -8.5F, -1F);
modeldefabricatorModel[20].addBox(-4F, -3F, 0F, 1, 3, 2); // Box 20
modeldefabricatorModel[20].setRotationPoint(4F, -5F, -1F);
modeldefabricatorModel[20].rotateAngleZ = -0.52359878F;
modeldefabricatorModel[21].addBox(-4F, -4F, 0F, 1, 1, 2); // Box 21
modeldefabricatorModel[21].setRotationPoint(4F, -5F, -1F);
modeldefabricatorModel[21].rotateAngleZ = -0.52359878F;
modeldefabricatorModel[22].addBox(0F, 0F, 0F, 4, 3, 2); // Box 22
modeldefabricatorModel[22].setRotationPoint(-6F, 0F, -1F);
modeldefabricatorModel[23].addBox(0F, 0F, 0F, 4, 2, 3); // Box 23
modeldefabricatorModel[23].setRotationPoint(-6F, 0.5F, -1.5F);
modeldefabricatorModel[24].addBox(0F, 0F, 0F, 5, 2, 2); // Box 24
modeldefabricatorModel[24].setRotationPoint(-11F, 0.5F, -1F);
modeldefabricatorModel[25].addBox(0F, 0F, 0F, 2, 3, 2); // Box 25
modeldefabricatorModel[25].setRotationPoint(-10.5F, 0F, -1F);
modeldefabricatorModel[26].addBox(0F, 0F, 0F, 2, 2, 3); // Box 26
modeldefabricatorModel[26].setRotationPoint(-10.5F, 0.5F, -1.5F);
modeldefabricatorModel[27].addBox(0F, -2.5F, -0.5F, 1, 1, 1); // Box 27
modeldefabricatorModel[27].setRotationPoint(-3F, 1.5F, 0F);
modeldefabricatorModel[28].addBox(0F, -3F, -0.5F, 20, 1, 1); // Box 28
modeldefabricatorModel[28].setRotationPoint(-23F, 1.5F, 0F);
modeldefabricatorModel[29].addBox(0F, -2.5F, -0.5F, 1, 1, 1); // Box 29
modeldefabricatorModel[29].setRotationPoint(-3F, 1.5F, 0F);
modeldefabricatorModel[29].rotateAngleX = 2.0943951F;
modeldefabricatorModel[30].addBox(0F, -2.5F, -0.5F, 1, 1, 1); // Box 30
modeldefabricatorModel[30].setRotationPoint(-3F, 1.5F, 0F);
modeldefabricatorModel[30].rotateAngleX = -2.0943951F;
modeldefabricatorModel[31].addBox(0F, -3F, -0.5F, 20, 1, 1); // Box 31
modeldefabricatorModel[31].setRotationPoint(-23F, 1.5F, 0F);
modeldefabricatorModel[31].rotateAngleX = -2.0943951F;
modeldefabricatorModel[32].addBox(0F, -3F, -0.5F, 20, 1, 1); // Box 32
modeldefabricatorModel[32].setRotationPoint(-23F, 1.5F, 0F);
modeldefabricatorModel[32].rotateAngleX = 2.0943951F;
modeldefabricatorModel[33].addBox(0F, -2F, -3F, 2, 1, 6); // Box 33
modeldefabricatorModel[33].setRotationPoint(-22F, 1.5F, 0F);
modeldefabricatorModel[33].rotateAngleX = 1.04719755F;
modeldefabricatorModel[34].addBox(0F, -2F, -3F, 2, 1, 6); // Box 34
modeldefabricatorModel[34].setRotationPoint(-22F, 1.5F, 0F);
modeldefabricatorModel[34].rotateAngleX = -3.14159265F;
modeldefabricatorModel[35].addBox(0F, -2F, -3F, 2, 1, 6); // Box 35
modeldefabricatorModel[35].setRotationPoint(-22F, 1.5F, 0F);
modeldefabricatorModel[35].rotateAngleX = -1.04719755F;
modeldefabricatorModel[36].addBox(0.5F, -2.5F, -0.5F, 1, 1, 1); // Box 36
modeldefabricatorModel[36].setRotationPoint(-24F, 1.5F, 0F);
modeldefabricatorModel[37].addBox(0.5F, -2.5F, -0.5F, 1, 1, 1); // Box 39
modeldefabricatorModel[37].setRotationPoint(-24F, 1.5F, 0F);
modeldefabricatorModel[37].rotateAngleX = 2.0943951F;
modeldefabricatorModel[38].addBox(0.5F, -2.5F, -0.5F, 1, 1, 1); // Box 40
modeldefabricatorModel[38].setRotationPoint(-24F, 1.5F, 0F);
modeldefabricatorModel[38].rotateAngleX = -2.0943951F;
modeldefabricatorModel[39].addBox(0F, 0F, 0F, 13, 0, 1); // Box 41
modeldefabricatorModel[39].setRotationPoint(5F, -5F, -0.5F);
modeldefabricatorModel[39].rotateAngleZ = -0.17453293F;
for(int i = 0; i < 40; i++)
{
modeldefabricatorModel[i].setTextureSize(textureX, textureY);
modeldefabricatorModel[i].mirror = true;
}
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
for(int i = 0; i < 40; i++)
{
modeldefabricatorModel[i].render(f5);
}
}
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
{
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
}
}

2
com/hbm/world/DesertAtom002.java
View File

@ -32,7 +32,7 @@ public class DesertAtom002
Block Block14 = ModBlocks.machine_generator;
Block Block15 = ModBlocks.block_titanium;
Block Block16 = ModBlocks.machine_reactor;
Block Block17 = ModBlocks.ore_schrabidium;
Block Block17 = ModBlocks.ore_nether_plutonium;
Block Block18 = ModBlocks.waste_planks;
Block Block19 = ModBlocks.machine_centrifuge;
Block Block20 = ModBlocks.machine_uf6_tank;