diff --git a/assets/hbm/textures/blocks/industrial_generator.png b/assets/hbm/textures/blocks/industrial_generator.png index fb28cf088..089b2f3e7 100644 Binary files a/assets/hbm/textures/blocks/industrial_generator.png and b/assets/hbm/textures/blocks/industrial_generator.png differ diff --git a/assets/hbm/textures/items/ring_pull.png b/assets/hbm/textures/items/ring_pull.png index 55753105e..56722031b 100644 Binary files a/assets/hbm/textures/items/ring_pull.png and b/assets/hbm/textures/items/ring_pull.png differ diff --git a/assets/hbm/textures/models/TestObj.png b/assets/hbm/textures/models/TestObj.png index e681f2c15..e4b7504dc 100644 Binary files a/assets/hbm/textures/models/TestObj.png and b/assets/hbm/textures/models/TestObj.png differ diff --git a/assets/hbm/textures/models/textureIGen.png b/assets/hbm/textures/models/textureIGen.png index 70fc5d7f3..9d98179c5 100755 Binary files a/assets/hbm/textures/models/textureIGen.png and b/assets/hbm/textures/models/textureIGen.png differ diff --git a/assets/hbm/textures/models/textureIGenRotor.png b/assets/hbm/textures/models/textureIGenRotor.png new file mode 100644 index 000000000..4cf0c7ddf Binary files /dev/null and b/assets/hbm/textures/models/textureIGenRotor.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index a8cd7e2bf..52e8af98f 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -923,7 +923,7 @@ public class ModBlocks { //GameRegistry.registerBlock(machine_rtg_orange, machine_rtg_orange.getUnlocalizedName()); //GameRegistry.registerBlock(machine_rtg_yellow, machine_rtg_yellow.getUnlocalizedName()); //GameRegistry.registerBlock(machine_rtg_green, machine_rtg_green.getUnlocalizedName()); - GameRegistry.registerBlock(machine_rtg_cyan, machine_rtg_cyan.getUnlocalizedName()); + //GameRegistry.registerBlock(machine_rtg_cyan, machine_rtg_cyan.getUnlocalizedName()); //GameRegistry.registerBlock(machine_rtg_blue, machine_rtg_blue.getUnlocalizedName()); //GameRegistry.registerBlock(machine_rtg_purple, machine_rtg_purple.getUnlocalizedName()); GameRegistry.registerBlock(red_cable, red_cable.getUnlocalizedName()); @@ -940,7 +940,7 @@ public class ModBlocks { GameRegistry.registerBlock(machine_teleporter, machine_teleporter.getUnlocalizedName()); //ReiX Machines - GameRegistry.registerBlock(machine_reix_mainframe, machine_reix_mainframe.getUnlocalizedName()); + //GameRegistry.registerBlock(machine_reix_mainframe, machine_reix_mainframe.getUnlocalizedName()); //Industrial Factories GameRegistry.registerBlock(factory_titanium_hull, factory_titanium_hull.getUnlocalizedName()); diff --git a/com/hbm/entity/projectile/EntitySchrab.java b/com/hbm/entity/projectile/EntitySchrab.java index e198b3009..5c7017fd3 100644 --- a/com/hbm/entity/projectile/EntitySchrab.java +++ b/com/hbm/entity/projectile/EntitySchrab.java @@ -264,7 +264,7 @@ public class EntitySchrab extends Entity implements IProjectile this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.5F, true); ExplosionChaos.burn(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 10); ExplosionChaos.flameDeath(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 20); - ExplosionNukeGeneric.waste(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 20); + ExplosionNukeGeneric.wasteNoSchrab(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 20); ExplosionChaos.poison(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 20); } this.worldObj.spawnEntityInWorld(new EntityLightningBolt(this.worldObj, this.posX, this.posY, this.posZ)); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index cd1ddcb3b..75dcad593 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -1655,7 +1655,7 @@ public class ModItems { cape_vertice = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_vertice").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); schrabidium_hammer = new WeaponSpecial(MainRegistry.enumToolMaterialHammer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer"); - bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener"); + bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener"); euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper"); matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick"); crowbar = new ModSword(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar"); @@ -2216,7 +2216,7 @@ public class ModItems { //Missiles GameRegistry.registerItem(missile_generic, missile_generic.getUnlocalizedName()); - GameRegistry.registerItem(missile_anti_ballistic, missile_anti_ballistic.getUnlocalizedName()); + //GameRegistry.registerItem(missile_anti_ballistic, missile_anti_ballistic.getUnlocalizedName()); GameRegistry.registerItem(missile_incendiary, missile_incendiary.getUnlocalizedName()); GameRegistry.registerItem(missile_cluster, missile_cluster.getUnlocalizedName()); GameRegistry.registerItem(missile_buster, missile_buster.getUnlocalizedName()); @@ -2381,7 +2381,6 @@ public class ModItems { GameRegistry.registerItem(pipe_rusty, pipe_rusty.getUnlocalizedName()); GameRegistry.registerItem(pipe_lead, pipe_lead.getUnlocalizedName()); GameRegistry.registerItem(reer_graar, reer_graar.getUnlocalizedName()); - GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName()); //Multitool GameRegistry.registerItem(multitool_hit, multitool_hit.getUnlocalizedName()); @@ -2435,6 +2434,7 @@ public class ModItems { GameRegistry.registerItem(bottle2_fritz, bottle2_fritz.getUnlocalizedName()); GameRegistry.registerItem(bottle2_korl_special, bottle2_korl_special.getUnlocalizedName()); GameRegistry.registerItem(bottle2_fritz_special, bottle2_fritz_special.getUnlocalizedName()); + GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName()); //Money GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName()); diff --git a/com/hbm/items/gear/ArmorAustralium.java b/com/hbm/items/gear/ArmorAustralium.java index 811cdf195..f5b1c5313 100644 --- a/com/hbm/items/gear/ArmorAustralium.java +++ b/com/hbm/items/gear/ArmorAustralium.java @@ -39,19 +39,22 @@ public class ArmorAustralium extends ItemArmor { if(rand.nextInt(3) == 0) { armor.damageItem(1, player); } - player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 10, 2, true)); + if(!player.isPotionActive(Potion.field_76444_x.id)) + player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 80, 2, true)); } if (armor.getItem() == ModItems.australium_iv) { if(rand.nextInt(5) == 0) { armor.damageItem(1, player); } - player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 10, 4, true)); + if(!player.isPotionActive(Potion.field_76444_x.id)) + player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 80, 4, true)); } if (armor.getItem() == ModItems.australium_v) { if(rand.nextInt(7) == 0) { armor.damageItem(1, player); } - player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 10, 3, true)); + if(!player.isPotionActive(Potion.field_76444_x.id)) + player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 80, 3, true)); } } } diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index bbdeb0f9d..a583c771e 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -40,7 +40,11 @@ public class ItemCustomLore extends ItemRadioactive { if(this == ModItems.ingot_neptunium) { - list.add("That one's my favourite!"); + if(MainRegistry.polaroidID == 11) { + list.add("Pretty weird...you know what I mean, right?"); + list.add("All of it. The lore, the polaroid, the..."); + } else + list.add("That one's my favourite!"); } if(this == ModItems.pellet_rtg) @@ -389,7 +393,7 @@ public class ItemCustomLore extends ItemRadioactive { if(this == ModItems.crystal_horn) { if(MainRegistry.polaroidID == 11) - list.add("An actual horn"); + list.add("An actual horn."); else list.add("Not an actual horn."); } diff --git a/com/hbm/items/tool/ItemRamManipulator.java b/com/hbm/items/tool/ItemRamManipulator.java index f252d71a8..828f2f0e2 100644 --- a/com/hbm/items/tool/ItemRamManipulator.java +++ b/com/hbm/items/tool/ItemRamManipulator.java @@ -4,6 +4,7 @@ import java.util.List; import com.hbm.interfaces.IBomb; import com.hbm.lib.Library; +import com.hbm.main.MainRegistry; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +19,11 @@ public class ItemRamManipulator extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - list.add("A broken remote."); + + if(MainRegistry.polaroidID == 11) + list.add("A cheating device."); + else + list.add("A broken remote."); if (itemstack.getTagCompound() == null) { } else { list.add(""); diff --git a/com/hbm/items/weapon/GunBaleFlare.java b/com/hbm/items/weapon/GunBaleFlare.java index 4953e54cc..49f286a56 100644 --- a/com/hbm/items/weapon/GunBaleFlare.java +++ b/com/hbm/items/weapon/GunBaleFlare.java @@ -150,7 +150,7 @@ public class GunBaleFlare extends Item { list.add("These bombs were meant for artillery, but"); list.add("this makeshift launcher works just fine!"); list.add(""); - list.add("Ammo: Mini Nukes"); + list.add("Ammo: Mk.V AMAT Shell"); list.add("Damage: 1000"); list.add("Creates small nuclear explosion."); } diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 6d4c6622f..eb845f99a 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -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.24 Beta (V-Bromine-Luna), change before release"; + public static final String VERSION = "1.0.24"; public static final String CLIENTSIDE = "com.hbm.main.ClientProxy"; public static final String SERVERSIDE = "com.hbm.main.ServerProxy"; } diff --git a/com/hbm/lib/SPCLStrings.java b/com/hbm/lib/SPCLStrings.java index 050e65744..594c55a2f 100644 --- a/com/hbm/lib/SPCLStrings.java +++ b/com/hbm/lib/SPCLStrings.java @@ -8,5 +8,7 @@ public class SPCLStrings { String stringQuestion = "41 4d 20 4e 4f 54 20 4f 46 20 55 4e 44 45 52 53 54 41 4e 44 49 4e 47 20 48 4f 57 20 4d 41 4e 45 20 49 53 20 4f 46 20 57 41 56 49 4e 47"; //Hash value for error reports String stringError = "T1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVM"; + //Hilarious name + String stringCumberbatch = "Bunsenburner Toodlesnoot"; } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 2cfad418d..7093d313d 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -878,6 +878,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pipe_rusty, 1), new Object[] { "II", " I", " I", 'I', "ingotIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pipe_lead, 1), new Object[] { "II", " I", " I", 'I', "ingotLead" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bottle_opener, 1), new Object[] { "S", "P", 'S', "plateSteel", 'P', "plankWood" })); + GameRegistry.addRecipe(new ItemStack(ModItems.chopper, 1), new Object[] { "BBB", "HTF", "GWW", 'B', ModItems.chopper_blades, 'H', ModItems.chopper_head, 'T', ModItems.chopper_torso, 'F', ModItems.chopper_tail, 'G', ModItems.chopper_gun, 'W', ModItems.chopper_wing }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.polaroid, 1), new Object[] { " C ", "RPY", " B ", 'B', "dustLapis", 'C', "dustCoal", 'R', "dustAdvanced", 'Y', "dustGold", 'P', Items.paper })); diff --git a/com/hbm/render/tileentity/RenderIGenerator.java b/com/hbm/render/tileentity/RenderIGenerator.java index 83ae4b546..109ac8f02 100644 --- a/com/hbm/render/tileentity/RenderIGenerator.java +++ b/com/hbm/render/tileentity/RenderIGenerator.java @@ -16,14 +16,16 @@ public class RenderIGenerator extends TileEntitySpecialRenderer { private static final ResourceLocation rotor = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/generator_rotor.obj"); private IModelCustom genModel; private IModelCustom rotModel; - private ResourceLocation gadgetTexture; + private ResourceLocation genTexture; + private ResourceLocation rotTexture; public RenderIGenerator() { genModel = AdvancedModelLoader.loadModel(body); rotModel = AdvancedModelLoader.loadModel(rotor); //gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); - gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGen.png"); + genTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGen.png"); + rotTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGenRotor.png"); } @Override @@ -50,7 +52,7 @@ public class RenderIGenerator extends TileEntitySpecialRenderer { GL11.glTranslated(0.5D, 0.0D, 0.0D); break; } - bindTexture(gadgetTexture); + bindTexture(genTexture); genModel.renderAll(); @@ -86,7 +88,7 @@ public class RenderIGenerator extends TileEntitySpecialRenderer { i++; GL11.glRotatef(i, 1F, 0F, 0F); - bindTexture(gadgetTexture); + bindTexture(rotTexture); rotModel.renderAll(); GL11.glPopMatrix(); diff --git a/com/hbm/tileentity/TileEntityNukeCustom.java b/com/hbm/tileentity/TileEntityNukeCustom.java index 0147e945e..5edb3ea8e 100644 --- a/com/hbm/tileentity/TileEntityNukeCustom.java +++ b/com/hbm/tileentity/TileEntityNukeCustom.java @@ -234,6 +234,9 @@ public class TileEntityNukeCustom extends TileEntity implements ISidedInventory if(item == Item.getItemFromBlock(ModBlocks.det_cord)) { this.tntStrength += 1.5F; } + if(item == Item.getItemFromBlock(ModBlocks.det_charge)) { + this.tntStrength += 15F; + } if(item == ModItems.canister_fuel) { this.tntStrength += 0.3F; }