wabba dee

changelog

@@ -5,8 +5,11 @@
   * Relatively easy to build and safe to operate
   * Does not use any tile entity rendering and all math is pre-calculated when the reactor is assembled, making this one even more performant than the old large reactor
 * Sodalite
-  * A gem that can be extracted from fluorite ore
-  * Can be heated in the combination oven to make sodium dust and chlorine
+  * A gem that can be extracted from fluorite or lapis ore
+  * Can be heated in the combination oven to make sodium and chlorine
+* Liquid sodium
+  * Valid PWR coolant with high efficiency rating
+  * Made by liquefacting sodium
 
 ## Changed
 * Bedrock fluorite ore now yields actual ore instead of fluorite directly

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -2047,14 +2047,14 @@ public class ModBlocks {
 		cm_port = new BlockCMPort(Material.iron, EnumCMMaterials.class, true, true).setBlockName("cm_port").setCreativeTab(MainRegistry.machineTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cm_port");
 		custom_machine = new BlockCustomMachine().setBlockName("custom_machine").setCreativeTab(MainRegistry.machineTab).setLightLevel(1F).setHardness(5.0F).setResistance(10.0F);
 
-		pwr_fuel = new BlockPillar(Material.iron, RefStrings.MODID + ":pwr_fuel_top").setBlockName("pwr_fuel").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_fuel_side");
-		pwr_control = new BlockPillar(Material.iron, RefStrings.MODID + ":pwr_control_top").setBlockName("pwr_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_control_side");
-		pwr_channel = new BlockPillar(Material.iron, RefStrings.MODID + ":pwr_channel_top").setBlockName("pwr_channel").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_channel_side");
-		pwr_heatex = new BlockGeneric(Material.iron).setBlockName("pwr_heatex").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_heatex");
-		pwr_neutron_source = new BlockGeneric(Material.iron).setBlockName("pwr_neutron_source").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_neutron_source");
-		pwr_reflector = new BlockGeneric(Material.iron).setBlockName("pwr_reflector").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_reflector");
-		pwr_casing = new BlockGeneric(Material.iron).setBlockName("pwr_casing").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_casing");
-		pwr_port = new BlockGeneric(Material.iron).setBlockName("pwr_port").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_port");
+		pwr_fuel = new BlockPillarPWR(Material.iron, RefStrings.MODID + ":pwr_fuel_top").setBlockName("pwr_fuel").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_fuel_side");
+		pwr_control = new BlockPillarPWR(Material.iron, RefStrings.MODID + ":pwr_control_top").setBlockName("pwr_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_control_side");
+		pwr_channel = new BlockPillarPWR(Material.iron, RefStrings.MODID + ":pwr_channel_top").setBlockName("pwr_channel").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_channel_side");
+		pwr_heatex = new BlockGenericPWR(Material.iron).setBlockName("pwr_heatex").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_heatex");
+		pwr_neutron_source = new BlockGenericPWR(Material.iron).setBlockName("pwr_neutron_source").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_neutron_source");
+		pwr_reflector = new BlockGenericPWR(Material.iron).setBlockName("pwr_reflector").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_reflector");
+		pwr_casing = new BlockGenericPWR(Material.iron).setBlockName("pwr_casing").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_casing");
+		pwr_port = new BlockGenericPWR(Material.iron).setBlockName("pwr_port").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_port");
 		pwr_controller = new MachinePWRController(Material.iron).setBlockName("pwr_controller").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_casing_blank");
 		pwr_block = new BlockPWR(Material.iron).setBlockName("pwr_block").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pwr_block");
 		
@@ -3389,16 +3389,16 @@ public class ModBlocks {
 		register(cm_port);
 		
 		//PWR
-		GameRegistry.registerBlock(pwr_fuel, pwr_fuel.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_control, pwr_control.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_channel, pwr_channel.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_heatex, pwr_heatex.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_neutron_source, pwr_neutron_source.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_reflector, pwr_reflector.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_casing, pwr_casing.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_port, pwr_port.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_controller, pwr_controller.getUnlocalizedName());
-		GameRegistry.registerBlock(pwr_block, pwr_block.getUnlocalizedName());
+		register(pwr_fuel);
+		register(pwr_control);
+		register(pwr_channel);
+		register(pwr_heatex);
+		register(pwr_neutron_source);
+		register(pwr_reflector);
+		register(pwr_casing);
+		register(pwr_port);
+		register(pwr_controller);
+		register(pwr_block);
 		
 		//Multiblock Generators
 		GameRegistry.registerBlock(reactor_element, reactor_element.getUnlocalizedName());

src/main/java/com/hbm/blocks/machine/BlockGenericPWR.java

@@ -0,0 +1,22 @@
+package com.hbm.blocks.machine;
+
+import java.util.List;
+
+import com.hbm.blocks.ITooltipProvider;
+import com.hbm.blocks.generic.BlockGeneric;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public class BlockGenericPWR extends BlockGeneric implements ITooltipProvider {
+
+	public BlockGenericPWR(Material material) {
+		super(material);
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
+		this.addStandardInfo(stack, player, list, ext);
+	}
+}

src/main/java/com/hbm/blocks/machine/BlockPillarPWR.java

@@ -0,0 +1,21 @@
+package com.hbm.blocks.machine;
+
+import java.util.List;
+
+import com.hbm.blocks.ITooltipProvider;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public class BlockPillarPWR extends BlockPillar implements ITooltipProvider {
+
+	public BlockPillarPWR(Material mat, String top) {
+		super(mat, top);
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
+		this.addStandardInfo(stack, player, list, ext);
+	}
+}

src/main/java/com/hbm/blocks/machine/MachinePWRController.java

@@ -1,8 +1,10 @@
 package com.hbm.blocks.machine;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map.Entry;
 
+import com.hbm.blocks.ITooltipProvider;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.BlockPWR.TileEntityBlockPWR;
 import com.hbm.lib.RefStrings;
@@ -30,7 +32,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class MachinePWRController extends BlockContainer {
+public class MachinePWRController extends BlockContainer implements ITooltipProvider {
 	
 	@SideOnly(Side.CLIENT)
 	private IIcon iconFront;
@@ -198,4 +200,9 @@ public class MachinePWRController extends BlockContainer {
 		if(block == ModBlocks.pwr_casing || block == ModBlocks.pwr_reflector || block == ModBlocks.pwr_port) return true;
 		return false;
 	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
+		this.addStandardInfo(stack, player, list, ext);
+	}
 }

src/main/java/com/hbm/entity/effect/EntityNukeTorex.java

@@ -84,7 +84,7 @@ public class EntityNukeTorex extends Entity {
 			if(ticksExisted < 50) {
 				
 				int cloudCount = ticksExisted * 5;
-				int shockLife = 200 - ticksExisted * 9 / 10;
+				int shockLife = Math.max(300 - ticksExisted * 20, 50);
 				
 				for(int i = 0; i < cloudCount; i++) {
 					Vec3 vec = Vec3.createVectorHelper((ticksExisted * 2 + rand.nextDouble()) * 2, 0, 0);

src/main/java/com/hbm/inventory/fluid/Fluids.java

@@ -157,6 +157,11 @@ public class Fluids {
 	public static FluidType SMOKE_POISON;
 	public static FluidType HELIUM4;
 	public static FluidType HEAVYWATER_HOT;
+	public static FluidType SODIUM;
+	public static FluidType SODIUM_HOT;
+	public static FluidType THORIUM_SALT;
+	public static FluidType THORIUM_SALT_HOT;
+	public static FluidType THORIUM_SALT_DEPLETED;
 
 	private static final HashMap<Integer, FluidType> idMapping = new HashMap();
 	private static final HashMap<String, FluidType> nameMapping = new HashMap();
@@ -313,7 +318,12 @@ public class Fluids {
 		SMOKE_LEADED =			new FluidType("SMOKE_LEADED",		0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS, NOID, NOCON);
 		SMOKE_POISON =			new FluidType("SMOKE_POISON",		0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS, NOID, NOCON);
 		HELIUM4 =				new FluidType("HELIUM4",			0xE54B0A, 0, 0, 0, EnumSymbol.ASPHYXIANT).addTraits(GASEOUS);
-		HEAVYWATER_HOT =		new FluidType(124, "HEAVYWATER_HOT",0x4D007B, 1, 0, 0, EnumSymbol.NONE).setTemp(600).addTraits(LIQUID);
+		HEAVYWATER_HOT =		new FluidType("HEAVYWATER_HOT",		0x4D007B, 1, 0, 0, EnumSymbol.NONE).setTemp(600).addTraits(LIQUID);
+		SODIUM =				new FluidType("SODIUM",				0xCCD4D5, 1, 2, 3, EnumSymbol.NONE).setTemp(400).addTraits(LIQUID);
+		SODIUM_HOT =			new FluidType("SODIUM_HOT",			0xE2ADC1, 1, 2, 3, EnumSymbol.NONE).setTemp(1200).addTraits(LIQUID);
+		THORIUM_SALT =			new FluidType("THORIUM_SALT",		0x7A5542, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID);
+		THORIUM_SALT_HOT =		new FluidType("THORIUM_SALT_HOT",	0x3E3627, 2, 0, 3, EnumSymbol.NONE).setTemp(1600).addTraits(LIQUID);
+		THORIUM_SALT_DEPLETED =	new FluidType(129, "THORIUM_SALT_DEPLETED",	0x302D1C, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID);
 		
 		// ^ ^ ^ ^ ^ ^ ^ ^
 		//ADD NEW FLUIDS HERE
@@ -342,6 +352,11 @@ public class Fluids {
 		metaOrder.add(MUG_HOT);
 		metaOrder.add(BLOOD);
 		metaOrder.add(BLOOD_HOT);
+		metaOrder.add(SODIUM);
+		metaOrder.add(SODIUM_HOT);
+		metaOrder.add(THORIUM_SALT);
+		metaOrder.add(THORIUM_SALT_HOT);
+		metaOrder.add(THORIUM_SALT_DEPLETED);
 		//pure elements, cyogenic gasses
 		metaOrder.add(HYDROGEN);
 		metaOrder.add(DEUTERIUM);
@@ -505,6 +520,12 @@ 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).addStep(400, 1, SODIUM_HOT, 1));
+		SODIUM_HOT.addTraits(new FT_Coolable(SODIUM, 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));
+		
 		if(idMapping.size() != metaOrder.size()) {
 			throw new IllegalStateException("A severe error has occoured during NTM's fluid registering process! The MetaOrder and Mappings are inconsistent! Mapping size: " + idMapping.size()+ " / MetaOrder size: " + metaOrder.size());
 		}

src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java

@@ -42,6 +42,7 @@ public class FT_Coolable extends FluidTrait {
 	
 	@Override
 	public void addInfoHidden(List<String> info) {
+		info.add(EnumChatFormatting.AQUA + "Thermal capacity: " + heatEnergy + " TU");
 		for(CoolingType type : CoolingType.values()) {
 			
 			double eff = getEfficiency(type);

src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java

@@ -42,6 +42,7 @@ public class FT_Heatable extends FluidTrait {
 
 	@Override
 	public void addInfoHidden(List<String> info) {
+		info.add(EnumChatFormatting.AQUA + "Thermal capacity: " + this.getFirstStep().heatReq + " TU");
 		for(HeatingType type : HeatingType.values()) {
 			
 			double eff = getEfficiency(type);

src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java

@@ -339,9 +339,9 @@ public class CentrifugeRecipes extends SerializableRecipe {
 				new ItemStack(Blocks.end_stone, 1) });
 		
 		recipes.put(new OreDictStack(LAPIS.ore()), new ItemStack[] {
-				new ItemStack(ModItems.powder_lapis, 3),
-				new ItemStack(ModItems.powder_lapis, 3),
+				new ItemStack(ModItems.powder_lapis, 6),
 				new ItemStack(ModItems.powder_cobalt_tiny, 1),
+				new ItemStack(ModItems.gem_sodalite, 1),
 				new ItemStack(Blocks.gravel, 1) });
 		
 		recipes.put(new ComparableStack(ModBlocks.ore_meteor_starmetal), new ItemStack[] {
@@ -452,7 +452,7 @@ public class CentrifugeRecipes extends SerializableRecipe {
 		recipes.put(new ComparableStack(ModItems.crystal_iron), new ItemStack[] { new ItemStack(ModItems.powder_iron, 2), new ItemStack(ModItems.powder_iron, 2), new ItemStack(ModItems.powder_titanium, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) });
 		recipes.put(new ComparableStack(ModItems.crystal_gold), new ItemStack[] { new ItemStack(ModItems.powder_gold, 2), new ItemStack(ModItems.powder_gold, 2), new ItemStack(ModItems.ingot_mercury, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) });
 		recipes.put(new ComparableStack(ModItems.crystal_redstone), new ItemStack[] { new ItemStack(Items.redstone, 3), new ItemStack(Items.redstone, 3), new ItemStack(Items.redstone, 3), new ItemStack(ModItems.ingot_mercury, 3) });
-		recipes.put(new ComparableStack(ModItems.crystal_lapis), new ItemStack[] { new ItemStack(ModItems.powder_lapis, 3), new ItemStack(ModItems.powder_lapis, 3), new ItemStack(ModItems.powder_lapis, 3), new ItemStack(ModItems.powder_cobalt, 1) });
+		recipes.put(new ComparableStack(ModItems.crystal_lapis), new ItemStack[] { new ItemStack(ModItems.powder_lapis, 4), new ItemStack(ModItems.powder_lapis, 4), new ItemStack(ModItems.powder_cobalt, 1), new ItemStack(ModItems.gem_sodalite, 1) });
 		recipes.put(new ComparableStack(ModItems.crystal_diamond), new ItemStack[] { new ItemStack(ModItems.powder_diamond, 1), new ItemStack(ModItems.powder_diamond, 1), new ItemStack(ModItems.powder_diamond, 1), new ItemStack(ModItems.powder_diamond, 1) });
 		recipes.put(new ComparableStack(ModItems.crystal_uranium), new ItemStack[] { new ItemStack(ModItems.powder_uranium, 2), new ItemStack(ModItems.powder_uranium, 2), new ItemStack(ModItems.nugget_ra226, 2), new ItemStack(ModItems.powder_lithium_tiny, 1) });
 		recipes.put(new ComparableStack(ModItems.crystal_thorium), new ItemStack[] { new ItemStack(ModItems.powder_thorium, 2), new ItemStack(ModItems.powder_thorium, 2), new ItemStack(ModItems.powder_uranium, 1), new ItemStack(ModItems.nugget_ra226, 1) });

src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java

@@ -401,6 +401,13 @@ public class ChemplantRecipes extends SerializableRecipe {
 		recipes.add(new ChemRecipe(101, "CC_CENTRIFUGE", 200)
 				.inputFluids(new FluidStack(Fluids.CHLOROCALCITE_CLEANED, 500), new FluidStack(Fluids.SULFURIC_ACID, 8_000))
 				.outputFluids(new FluidStack(Fluids.POTASSIUM_CHLORIDE, 250), new FluidStack(Fluids.CALCIUM_CHLORIDE, 250)));
+		recipes.add(new ChemRecipe(102, "THORIUM_SALT", 60)
+				.inputFluids(new FluidStack(Fluids.THORIUM_SALT_DEPLETED, 8_000))
+				.inputItems(new OreDictStack(TH232.dust(), 1))
+				.outputFluids(new FluidStack(Fluids.THORIUM_SALT, 8_000))
+				.outputItems(
+						new ItemStack(ModItems.nugget_u233, 4, 10),
+						new ItemStack(ModItems.nuclear_waste_tiny, 5, 10)));
 	}
 	
 	public static void registerFuelProcessing() {

src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java

@@ -48,6 +48,7 @@ public class CombinationRecipes extends SerializableRecipe {
 		recipes.put(new ComparableStack(Items.glowstone_dust),	new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.CHLORINE, 100)));
 		recipes.put(SODALITE.gem(),								new Pair(new ItemStack(ModItems.powder_sodium), new FluidStack(Fluids.CHLORINE, 100)));
 		recipes.put(new ComparableStack(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE)), new Pair(new ItemStack(ModItems.ingot_aluminium, 2), new FluidStack(Fluids.REDMUD, 250)));
+		recipes.put(NA.dust(),									new Pair(null, new FluidStack(Fluids.SODIUM, 100)));
 
 		recipes.put(KEY_LOG,		new Pair(new ItemStack(Items.coal, 1 ,1),							new FluidStack(Fluids.WOODOIL, 250)));
 		recipes.put(KEY_SAPLING,	new Pair(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.WOOD),	new FluidStack(Fluids.WOODOIL, 50)));

src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java

@@ -42,6 +42,7 @@ public class LiquefactionRecipes extends SerializableRecipe {
 		recipes.put(KEY_COAL_TAR,									new FluidStack(50, Fluids.BITUMEN));
 		recipes.put(KEY_LOG,										new FluidStack(100, Fluids.MUG));
 		recipes.put(KNO.dust(),										new FluidStack(250, Fluids.NITRIC_ACID));
+		recipes.put(NA.dust(),										new FluidStack(100, Fluids.SODIUM));
 		//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));

src/main/java/com/hbm/inventory/recipes/MixerRecipes.java

@@ -65,6 +65,8 @@ public class MixerRecipes extends SerializableRecipe {
 		register(Fluids.NITROGLYCERIN,
 				new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.PETROLEUM, 1_000)).setStack2(new FluidStack(Fluids.NITRIC_ACID, 1_000)),
 				new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.FISHOIL, 500)).setStack2(new FluidStack(Fluids.NITRIC_ACID, 500)));
+		
+		register(Fluids.THORIUM_SALT, new MixerRecipe(1_000, 30).setStack1(new FluidStack(Fluids.CHLORINE, 1000)).setSolid(new OreDictStack(TH232.dust())));
 
 		register(Fluids.SYNGAS, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.COALOIL, 500)).setStack2(new FluidStack(Fluids.STEAM, 500)));
 		register(Fluids.OXYHYDROGEN, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.HYDROGEN, 500)).setStack2(new FluidStack(Fluids.OXYGEN, 500)));
@@ -77,7 +79,6 @@ public class MixerRecipes extends SerializableRecipe {
 		register(Fluids.DIESEL_CRACK_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.DIESEL_CRACK, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100)));
 		register(Fluids.KEROSENE_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.KEROSENE, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100)));
 		
-
 		register(Fluids.CHLOROCALCITE_SOLUTION, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.WATER, 250)).setStack2(new FluidStack(Fluids.NITRIC_ACID, 250)).setSolid(new OreDictStack(CHLOROCALCITE.dust())));
 		register(Fluids.CHLOROCALCITE_MIX, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.CHLOROCALCITE_SOLUTION, 500)).setStack2(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new ComparableStack(ModItems.powder_flux)));
 	}

