tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Deuterium production is complete - use heavy water electrolysis instead of centrifuge recipe

Browse source
This commit is contained in:
Aidan C. Brady 2015-02-24 10:59:03 -05:00
parent 29e50a34fa
commit 888d1bdad8
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/mekanism/api/MekanismConfig.java
View file

@ -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

1
src/main/java/mekanism/common/CommonProxy.java
View file

@ -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())
{

3
src/main/java/mekanism/common/Mekanism.java
View file

@ -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

2
src/main/java/mekanism/common/network/PacketConfigSync.java
View file

@ -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)

2
src/main/resources/assets/mekanism/lang/en_US.lang
View file

@ -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