diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 62932b4ff..a0608f65c 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -54,6 +54,11 @@ public class MineralRecipes { RecipesCommon.add9To1(ModItems.powder_xe135_tiny, ModItems.powder_xe135); RecipesCommon.add1To9(ModItems.powder_xe135, ModItems.powder_xe135_tiny); + RecipesCommon.add9To1(ModItems.nugget_technetium, ModItems.ingot_technetium); + RecipesCommon.add1To9(ModItems.ingot_technetium, ModItems.nugget_technetium); + RecipesCommon.add9To1(ModItems.nugget_bismuth, ModItems.ingot_bismuth); + RecipesCommon.add1To9(ModItems.ingot_bismuth, ModItems.nugget_bismuth); + for(int i = 0; i < ItemWasteLong.WasteClass.values().length; i++) { RecipesCommon.add9To1SameMeta(ModItems.nuclear_waste_long_tiny, ModItems.nuclear_waste_long, i); RecipesCommon.add1To9SameMeta(ModItems.nuclear_waste_long, ModItems.nuclear_waste_long_tiny, i); @@ -92,6 +97,7 @@ public class MineralRecipes { RecipesCommon.addBillet(ModItems.billet_pu_mix, ModItems.nugget_pu_mix); RecipesCommon.addBillet(ModItems.billet_neptunium, ModItems.nugget_neptunium, "nuggetNeptunium237", "tinyNp237"); RecipesCommon.addBillet(ModItems.billet_polonium, ModItems.nugget_polonium, "nuggetPolonium"); + RecipesCommon.addBillet(ModItems.billet_technetium, ModItems.nugget_technetium, "nuggetTechnetium"); RecipesCommon.addBillet(ModItems.billet_schrabidium, ModItems.nugget_schrabidium); RecipesCommon.addBillet(ModItems.billet_solinium, ModItems.nugget_solinium); RecipesCommon.addBillet(ModItems.billet_uranium_fuel, ModItems.nugget_uranium_fuel); @@ -107,9 +113,6 @@ public class MineralRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_thorium_fuel, 3), new Object[] { ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_u233 }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_thorium_fuel, 1), new Object[] { "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetUranium233", "nuggetUranium233" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_thorium_fuel, 1), new Object[] { "tinyTh232", "tinyTh232", "tinyTh232", "tinyTh232", "tinyU233", "tinyU233" })); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_uranium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u233 }); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium233", "nuggetUranium233" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU233", "tinyU233" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_uranium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_u235 }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium235", "nuggetUranium235" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_uranium_fuel, 1), new Object[] { "tinyU238", "tinyU238", "tinyU238", "tinyU238", "tinyU235", "tinyU235" })); @@ -143,6 +146,7 @@ public class MineralRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_neptunium, 2), new Object[] { ModItems.billet_neptunium, ModItems.billet_neptunium, ModItems.billet_neptunium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_neptunium_fuel, 2), new Object[] { ModItems.billet_neptunium_fuel, ModItems.billet_neptunium_fuel, ModItems.billet_neptunium_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_polonium, 2), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_technetium, 2), new Object[] { ModItems.billet_technetium, ModItems.billet_technetium, ModItems.billet_technetium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_schrabidium, 2), new Object[] { ModItems.billet_schrabidium, ModItems.billet_schrabidium, ModItems.billet_schrabidium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_solinium, 2), new Object[] { ModItems.billet_solinium, ModItems.billet_solinium, ModItems.billet_solinium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_schrabidium_fuel, 2), new Object[] { ModItems.billet_schrabidium_fuel, ModItems.billet_schrabidium_fuel, ModItems.billet_schrabidium_fuel }); diff --git a/src/main/java/com/hbm/crafting/RecipesCommon.java b/src/main/java/com/hbm/crafting/RecipesCommon.java index 3bcf4fee2..5d029e028 100644 --- a/src/main/java/com/hbm/crafting/RecipesCommon.java +++ b/src/main/java/com/hbm/crafting/RecipesCommon.java @@ -54,7 +54,7 @@ public class RecipesCommon { for(String o : ore) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(billet), new Object[] { "###", "###", '#', o })); - GameRegistry.addShapelessRecipe(new ItemStack(nugget, 6), new Object[] { billet }); + addBillet(billet, nugget); } public static void addBillet(Item billet, Item nugget) { diff --git a/src/main/java/com/hbm/inventory/MachineRecipes.java b/src/main/java/com/hbm/inventory/MachineRecipes.java index 2615710d0..0c6d76484 100644 --- a/src/main/java/com/hbm/inventory/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/MachineRecipes.java @@ -407,6 +407,8 @@ public class MachineRecipes { if(input.getItem() == ModItems.circuit_raw) return new ItemStack(ModItems.circuit_aluminium); + if(input.getItem() == ModItems.circuit_bismuth_raw) + return new ItemStack(ModItems.circuit_bismuth); } if(stamp.getItem() == ModItems.stamp_357) { @@ -517,6 +519,7 @@ public class MachineRecipes { recipes.put(new Object[] { i_stamps_wire, new ItemStack(ModItems.ingot_magnetized_tungsten) }, getPressResultNN(stamps_wire.get(0), ModItems.ingot_magnetized_tungsten)); recipes.put(new Object[] { i_stamps_circuit, new ItemStack(ModItems.circuit_raw) }, getPressResultNN(stamps_circuit.get(0), ModItems.circuit_raw)); + recipes.put(new Object[] { i_stamps_circuit, new ItemStack(ModItems.circuit_bismuth_raw) }, getPressResultNN(stamps_circuit.get(0), ModItems.circuit_bismuth_raw)); recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.assembly_iron) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.assembly_iron)); recipes.put(new Object[] { i_stamps_357, new ItemStack(ModItems.assembly_steel) }, getPressResultNN(i_stamps_357.get(0).getItem(), ModItems.assembly_steel)); diff --git a/src/main/java/com/hbm/inventory/gui/GUIRBMKOutgasser.java b/src/main/java/com/hbm/inventory/gui/GUIRBMKOutgasser.java index 33bea4886..92b22d8d6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRBMKOutgasser.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRBMKOutgasser.java @@ -7,12 +7,11 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKOutgasser; 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 GUIRBMKOutgasser extends GuiContainer { +public class GUIRBMKOutgasser extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/reactors/gui_rbmk_outgasser.png"); private TileEntityRBMKOutgasser rod; @@ -25,6 +24,13 @@ public class GUIRBMKOutgasser extends GuiContainer { this.ySize = 186; } + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + rod.gas.renderTankInfo(this, mouseX, mouseY, guiLeft + 112, guiTop + 21, 16, 48); + } + @Override protected void drawGuiContainerForegroundLayer(int i, int j) { String name = this.rod.hasCustomInventoryName() ? this.rod.getInventoryName() : I18n.format(this.rod.getInventoryName()); @@ -38,5 +44,11 @@ public class GUIRBMKOutgasser extends GuiContainer { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + int progress = (int) (rod.progress * 13 / rod.duration); + drawTexturedModalRect(guiLeft + 82, guiTop + 50, 176, 0, progress, 6); + + int gas = (int) (rod.gas.getFill() * 42 / rod.gas.getMaxFill()); + drawTexturedModalRect(guiLeft + 115, guiTop + 66 - gas, 188, 42 - gas, 10, gas); } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 37f11bf24..12d28957c 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -67,6 +67,7 @@ public class ModItems { public static Item ingot_pu_mix; public static Item ingot_neptunium; public static Item ingot_polonium; + public static Item ingot_technetium; public static Item ingot_co60; public static Item ingot_au198; public static Item ingot_titanium; @@ -161,6 +162,7 @@ public class ModItems { public static Item billet_pu_mix; public static Item billet_neptunium; public static Item billet_polonium; + public static Item billet_technetium; public static Item billet_co60; public static Item billet_au198; public static Item billet_schrabidium; @@ -436,6 +438,7 @@ public class ModItems { public static Item circuit_red_copper; public static Item circuit_gold; public static Item circuit_schrabidium; + public static Item circuit_bismuth_raw; public static Item circuit_bismuth; public static Item mechanism_revolver_1; @@ -2343,6 +2346,7 @@ public class ModItems { ingot_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.ingot).setUnlocalizedName("ingot_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu_mix"); ingot_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.ingot).setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium"); ingot_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.ingot, true).setUnlocalizedName("ingot_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polonium"); + ingot_technetium = new ItemHazard().addRadiation(ItemHazard.tc99 * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_technetium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_technetium"); ingot_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.ingot).addFire(5).toItem().setUnlocalizedName("ingot_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_co60"); ingot_au198 = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.ingot).addFire(15).toItem().setUnlocalizedName("ingot_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_au198"); ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_titanium"); @@ -2427,6 +2431,7 @@ public class ModItems { billet_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.billet).setUnlocalizedName("billet_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu_mix"); billet_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.billet).setUnlocalizedName("billet_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium"); billet_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.billet, true).setUnlocalizedName("billet_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_polonium"); + billet_technetium = new ItemHazard().addRadiation(ItemHazard.tc99 * ItemHazard.billet).toItem().setUnlocalizedName("billet_technetium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_technetium"); billet_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.billet).addFire(5).toItem().setUnlocalizedName("billet_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_co60"); billet_au198 = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.billet).addFire(15).toItem().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198"); billet_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.billet, false, true).setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium"); @@ -2526,7 +2531,7 @@ public class ModItems { wire_tungsten = new ItemCustomLore().setUnlocalizedName("wire_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_tungsten"); neutron_reflector = new Item().setUnlocalizedName("neutron_reflector").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":neutron_reflector"); nugget_lead = new Item().setUnlocalizedName("nugget_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_lead"); - ingot_bismuth = new Item().setUnlocalizedName("ingot_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_bismuth"); + ingot_bismuth = new ItemCustomLore().setUnlocalizedName("ingot_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_bismuth"); nugget_bismuth = new Item().setUnlocalizedName("nugget_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_bismuth"); nugget_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.nugget, false, true).setUnlocalizedName("nugget_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium"); nugget_beryllium = new Item().setUnlocalizedName("nugget_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_beryllium"); @@ -2778,6 +2783,7 @@ public class ModItems { circuit_red_copper = new Item().setUnlocalizedName("circuit_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_red_copper"); circuit_gold = new Item().setUnlocalizedName("circuit_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_gold"); circuit_schrabidium = new ItemCustomLore().setUnlocalizedName("circuit_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_schrabidium"); + circuit_bismuth_raw = new Item().setUnlocalizedName("circuit_bismuth_raw").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_bismuth_raw"); circuit_bismuth = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("circuit_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_bismuth"); circuit_targeting_tier1 = new Item().setUnlocalizedName("circuit_targeting_tier1").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_targeting_tier1"); circuit_targeting_tier2 = new Item().setUnlocalizedName("circuit_targeting_tier2").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_targeting_tier2"); @@ -5019,6 +5025,7 @@ public class ModItems { GameRegistry.registerItem(ingot_pu_mix, ingot_pu_mix.getUnlocalizedName()); GameRegistry.registerItem(ingot_neptunium, ingot_neptunium.getUnlocalizedName()); GameRegistry.registerItem(ingot_polonium, ingot_polonium.getUnlocalizedName()); + GameRegistry.registerItem(ingot_technetium, ingot_technetium.getUnlocalizedName()); GameRegistry.registerItem(ingot_co60, ingot_co60.getUnlocalizedName()); GameRegistry.registerItem(ingot_au198, ingot_au198.getUnlocalizedName()); GameRegistry.registerItem(ingot_titanium, ingot_titanium.getUnlocalizedName()); @@ -5095,6 +5102,7 @@ public class ModItems { GameRegistry.registerItem(billet_pu_mix, billet_pu_mix.getUnlocalizedName()); GameRegistry.registerItem(billet_neptunium, billet_neptunium.getUnlocalizedName()); GameRegistry.registerItem(billet_polonium, billet_polonium.getUnlocalizedName()); + GameRegistry.registerItem(billet_technetium, billet_technetium.getUnlocalizedName()); GameRegistry.registerItem(billet_co60, billet_co60.getUnlocalizedName()); GameRegistry.registerItem(billet_au198, billet_au198.getUnlocalizedName()); GameRegistry.registerItem(billet_schrabidium, billet_schrabidium.getUnlocalizedName()); @@ -5478,6 +5486,7 @@ public class ModItems { GameRegistry.registerItem(circuit_red_copper, circuit_red_copper.getUnlocalizedName()); GameRegistry.registerItem(circuit_gold, circuit_gold.getUnlocalizedName()); GameRegistry.registerItem(circuit_schrabidium, circuit_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(circuit_bismuth_raw, circuit_bismuth_raw.getUnlocalizedName()); GameRegistry.registerItem(circuit_bismuth, circuit_bismuth.getUnlocalizedName()); //Military Circuits diff --git a/src/main/java/com/hbm/items/special/ItemCustomLore.java b/src/main/java/com/hbm/items/special/ItemCustomLore.java index d34ff8e8e..9b1958204 100644 --- a/src/main/java/com/hbm/items/special/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/special/ItemCustomLore.java @@ -408,6 +408,13 @@ public class ItemCustomLore extends Item { { list.add("Or 'Lanthanum' for stupid people."); } + + if(this == ModItems.ingot_bismuth) + { + list.add("\"Bismuth acts as post-RBMK gate, similar to Technetium"); + list.add("with the difference that Technetium is also available"); + list.add("from PWRs.\" <- THAT is what I needed to hear."); + } } @Override @@ -454,7 +461,7 @@ public class ItemCustomLore extends Item { return EnumRarity.uncommon; } - return this.rarity != null ? rarity : EnumRarity.common; + return this.rarity != null ? rarity : super.getRarity(p_77613_1_); } @Override diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 33b639519..2610da093 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -68,6 +68,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.marker_structure, 1), new Object[] { "L", "G", "R", 'L', "dustLapis", 'G', Items.glowstone_dust, 'R', Blocks.redstone_torch })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_raw, 1), new Object[] { "A", "R", "S", 'S', "plateSteel", 'R', "dustRedstone", 'A', ModItems.wire_aluminium })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_bismuth_raw, 1), new Object[] { "RPR", "ABA", "RPR", 'R', "dustRedstone", 'P', "ingotPolymer", 'A', "ingotAsbestos", 'B', ModItems.ingot_bismuth })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier1, 1), new Object[] { "CPC", 'C', ModItems.circuit_aluminium, 'P', "dustRedstone" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier2, 1), new Object[] { "CPC", 'C', ModItems.circuit_copper, 'P', "dustNetherQuartz" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier3, 1), new Object[] { "CPC", 'C', ModItems.circuit_red_copper, 'P', "dustGold" })); @@ -740,6 +741,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_control_auto, 1), new Object[] { "C", "R", "C", 'C', ModItems.circuit_targeting_tier1, 'R', ModBlocks.rbmk_control }); GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_boiler, 1), new Object[] { "CPC", "CRC", "CPC", 'C', ModItems.board_copper, 'P', ModItems.pipes_steel, 'R', ModBlocks.rbmk_blank }); GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_rod, 1), new Object[] { "C", "R", "C", 'C', ModItems.hull_small_steel, 'R', ModBlocks.rbmk_blank }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_outgasser, 1), new Object[] { "GHG", "GRG", "GTG", 'G', ModBlocks.steel_grate, 'H', Blocks.hopper, 'T', ModItems.tank_steel, 'R', ModBlocks.rbmk_blank }); GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_console, 1), new Object[] { "PPP", "PCP", "PPP", 'C', ModItems.circuit_targeting_tier3, 'P', Items.potato }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rbmk_loader, 1), new Object[] { "SCS", "CBC", "SCS", 'S', "plateSteel", 'C', "ingotCopper", 'B', ModItems.tank_steel })); diff --git a/src/main/java/com/hbm/render/entity/effect/RenderBlackHole.java b/src/main/java/com/hbm/render/entity/effect/RenderBlackHole.java index cc032fe3b..0adc25b0a 100644 --- a/src/main/java/com/hbm/render/entity/effect/RenderBlackHole.java +++ b/src/main/java/com/hbm/render/entity/effect/RenderBlackHole.java @@ -9,139 +9,220 @@ import com.hbm.entity.effect.EntityRagingVortex; import com.hbm.entity.effect.EntityVortex; import com.hbm.lib.RefStrings; +import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Vec3; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; public class RenderBlackHole extends Render { - private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Sphere.obj"); + private static final ResourceLocation objTesterModelRL = new ResourceLocation(RefStrings.MODID, "models/Sphere.obj"); private IModelCustom blastModel; - private ResourceLocation blastTexture; + private ResourceLocation hole = new ResourceLocation(RefStrings.MODID, "textures/models/BlackHole.png"); + private ResourceLocation swirl = new ResourceLocation(RefStrings.MODID, "textures/entity/bhole.png"); - - public RenderBlackHole() { - blastModel = AdvancedModelLoader.loadModel(objTesterModelRL); - blastTexture = new ResourceLocation(RefStrings.MODID, "textures/models/BlackHole.png"); - - } + public RenderBlackHole() { + blastModel = AdvancedModelLoader.loadModel(objTesterModelRL); + } @Override - public void doRender(Entity entity, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, - float p_76986_9_) { - + public void doRender(Entity entity, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float interp) { + if(entity instanceof EntityBlackHole) { GL11.glPushMatrix(); - GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); - GL11.glRotatef((entity.ticksExisted % 360) * 10, 1, 1, 1); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - - float size = entity.getDataWatcher().getWatchableObjectFloat(16); - - GL11.glScalef(size, size, size); - - bindTexture(blastTexture); - blastModel.renderAll(); - + GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glScalef(0.2F, 0.2F, 0.2F); - - //FLARE START - Tessellator tessellator = Tessellator.instance; - RenderHelper.disableStandardItemLighting(); - int j = 75;//entity.ticksExisted > 250 ? 250 : entity.ticksExisted; - float f1 = (j + 2.0F) / 200.0F; - float f2 = 0.0F; - int count = 250; - - /*if(entity.ticksExisted < 250) - { - count = entity.ticksExisted * 3; - }*/ - - count = j; + float size = entity.getDataWatcher().getWatchableObjectFloat(16); - if (f1 > 0.8F) - { - f2 = (f1 - 0.8F) / 0.2F; - } + GL11.glScalef(size, size, size); - Random random = new Random(432L); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDepthMask(false); - GL11.glPushMatrix(); - - //for (int i = 0; (float)i < (f1 + f1 * f1) / 2.0F * 60.0F; ++i) - for(int i = 0; i < count; i++) - { - GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(random.nextFloat() * 360.0F + f1 * 90.0F, 0.0F, 0.0F, 1.0F); - tessellator.startDrawing(6); - float f3 = random.nextFloat() * 20.0F + 5.0F + f2 * 10.0F; - float f4 = random.nextFloat() * 2.0F + 1.0F + f2 * 2.0F; - setColorFull(entity, tessellator); - tessellator.addVertex(0.0D, 0.0D, 0.0D); - setColorNone(entity, tessellator); - tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); - tessellator.addVertex(0.866D * f4, f3, -0.5F * f4); - tessellator.addVertex(0.0D, f3, 1.0F * f4); - tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); - tessellator.draw(); - } + bindTexture(hole); + blastModel.renderAll(); + + renderSwirl(entity, true, interp); + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_LIGHTING); + + GL11.glPopMatrix(); - GL11.glPopMatrix(); - GL11.glPopMatrix(); - GL11.glDepthMask(true); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_ALPHA_TEST); - RenderHelper.enableStandardItemLighting(); - //FLARE END - } } - private void setColorFull(Entity e, Tessellator tessellator) { + private void renderSwirl(Entity entity, boolean hasJet, float interp) { - if(e instanceof EntityVortex) - tessellator.setColorRGBA_I(0x3898b3, (int)(255.0F * (1.0F))); + bindTexture(swirl); + + GL11.glRotatef(entity.getEntityId() % 90 - 45, 1, 0, 0); + GL11.glRotatef(entity.getEntityId() % 360, 0, 1, 0); + GL11.glRotatef((entity.ticksExisted + interp % 360) * -5, 0, 1, 0); + GL11.glShadeModel(GL11.GL_SMOOTH); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + Vec3 vec = Vec3.createVectorHelper(1, 0, 0); - else if(e instanceof EntityRagingVortex) - tessellator.setColorRGBA_I(0xe8390d, (int)(255.0F * (1.0F))); + Tessellator tess = Tessellator.instance; + tess.startDrawingQuads(); - else - tessellator.setColorRGBA_I(59345715, (int)(255.0F * (1.0F))); + double s = 3; + int count = 16; + + for(int i = 0; i < count; i++) { + + tess.setColorRGBA_F(0.0F, 0.0F, 0.0F, 1.0F); + tess.addVertexWithUV(vec.xCoord * 0.9, 0, vec.zCoord * 0.9, 0.5 + vec.xCoord * 0.25 / s * 0.9, 0.5 + vec.zCoord * 0.25 / s * 0.9); + this.setColorFull(entity, tess); + tess.addVertexWithUV(vec.xCoord * s, 0, vec.zCoord * s, 0.5 + vec.xCoord * 0.25, 0.5 + vec.zCoord * 0.25); + + vec.rotateAroundY((float)(Math.PI * 2 / count)); + this.setColorFull(entity, tess); + tess.addVertexWithUV(vec.xCoord * s, 0, vec.zCoord * s, 0.5 + vec.xCoord * 0.25, 0.5 + vec.zCoord * 0.25); + tess.setColorRGBA_F(0.0F, 0.0F, 0.0F, 1.0F); + tess.addVertexWithUV(vec.xCoord * 0.9, 0, vec.zCoord * 0.9, 0.5 + vec.xCoord * 0.25 / s * 0.9, 0.5 + vec.zCoord * 0.25 / s * 0.9); + } + + tess.draw(); + + tess.startDrawingQuads(); + + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glDepthMask(false); + GL11.glAlphaFunc(GL11.GL_GEQUAL, 0.0F); + GL11.glEnable(GL11.GL_BLEND); + + for(int i = 0; i < count; i++) { + + this.setColorFull(entity, tess); + tess.addVertexWithUV(vec.xCoord * s, 0, vec.zCoord * s, 0.5 + vec.xCoord * 0.25, 0.5 + vec.zCoord * 0.25); + this.setColorNone(entity, tess); + tess.addVertexWithUV(vec.xCoord * s * 2, 0, vec.zCoord * s * 2, 0.5 + vec.xCoord * 0.5, 0.5 + vec.zCoord * 0.5); + + vec.rotateAroundY((float)(Math.PI * 2 / count)); + this.setColorNone(entity, tess); + tess.addVertexWithUV(vec.xCoord * s * 2, 0, vec.zCoord * s * 2, 0.5 + vec.xCoord * 0.5, 0.5 + vec.zCoord * 0.5); + this.setColorFull(entity, tess); + tess.addVertexWithUV(vec.xCoord * s, 0, vec.zCoord * s, 0.5 + vec.xCoord * 0.25, 0.5 + vec.zCoord * 0.25); + } + + tess.draw(); + + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GL11.glDisable(GL11.GL_TEXTURE_2D); + + for(int j = -1; j <= 1; j += 2) { + tess.startDrawing(GL11.GL_TRIANGLE_FAN); + + tess.setColorRGBA_F(1.0F, 1.0F, 1.0F, 0.35F); + tess.addVertex(0, 0, 0); + tess.setColorRGBA_F(1.0F, 1.0F, 1.0F, 0.0F); + + Vec3 jet = Vec3.createVectorHelper(0.5, 0, 0); + + for(int i = 0; i <= 12; i++) { + + tess.addVertex(jet.xCoord, 10 * j, jet.zCoord); + jet.rotateAroundY((float)(Math.PI / 6 * -j)); + } + + tess.draw(); + } + + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glDisable(GL11.GL_BLEND); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_ALPHA_TEST); } - private void setColorNone(Entity e, Tessellator tessellator) { + private void renderFlare(Entity entity) { + + GL11.glScalef(0.2F, 0.2F, 0.2F); + Tessellator tessellator = Tessellator.instance; + RenderHelper.disableStandardItemLighting(); + int j = 75; + float f1 = (j + 2.0F) / 200.0F; + float f2 = 0.0F; + int count = 250; + + count = j; + + if(f1 > 0.8F) { + f2 = (f1 - 0.8F) / 0.2F; + } + + Random random = new Random(432L); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDepthMask(false); + GL11.glPushMatrix(); + + for(int i = 0; i < count; i++) { + GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(random.nextFloat() * 360.0F + f1 * 90.0F, 0.0F, 0.0F, 1.0F); + tessellator.startDrawing(6); + float f3 = random.nextFloat() * 20.0F + 5.0F + f2 * 10.0F; + float f4 = random.nextFloat() * 2.0F + 1.0F + f2 * 2.0F; + setColorFull(entity, tessellator); + tessellator.addVertex(0.0D, 0.0D, 0.0D); + setColorNone(entity, tessellator); + tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); + tessellator.addVertex(0.866D * f4, f3, -0.5F * f4); + tessellator.addVertex(0.0D, f3, 1.0F * f4); + tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); + tessellator.draw(); + } + + GL11.glPopMatrix(); + GL11.glDepthMask(true); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_BLEND); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_ALPHA_TEST); + RenderHelper.enableStandardItemLighting(); + } + + private void setColorFull(Entity e, Tessellator tessellator) { + + if(e instanceof EntityVortex) + tessellator.setColorRGBA_I(0x3898b3, (int) (255.0F * (1.0F))); + + else if(e instanceof EntityRagingVortex) + tessellator.setColorRGBA_I(0xe8390d, (int) (255.0F * (1.0F))); + + else + tessellator.setColorRGBA_I(0xFFB900, (int) (255.0F * (1.0F))); + } + + private void setColorNone(Entity e, Tessellator tessellator) { + if(e instanceof EntityVortex) tessellator.setColorRGBA_I(0x3898b3, 0); - + else if(e instanceof EntityRagingVortex) tessellator.setColorRGBA_I(0xe8390d, 0); - - else - tessellator.setColorRGBA_I(59345715, 0); + + else + tessellator.setColorRGBA_I(0xFFB900, 0); } - + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return null; diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFMaresLeg.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFMaresLeg.java index 415e65239..b95260b35 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFMaresLeg.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFMaresLeg.java @@ -6,11 +6,10 @@ import com.hbm.main.ResourceManager; import com.hbm.render.anim.HbmAnimations; import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderWeaponFFMaresLeg implements IItemRenderer { @@ -46,6 +45,8 @@ public class ItemRenderWeaponFFMaresLeg implements IItemRenderer { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_CULL_FACE); + + EntityPlayer player = Minecraft.getMinecraft().thePlayer; double lever = 0; @@ -56,9 +57,17 @@ public class ItemRenderWeaponFFMaresLeg implements IItemRenderer { double s0 = 1.25D; GL11.glTranslated(0.75, 0.5, 0); GL11.glScaled(s0, s0, s0); - GL11.glRotated(100, 0, -1, 0); - GL11.glRotated(-5, 0, 1, 0); - GL11.glRotated(20, 1, 0, 0); + + if(!player.isSneaking()) { + GL11.glRotated(100, 0, -1, 0); + GL11.glRotated(-5, 0, 1, 0); + GL11.glRotated(20, 1, 0, 0); + } else { + GL11.glRotated(97.5, 0, -1, 0); + GL11.glTranslated(-0.71, 0.375, 0); + GL11.glRotated(25, 1, 0, 0); + GL11.glRotated(1, 0, 1, 0); + } double[] recoil = HbmAnimations.getRelevantTransformation("LEVER_RECOIL"); GL11.glTranslated(0, 0, recoil[0] * 0.5); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java index 067b705fd..0cbbc7209 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java @@ -268,6 +268,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent new WeightedRandomObject(new ItemStack(ModItems.powder_aluminium, 3), 10), new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 10), new WeightedRandomObject(new ItemStack(ModItems.powder_titanium, 2), 8), + new WeightedRandomObject(new ItemStack(ModItems.crystal_tungsten, 2), 7), new WeightedRandomObject(new ItemStack(ModItems.powder_coal, 4), 15), new WeightedRandomObject(new ItemStack(ModItems.powder_uranium, 2), 5), new WeightedRandomObject(new ItemStack(ModItems.powder_plutonium, 1), 5), @@ -290,6 +291,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent new WeightedRandomObject(new ItemStack(ModItems.crystal_plutonium, 1), 3), new WeightedRandomObject(new ItemStack(ModItems.crystal_trixite, 1), 1), new WeightedRandomObject(new ItemStack(ModItems.crystal_starmetal, 1), 1), + new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 2), 4) }; private void addToInv(ItemStack stack) { diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java index 9e6519c5e..335cdbee1 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java @@ -16,6 +16,7 @@ public class RBMKDials { public static final String KEY_CONTROL_SPEED_MOD = "dialControlSpeed"; public static final String KEY_REACTIVITY_MOD = "dialReactivityMod"; public static final String KEY_SAVE_DIALS = "dialSaveDials"; + public static final String KEY_OUTGASSER_MOD = "dialOutgasserSpeedMod"; public static void createDials(World world) { GameRules rules = world.getGameRules(); @@ -31,6 +32,7 @@ public class RBMKDials { rules.setOrCreateGameRule(KEY_CONTROL_SPEED_MOD, "1.0"); rules.setOrCreateGameRule(KEY_REACTIVITY_MOD, "1.0"); rules.setOrCreateGameRule(KEY_SAVE_DIALS, "true"); + rules.setOrCreateGameRule(KEY_OUTGASSER_MOD, "1.0"); } } @@ -115,6 +117,15 @@ public class RBMKDials { return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_REACTIVITY_MOD), 1.0D), 0.0D); } + /** + * A multiplier for how much flux the rods give out. + * @param world + * @return + */ + public static double getOutgasserMod(World world) { + return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_OUTGASSER_MOD), 1.0D), 0.0D); + } + //why make the double representation accessible in a game rule when you can just force me to add a second pointless parsing operation? public static double shittyWorkaroundParseDouble(String s, double def) { diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java index 42a10db03..8bc534a51 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java @@ -9,17 +9,12 @@ import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.RecipesCommon; -import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; -import com.hbm.inventory.SILEXRecipes.SILEXRecipe; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.lib.Library; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -48,7 +43,13 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement if(worldObj.getTotalWorldTime() % 10 == 0) fillFluidInit(gas.getTankType()); + + if(!canProcess()) { + this.progress = 0; + } } + + super.updateEntity(); } @Override @@ -59,7 +60,7 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement if(type == NType.FAST) flux *= 0.2D; - progress += flux; + progress += flux * RBMKDials.getOutgasserMod(worldObj); if(progress > duration) { process(); @@ -71,6 +72,7 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement private static HashMap recipes = new HashMap(); static { + recipes.put("blockLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.TRITIUM.ordinal()), 10000)); recipes.put("ingotLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.TRITIUM.ordinal()), 1000)); recipes.put("dustLithium", ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.TRITIUM.ordinal()), 1000)); recipes.put(new ComparableStack(ModItems.powder_lithium_tiny), ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.TRITIUM.ordinal()), 100)); @@ -123,6 +125,8 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement private void process() { ItemStack output = getOutput(slots[0]); + this.decrStackSize(0, 1); + this.progress = 0; if(output.getItem() == ModItems.fluid_icon) { gas.setFill(gas.getFill() + ItemFluidIcon.getQuantity(output)); @@ -233,7 +237,7 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - this.heat = nbt.getDouble("progress"); + this.progress = nbt.getDouble("progress"); this.gas.readFromNBT(nbt, "gas"); } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java index 0a5617ee5..976ecf208 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java @@ -121,6 +121,11 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM break; } } + if(te instanceof IRBMKFluxReceiver) { + IRBMKFluxReceiver rod = (IRBMKFluxReceiver)te; + rod.receiveFlux(stream, flux); + break; + } //set neutrons to slow if(te instanceof TileEntityRBMKControl) { diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 393b00f25..c22a22b9b 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -245,6 +245,11 @@ container.radGen=Strahlenbetriebener Generator container.radar=Radar container.radiobox=UKW-Sender container.radiorec=UKW Radio +container.rbmkBoiler=RBMK Dampfkanal +container.rbmkControl=RBMK Steuerstäbe +container.rbmkControlAuto=RBMK Automatische Steuerstäbe +container.rbmkOutgasser=RBMK Bestrahlungskanal +container.rbmkRod=RBMK Steuerstäbe container.reactor=Brutreaktor container.reactorControl=Reaktorfernsteuerung container.reactorLarge=Großer Atomreaktor @@ -695,20 +700,20 @@ item.billet_neptunium_fuel.name=Neptuniumkernbrennstoffbillet item.billet_po210be.name=Po210Be-Billet item.billet_polonium.name=Polonium-210-Billet item.billet_pu_mix.name=Reaktorfähiges Plutoniumbillet -item.billet_pu238.name=Pu238-Billet +item.billet_pu238.name=Plutonium-238-Billet item.billet_pu238be.name=Pu238Be-Billet -item.billet_pu239.name=Pu239-Billet -item.billet_pu240.name=Pu240-Billet +item.billet_pu239.name=Plutonium-239-Billet +item.billet_pu240.name=Plutonium-240-Billet item.billet_plutonium.name=Plutoniumbillet item.billet_plutonium_fuel.name=Plutoniumkernbrennstoffbillet item.billet_schrabidium.name=Schrabidiumbillet item.billet_schrabidium_fuel.name=Schrabidiumkernbrennstoffbillet item.billet_solinium.name=Soliniumbillet -item.billet_th232.name=Th232-Billet +item.billet_th232.name=Thorium-232-Billet item.billet_thorium_fuel.name=Thoriumkernbrennstoffbillet -item.billet_u233.name=U233-Billet -item.billet_u235.name=U235-Billet -item.billet_u238.name=U238-Billet +item.billet_u233.name=Uran-233-Billet +item.billet_u235.name=Uran-235-Billet +item.billet_u238.name=Uran-238-Billet item.billet_uranium.name=Uranbillet item.billet_uranium_fuel.name=Urankernbrennstoffbillet item.billet_yharonite.name=Yharonitbillet @@ -881,6 +886,8 @@ item.chopper_torso.name=Jagdschrauber Rumpf item.chopper_wing.name=Jagdschrauber Seitentragfläche item.cinnebar.name=Zinnober item.circuit_aluminium.name=Einfacher Schaltkreis +item.circuit_bismuth.name=Vielfältiges Chipset +item.circuit_bismuth_raw.name=Bismuth-Schaltkreisrohling item.circuit_copper.name=Erweiterter Schaltkreis item.circuit_gold.name=Übertakteter Schaltkreis item.circuit_raw.name=Schaltkreisrohling @@ -1361,6 +1368,7 @@ item.ingot_asbestos.name=Asbestplatte item.ingot_au198.name=Gold-198-Barren item.ingot_australium.name=Australiumbarren item.ingot_beryllium.name=Berylliumbarren +item.ingot_bismuth.name=Bismutbarren item.ingot_boron.name=Borbarren item.ingot_chainsteel.name=Schwerer Kettenstahl item.ingot_co60.name=Kobalt-60-Barren @@ -1391,9 +1399,9 @@ item.ingot_plutonium_fuel.name=Plutoniumkernbrennstoffbarren item.ingot_polonium.name=Polonium-210-Barren item.ingot_polymer.name=Polymertafel item.ingot_pu_mix.name=Reaktorfähiger Plutoniumbarren -item.ingot_pu238.name=Pu238-Barren -item.ingot_pu239.name=Pu239-Barren -item.ingot_pu240.name=Pu240-Barren +item.ingot_pu238.name=Plutonium-238-Barren +item.ingot_pu239.name=Plutonium-239-Barren +item.ingot_pu240.name=Plutonium-240-Barren item.ingot_red_copper.name=Minecraft-Kupfer item.ingot_reiium.name=Reiiumbarren item.ingot_saturnite.name=Saturnitbarren @@ -1406,14 +1414,15 @@ item.ingot_solinium.name=Soliniumbarren item.ingot_starmetal.name=§9Sternenmetallbarren§r item.ingot_steel.name=Stahlbarren item.ingot_steel_dusted.name=Bestäubter Stahlbarren -item.ingot_th232.name=Th232-Barren +item.ingot_technetium.name=Technetium-99-Barren +item.ingot_th232.name=Thorium-232-Barren item.ingot_thorium_fuel.name=Thoriumkernbrennstoffbarren item.ingot_titanium.name=Titanbarren item.ingot_tungsten.name=Wolframbarren -item.ingot_u233.name=U233-Barren -item.ingot_u235.name=U235-Barren -item.ingot_u238.name=U238-Barren -item.ingot_u238m2.name=Metastabiler U238/2-Barren +item.ingot_u233.name=Uran-233-Barren +item.ingot_u235.name=Uran-235-Barren +item.ingot_u238.name=Uran-238-Barren +item.ingot_u238m2.name=Metastabiler Uran-238M2-Barren item.ingot_unobtainium.name=Unobtainiumbarren item.ingot_uranium.name=Uranbarren item.ingot_uranium_fuel.name=Urankernbrennstoffbarren @@ -1709,6 +1718,7 @@ item.nugget_australium.name=Australiumnugget item.nugget_australium_greater.name=Ayerit-Australiumnugget item.nugget_australium_lesser.name=Tasmanit-Australiumnugget item.nugget_beryllium.name=Berylliumnugget +item.nugget_bismuth.name=Bismutnugget item.nugget_co60.name=Kobalt-60-Nugget item.nugget_daffergon.name=Daffergonnugget item.nugget_desh.name=Deshnugget @@ -1735,7 +1745,7 @@ item.nugget_schrabidium.name=Schrabidiumnugget item.nugget_schrabidium_fuel.name=Schrabidiumkernbrennstoffnugget item.nugget_solinium.name=Soliniumnugget item.nugget_technetium.name=Technetium-99-Nugget -item.nugget_th232.name=Th232-Nugget +item.nugget_th232.name=Thorium-232-Nugget item.nugget_thorium_fuel.name=Thoriumkernbrennstoffnugget item.nugget_u233.name=Uran-233-Nugget item.nugget_u235.name=Uran-235-Nugget @@ -1887,6 +1897,7 @@ item.powder_euphemium.name=Euphemiumstaub item.powder_fire.name=Roter Phosphor item.powder_gold.name=Goldstaub item.powder_i131.name=Iod-131-Staub +item.powder_i131_tiny.name=Kleiner Haufen Iod-131-Staub item.powder_ice.name=Kryopulver item.powder_iodine.name=Iodstaub item.powder_iron.name=Eisenstaub @@ -2019,20 +2030,20 @@ item.rod_dual_plutonium.name=Plutoniumdoppelbrennstab item.rod_dual_plutonium_fuel.name=Doppelte Plutoniumkernbrennstoffzelle item.rod_dual_plutonium_fuel_depleted.name=Erschöpfte Plutoniumdoppelkernbrennstoffzelle item.rod_dual_polonium.name=Polonium-210-Doppelbrennstab -item.rod_dual_pu238.name=Pu238-Doppelbrennstab -item.rod_dual_pu239.name=Pu239-Doppelbrennstab -item.rod_dual_pu240.name=Pu240-Doppelbrennstab -item.rod_dual_schrabidium.name=Sa326-Doppelbrennstab +item.rod_dual_pu238.name=Plutonium-238-Doppelbrennstab +item.rod_dual_pu239.name=Plutonium-239-Doppelbrennstab +item.rod_dual_pu240.name=Plutonium-240-Doppelbrennstab +item.rod_dual_schrabidium.name=Schrabidium-326-Doppelbrennstab item.rod_dual_schrabidium_fuel.name=Doppelte Schrabidiumkernbrennstoffzelle item.rod_dual_schrabidium_fuel_depleted.name=Erschöpfte Schrabidiumdoppelkernbrennstoffzelle -item.rod_dual_solinium.name=Sa327-Doppelbrennstab -item.rod_dual_th232.name=Th232-Doppelbrennstab +item.rod_dual_solinium.name=Schrabidium-327-Doppelbrennstab +item.rod_dual_th232.name=Thorium-232-Doppelbrennstab item.rod_dual_thorium_fuel.name=Doppelte Thoriumkernbrennstoffzelle item.rod_dual_thorium_fuel_depleted.name=Erschöpfte Thoriumdoppelkernbrennstoffzelle item.rod_dual_tritium.name=Doppelte Tritiumzelle -item.rod_dual_u233.name=U233-Doppelbrennstab -item.rod_dual_u235.name=U235-Doppelbrennstab -item.rod_dual_u238.name=U238-Doppelbrennstab +item.rod_dual_u233.name=Uran-233-Doppelbrennstab +item.rod_dual_u235.name=Uran-235-Doppelbrennstab +item.rod_dual_u238.name=Uran-238-Doppelbrennstab item.rod_dual_uranium.name=Urandoppelbrennstab item.rod_dual_uranium_fuel.name=Doppelte Urankernbrennstoffzelle item.rod_dual_uranium_fuel_depleted.name=Erschöpfte Urandoppelkernbrennstoffzelle @@ -2050,9 +2061,9 @@ item.rod_plutonium.name=Plutoniumbrennstab item.rod_plutonium_fuel.name=Plutoniumkernbrennstoffzelle item.rod_plutonium_fuel_depleted.name=Erschöpfte Plutoniumkernbrennstoffzelle item.rod_polonium.name=Polonium-210-Brennstab -item.rod_pu238.name=Pu238-Brennstab -item.rod_pu239.name=Pu239-Brennstab -item.rod_pu240.name=Pu240-Brennstab +item.rod_pu238.name=Plutonium-238-Brennstab +item.rod_pu239.name=Plutonium-239-Brennstab +item.rod_pu240.name=Plutonium-240-Brennstab item.rod_quad_balefire.name=Balefire-Vierfachbrennstab item.rod_quad_balefire_blazing.name=Lodernder Balefire-Vierfachbrennstab item.rod_quad_coolant.name=Vierfache Kühlzelle @@ -2067,37 +2078,37 @@ item.rod_quad_plutonium.name=Plutoniumvierfachbrennstab item.rod_quad_plutonium_fuel.name=Vierfache Plutoniumkernbrennstoffzelle item.rod_quad_plutonium_fuel_depleted.name=Erschöpfte Plutoniumvierfachkernbrennstoffzelle item.rod_quad_polonium.name=Polonium-210-Vierfachbrennstab -item.rod_quad_pu238.name=Pu238-Vierfachbrennstab -item.rod_quad_pu239.name=Pu239-Vierfachbrennstab -item.rod_quad_pu240.name=Pu240-Vierfachbrennstab -item.rod_quad_schrabidium.name=Sa326-Vierfachbrennstab +item.rod_quad_pu238.name=Plutonium-238-Vierfachbrennstab +item.rod_quad_pu239.name=Plutonium-239-Vierfachbrennstab +item.rod_quad_pu240.name=Plutonium-240-Vierfachbrennstab +item.rod_quad_schrabidium.name=Schrabidium-326-Vierfachbrennstab item.rod_quad_schrabidium_fuel.name=Vierfache Schrabidiumkernbrennstoffzelle item.rod_quad_schrabidium_fuel_depleted.name=Erschöpfte Schrabidiumvierfachkernbrennstoffzelle -item.rod_quad_solinium.name=Sa327-Vierfachbrennstab -item.rod_quad_th232.name=Th232-Vierfachbrennstab +item.rod_quad_solinium.name=Schrabidium-327-Vierfachbrennstab +item.rod_quad_th232.name=Thorium-232-Vierfachbrennstab item.rod_quad_thorium_fuel.name=Vierfache Thoriumkernbrennstoffzelle item.rod_quad_thorium_fuel_depleted.name=Erschöpfte Thoriumvierfachkernbrennstoffzelle item.rod_quad_tritium.name=Vierfache Tritiumzelle -item.rod_quad_u233.name=U233-Vierfachbrennstab -item.rod_quad_u235.name=U235-Vierfachbrennstab -item.rod_quad_u238.name=U238-Vierfachbrennstab +item.rod_quad_u233.name=Uran-233-Vierfachbrennstab +item.rod_quad_u235.name=Uran-235-Vierfachbrennstab +item.rod_quad_u238.name=Uran-238-Vierfachbrennstab item.rod_quad_uranium.name=Uranvierfachbrennstab item.rod_quad_uranium_fuel.name=Vierfache Urankernbrennstoffzelle item.rod_quad_uranium_fuel_depleted.name=Erschöpfte Uranvierfachkernbrennstoffzelle item.rod_quad_waste.name=Vierfacher Atommüllstab item.rod_quad_water.name=Vierfache Wasserzelle item.rod_reiium.name=Reiiumbrennstab -item.rod_schrabidium.name=Sa326-Brennstab +item.rod_schrabidium.name=Schrabidium-326-Brennstab item.rod_schrabidium_fuel.name=Schrabidiumkernbrennstoffzelle item.rod_schrabidium_fuel_depleted.name=Erschöpfte Schrabidiumkernbrennstoffzelle -item.rod_solinium.name=Sa327-Brennstab -item.rod_th232.name=Th232-Brennstab +item.rod_solinium.name=Schrabidium-327-Brennstab +item.rod_th232.name=Thorium-232-Brennstab item.rod_thorium_fuel.name=Thoriumkernbrennstoffzelle item.rod_thorium_fuel_depleted.name=Erschöpfte Thoriumkernbrennstoffzelle item.rod_tritium.name=Tritiumzelle -item.rod_u233.name=U233-Brennstab -item.rod_u235.name=U235-Brennstab -item.rod_u238.name=U238-Brennstab +item.rod_u233.name=Uran-233-Brennstab +item.rod_u235.name=Uran-235-Brennstab +item.rod_u238.name=Uran-238-Brennstab item.rod_unobtainium.name=Unobtainiumbrennstab item.rod_uranium.name=Uranbrennstab item.rod_uranium_fuel.name=Urankernbrennstoffzelle @@ -2485,9 +2496,9 @@ tile.block_plutonium.name=Plutoniumblock tile.block_plutonium_fuel.name=Plutoniumkernbrennstoffblock tile.block_polonium.name=Polonium-210-Block tile.block_pu_mix.name=Reaktorfähiger Plutoniumblock -tile.block_pu238.name=Pu238-Block -tile.block_pu239.name=Pu239-Block -tile.block_pu240.name=Pu240-Block +tile.block_pu238.name=Plutonium-238-Block +tile.block_pu239.name=Plutonium-239-Block +tile.block_pu240.name=Plutonium-240-Block tile.block_red_copper.name=Roter Kupferblock tile.block_red_phosphorus.name=Roter Phosphorblock tile.block_reiium.name=Reiiumblock @@ -2501,15 +2512,15 @@ tile.block_solinium.name=Soliniumblock tile.block_starmetal.name=§9Sternenmetallblock§r tile.block_steel.name=Stahlblock tile.block_sulfur.name=Schwefelblock -tile.block_thorium.name=Thoriumblock +tile.block_thorium.name=Thorium-232-Block tile.block_thorium_fuel.name=Thoriumkernbrennstoffblock tile.block_titanium.name=Titanblock tile.block_trinitite.name=Trinititblock tile.block_tritium.name=Tritiumzellenblock tile.block_tungsten.name=Wolframblock -tile.block_u233.name=U233-Block -tile.block_u235.name=U235-Block -tile.block_u238.name=U238-Block +tile.block_u233.name=Uran-233-Block +tile.block_u235.name=Uran-235-Block +tile.block_u238.name=Uran-238-Block tile.block_unobtainium.name=Unobtainiumblock tile.block_uranium.name=Uranblock tile.block_uranium_fuel.name=Urankernbrennstoffblock diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 72eb182c0..9f16f2a69 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -313,6 +313,11 @@ container.radGen=Radiation-Powered Engine container.radar=Radar container.radiobox=FM Transmitter container.radiorec=FM Radio +container.rbmkBoiler=RBMK Steam Channel +container.rbmkControl=RBMK Control Rods +container.rbmkControlAuto=RBMK Automatic Control Rods +container.rbmkOutgasser=RBMK Irradiation Channel +container.rbmkRod=RBMK Fuel Rod container.reactor=Breeding Reactor container.reactorControl=Reactor Remote Control Block container.reactorLarge=Big Nuclear Reactor @@ -326,7 +331,7 @@ container.satLinker=SatLink Device container.siren=Siren container.soyuzCapsule=Cargo Landing Capsule container.soyuzLauncher=Soyuz Launch Platform -container.storageDrum=Nuclear Waste Storage Drum +container.storageDrum=Nuclear Waste Disposal Drum container.teleLinker=TelLink Device container.teleporter=Teleporter container.turretChekhov=Chekhov's Gun @@ -763,20 +768,20 @@ item.billet_neptunium_fuel.name=Neptunium Fuel Billet item.billet_po210be.name=Po210Be Billet item.billet_polonium.name=Polonium-210 Billet item.billet_pu_mix.name=Reactor Grade Plutonium Billet -item.billet_pu238.name=Pu238 Billet +item.billet_pu238.name=Plutonium-238 Billet item.billet_pu238be.name=Pu238Be Billet -item.billet_pu239.name=Pu239 Billet -item.billet_pu240.name=Pu240 Billet +item.billet_pu239.name=Plutonium-239 Billet +item.billet_pu240.name=Plutonium-240 Billet item.billet_plutonium.name=Plutonium Billet item.billet_plutonium_fuel.name=Plutonium Fuel Billet item.billet_schrabidium.name=Schrabidium Billet item.billet_schrabidium_fuel.name=Schrabidium Fuel Billet item.billet_solinium.name=Solinium Billet -item.billet_th232.name=Th232 Billet +item.billet_th232.name=Thorium-232 Billet item.billet_thorium_fuel.name=Thorium Fuel Billet -item.billet_u233.name=U233 Billet -item.billet_u235.name=U235 Billet -item.billet_u238.name=U238 Billet +item.billet_u233.name=Uranium-233 Billet +item.billet_u235.name=Uranium-235 Billet +item.billet_u238.name=Uranium-238 Billet item.billet_uranium.name=Uranium Billet item.billet_uranium_fuel.name=Uranium Fuel Billet item.billet_yharonite.name=Yharonite Billet @@ -949,6 +954,8 @@ item.chopper_torso.name=Hunter Chopper Body item.chopper_wing.name=Hunter Chopper Wing item.cinnebar.name=Cinnibar item.circuit_aluminium.name=Basic Circuit +item.circuit_bismuth.name=Versatile Chipset +item.circuit_bismuth_raw.name=Versatile Chipset Assembly item.circuit_copper.name=Enhanced Circuit item.circuit_gold.name=Overclocked Circuit item.circuit_raw.name=Basic Circuit Assembly @@ -1429,6 +1436,7 @@ item.ingot_asbestos.name=Asbestos Sheet item.ingot_au198.name=Gold-198 Ingot item.ingot_australium.name=Australium Ingot item.ingot_beryllium.name=Beryllium Ingot +item.ingot_bismuth.name=Bismuth Ingot item.ingot_boron.name=Boron Ingot item.ingot_chainsteel.name=Heavy Chainsteel item.ingot_co60.name=Cobalt-60 Ingot @@ -1459,9 +1467,9 @@ item.ingot_plutonium_fuel.name=Ingot of Plutonium Fuel item.ingot_polonium.name=Polonium-210 Ingot item.ingot_polymer.name=Polymer Bar item.ingot_pu_mix.name=Reactor Grade Plutonium Ingot -item.ingot_pu238.name=Pu238 Ingot -item.ingot_pu239.name=Pu239 Ingot -item.ingot_pu240.name=Pu240 Ingot +item.ingot_pu238.name=Plutonium-238 Ingot +item.ingot_pu239.name=Plutonium-239 Ingot +item.ingot_pu240.name=Plutonium-240 Ingot item.ingot_red_copper.name=Minecraft Grade Copper item.ingot_reiium.name=Reiium Ingot item.ingot_saturnite.name=Saturnite Ingot @@ -1474,14 +1482,15 @@ item.ingot_solinium.name=Solinium Ingot item.ingot_starmetal.name=§9Starmetal Ingot§r item.ingot_steel.name=Steel Ingot item.ingot_steel_dusted.name=Dusted Steel Ingot -item.ingot_th232.name=Th232 Ingot +item.ingot_technetium.name=Technetium-99 Ingot +item.ingot_th232.name=Thorium-232 Ingot item.ingot_thorium_fuel.name=Ingot of Thorium Fuel item.ingot_titanium.name=Titanium Ingot item.ingot_tungsten.name=Tungsten Ingot -item.ingot_u233.name=U233 Ingot -item.ingot_u235.name=U235 Ingot -item.ingot_u238.name=U238 Ingot -item.ingot_u238m2.name=Metastable U238-2 Ingot +item.ingot_u233.name=Uranium-233 Ingot +item.ingot_u235.name=Uranium-235 Ingot +item.ingot_u238.name=Uranium-238 Ingot +item.ingot_u238m2.name=Metastable Uranium-238M2 Ingot item.ingot_unobtainium.name=Unobtainium Ingot item.ingot_uranium.name=Uranium Ingot item.ingot_uranium_fuel.name=Ingot of Uranium Fuel @@ -1777,6 +1786,7 @@ item.nugget_australium.name=Australium Nugget item.nugget_australium_greater.name=Greater Australium Nugget item.nugget_australium_lesser.name=Lesser Australium Nugget item.nugget_beryllium.name=Beryllium Nugget +item.nugget_bismuth.name=Bismuth Nugget item.nugget_co60.name=Cobalt-60 Nugget item.nugget_daffergon.name=Daffergon Nugget item.nugget_desh.name=Desh Nugget @@ -1803,7 +1813,7 @@ item.nugget_schrabidium.name=Schrabidium Nugget item.nugget_schrabidium_fuel.name=Nugget of Schrabidium Fuel item.nugget_solinium.name=Solinium Nugget item.nugget_technetium.name=Technetium-99 Nugget -item.nugget_th232.name=Th232 Nugget +item.nugget_th232.name=Thorium-232 Nugget item.nugget_thorium_fuel.name=Nugget of Thorium Fuel item.nugget_u233.name=Uranium-233 Nugget item.nugget_u235.name=Uranium-235 Nugget @@ -1955,6 +1965,7 @@ item.powder_euphemium.name=Euphemium Powder item.powder_fire.name=Red Phosphorus item.powder_gold.name=Gold Powder item.powder_i131.name=Iodine-131 Powder +item.powder_i131_tiny.name=Tiny Pile of Iodine-131 Powder item.powder_ice.name=Cryo Powder item.powder_iodine.name=Iodine Powder item.powder_iron.name=Iron Powder @@ -2087,20 +2098,20 @@ item.rod_dual_plutonium.name=Plutonium Dual Rod item.rod_dual_plutonium_fuel.name=Plutonium Dual Fuel Rod item.rod_dual_plutonium_fuel_depleted.name=Depleted Plutonium Dual Fuel Rod item.rod_dual_polonium.name=Polonium-210 Dual Rod -item.rod_dual_pu238.name=Pu238 Dual Rod -item.rod_dual_pu239.name=Pu239 Dual Rod -item.rod_dual_pu240.name=Pu240 Dual Rod -item.rod_dual_schrabidium.name=Sa326 Dual Rod +item.rod_dual_pu238.name=Plutonium-238 Dual Rod +item.rod_dual_pu239.name=Plutonium-239 Dual Rod +item.rod_dual_pu240.name=Plutonium-240 Dual Rod +item.rod_dual_schrabidium.name=Schrabidium-326 Dual Rod item.rod_dual_schrabidium_fuel.name=Schrabidium Dual Fuel Rod item.rod_dual_schrabidium_fuel_depleted.name=Depleted Schrabidium Dual Fuel Rod -item.rod_dual_solinium.name=Sa327 Dual Rod -item.rod_dual_th232.name=Th232 Dual Rod +item.rod_dual_solinium.name=Schrabidium-327 Dual Rod +item.rod_dual_th232.name=Thorium-232 Dual Rod item.rod_dual_thorium_fuel.name=Thorium Dual Fuel Rod item.rod_dual_thorium_fuel_depleted.name=Depleted Thorium Dual Fuel Rod item.rod_dual_tritium.name=Dual Tritium Cell -item.rod_dual_u233.name=U233 Dual Rod -item.rod_dual_u235.name=U235 Dual Rod -item.rod_dual_u238.name=U238 Dual Rod +item.rod_dual_u233.name=Uranium-233 Dual Rod +item.rod_dual_u235.name=Uranium-235 Dual Rod +item.rod_dual_u238.name=Uranium-238 Dual Rod item.rod_dual_uranium.name=Uranium Dual Rod item.rod_dual_uranium_fuel.name=Uranium Dual Fuel Rod item.rod_dual_uranium_fuel_depleted.name=Depleted Uranium Dual Fuel Rod @@ -2118,9 +2129,9 @@ item.rod_plutonium.name=Plutonium Rod item.rod_plutonium_fuel.name=Plutonium Fuel Rod item.rod_plutonium_fuel_depleted.name=Depleted Plutonium Fuel Rod item.rod_polonium.name=Polonium-210 Rod -item.rod_pu238.name=Pu238 Rod -item.rod_pu239.name=Pu239 Rod -item.rod_pu240.name=Pu240 Rod +item.rod_pu238.name=Plutonium-238 Rod +item.rod_pu239.name=Plutonium-239 Rod +item.rod_pu240.name=Plutonium-240 Rod item.rod_quad_balefire.name=Balefire Quad Rod item.rod_quad_balefire_blazing.name=Blazing Balefire Quad Rod item.rod_quad_coolant.name=Quad Coolant Cell @@ -2135,37 +2146,37 @@ item.rod_quad_plutonium.name=Plutonium Quad Rod item.rod_quad_plutonium_fuel.name=Plutonium Quad Fuel Rod item.rod_quad_plutonium_fuel_depleted.name=Depleted Plutonium Quad Fuel Rod item.rod_quad_polonium.name=Polonium-210 Quad Rod -item.rod_quad_pu238.name=Pu238 Quad Rod -item.rod_quad_pu239.name=Pu239 Quad Rod -item.rod_quad_pu240.name=Pu240 Quad Rod -item.rod_quad_schrabidium.name=Sa326 Quad Rod +item.rod_quad_pu238.name=Plutonium-238 Quad Rod +item.rod_quad_pu239.name=Plutonium-239 Quad Rod +item.rod_quad_pu240.name=Plutonium-240 Quad Rod +item.rod_quad_schrabidium.name=Schrabidium-326 Quad Rod item.rod_quad_schrabidium_fuel.name=Schrabidium Quad Fuel Rod item.rod_quad_schrabidium_fuel_depleted.name=Depleted Schrabidium Quad Fuel Rod -item.rod_quad_solinium.name=Sa327 Quad Rod -item.rod_quad_th232.name=Th232 Quad Rod +item.rod_quad_solinium.name=Schrabidium-327 Quad Rod +item.rod_quad_th232.name=Thorium-232 Quad Rod item.rod_quad_thorium_fuel.name=Thorium Quad Fuel Rod item.rod_quad_thorium_fuel_depleted.name=Depleted Thorium Quad Fuel Rod item.rod_quad_tritium.name=Quad Tritium Cell -item.rod_quad_u233.name=U233 Quad Rod -item.rod_quad_u235.name=U235 Quad Rod -item.rod_quad_u238.name=U238 Quad Rod +item.rod_quad_u233.name=Uranium-233 Quad Rod +item.rod_quad_u235.name=Uranium-235 Quad Rod +item.rod_quad_u238.name=Uranium-238 Quad Rod item.rod_quad_uranium.name=Uranium Quad Rod item.rod_quad_uranium_fuel.name=Uranium Quad Fuel Rod item.rod_quad_uranium_fuel_depleted.name=Depleted Uranium Quad Fuel Rod item.rod_quad_waste.name=Nuclear Waste Quad Rod item.rod_quad_water.name=Quad Water Cell item.rod_reiium.name=Reiium Rod -item.rod_schrabidium.name=Sa326 Rod +item.rod_schrabidium.name=Schrabidium-326 Rod item.rod_schrabidium_fuel.name=Schrabidium Fuel Rod item.rod_schrabidium_fuel_depleted.name=Depleted Schrabidium Fuel Rod -item.rod_solinium.name=Sa327 Rod -item.rod_th232.name=Th232 Rod +item.rod_solinium.name=Schrabidium-327 Rod +item.rod_th232.name=Thorium-232 Rod item.rod_thorium_fuel.name=Thorium Fuel Rod item.rod_thorium_fuel_depleted.name=Depleted Thorium Fuel Rod item.rod_tritium.name=Tritium Cell -item.rod_u233.name=U233 Rod -item.rod_u235.name=U235 Rod -item.rod_u238.name=U238 Rod +item.rod_u233.name=Uranium-233 Rod +item.rod_u235.name=Uranium-235 Rod +item.rod_u238.name=Uranium-238 Rod item.rod_unobtainium.name=Unobtainium Rod item.rod_uranium.name=Uranium Rod item.rod_uranium_fuel.name=Uranium Fuel Rod @@ -2553,9 +2564,9 @@ tile.block_plutonium.name=Block of Plutonium tile.block_plutonium_fuel.name=Block of Plutonium Fuel tile.block_polonium.name=Block of Polonium-210 tile.block_pu_mix.name=Block of Reactor Grade Plutonium -tile.block_pu238.name=Block of Pu238 -tile.block_pu239.name=Block of Pu239 -tile.block_pu240.name=Block of Pu240 +tile.block_pu238.name=Block of Plutonium-238 +tile.block_pu239.name=Block of Plutonium-239 +tile.block_pu240.name=Block of Plutonium-240 tile.block_red_copper.name=Block of Red Copper tile.block_red_phosphorus.name=Block of Red Phosphorus tile.block_reiium.name=Block of Reiium @@ -2569,15 +2580,15 @@ tile.block_solinium.name=Block of Solinium tile.block_starmetal.name=§9Block of Starmetal§r tile.block_steel.name=Block of Steel tile.block_sulfur.name=Block of Sulfur -tile.block_thorium.name=Block of Thorium +tile.block_thorium.name=Block of Thorium-232 tile.block_thorium_fuel.name=Block of Thorium Fuel tile.block_titanium.name=Block of Titanium tile.block_trinitite.name=Block of Trinitite tile.block_tritium.name=Block of Tritium Cells tile.block_tungsten.name=Block of Tungsten -tile.block_u233.name=Block of U233 -tile.block_u235.name=Block of U235 -tile.block_u238.name=Block of U238 +tile.block_u233.name=Block of Uranium-233 +tile.block_u235.name=Block of Uranium-235 +tile.block_u238.name=Block of Uranium-238 tile.block_unobtainium.name=Block of Unobtainium tile.block_uranium.name=Block of Uranium tile.block_uranium_fuel.name=Block of Uranium Fuel diff --git a/src/main/resources/assets/hbm/textures/entity/bHoleSwirl.png b/src/main/resources/assets/hbm/textures/entity/bHoleSwirl.png new file mode 100644 index 000000000..614940c3f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/entity/bHoleSwirl.png differ diff --git a/src/main/resources/assets/hbm/textures/entity/bhole.png b/src/main/resources/assets/hbm/textures/entity/bhole.png new file mode 100644 index 000000000..eeaf89d92 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/entity/bhole.png differ diff --git a/src/main/resources/assets/hbm/textures/entity/bholeBase.png b/src/main/resources/assets/hbm/textures/entity/bholeBase.png new file mode 100644 index 000000000..fa4118bb0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/entity/bholeBase.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/reactors/gui_rbmk_outgasser.png b/src/main/resources/assets/hbm/textures/gui/reactors/gui_rbmk_outgasser.png index 9dc62d443..9ea72905f 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/reactors/gui_rbmk_outgasser.png and b/src/main/resources/assets/hbm/textures/gui/reactors/gui_rbmk_outgasser.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_bismuth.png b/src/main/resources/assets/hbm/textures/items/circuit_bismuth.png index eab66700a..0af4c7d3c 100644 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_bismuth.png and b/src/main/resources/assets/hbm/textures/items/circuit_bismuth.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_bismuth_raw.png b/src/main/resources/assets/hbm/textures/items/circuit_bismuth_raw.png new file mode 100644 index 000000000..07a458215 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit_bismuth_raw.png differ