brick by brick, suck my di

changelog

@@ -19,9 +19,11 @@
 * Mist now spawns cloud particles with the correct color instead of standard white
 * HE artillery shells and rockets now turn blocks into slag
 * The old static bunker structure has been removed and replaced with dynamically generated ones, using the same style of generation as vanilla strongholds.
+* Changed the processing for chlorocalcite, instead of using a combination furnace it now requires a six step cleaning and electrolysis process
 
 ## Fixed
 * Fixed the TOXIC trait not respecting protection when applying potion effects
 * Fixed some armor recipes only accepting polymer and not bakelite
 * Fixed turbofans not sucking in players
-* Fixed NTM skybox not applying to superflat worlds
+* Fixed NTM skybox not applying to superflat worlds
+* Fixed breeding slot in the fusion reactor never resettingthe progress after completing an operation

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

@@ -134,6 +134,12 @@ public class Fluids {
 	public static FluidType SUNFLOWEROIL;
 	public static FluidType NITROGLYCERIN;
 	public static FluidType REDMUD;
+	public static FluidType CHLOROCALCITE_SOLUTION;
+	public static FluidType CHLOROCALCITE_MIX;
+	public static FluidType CHLOROCALCITE_CLEANED;
+	public static FluidType POTASSIUM_CHLORIDE;
+	public static FluidType CALCIUM_CHLORIDE;
+	public static FluidType CALCIUM_SOLUTION;
 
 	private static final HashMap<Integer, FluidType> idMapping = new HashMap();
 	private static final HashMap<String, FluidType> nameMapping = new HashMap();
@@ -278,7 +284,13 @@ public class Fluids {
 		FISHOIL =				new FluidType("FISHOIL",			0x4B4A45, 0, 1, 0, EnumSymbol.NONE).addTraits(LIQUID);
 		SUNFLOWEROIL =			new FluidType("SUNFLOWEROIL",		0xCBAD45, 0, 1, 0, EnumSymbol.NONE).addTraits(LIQUID);
 		NITROGLYCERIN =			new FluidType("NITROGLYCERIN",		0x92ACA6, 0, 4, 0, EnumSymbol.NONE).addTraits(LIQUID);
-		REDMUD =				new FluidType(113, "REDMUD",		0xD85638, 3, 0, 4, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS, LEADCON, new FT_Corrosive(60), new FT_Flammable(1_000));
+		REDMUD =				new FluidType("REDMUD",				0xD85638, 3, 0, 4, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS, LEADCON, new FT_Corrosive(60), new FT_Flammable(1_000));
+		CHLOROCALCITE_SOLUTION = new FluidType("CHLOROCALCITE_SOLUTION", 0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, NOCON, new FT_Corrosive(60));
+		CHLOROCALCITE_MIX =		new FluidType("CHLOROCALCITE_MIX",	0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, NOCON, new FT_Corrosive(60));
+		CHLOROCALCITE_CLEANED =	new FluidType("CHLOROCALCITE_CLEANED", 0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, NOCON, new FT_Corrosive(60));
+		POTASSIUM_CHLORIDE =	new FluidType("POTASSIUM_CHLORIDE",	0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, NOCON, new FT_Corrosive(60));
+		CALCIUM_CHLORIDE =		new FluidType("CALCIUM_CHLORIDE", 0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, NOCON, new FT_Corrosive(60));
+		CALCIUM_SOLUTION =		new FluidType(119, "CALCIUM_SOLUTION", 0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, NOCON, new FT_Corrosive(60));
 		
 		// ^ ^ ^ ^ ^ ^ ^ ^
 		//ADD NEW FLUIDS HERE
@@ -389,6 +401,12 @@ public class Fluids {
 		metaOrder.add(REDMUD);
 		metaOrder.add(EGG);
 		metaOrder.add(CHOLESTEROL);
+		metaOrder.add(CHLOROCALCITE_SOLUTION);
+		metaOrder.add(CHLOROCALCITE_MIX);
+		metaOrder.add(CHLOROCALCITE_CLEANED);
+		metaOrder.add(POTASSIUM_CHLORIDE);
+		metaOrder.add(CALCIUM_CHLORIDE);
+		metaOrder.add(CALCIUM_SOLUTION);
 		//solutions and working fluids
 		metaOrder.add(FRACKSOL);
 		//the fun guys

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

@@ -398,6 +398,16 @@ public class ChemplantRecipes extends SerializableRecipe {
 						new OreDictStack(ANY_PLASTIC.ingot(), 1))
 				.inputFluids(new FluidStack(Fluids.MUSTARDGAS, 4000))
 				.outputItems(new ItemStack(ModItems.ammo_arty, 1, 11)));
+		recipes.add(new ChemRecipe(101, "CC_CENTRIFUGE", 200)
+				.inputFluids(new FluidStack(Fluids.CHLOROCALCITE_CLEANED, 500), new FluidStack(Fluids.WATER, 1_000))
+				.outputFluids(new FluidStack(Fluids.POTASSIUM_CHLORIDE, 250), new FluidStack(Fluids.CALCIUM_CHLORIDE, 250)));
+		recipes.add(new ChemRecipe(102, "PC_ELECTROLYSIS", 200)
+				.inputFluids(new FluidStack(Fluids.POTASSIUM_CHLORIDE, 250))
+				.outputItems(new ItemStack(ModItems.dust))
+				.outputFluids(new FluidStack(Fluids.CHLORINE, 125)));
+		recipes.add(new ChemRecipe(103, "CC_ELECTROLYSIS", 200)
+				.inputFluids(new FluidStack(Fluids.CALCIUM_CHLORIDE, 250))
+				.outputFluids(new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.CALCIUM_SOLUTION, 125)));
 	}
 	
 	public static void registerFuelProcessing() {

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

@@ -59,6 +59,7 @@ public class CokerRecipes extends SerializableRecipe {
 		registerRecipe(REDMUD, 1_000, new ItemStack(Items.iron_ingot, 2), new FluidStack(MERCURY, 50));
 		registerRecipe(BITUMEN, 16_000, DictFrame.fromOne(ModItems.coke, EnumCokeType.PETROLEUM), new FluidStack(OIL_COKER, 1_600));
 		registerRecipe(LUBRICANT, 12_000, DictFrame.fromOne(ModItems.coke, EnumCokeType.PETROLEUM), new FluidStack(OIL_COKER, 1_200));
+		registerRecipe(CALCIUM_SOLUTION, 125, new ItemStack(ModItems.powder_calcium), new FluidStack(SPENTSTEAM, 100));
 	}
 
 	private static void registerAuto(FluidType fluid, FluidType type) {

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

@@ -44,7 +44,7 @@ public class CombinationRecipes extends SerializableRecipe {
 		recipes.put(new ComparableStack(DictFrame.fromOne(ModItems.briquette, EnumBriquetteType.LIGNITE)), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.LIGNITE), new FluidStack(Fluids.COALCREOSOTE, 100)));
 
 		recipes.put(CINNABAR.crystal(), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.MERCURY, 100)));
