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

Add ethylene burn time as a config entry

Browse source
This commit is contained in:
Brian Lewis 2015-02-18 13:19:53 -06:00
parent bf42f71b8e
commit 112c1a1ba9
4 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,6 +204,7 @@ public class CommonProxy
Mekanism.FROM_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToRF", 2.5D).getDouble(25D);
Mekanism.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", .4D).getDouble(.04D);
Mekanism.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "THIS DETERMINES ELECTROLYTIC SEPARATOR USAGE").getDouble(200D);
Mekanism.ETHENE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EthyleneBurnTime", 40).getInt(40);
Mekanism.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(10000D);
Mekanism.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt();
//If this is less than 1, upgrades make machines worse. If less than 0, I don't even know.

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

@ -330,6 +330,7 @@ public class Mekanism
public static double FROM_IC2;
public static double FROM_TE;
public static double FROM_UE = 1/TO_UE;
public static int ETHENE_BURN_TIME = 40;
public static boolean blacklistBC;
public static boolean blacklistIC2;

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

@ -41,6 +41,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
dataStream.writeDouble(Mekanism.FROM_TE);
dataStream.writeDouble(Mekanism.TO_TE);
dataStream.writeDouble(Mekanism.FROM_H2);
dataStream.writeInt(Mekanism.ETHENE_BURN_TIME);
dataStream.writeDouble(Mekanism.ENERGY_PER_REDSTONE);
dataStream.writeInt(Mekanism.VOICE_PORT);
dataStream.writeInt(Mekanism.maxUpgradeMultiplier);
@ -95,6 +96,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
Mekanism.FROM_TE = dataStream.readDouble();
Mekanism.TO_TE = dataStream.readDouble();
Mekanism.FROM_H2 = dataStream.readDouble();
Mekanism.ETHENE_BURN_TIME = dataStream.readInt();
Mekanism.ENERGY_PER_REDSTONE = dataStream.readDouble();
Mekanism.VOICE_PORT = dataStream.readInt();
Mekanism.maxUpgradeMultiplier = dataStream.readInt();

2
src/main/java/mekanism/generators/common/MekanismGenerators.java
View file

@ -143,7 +143,7 @@ public class MekanismGenerators implements IModule
" O ", "OAO", "ECE", Character.valueOf('O'), "ingotOsmium", Character.valueOf('A'), Mekanism.EnrichedAlloy, Character.valueOf('E'), Mekanism.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "circuitBasic"
}));
FuelHandler.addGas(GasRegistry.getGas("ethene"), 40, Mekanism.FROM_H2 + bioGeneration * 80); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus
FuelHandler.addGas(GasRegistry.getGas("ethene"), Mekanism.ETHENE_BURN_TIME, Mekanism.FROM_H2 + bioGeneration * 2 * Mekanism.ETHENE_BURN_TIME); //1mB hydrogen + 2*bioFuel/tick*2000ticks/100mB * 2x efficiency bonus
}