diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index be12d3896..b11c1091a 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -380,8 +380,6 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModBlocks.mine_fat, 1), new Object[] { "CDN", 'C', ModItems.circuit_targeting_tier2, 'D', ModItems.ducttape, 'N', ModItems.ammo_nuke }); //Nuke parts - CraftingManager.addRecipeAuto(new ItemStack(ModItems.gadget_explosive8, 1), new Object[] { "EEE", "EPE", "EEE", 'E', ModItems.gadget_explosive, 'P', AL.plate() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.man_explosive8, 1), new Object[] { "EEE", "ESE", "EEE", 'E', ModItems.man_explosive, 'S', STEEL.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.n2_charge, 1), new Object[] { " D ", "ERE", " D ", 'D', ModItems.ducttape, 'E', ModBlocks.det_charge, 'R', REDSTONE.block() }); //Custom nuke rods diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index c1c0f1ffb..8d396fafe 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -442,12 +442,7 @@ public class HazardRegistry { HazardSystem.register(ModItems.crystal_trixite, makeData(RADIATION, trx * crystal)); //nuke parts - HazardSystem.register(gadget_explosive, makeData(EXPLOSIVE, 1F)); - HazardSystem.register(gadget_explosive8, makeData(EXPLOSIVE, 8F)); HazardSystem.register(boy_propellant, makeData(EXPLOSIVE, 2F)); - HazardSystem.register(boy_igniter, makeData(EXPLOSIVE, 1F)); - HazardSystem.register(man_explosive, makeData(EXPLOSIVE, 2F)); - HazardSystem.register(man_explosive8, makeData(EXPLOSIVE, 16F)); HazardSystem.register(gadget_core, makeData(RADIATION, pu239 * nugget * 10)); HazardSystem.register(boy_target, makeData(RADIATION, u235 * ingot * 2)); diff --git a/src/main/java/com/hbm/inventory/gui/GUINukeBoy.java b/src/main/java/com/hbm/inventory/gui/GUINukeBoy.java index 43640fb1d..b89cff524 100644 --- a/src/main/java/com/hbm/inventory/gui/GUINukeBoy.java +++ b/src/main/java/com/hbm/inventory/gui/GUINukeBoy.java @@ -6,14 +6,14 @@ import com.hbm.inventory.container.ContainerNukeBoy; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityNukeBoy; +import com.hbm.util.I18nUtil; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -public class GUINukeBoy extends GuiContainer { +public class GUINukeBoy extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/weapon/lilBoySchematic.png"); private TileEntityNukeBoy testNuke; @@ -25,6 +25,14 @@ public class GUINukeBoy extends GuiContainer { this.xSize = 176; this.ySize = 222; } + + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + String[] descText = I18nUtil.resolveKeyArray("desc.gui.nukeBoy.desc"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16, 16, 16, guiLeft - 8, guiTop + 16 + 16, descText); + } @Override protected void drawGuiContainerForegroundLayer( int i, int j) { @@ -55,6 +63,8 @@ public class GUINukeBoy extends GuiContainer { drawTexturedModalRect(guiLeft + 92, guiTop + 95, 176, 66, 12, 6); if(testNuke.getStackInSlot(4) != null && testNuke.getStackInSlot(4).getItem() == ModItems.boy_igniter) drawTexturedModalRect(guiLeft + 107, guiTop + 91, 176, 75, 16, 14); + + this.drawInfoPanel(guiLeft - 16, guiTop + 16, 16, 16, 2); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUINukeGadget.java b/src/main/java/com/hbm/inventory/gui/GUINukeGadget.java index e8f533d9b..ad0d4c8ef 100644 --- a/src/main/java/com/hbm/inventory/gui/GUINukeGadget.java +++ b/src/main/java/com/hbm/inventory/gui/GUINukeGadget.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -11,8 +10,9 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeGadget; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityNukeGadget; +import com.hbm.util.I18nUtil; -public class GUINukeGadget extends GuiContainer { +public class GUINukeGadget extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/weapon/gadgetSchematic.png"); private TileEntityNukeGadget testNuke; @@ -25,6 +25,14 @@ public class GUINukeGadget extends GuiContainer { this.ySize = 166; } + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + String[] descText = I18nUtil.resolveKeyArray("desc.gui.nukeGadget.desc"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16, 16, 16, guiLeft - 8, guiTop + 16 + 16, descText); + } + @Override protected void drawGuiContainerForegroundLayer( int i, int j) { String name = this.testNuke.hasCustomInventoryName() ? this.testNuke.getInventoryName() : I18n.format(this.testNuke.getInventoryName()); @@ -63,5 +71,7 @@ public class GUINukeGadget extends GuiContainer { { drawTexturedModalRect(guiLeft + 134, guiTop + 35, 176, 48, 16, 16); } + + this.drawInfoPanel(guiLeft - 16, guiTop + 16, 16, 16, 2); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUINukeMan.java b/src/main/java/com/hbm/inventory/gui/GUINukeMan.java index cd5040b18..b89d2b043 100644 --- a/src/main/java/com/hbm/inventory/gui/GUINukeMan.java +++ b/src/main/java/com/hbm/inventory/gui/GUINukeMan.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -11,8 +10,9 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeMan; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityNukeMan; +import com.hbm.util.I18nUtil; -public class GUINukeMan extends GuiContainer { +public class GUINukeMan extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/weapon/fatManSchematic.png"); private TileEntityNukeMan testNuke; @@ -25,6 +25,14 @@ public class GUINukeMan extends GuiContainer { this.ySize = 166; } + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + String[] descText = I18nUtil.resolveKeyArray("desc.gui.nukeMan.desc"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16, 16, 16, guiLeft - 8, guiTop + 16 + 16, descText); + } + @Override protected void drawGuiContainerForegroundLayer( int i, int j) { String name = this.testNuke.hasCustomInventoryName() ? this.testNuke.getInventoryName() : I18n.format(this.testNuke.getInventoryName()); @@ -63,5 +71,7 @@ public class GUINukeMan extends GuiContainer { { drawTexturedModalRect(guiLeft + 134, guiTop + 35, 176, 48, 16, 16); } + + this.drawInfoPanel(guiLeft - 16, guiTop + 16, 16, 16, 2); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUINukeMike.java b/src/main/java/com/hbm/inventory/gui/GUINukeMike.java index bef83622d..b42539226 100644 --- a/src/main/java/com/hbm/inventory/gui/GUINukeMike.java +++ b/src/main/java/com/hbm/inventory/gui/GUINukeMike.java @@ -6,14 +6,14 @@ import com.hbm.inventory.container.ContainerNukeMike; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityNukeMike; +import com.hbm.util.I18nUtil; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -public class GUINukeMike extends GuiContainer { +public class GUINukeMike extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/weapon/ivyMikeSchematic.png"); private TileEntityNukeMike testNuke; @@ -26,6 +26,14 @@ public class GUINukeMike extends GuiContainer { this.ySize = 217; } + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + String[] descText = I18nUtil.resolveKeyArray("desc.gui.nukeMike.desc"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16, 16, 16, guiLeft - 8, guiTop + 16 + 16, descText); + } + @Override protected void drawGuiContainerForegroundLayer( int i, int j) { String name = this.testNuke.hasCustomInventoryName() ? this.testNuke.getInventoryName() : I18n.format(this.testNuke.getInventoryName()); @@ -60,7 +68,7 @@ public class GUINukeMike extends GuiContainer { drawTexturedModalRect(guiLeft + 140, guiTop + 30, 240, 88, 12, 26); for(int i = 0; i < 4; i++) { - if(testNuke.getStackInSlot(i) != null && testNuke.getStackInSlot(i).getItem() == ModItems.man_explosive8) + if(testNuke.getStackInSlot(i) != null && testNuke.getStackInSlot(i).getItem() == ModItems.explosive_lenses) switch(i) { case 0: drawTexturedModalRect(guiLeft + 24, guiTop + 20 , 209, 1, 23, 23); break; case 2: drawTexturedModalRect(guiLeft + 47, guiTop + 20 , 232, 1, 23, 23); break; @@ -68,5 +76,7 @@ public class GUINukeMike extends GuiContainer { case 3: drawTexturedModalRect(guiLeft + 47, guiTop + 43 , 232, 24, 23, 23); break; } } + + this.drawInfoPanel(guiLeft - 16, guiTop + 16, 16, 16, 2); } } \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/gui/GUINukeTsar.java b/src/main/java/com/hbm/inventory/gui/GUINukeTsar.java index d610d597f..e91e91e65 100644 --- a/src/main/java/com/hbm/inventory/gui/GUINukeTsar.java +++ b/src/main/java/com/hbm/inventory/gui/GUINukeTsar.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -11,8 +10,9 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeTsar; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityNukeTsar; +import com.hbm.util.I18nUtil; -public class GUINukeTsar extends GuiContainer { +public class GUINukeTsar extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/weapon/tsarBombaSchematic.png"); private TileEntityNukeTsar testNuke; @@ -25,6 +25,14 @@ public class GUINukeTsar extends GuiContainer { this.ySize = 166; } + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + String[] descText = I18nUtil.resolveKeyArray("desc.gui.nukeTsar.desc"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16, 16, 16, guiLeft - 8, guiTop + 16 + 16, descText); + } + @Override protected void drawGuiContainerForegroundLayer( int i, int j) { String name = this.testNuke.hasCustomInventoryName() ? this.testNuke.getInventoryName() : I18n.format(this.testNuke.getInventoryName()); @@ -48,5 +56,7 @@ public class GUINukeTsar extends GuiContainer { { drawTexturedModalRect(guiLeft + 133, guiTop + 34, 176, 18, 16, 16); } + + this.drawInfoPanel(guiLeft - 16, guiTop + 16, 16, 16, 2); } } diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 74b079842..b6348bd0e 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -374,7 +374,8 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.grenade_nuclear, 1), new AStack[] {new OreDictStack(IRON.plate(), 1), new OreDictStack(STEEL.plate(), 1), new OreDictStack(PU239.nugget(), 2), new ComparableStack(ModItems.wire_red_copper, 2), },200); makeRecipe(new ComparableStack(ModItems.grenade_zomg, 1), new AStack[] {new ComparableStack(ModItems.plate_paa, 3), new OreDictStack(OreDictManager.getReflector(), 1), new ComparableStack(ModItems.coil_magnetized_tungsten, 3), new ComparableStack(ModItems.powder_power, 3), },300); makeRecipe(new ComparableStack(ModItems.grenade_black_hole, 1), new AStack[] {new OreDictStack(ANY_PLASTIC.ingot(), 6), new OreDictStack(OreDictManager.getReflector(), 3), new ComparableStack(ModItems.coil_magnetized_tungsten, 2), new ComparableStack(ModItems.black_hole, 1), },500); - makeRecipe(new ComparableStack(ModItems.gadget_explosive, 1), new AStack[] {new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 4), new OreDictStack(STEEL.plate(), 2), new OreDictStack(AL.plate(), 3), new ComparableStack(ModItems.wire_gold, 3), },200); + makeRecipe(new ComparableStack(ModItems.early_explosive_lenses, 1), new AStack[] {new OreDictStack(AL.plate(), 8), new ComparableStack(ModItems.hull_small_steel, 4), new ComparableStack(ModItems.wire_copper, 16), new ComparableStack(ModItems.wire_tungsten, 8), new ComparableStack(ModItems.ball_dynamite, 4), new OreDictStack(CU.plate(), 4), new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 24), new OreDictStack(AL.ingot(), 8)},400); //8 HE lenses w/ bridge-wire detonators, aluminum pushers, & duraluminum shell + makeRecipe(new ComparableStack(ModItems.explosive_lenses, 1), new AStack[] {new OreDictStack(AL.plate(), 8), new ComparableStack(ModItems.hull_small_steel, 2), new ComparableStack(ModItems.wire_red_copper, 8), new ComparableStack(ModItems.wire_gold, 8), new OreDictStack(ANY_PLASTICEXPLOSIVE.ingot(), 4), new OreDictStack(CU.plate(), 4), new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 20), new OreDictStack(AL.ingot(), 1)},500); //8 HE (To use 16 PBX ingots) lenses w/ improved bridge-wire detonators, thin aluminum pushers, & duraluminum shell makeRecipe(new ComparableStack(ModItems.gadget_wireing, 1), new AStack[] {new OreDictStack(IRON.plate(), 1), new ComparableStack(ModItems.wire_gold, 12), },100); makeRecipe(new ComparableStack(ModItems.gadget_core, 1), new AStack[] {new OreDictStack(PU239.nugget(), 7), new OreDictStack(U238.nugget(), 3), },200); makeRecipe(new ComparableStack(ModItems.boy_shielding, 1), new AStack[] {new OreDictStack(OreDictManager.getReflector(), 12), new OreDictStack(STEEL.plate(), 4), },150); @@ -382,7 +383,6 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.boy_bullet, 1), new AStack[] {new OreDictStack(U235.nugget(), 9), },100); makeRecipe(new ComparableStack(ModItems.boy_propellant, 1), new AStack[] {new ComparableStack(ModItems.cordite, 8), new OreDictStack(IRON.plate(), 8), new OreDictStack(AL.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 4), },100); makeRecipe(new ComparableStack(ModItems.boy_igniter, 1), new AStack[] {new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 1), new OreDictStack(AL.plate(), 6), new OreDictStack(STEEL.plate(), 1), new ComparableStack(ModItems.circuit_red_copper, 1), new ComparableStack(ModItems.wire_red_copper, 3), },150); //HE for gating purposes - makeRecipe(new ComparableStack(ModItems.man_explosive, 1), new AStack[] {new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 2), new OreDictStack(ANY_PLASTICEXPLOSIVE.ingot(), 1), new OreDictStack(STEEL.plate(), 2), new OreDictStack(TI.plate(), 1), new ComparableStack(ModItems.wire_red_copper, 3), },200); makeRecipe(new ComparableStack(ModItems.man_igniter, 1), new AStack[] {new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.circuit_red_copper, 1), new ComparableStack(ModItems.wire_red_copper, 9), },150); makeRecipe(new ComparableStack(ModItems.man_core, 1), new AStack[] {new OreDictStack(PU239.nugget(), 8), new OreDictStack(BE.nugget(), 2), },250); makeRecipe(new ComparableStack(ModItems.mike_core, 1), new AStack[] {new OreDictStack(U238.nugget(), 24), new OreDictStack(PB.ingot(), 6), },250); @@ -775,17 +775,6 @@ public class AssemblerRecipes { new ComparableStack(ModItems.circuit_tantalium, 16) }, 100); - makeRecipe(new ComparableStack(ModBlocks.machine_deuterium_extractor, 1), new AStack[] { - new ComparableStack(ModItems.deuterium_filter, 1), - new ComparableStack(ModItems.sulfur, 12), - new OreDictStack(STEEL.plate(), 4), - new OreDictStack(AL.plate(), 2), - new ComparableStack(ModBlocks.deco_pipe_quad, 4), - new ComparableStack(ModItems.board_copper, 1), - new ComparableStack(ModItems.turbine_titanium, 2), - new ComparableStack(ModItems.circuit_aluminium, 2) - }, 100); - makeRecipe(new ComparableStack(ModBlocks.machine_assemfac, 1), new AStack[] { new OreDictStack(STEEL.ingot(), 48), new OreDictStack(TCALLOY.ingot(), 8), diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 9f79840e7..b6476112f 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -202,6 +202,18 @@ public class AnvilRecipes { new ComparableStack(Items.feather, 24) }, new AnvilOutput(new ItemStack(ModItems.wings_limp))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new AStack[] { + new ComparableStack(ModItems.sulfur, 8), + new OreDictStack(STEEL.plate(), 4), + new OreDictStack(AL.plate(), 2), + new ComparableStack(ModItems.hull_small_steel, 4), + new ComparableStack(ModItems.board_copper, 1), + new ComparableStack(ModItems.turbine_titanium, 1), + new ComparableStack(ModItems.circuit_aluminium, 1) + }, + new AnvilOutput(new ItemStack(ModBlocks.machine_deuterium_extractor))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(ModItems.deuterium_filter, 2), diff --git a/src/main/java/com/hbm/items/ItemCustomLore.java b/src/main/java/com/hbm/items/ItemCustomLore.java index 4a845ca3f..883be3ee6 100644 --- a/src/main/java/com/hbm/items/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/ItemCustomLore.java @@ -23,7 +23,9 @@ public class ItemCustomLore extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - if(MainRegistry.polaroidID == 11) { + boolean p11 = !I18nUtil.resolveKey(this.getUnlocalizedName() + ".desc.P11").equals(this.getUnlocalizedName() + ".desc.P11"); + + if(MainRegistry.polaroidID == 11 && p11) { String unlocP11 = this.getUnlocalizedName() + ".desc.P11"; String locP11 = I18nUtil.resolveKey(unlocP11); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 9ee90e9e7..382b319b2 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -774,8 +774,8 @@ public class ModItems { public static Item piston_selenium; - public static Item crystal_energy; - public static Item pellet_coolant; + //public static Item crystal_energy; + //public static Item pellet_coolant; public static Item rune_blank; public static Item rune_isa; @@ -1810,8 +1810,9 @@ public class ModItems { public static Item flame_politics; public static Item flame_opinion; - public static Item gadget_explosive; - public static Item gadget_explosive8; + //public static Item gadget_explosive; + public static Item early_explosive_lenses; + public static Item explosive_lenses; public static Item gadget_wireing; public static Item gadget_core; public static Item boy_igniter; @@ -1819,8 +1820,7 @@ public class ModItems { public static Item boy_bullet; public static Item boy_target; public static Item boy_shielding; - public static Item man_explosive; - public static Item man_explosive8; + //public static Item man_explosive; public static Item man_igniter; public static Item man_core; public static Item mike_core; @@ -3202,9 +3202,9 @@ public class ModItems { piston_selenium = new Item().setUnlocalizedName("piston_selenium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":piston_selenium"); - crystal_energy = new ItemCustomLore().setUnlocalizedName("crystal_energy").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":crystal_energy"); - pellet_coolant = new ItemCustomLore().setUnlocalizedName("pellet_coolant").setMaxDamage(41400).setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_coolant"); - + //crystal_energy = new ItemCustomLore().setUnlocalizedName("crystal_energy").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":crystal_energy"); + //pellet_coolant = new ItemCustomLore().setUnlocalizedName("pellet_coolant").setMaxDamage(41400).setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_coolant"); + rune_blank = new ItemCustomLore().setUnlocalizedName("rune_blank").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_blank"); rune_isa = new ItemCustomLore().setUnlocalizedName("rune_isa").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_isa"); rune_dagaz = new ItemCustomLore().setUnlocalizedName("rune_dagaz").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_dagaz"); @@ -4538,27 +4538,27 @@ public class ModItems { flame_politics = new ItemCustomLore().setUnlocalizedName("flame_politics").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_politics"); flame_opinion = new ItemCustomLore().setUnlocalizedName("flame_opinion").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_opinion"); - gadget_explosive = new Item().setUnlocalizedName("gadget_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive"); - gadget_explosive8 = new ItemGadget().setUnlocalizedName("gadget_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive8"); - gadget_wireing = new ItemGadget().setUnlocalizedName("gadget_wireing").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_wireing"); - gadget_core = new ItemGadget().setUnlocalizedName("gadget_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_core"); + //gadget_explosive = new Item().setUnlocalizedName("gadget_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive"); + early_explosive_lenses = new ItemCustomLore().setUnlocalizedName("early_explosive_lenses").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_explosive8"); + explosive_lenses = new ItemCustomLore().setUnlocalizedName("explosive_lenses").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive8"); + gadget_wireing = new Item().setUnlocalizedName("gadget_wireing").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_wireing"); + gadget_core = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("gadget_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":gadget_core"); - boy_igniter = new ItemBoy().setUnlocalizedName("boy_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_igniter"); - boy_propellant = new ItemBoy().setUnlocalizedName("boy_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_propellant"); - boy_bullet = new ItemBoy().setUnlocalizedName("boy_bullet").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_bullet"); - boy_target = new ItemBoy().setUnlocalizedName("boy_target").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_target"); - boy_shielding = new ItemBoy().setUnlocalizedName("boy_shielding").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_shielding"); + boy_igniter = new Item().setUnlocalizedName("boy_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_igniter"); + boy_propellant = new Item().setUnlocalizedName("boy_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_propellant"); + boy_bullet = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("boy_bullet").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_bullet"); + boy_target = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("boy_target").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_target"); + boy_shielding = new Item().setUnlocalizedName("boy_shielding").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":boy_shielding"); - man_explosive = new Item().setUnlocalizedName("man_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive"); - man_explosive8 = new ItemManMike().setUnlocalizedName("man_explosive8").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive8"); - man_igniter = new ItemMan().setUnlocalizedName("man_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_igniter"); - man_core = new ItemManMike().setUnlocalizedName("man_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_core"); + //man_explosive = new Item().setUnlocalizedName("man_explosive").setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_explosive"); + man_igniter = new Item().setUnlocalizedName("man_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_igniter"); + man_core = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("man_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":man_core"); - mike_core = new ItemMike().setUnlocalizedName("mike_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_core"); - mike_deut = new ItemMike().setUnlocalizedName("mike_deut").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setContainerItem(ModItems.tank_steel).setTextureName(RefStrings.MODID + ":mike_deut"); - mike_cooling_unit = new ItemMike().setUnlocalizedName("mike_cooling_unit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_cooling_unit"); + mike_core = new Item().setUnlocalizedName("mike_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_core"); + mike_deut = new Item().setUnlocalizedName("mike_deut").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setContainerItem(ModItems.tank_steel).setTextureName(RefStrings.MODID + ":mike_deut"); + mike_cooling_unit = new Item().setUnlocalizedName("mike_cooling_unit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":mike_cooling_unit"); - tsar_core = new ItemTsar().setUnlocalizedName("tsar_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":tsar_core"); + tsar_core = new Item().setUnlocalizedName("tsar_core").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":tsar_core"); fleija_igniter = new ItemFleija().setUnlocalizedName("fleija_igniter").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_igniter"); fleija_propellant = new ItemFleija().setUnlocalizedName("fleija_propellant").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_propellant"); @@ -6664,8 +6664,8 @@ public class ModItems { GameRegistry.registerItem(arc_electrode_desh, arc_electrode_desh.getUnlocalizedName()); //Particle Collider Items - GameRegistry.registerItem(crystal_energy, crystal_energy.getUnlocalizedName()); - GameRegistry.registerItem(pellet_coolant, pellet_coolant.getUnlocalizedName()); + //GameRegistry.registerItem(crystal_energy, crystal_energy.getUnlocalizedName()); + //GameRegistry.registerItem(pellet_coolant, pellet_coolant.getUnlocalizedName()); //Particle Collider Fuel GameRegistry.registerItem(part_lithium, part_lithium.getUnlocalizedName()); @@ -7834,10 +7834,13 @@ public class ModItems { //Minecarts GameRegistry.registerItem(cart, cart.getUnlocalizedName()); - + + //High Explosive Lenses + GameRegistry.registerItem(early_explosive_lenses, early_explosive_lenses.getUnlocalizedName()); + GameRegistry.registerItem(explosive_lenses, explosive_lenses.getUnlocalizedName()); + //The Gadget - GameRegistry.registerItem(gadget_explosive, gadget_explosive.getUnlocalizedName()); - GameRegistry.registerItem(gadget_explosive8, gadget_explosive8.getUnlocalizedName()); + //GameRegistry.registerItem(gadget_explosive, gadget_explosive.getUnlocalizedName()); GameRegistry.registerItem(gadget_wireing, gadget_wireing.getUnlocalizedName()); GameRegistry.registerItem(gadget_core, gadget_core.getUnlocalizedName()); @@ -7849,8 +7852,7 @@ public class ModItems { GameRegistry.registerItem(boy_igniter, boy_igniter.getUnlocalizedName());; //Fat Man - GameRegistry.registerItem(man_explosive, man_explosive.getUnlocalizedName()); - GameRegistry.registerItem(man_explosive8, man_explosive8.getUnlocalizedName()); + //GameRegistry.registerItem(man_explosive, man_explosive.getUnlocalizedName()); GameRegistry.registerItem(man_igniter, man_igniter.getUnlocalizedName()); GameRegistry.registerItem(man_core, man_core.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/bomb/ItemBoy.java b/src/main/java/com/hbm/items/bomb/ItemBoy.java deleted file mode 100644 index a857ce098..000000000 --- a/src/main/java/com/hbm/items/bomb/ItemBoy.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hbm.items.bomb; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemBoy extends Item { - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { - list.add("Used in:"); - list.add("Little Boy"); - super.addInformation(itemstack, player, list, bool); - } - -} diff --git a/src/main/java/com/hbm/items/bomb/ItemGadget.java b/src/main/java/com/hbm/items/bomb/ItemGadget.java deleted file mode 100644 index ff7bf9549..000000000 --- a/src/main/java/com/hbm/items/bomb/ItemGadget.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hbm.items.bomb; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemGadget extends Item { - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { - list.add("Used in:"); - list.add("The Gadget"); - super.addInformation(itemstack, player, list, bool); - } - -} diff --git a/src/main/java/com/hbm/items/bomb/ItemMan.java b/src/main/java/com/hbm/items/bomb/ItemMan.java deleted file mode 100644 index 1d51867a8..000000000 --- a/src/main/java/com/hbm/items/bomb/ItemMan.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hbm.items.bomb; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemMan extends Item { - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { - list.add("Used in:"); - list.add("Fat Man"); - super.addInformation(itemstack, player, list, bool); - } - -} diff --git a/src/main/java/com/hbm/items/bomb/ItemManMike.java b/src/main/java/com/hbm/items/bomb/ItemManMike.java deleted file mode 100644 index 52bfa5616..000000000 --- a/src/main/java/com/hbm/items/bomb/ItemManMike.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hbm.items.bomb; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemManMike extends Item { - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { - list.add("Used in:"); - list.add("Fat Man"); - list.add("Ivy Mike"); - list.add("Tsar Bomba"); - super.addInformation(itemstack, player, list, bool); - } - -} diff --git a/src/main/java/com/hbm/items/bomb/ItemMike.java b/src/main/java/com/hbm/items/bomb/ItemMike.java deleted file mode 100644 index 29411e724..000000000 --- a/src/main/java/com/hbm/items/bomb/ItemMike.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hbm.items.bomb; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemMike extends Item { - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { - list.add("Used in:"); - list.add("Ivy Mike"); - } - -} diff --git a/src/main/java/com/hbm/items/bomb/ItemTsar.java b/src/main/java/com/hbm/items/bomb/ItemTsar.java deleted file mode 100644 index 57ac1804e..000000000 --- a/src/main/java/com/hbm/items/bomb/ItemTsar.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hbm.items.bomb; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemTsar extends Item { - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { - list.add("Used in:"); - list.add("Tsar Bomba"); - super.addInformation(itemstack, player, list, bool); - } - -} diff --git a/src/main/java/com/hbm/items/special/ItemStarterKit.java b/src/main/java/com/hbm/items/special/ItemStarterKit.java index 632119c6f..1890a002d 100644 --- a/src/main/java/com/hbm/items/special/ItemStarterKit.java +++ b/src/main/java/com/hbm/items/special/ItemStarterKit.java @@ -230,10 +230,10 @@ public class ItemStarterKit extends Item { if(this == ModItems.gadget_kit) { player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_gadget), 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gadget_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gadget_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gadget_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gadget_explosive8, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.early_explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.early_explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.early_explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.early_explosive_lenses, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.gadget_wireing, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.gadget_core, 1)); @@ -255,10 +255,10 @@ public class ItemStarterKit extends Item { if(this == ModItems.man_kit) { player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_man), 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.early_explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.early_explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.early_explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.early_explosive_lenses, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_igniter, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_core, 1)); @@ -268,10 +268,10 @@ public class ItemStarterKit extends Item { if(this == ModItems.mike_kit) { player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_mike), 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.explosive_lenses, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_core, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.mike_core, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.mike_deut, 1)); @@ -283,10 +283,10 @@ public class ItemStarterKit extends Item { if(this == ModItems.tsar_kit) { player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_tsar), 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_explosive8, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.explosive_lenses, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.explosive_lenses, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.man_core, 1)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.tsar_core, 1)); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 74b8d2d49..d85a0c8b1 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -868,7 +868,7 @@ public class MainRegistry { achBismuth = new Achievement("achievement.bismuth", "bismuth", 11, -6, ModItems.ingot_bismuth, achRBMK).initIndependentStat().registerStat(); achBreeding = new Achievement("achievement.breeding", "breeding", 7, -6, ModItems.ingot_am_mix, achRBMK).initIndependentStat().setSpecial().registerStat(); achFusion = new Achievement("achievement.fusion", "fusion", 13, -7, new ItemStack(ModBlocks.iter), achBismuth).initIndependentStat().setSpecial().registerStat(); - achMeltdown = new Achievement("achievement.meltdown", "meltdown", 15, -7, ModItems.crystal_energy, achFusion).initIndependentStat().setSpecial().registerStat(); + achMeltdown = new Achievement("achievement.meltdown", "meltdown", 15, -7, ModItems.powder_balefire, achFusion).initIndependentStat().setSpecial().registerStat(); achRedBalloons = new Achievement("achievement.redBalloons", "redBalloons", 11, 0, ModItems.missile_nuclear, achPolymer).initIndependentStat().setSpecial().registerStat(); achManhattan = new Achievement("achievement.manhattan", "manhattan", 11, -4, new ItemStack(ModBlocks.nuke_boy), achPolymer).initIndependentStat().setSpecial().registerStat(); @@ -1116,6 +1116,12 @@ public class MainRegistry { ignoreMappings.add("hbm:item.thermo_unit_empty"); ignoreMappings.add("hbm:item.thermo_unit_endo"); ignoreMappings.add("hbm:item.thermo_unit_exo"); + ignoreMappings.add("hbm:item.gadget_explosive"); + ignoreMappings.add("hbm:item.man_explosive"); + ignoreMappings.add("hbm:item.crystal_energy"); + ignoreMappings.add("hbm:item.pellet_coolant"); + remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); + remapItems.put("hbm:item.man_explosive8", ModItems.explosive_lenses); for(MissingMapping mapping : event.get()) { diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeGadget.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeGadget.java index adcb48d52..4777be282 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeGadget.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeGadget.java @@ -91,7 +91,7 @@ public class TileEntityNukeGadget extends TileEntity implements ISidedInventory @Override public int getInventoryStackLimit() { - return 64; + return 1; } @Override @@ -196,7 +196,7 @@ public class TileEntityNukeGadget extends TileEntity implements ISidedInventory }*/ public boolean exp1() { - if(this.slots[1] != null && this.slots[1].getItem() == ModItems.gadget_explosive8) + if(this.slots[1] != null && this.slots[1].getItem() == ModItems.early_explosive_lenses) { return true; } @@ -205,7 +205,7 @@ public class TileEntityNukeGadget extends TileEntity implements ISidedInventory } public boolean exp2() { - if(this.slots[2] != null && this.slots[2].getItem() == ModItems.gadget_explosive8) + if(this.slots[2] != null && this.slots[2].getItem() == ModItems.early_explosive_lenses) { return true; } @@ -214,7 +214,7 @@ public class TileEntityNukeGadget extends TileEntity implements ISidedInventory } public boolean exp3() { - if(this.slots[3] != null && this.slots[3].getItem() == ModItems.gadget_explosive8) + if(this.slots[3] != null && this.slots[3].getItem() == ModItems.early_explosive_lenses) { return true; } @@ -223,7 +223,7 @@ public class TileEntityNukeGadget extends TileEntity implements ISidedInventory } public boolean exp4() { - if(this.slots[4] != null && this.slots[4].getItem() == ModItems.gadget_explosive8) + if(this.slots[4] != null && this.slots[4].getItem() == ModItems.early_explosive_lenses) { return true; } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMan.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMan.java index 8ec6010d9..0ddb12425 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMan.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMan.java @@ -91,7 +91,7 @@ public class TileEntityNukeMan extends TileEntity implements ISidedInventory { @Override public int getInventoryStackLimit() { - return 64; + return 1; } @Override @@ -170,7 +170,7 @@ public class TileEntityNukeMan extends TileEntity implements ISidedInventory { } public boolean exp1() { - if(this.slots[1] != null && this.slots[1].getItem() == ModItems.man_explosive8) + if(this.slots[1] != null && this.slots[1].getItem() == ModItems.early_explosive_lenses) { return true; } @@ -179,7 +179,7 @@ public class TileEntityNukeMan extends TileEntity implements ISidedInventory { } public boolean exp2() { - if(this.slots[2] != null && this.slots[2].getItem() == ModItems.man_explosive8) + if(this.slots[2] != null && this.slots[2].getItem() == ModItems.early_explosive_lenses) { return true; } @@ -188,7 +188,7 @@ public class TileEntityNukeMan extends TileEntity implements ISidedInventory { } public boolean exp3() { - if(this.slots[3] != null && this.slots[3].getItem() == ModItems.man_explosive8) + if(this.slots[3] != null && this.slots[3].getItem() == ModItems.early_explosive_lenses) { return true; } @@ -197,7 +197,7 @@ public class TileEntityNukeMan extends TileEntity implements ISidedInventory { } public boolean exp4() { - if(this.slots[4] != null && this.slots[4].getItem() == ModItems.man_explosive8) + if(this.slots[4] != null && this.slots[4].getItem() == ModItems.early_explosive_lenses) { return true; } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMike.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMike.java index f4299b6a4..1a4d07f0f 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMike.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMike.java @@ -91,7 +91,7 @@ public class TileEntityNukeMike extends TileEntity implements ISidedInventory { @Override public int getInventoryStackLimit() { - return 64; + return 1; } @Override @@ -172,10 +172,10 @@ public class TileEntityNukeMike extends TileEntity implements ISidedInventory { public boolean isReady() { if(slots[0] != null && slots[1] != null && slots[2] != null && slots[3] != null && slots[4] != null) - if(slots[0].getItem() == ModItems.man_explosive8 && - slots[1].getItem() == ModItems.man_explosive8 && - slots[2].getItem() == ModItems.man_explosive8 && - slots[3].getItem() == ModItems.man_explosive8 && + if(slots[0].getItem() == ModItems.explosive_lenses && + slots[1].getItem() == ModItems.explosive_lenses && + slots[2].getItem() == ModItems.explosive_lenses && + slots[3].getItem() == ModItems.explosive_lenses && slots[4].getItem() == ModItems.man_core) { return true; @@ -187,10 +187,10 @@ public class TileEntityNukeMike extends TileEntity implements ISidedInventory { public boolean isFilled() { if(slots[0] != null && slots[1] != null && slots[2] != null && slots[3] != null && slots[4] != null && slots[5] != null && slots[6] != null && slots[7] != null) - if(slots[0].getItem() == ModItems.man_explosive8 && - slots[1].getItem() == ModItems.man_explosive8 && - slots[2].getItem() == ModItems.man_explosive8 && - slots[3].getItem() == ModItems.man_explosive8 && + if(slots[0].getItem() == ModItems.explosive_lenses && + slots[1].getItem() == ModItems.explosive_lenses && + slots[2].getItem() == ModItems.explosive_lenses && + slots[3].getItem() == ModItems.explosive_lenses && slots[4].getItem() == ModItems.man_core && slots[5].getItem() == ModItems.mike_core && slots[6].getItem() == ModItems.mike_deut && diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeTsar.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeTsar.java index 0975f5817..1df071c68 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeTsar.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeTsar.java @@ -91,7 +91,7 @@ public class TileEntityNukeTsar extends TileEntity implements ISidedInventory { @Override public int getInventoryStackLimit() { - return 64; + return 1; } @Override @@ -172,10 +172,10 @@ public class TileEntityNukeTsar extends TileEntity implements ISidedInventory { public boolean isReady() { if(slots[0] != null && slots[1] != null && slots[2] != null && slots[3] != null && slots[4] != null) - if(slots[0].getItem() == ModItems.man_explosive8 && - slots[1].getItem() == ModItems.man_explosive8 && - slots[2].getItem() == ModItems.man_explosive8 && - slots[3].getItem() == ModItems.man_explosive8 && + if(slots[0].getItem() == ModItems.explosive_lenses && + slots[1].getItem() == ModItems.explosive_lenses && + slots[2].getItem() == ModItems.explosive_lenses && + slots[3].getItem() == ModItems.explosive_lenses && slots[4].getItem() == ModItems.man_core) { return true; @@ -187,10 +187,10 @@ public class TileEntityNukeTsar extends TileEntity implements ISidedInventory { public boolean isFilled() { if(slots[0] != null && slots[1] != null && slots[2] != null && slots[3] != null && slots[4] != null && slots[5] != null) - if(slots[0].getItem() == ModItems.man_explosive8 && - slots[1].getItem() == ModItems.man_explosive8 && - slots[2].getItem() == ModItems.man_explosive8 && - slots[3].getItem() == ModItems.man_explosive8 && + if(slots[0].getItem() == ModItems.explosive_lenses && + slots[1].getItem() == ModItems.explosive_lenses && + slots[2].getItem() == ModItems.explosive_lenses && + slots[3].getItem() == ModItems.explosive_lenses && slots[4].getItem() == ModItems.man_core && slots[5].getItem() == ModItems.tsar_core) { diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 33e0cd4bc..b9dd2951c 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -571,6 +571,11 @@ desc.gui.assembler.warning=§cError:§r This machine requires an assembly templa desc.gui.chemplant.warning=§cError:§r This machine requires an chemistry template! desc.gui.gasCent.enrichment=§2Enrichment§r$Uranium enrichment requires cascades.$Two-centrifuge cascades will give$uranium fuel, four-centrifuge cascades$will give total separation. desc.gui.gasCent.output=§6Fluid Transfer§r$Fluid can be transferred to another centrifuge$via the output port for further processing. +desc.gui.nukeBoy.desc=§1Requires:§r$ * Neutron Shielding$ * U235 Projectile$ * Subcritical U235 Target$ * Propellant$ * Bomb Igniter +desc.gui.nukeGadget.desc=§1Requires:§r$ * 4 Arrays of First-Generation$ High-Explosive Lenses$ * Heavy Plutonium Core$ * Wiring +desc.gui.nukeMan.desc=§1Requires:§r$ * 4 Arrays of First-Generation$ High-Explosive Lenses$ * Plutonium Core$ * Bomb Firing Unit +desc.gui.nukeMike.desc=§1Requires:§r$ * 4 Arrays of High-Explosive Lenses$ * Plutonium Core$ * Deuterium Cooling Unit$ * Uranium Coated Deuterium Tank$ * Deuterium Tank +desc.gui.nukeTsar.desc=§1Requires:§r$ * 4 Arrays of High-Explosive Lenses$ * Plutonium Core$§9Optional:§r$ * Tsar Bomba Core desc.gui.radiolysis.desc=§9Description§r$This RTG is more efficient then others, and$comes equipped with a radiolysis chamber for$cracking and sterilization. desc.gui.rtgBFurnace.desc=Requires at least 15 heat to process$The more heat on top of that, the faster it runs$Heat going over maximum speed will have no effect$Short-lived pellets may decay desc.gui.rtg.heat=§eCurrent heat level: %s @@ -970,7 +975,7 @@ item.ams_core_thingy.name=Thingy (AMS/DFC Core) item.ams_core_wormhole.name=Tiny Wormhole (AMS/DFC Core) item.ams_focus_blank.name=Blank Stabilizer Focus item.ams_focus_booster.name=Boosting Stabilizer Focus -item.ams_focus_booster.name=Weaker restriction field and core energy injection:$More heat generation, extra energy. +item.ams_focus_booster.desc=Weaker restriction field and core energy injection:$More heat generation, extra energy. item.ams_focus_limiter.name=Limiting Stabilizer Focus item.ams_focus_limiter.desc=Maximum performance for restriction field:$Standard cooling, no energy bonus. item.ams_lens.name=Stabilizer Lens @@ -1556,6 +1561,8 @@ item.dynosphere_euphemium_charged.name=Euphemium Dynosphere (Charged) item.dynosphere_schrabidium.name=Schrabidium Dynosphere item.dynosphere_schrabidium_charged.name=Schrabidium Dynosphere (Charged) item.dysfunctional_reactor.name=Dysfunctional Nuclear Reactor +item.early_explosive_lenses.name=Array of First-Generation High-Explosive Lenses +item.early_explosive_lenses.desc=Assembly of 8 high-explosive lenses with an aluminium$pusher, duraluminium shell, and bridgewire detonators. item.egg_balefire.name=Balefire Egg item.egg_balefire.desc=What kind of bird lays a radioactive egg? item.egg_balefire_shard.name=Balefire Shard @@ -1572,6 +1579,8 @@ item.euphemium_kit.name=Euphemium Kit item.euphemium_legs.name=Euphemium Leggings item.euphemium_plate.name=Euphemium Chestplate item.euphemium_stopper.name=Stopper +item.explosive_lenses.name=Array of High-Explosive Lenses +item.explosive_lenses.desc=Assembly of 8 PBX lenses with a thin$aluminium pusher, duraluminium shell, and$miniaturized bridgewire detonators. item.fabsols_vodka.name=Fabsol's Vodka item.factory_core_advanced.name=Advanced Factory Energy Cluster item.factory_core_titanium.name=Basic Factory Energy Cluster @@ -1642,9 +1651,8 @@ item.fusion_shield_chlorophyte.name=Chlorophyte-Metallized Fusion Reactor Blanke item.fusion_shield_desh.name=Desh Fusion Reactor Blanket item.fusion_shield_tungsten.name=Tungsten Fusion Reactor Blanket item.fusion_shield_vaporwave.name=Vaporwave Fusion Reactor Blanket -item.gadget_core.name=Plutonium Core +item.gadget_core.name=Large Plutonium Core item.gadget_explosive.name=First Generation Explosive Lens -item.gadget_explosive8.name=Bundle of First Generation Implosion Propellant item.gadget_kit.name=The Gadget Kit item.gadget_wireing.name=Wiring item.gas_biogas.name=Biogas Tank @@ -2050,8 +2058,7 @@ item.magnet_dee.name=Dee Magnets item.magnetron.name=Magnetron item.man_core.name=Plutonium Core item.man_explosive.name=Explosive Lens -item.man_explosive8.name=Bundle of Implosion Propellant -item.man_igniter.name=Bomb Igniter +item.man_igniter.name=Bomb Firing Unit item.man_kit.name=Fat Man Kit item.marshmallow.name=Marshmallow on a Stick item.mask_of_infamy.name=Mask of Infamy diff --git a/src/main/resources/assets/hbm/textures/gui/weapon/fatManSchematic.png b/src/main/resources/assets/hbm/textures/gui/weapon/fatManSchematic.png index 8eb62ae2e..631b0cd71 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/weapon/fatManSchematic.png and b/src/main/resources/assets/hbm/textures/gui/weapon/fatManSchematic.png differ