src/main/java/com/hbm/inventory/recipes/SolidificationRecipes.java

@@ -68,6 +68,7 @@ public class SolidificationRecipes extends SerializableRecipe {
 		registerRecipe(ENDERJUICE,	100,			Items.ender_pearl);
 		registerRecipe(WATZ,		1000,			ModItems.ingot_mud);
 		registerRecipe(REDMUD,		1000,			Items.iron_ingot);
+		registerRecipe(SODIUM,		100,			ModItems.powder_sodium);
 
 		registerRecipe(OIL,				SF_OIL,			DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE));
 		registerRecipe(CRACKOIL,		SF_CRACK,		DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRACK));

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -720,6 +720,8 @@ hbmfluid.smear=Industrieöl
 hbmfluid.smoke=Abgas
 hbmfluid.smoke_leaded=Bleiabgas
 hbmfluid.smoke_poison=Giftige Abgase
+hbmfluid.sodium=Flüssiges Natrium
+hbmfluid.sodium_hot=Heißes flüssiges Natrium
 hbmfluid.solvent=Lösungsmittel
 hbmfluid.sourgas=Saures Gas
 hbmfluid.spentsteam=Niedrigdruckdampf
@@ -728,6 +730,9 @@ hbmfluid.sulfuric_acid=Schwefelsäure
 hbmfluid.sunfloweroil=Sonnenblumenkernöl
 hbmfluid.superhotsteam=Superverdichteter Dampf
 hbmfluid.syngas=Synthesegas