-		recipes.put(CHLOROCALCITE.dust(), new Pair(new ItemStack(ModItems.powder_calcium), new FluidStack(Fluids.CHLORINE, 250)));
+		//recipes.put(CHLOROCALCITE.dust(), new Pair(new ItemStack(ModItems.powder_calcium), new FluidStack(Fluids.CHLORINE, 250)));
 		recipes.put(new ComparableStack(Items.glowstone_dust), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.CHLORINE, 50)));
 		recipes.put(new ComparableStack(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE)), new Pair(new ItemStack(ModItems.ingot_aluminium, 2), new FluidStack(Fluids.REDMUD, 250)));
 

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

@@ -63,6 +63,7 @@ public class FractionRecipes extends SerializableRecipe {
 		fractions.put(Fluids.OIL_COKER,			new Pair(new FluidStack(Fluids.CRACKOIL,		30),				new FluidStack(Fluids.HEATINGOIL,			70)));
 		fractions.put(Fluids.NAPHTHA_COKER,		new Pair(new FluidStack(Fluids.NAPHTHA_CRACK,	75),				new FluidStack(Fluids.LIGHTOIL_CRACK,		25)));
 		fractions.put(Fluids.GAS_COKER,			new Pair(new FluidStack(Fluids.AROMATICS,		25),				new FluidStack(Fluids.CARBONDIOXIDE,		75)));
+		fractions.put(Fluids.CHLOROCALCITE_MIX, new Pair(new FluidStack(Fluids.CHLOROCALCITE_CLEANED, 50), new FluidStack(Fluids.COLLOID, 50)));
 	}
 	
 	public static Pair<FluidStack, FluidStack> getFractions(FluidType oil) {

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

@@ -76,6 +76,10 @@ public class MixerRecipes extends SerializableRecipe {
 		register(Fluids.DIESEL_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.DIESEL, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100)));
 		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)));
 	}
 	
 	public static void register(FluidType type, MixerRecipe... rec) {

src/main/java/com/hbm/tileentity/machine/TileEntityITER.java

@@ -293,6 +293,8 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
 		
 		if(progress > this.duration) {
 			
+			this.progress = 0;
+			
 			if(slots[2] != null) {
 				slots[2].stackSize++;
 			} else {

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

@@ -178,6 +178,8 @@ chem.BALEFIRE=BF-Raketentreibstoffherstellung
 chem.BP_BIOFUEL=Biodieselumesterung
 chem.BP_BIOGAS=Biogasherstellung
 chem.C4=C4-Synthese
+chem.CC_CENTRIFUGE=Chlorokalzitspaltung
+chem.CC_ELECTROLYSIS=Kalziumchloridelektrolyse
 chem.CC_HEATING=Fortgeschrittene Kohleverflüssigung
 chem.CC_HEAVY=Einfache Kohleverflüssigung
 chem.CC_I=Erweiterte Kohleverflüssigung
@@ -225,6 +227,7 @@ chem.NITAN=NITAN-Supertreibstoff mischen
 chem.NITRIC_ACID=Salpetersäureherstellung
 chem.OIL_SAND=Teersand-Extraktion
 chem.OSMIRIDIUM_DEATH=Osmiridiumlösung-Herstellung
+chem.PC_ELECTROLYSIS=Kaliumchloridelektrolyse
 chem.PEROXIDE=Wasserstoffperoxidherstellung
 chem.PET=PET-Synthese
 chem.PETROIL_LEADED=Bleigemisch mischen
@@ -605,8 +608,12 @@ hbmfluid.biogas=Biogas
 hbmfluid.bitumen=Bitumen
 hbmfluid.blood=Blut
 hbmfluid.blood_hot=Heißes Blut
+hbmfluid.calcium_chloride=Kalziumchlorid-Lösung
 hbmfluid.carbondioxide=Kohlenstoffdioxid
 hbmfluid.chlorine=Chlorgas
+hbmfluid.chlorocalcite_cleaned=Gereinigten Chlorokalzit-Lösung
+hbmfluid.chlorocalcite_mix=Gemischte Chlorokalzit-Lösung
+hbmfluid.chlorocalcite_solution=Chlorokalzit-Lösung
 hbmfluid.cholesterol=Cholesterinlösung
 hbmfluid.coalcreosote=Kohleteer-Kreosot
 hbmfluid.coalgas=Kohlebenzin
@@ -678,6 +685,7 @@ hbmfluid.plasma_dt=Deuterium-Tritium-Plasma
 hbmfluid.plasma_hd=Wasserstoff-Deuterium-Plasma
 hbmfluid.plasma_ht=Wasserstoff-Tritium-Plasma
 hbmfluid.plasma_xm=Xenon-Quecksilber-Plasma
+hbmfluid.potassium_chloride=Kaliumchlorid-Lösung
 hbmfluid.puf6=Plutoniumhexafluorid
 hbmfluid.radiosolvent=Hochleistungs-Lösungsmittel
 hbmfluid.reclaimed=Wiederaufbetreitetes Industrieöl

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

@@ -465,6 +465,8 @@ chem.BALEFIRE=BF Rocket Fuel Mixing
 chem.BP_BIOFUEL=Biofuel Transesterification
 chem.BP_BIOGAS=Biogas Production
 chem.C4=C-4 Synthesis
+chem.CC_CENTRIFUGE=Chlorocalcite Separation
+chem.CC_ELECTROLYSIS=Calcium Chloride Electrolysis
 chem.CC_HEATING=Advanced Coal Liquefaction
 chem.CC_HEAVY=Basic Coal Liquefaction
 chem.CC_I=Enhanced Coal Liquefaction
@@ -516,6 +518,7 @@ chem.NITAN=NITAN Super Fuel Mixing
 chem.NITRIC_ACID=Nitric Acid Production
 chem.OIL_SAND=Tar Sand Extraction
 chem.OSMIRIDIUM_DEATH=Osmiridic Solution Production
+chem.PC_ELECTROLYSIS=Potassium Chloride Electrolysis
 chem.PEROXIDE=Hydrogen Peroxide Production
 chem.PET=PET Synthesis
 chem.PETROIL_LEADED=Leaded Petroil Mixing
@@ -1177,8 +1180,12 @@ hbmfluid.biogas=Biogas
 hbmfluid.bitumen=Bitumen
 hbmfluid.blood=Blood
 hbmfluid.blood_hot=Hot Blood
+hbmfluid.calcium_chloride=Calciumchloride Solution
 hbmfluid.carbondioxide=Carbon Dioxide
 hbmfluid.chlorine=Chlorine Gas
+hbmfluid.chlorocalcite_cleaned=Cleaned Chlorocalcite Solution
+hbmfluid.chlorocalcite_mix=Mixed Chlorocalcite Solution
+hbmfluid.chlorocalcite_solution=Chlorocalcite Solution
 hbmfluid.cholesterol=Cholesterol Solution
 hbmfluid.coalcreosote=Coal Tar Creosote
 hbmfluid.coalgas=Coal Gasoline
@@ -1250,6 +1257,7 @@ hbmfluid.plasma_dt=Deuterium-Tritium Plasma
 hbmfluid.plasma_hd=Hydrogen-Deuterium Plasma
 hbmfluid.plasma_ht=Hydrogen-Tritium Plasma
 hbmfluid.plasma_xm=Xenon-Mercury Plasma
+hbmfluid.potassium_chloride=Potassiumchloride Solution
 hbmfluid.puf6=Plutonium Hexafluoride
 hbmfluid.radiosolvent=High-Performance Solvent
 hbmfluid.reclaimed=Reclaimed Industrial Oil