From 888d1bdad82adf2d3006d239a9d69ee2ad1b4a13 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Tue, 24 Feb 2015 10:59:03 -0500
Subject: [PATCH] Deuterium production is complete - use heavy water
 electrolysis instead of centrifuge recipe

---
 src/main/java/mekanism/api/MekanismConfig.java              | 1 +
 src/main/java/mekanism/common/CommonProxy.java              | 1 +
 src/main/java/mekanism/common/Mekanism.java                 | 3 ++-
 src/main/java/mekanism/common/network/PacketConfigSync.java | 2 ++
 src/main/resources/assets/mekanism/lang/en_US.lang          | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java
index 78fc73401..c08701b98 100644
--- a/src/main/java/mekanism/api/MekanismConfig.java
+++ b/src/main/java/mekanism/api/MekanismConfig.java
@@ -83,6 +83,7 @@ public class MekanismConfig
 		public static double laserUsage;
 		public static double salinationPlantWaterUsage;
 		public static double gasCentrifugeUsage;
+		public static double heavyWaterElectrolysisUsage;
 	}
 
 	public static class generators
diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java
index f1defe82b..a25040b38 100644
--- a/src/main/java/mekanism/common/CommonProxy.java
+++ b/src/main/java/mekanism/common/CommonProxy.java
@@ -271,6 +271,7 @@ public class CommonProxy
 		usage.laserUsage = Mekanism.configuration.get("usage", "LaserUsage", 5000D).getDouble(5000D);
 		usage.salinationPlantWaterUsage = Mekanism.configuration.get("usage", "SalinationPlantSpeed", 40.0, "Millibuckets of water turned into brine by the plant per tick", 1.0, 9000.0).getDouble();
 		usage.gasCentrifugeUsage = Mekanism.configuration.get("usage", "GasCentrifugeUsage", 100D).getDouble(100D);
+		usage.heavyWaterElectrolysisUsage = Mekanism.configuration.get("usage", "HeavyWaterElectrolysisUsage", 800D).getDouble(800D);
 
 		if(Mekanism.configuration.hasChanged())
 		{
diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
index 7082694ed..b5094b671 100644
--- a/src/main/java/mekanism/common/Mekanism.java
+++ b/src/main/java/mekanism/common/Mekanism.java
@@ -14,6 +14,7 @@ import mekanism.api.EnumColor;
 import mekanism.api.MekanismAPI;
 import mekanism.api.MekanismAPI.BoxBlacklistEvent;
 import mekanism.api.MekanismConfig.general;
+import mekanism.api.MekanismConfig.usage;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasNetwork.GasTransferEvent;
 import mekanism.api.gas.GasRegistry;
@@ -722,6 +723,7 @@ public class Mekanism
 		//Electrolytic Separator Recipes
 		RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("water", 2), 2 * general.FROM_H2, new GasStack(GasRegistry.getGas("hydrogen"), 2), new GasStack(GasRegistry.getGas("oxygen"), 1));
 		RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("brine", 10), 2 * general.FROM_H2, new GasStack(GasRegistry.getGas("sodium"), 1), new GasStack(GasRegistry.getGas("chlorine"), 1));
+		RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("heavywater", 2), usage.heavyWaterElectrolysisUsage, new GasStack(GasRegistry.getGas("deuterium"), 2), new GasStack(GasRegistry.getGas("oxygen"), 1));
 		
 		//T4 Processing Recipes
 		for(Gas gas : GasRegistry.getRegisteredGasses())
@@ -753,7 +755,6 @@ public class Mekanism
 				60
 		);
 
-		RecipeHandler.addCentrifugeRecipe(new GasStack(GasRegistry.getGas("hydrogen"), 10), new GasStack(GasRegistry.getGas("deuterium"), 1));
 		RecipeHandler.addCentrifugeRecipe(new GasStack(GasRegistry.getGas("deuterium"), 10), new GasStack(GasRegistry.getGas("tritium"), 1));
 
         //Infuse objects
diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java
index 47a981169..0df663666 100644
--- a/src/main/java/mekanism/common/network/PacketConfigSync.java
+++ b/src/main/java/mekanism/common/network/PacketConfigSync.java
@@ -74,6 +74,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			dataStream.writeDouble(usage.fluidicPlenisherUsage);
 			dataStream.writeDouble(usage.salinationPlantWaterUsage);
 			dataStream.writeDouble(usage.gasCentrifugeUsage);
+			dataStream.writeDouble(usage.heavyWaterElectrolysisUsage);
 	
 			try {
 				for(IModule module : Mekanism.modulesLoaded)
@@ -134,6 +135,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			usage.fluidicPlenisherUsage = dataStream.readDouble();
 			usage.salinationPlantWaterUsage = dataStream.readDouble();
 			usage.gasCentrifugeUsage = dataStream.readDouble();
+			usage.heavyWaterElectrolysisUsage = dataStream.readDouble();
 	
 			try {
 				for(IModule module : Mekanism.modulesLoaded)
diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang
index c87a471c5..f3d845328 100644
--- a/src/main/resources/assets/mekanism/lang/en_US.lang
+++ b/src/main/resources/assets/mekanism/lang/en_US.lang
@@ -242,6 +242,8 @@ gas.liquidStone=Liquid Stone
 gas.ethene=Ethylene
 gas.sodium=Sodium
 gas.brine=Gaseous Brine
+gas.deuterium=Deuterium
+gas.tritium=Tritium
 
 gas.iron=Iron Slurry
 gas.gold=Gold Slurry