+hbmfluid.thorium_salt=Flüssiges Thoriumsalz
+hbmfluid.thorium_salt_depleted=Erschöpftes flüssiges Thoriumsalz
+hbmfluid.thorium_salt_hot=Heißes flüssiges Thoriumsalz
 hbmfluid.tritium=Tritium
 hbmfluid.uf6=Uranhexafluorid
 hbmfluid.ultrahotsteam=Ultraverdichteter Dampf
@@ -1448,7 +1453,7 @@ item.circuit_bismuth_raw.name=Bismuth-Schaltkreisrohling
 item.circuit_copper.name=Erweiterter Schaltkreis
 item.circuit_gold.name=Übertakteter Schaltkreis
 item.circuit_raw.name=Schaltkreisrohling
-item.circuit_red_copper.name=Forgeschrittener Schaltkreis
+item.circuit_red_copper.name=Fortgeschrittener Schaltkreis
 item.circuit_schrabidium.name=Leistungsstarker Schaltkreis
 item.circuit_star.name=StarControl Schalttafel
 item.circuit_star_component.chipset.name=StarControl Chipset
@@ -1815,6 +1820,7 @@ item.gear_large.name=Großes Zahnrad
 item.gear_large_steel.name=Großes Stahlzahnrad
 item.geiger_counter.name=Mobiler Geigerzähler
 item.gem_alexandrite.name=Alexandrit
