diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index cc933de8e..08007179a 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -170,6 +170,8 @@ public class Fluids { public static FluidType HEAVYWATER_HOT; public static FluidType SODIUM; public static FluidType SODIUM_HOT; + public static FluidType LEAD; + public static FluidType LEAD_HOT; public static FluidType THORIUM_SALT; public static FluidType THORIUM_SALT_HOT; public static FluidType THORIUM_SALT_DEPLETED; @@ -379,7 +381,9 @@ public class Fluids { LIGHTOIL_DS = new FluidType("LIGHTOIL_DS", 0x63543E, 1, 2, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xB46B52)).addTraits(LIQUID, P_FUEL); STELLAR_FLUX = new FluidType("STELLAR_FLUX", 0xE300FF, 0, 4, 4, EnumSymbol.ANTIMATTER).addTraits(ANTI, GASEOUS); VITRIOL = new FluidType("VITRIOL", 0x6E5222, 2, 0, 1, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS); - SLOP = new FluidType(141, "SLOP", 0x929D45, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS); + SLOP = new FluidType("SLOP", 0x929D45, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS); + LEAD = new FluidType("LEAD", 0x666672, 4, 0, 0, EnumSymbol.NONE).setTemp(350).addTraits(LIQUID, VISCOUS); + LEAD_HOT = new FluidType(143, "LEAD_HOT", 0x776563, 4, 0, 0, EnumSymbol.NONE).setTemp(1500).addTraits(LIQUID, VISCOUS); // ^ ^ ^ ^ ^ ^ ^ ^ //ADD NEW FLUIDS HERE @@ -416,6 +420,8 @@ public class Fluids { metaOrder.add(BLOOD_HOT); metaOrder.add(SODIUM); metaOrder.add(SODIUM_HOT); + metaOrder.add(LEAD); + metaOrder.add(LEAD_HOT); metaOrder.add(THORIUM_SALT); metaOrder.add(THORIUM_SALT_HOT); metaOrder.add(THORIUM_SALT_DEPLETED); @@ -609,9 +615,11 @@ public class Fluids { HEAVYWATER.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 1.0D).addStep(300, 1, HEAVYWATER_HOT, 1), new FT_PWRModerator(1.25D)); HEAVYWATER_HOT.addTraits(new FT_Coolable(HEAVYWATER, 1, 1, 300).setEff(CoolingType.HEATEXCHANGER, 1.0D)); - + SODIUM.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 2.5D).setEff(HeatingType.ICF, 3D).addStep(400, 1, SODIUM_HOT, 1)); SODIUM_HOT.addTraits(new FT_Coolable(SODIUM, 1, 1, 400).setEff(CoolingType.HEATEXCHANGER, 1.0D)); + LEAD.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 5D).setEff(HeatingType.ICF, 10D).addStep(600, 1, LEAD_HOT, 1), new FT_PWRModerator(0.5D)); + LEAD_HOT.addTraits(new FT_Coolable(LEAD, 1, 1, 400).setEff(CoolingType.HEATEXCHANGER, 1.0D)); THORIUM_SALT.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 1.0D).addStep(400, 1, THORIUM_SALT_HOT, 1), new FT_PWRModerator(2.5D)); THORIUM_SALT_HOT.addTraits(new FT_Coolable(THORIUM_SALT_DEPLETED, 1, 1, 400).setEff(CoolingType.HEATEXCHANGER, 1.0D)); diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java index 87f595015..3e57ac963 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java @@ -42,7 +42,7 @@ public class FT_Coolable extends FluidTrait { @Override public void addInfoHidden(List info) { - info.add(EnumChatFormatting.RED + "Thermal capacity: " + heatEnergy + " TU"); + info.add(EnumChatFormatting.RED + "Thermal capacity: " + heatEnergy + " TU per " + amountReq + "mB"); for(CoolingType type : CoolingType.values()) { double eff = getEfficiency(type); diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java index 0ec79abb7..f5c25c89e 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java @@ -42,7 +42,7 @@ public class FT_Heatable extends FluidTrait { @Override public void addInfoHidden(List info) { - info.add(EnumChatFormatting.RED + "Thermal capacity: " + this.getFirstStep().heatReq + " TU"); + info.add(EnumChatFormatting.RED + "Thermal capacity: " + this.getFirstStep().heatReq + " TU per " + this.getFirstStep().amountReq + "mB"); for(HeatingType type : HeatingType.values()) { double eff = getEfficiency(type); diff --git a/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java b/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java index 4b2ea8f6b..feb244d49 100644 --- a/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java @@ -43,6 +43,8 @@ public class LiquefactionRecipes extends SerializableRecipe { recipes.put(KEY_LOG, new FluidStack(100, Fluids.MUG)); recipes.put(KNO.dust(), new FluidStack(750, Fluids.NITRIC_ACID)); recipes.put(NA.dust(), new FluidStack(100, Fluids.SODIUM)); + recipes.put(PB.ingot(), new FluidStack(100, Fluids.LEAD)); + recipes.put(PB.dust(), new FluidStack(100, Fluids.LEAD)); //general utility recipes because why not recipes.put(new ComparableStack(Blocks.netherrack), new FluidStack(250, Fluids.LAVA)); recipes.put(new ComparableStack(Blocks.cobblestone), new FluidStack(250, Fluids.LAVA)); diff --git a/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java b/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java index 637779c6a..cc1f38a79 100644 --- a/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java @@ -70,6 +70,7 @@ public class SolidificationRecipes extends SerializableRecipe { registerRecipe(WATZ, 1000, ModItems.ingot_mud); registerRecipe(REDMUD, 1000, Items.iron_ingot); registerRecipe(SODIUM, 100, ModItems.powder_sodium); + registerRecipe(LEAD, 100, ModItems.ingot_lead); registerRecipe(SLOP, 250, ModBlocks.ore_oil_sand); registerRecipe(OIL, SF_OIL, DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE)); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 5e0a7bdbe..03b5fc26c 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -722,6 +722,8 @@ hbmfluid.iongel=Ionengel hbmfluid.kerosene=Kerosin hbmfluid.kerosene_reform=Düsentreibstoff hbmfluid.lava=Lava +hbmfluid.lead=Flüssiges Blei +hbmfluid.lead_hot=Heißes flüssiges Blei hbmfluid.lightoil=Leichtöl hbmfluid.lightoil_crack=Crack-Leichtöl hbmfluid.lightoil_ds=Entschwefeltes Leichtöl diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index e5c7acb68..ef097a17a 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1432,6 +1432,8 @@ hbmfluid.iongel=Ionic Gel hbmfluid.kerosene=Kerosene hbmfluid.kerosene_reform=Jet Fuel hbmfluid.lava=Lava +hbmfluid.lead=Liquid Lead +hbmfluid.lead_hot=Hot Liquid Lead hbmfluid.lightoil=Light Oil hbmfluid.lightoil_crack=Cracked Light Oil hbmfluid.lightoil_ds=Desulfurized Light Oil diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/lead.png b/src/main/resources/assets/hbm/textures/gui/fluids/lead.png new file mode 100644 index 000000000..d6da14bdd Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/lead.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/lead_hot.png b/src/main/resources/assets/hbm/textures/gui/fluids/lead_hot.png new file mode 100644 index 000000000..5d93be21e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/lead_hot.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD.png b/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD.png new file mode 100644 index 000000000..ee86122ea Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD_HOT.png b/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD_HOT.png new file mode 100644 index 000000000..a043b9a4d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_LEAD_HOT.png differ