+item.gem_sodalite.name=Sodalith
 item.gem_tantalium.name=Tantal-Polykristall
 item.gem_volcanic.name=Vulkanischer Edelstein
 item.generator_front.name=Generatorfront
@@ -2759,6 +2765,7 @@ item.powder_sawdust.name=Sägespäne
 item.powder_schrabidate.name=Eisenschrabidatstaub
 item.powder_schrabidium.name=Schrabidiumstaub
 item.powder_semtex_mix.name=Semtexmischung
+item.powder_sodium.name=Natrium
 item.powder_spark_mix.name=Sparkmischung
 item.powder_steel.name=Stahlstaub
 item.powder_steel_tiny.name=Kleiner Haufen Stahlstaub

src/main/resources/assets/hbm/lang/en_US.lang

@@ -1362,6 +1362,8 @@ hbmfluid.smear=Industrial Oil
 hbmfluid.smoke=Smoke
 hbmfluid.smoke_leaded=Leaded Smoke
 hbmfluid.smoke_poison=Poison Smoke
+hbmfluid.sodium=Liquid Sodium
+hbmfluid.sodium_hot=Hot Liquid Sodium
 hbmfluid.solvent=Solvent
 hbmfluid.sourgas=Sour Gas
 hbmfluid.spentsteam=Low-Pressure Steam
@@ -1370,6 +1372,9 @@ hbmfluid.sulfuric_acid=Sulfuric Acid
 hbmfluid.sunfloweroil=Sunflower Seed Oil
 hbmfluid.superhotsteam=Super Dense Steam
 hbmfluid.syngas=Syngas
+hbmfluid.thorium_salt=Liquid Thorium Salt
+hbmfluid.thorium_salt_depleted=Depleted Liquid Thorium Salt
+hbmfluid.thorium_salt_hot=Hot Liquid Thorium Salt
 hbmfluid.tritium=Tritium
 hbmfluid.uf6=Uranium Hexafluoride
 hbmfluid.ultrahotsteam=Ultra Dense Steam
@@ -2527,6 +2532,7 @@ item.gear_large.name=Large Gear
 item.gear_large_steel.name=Large Steel Gear
 item.geiger_counter.name=Handheld Geiger Counter
 item.gem_alexandrite.name=Alexandrite
+item.gem_sodalite.name=Sodalite
 item.gem_tantalium.name=Tantalium Polycrystal
 item.gem_tantalium.desc='Tantalum'
 item.gem_tantalium.desc.P11=AKA Tantalum.
@@ -3570,6 +3576,7 @@ item.powder_sawdust.name=Sawdust
 item.powder_schrabidate.name=Ferric Schrabidate Powder
 item.powder_schrabidium.name=Schrabidium Powder
 item.powder_semtex_mix.name=Semtex Blend
+item.powder_sodium.name=Sodium
 item.powder_spark_mix.name=Spark Blend
 item.powder_sr90.name=Strontium-90 Powder
 item.powder_sr90_tiny.name=Tiny Pile of Strontium-90 Powder
@@ -4663,6 +4670,25 @@ tile.deco_computer.ibm_300pl.name=IBM Personal Computer 300PL
 tile.deco_emitter.name=Deco Light Emitter
 tile.part_emitter.name=Deco Particle Emitter
 tile.piston_inserter.name=Inserter
+tile.pwr_block.name=PWR
+tile.pwr_casing.name=PWR Pressure Vessel
+tile.pwr_casing.desc=Needs to cover all internal parts for the reactor to form$Placement: Casing
+tile.pwr_channel.name=PWR Coolant Channel
+tile.pwr_channel.desc=Uses hull heat to heat up coolant$Placement: Any
+tile.pwr_control.name=PWR Control Rod
+tile.pwr_control.desc=Allows connected fuel rods to be controlled$Placement: Grid, between control rods
+tile.pwr_controller.name=PWR Controller
+tile.pwr_controller.desc=Access terminal for the PWR$Placement: Casing, only one per reactor$Right-click to assemble the reactor
+tile.pwr_fuel.name=PWR Fuel Rod
+tile.pwr_fuel.desc=Increases PWR fuel capacity$Placement: Grid, for increased reactivity
+tile.pwr_heatex.name=PWR Heat Exchanger
+tile.pwr_heatex.desc=Moves core heat to the hull$Placement: Any
+tile.pwr_neutron_source.name=PWR Neutron Source
+tile.pwr_neutron_source.desc=Adds 20 flux to the core$Placement: Any$Flux only reaches fuel rods if connections are open
+tile.pwr_port.name=PWR Access Port
+tile.pwr_port.desc=Allows item and fluid IO$Placement: Casing
+tile.pwr_reflector.name=PWR Neutron Reflector
+tile.pwr_reflector.desc=Reflects neutrons back to fuel rods$Placement: Grid, for increased reactivity$Valid casing material
 tile.deco_lead.name=Lead Deco Block
 tile.deco_rbmk.name=RBMK Deco Block
 tile.deco_rbmk_smooth.name=Smooth RBMK Deco Block