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

Add Methane to gas burner fuel list

Browse source
This commit is contained in:
TechnoParadox 2022-09-11 19:40:42 +02:00
parent d32bb14c28
commit 282c21d3cb
4 changed files with 6 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

@ -30,6 +30,7 @@ public class MekanismConfig
public static int userWorldGenVersion = 0; public static int userWorldGenVersion = 0;
public static double ENERGY_PER_REDSTONE = 10000; public static double ENERGY_PER_REDSTONE = 10000;
public static int ETHENE_BURN_TIME = 40; public static int ETHENE_BURN_TIME = 40;
public static int METHANE_BURN_TIME = 10;
public static double DISASSEMBLER_USAGE = 10; public static double DISASSEMBLER_USAGE = 10;
public static EnergyType energyUnit = EnergyType.J; public static EnergyType energyUnit = EnergyType.J;
public static TempType tempUnit = TempType.K; public static TempType tempUnit = TempType.K;

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

@ -270,6 +270,7 @@ public class CommonProxy implements IGuiProvider
general.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", 0.4D).getDouble(); general.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", 0.4D).getDouble();
general.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "Determines Electrolytic Separator usage").getDouble(); general.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "Determines Electrolytic Separator usage").getDouble();
general.ETHENE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EthyleneBurnTime", 40).getInt(); general.ETHENE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EthyleneBurnTime", 40).getInt();
general.METHANE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MethaneBurnTime", 10).getInt();
general.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(); general.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble();
general.DISASSEMBLER_USAGE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisassemblerEnergyUsage", 10).getInt(); general.DISASSEMBLER_USAGE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisassemblerEnergyUsage", 10).getInt();
general.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt(); general.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt();

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

@ -44,6 +44,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
dataStream.writeDouble(general.TO_TE); dataStream.writeDouble(general.TO_TE);
dataStream.writeDouble(general.FROM_H2); dataStream.writeDouble(general.FROM_H2);
dataStream.writeInt(general.ETHENE_BURN_TIME); dataStream.writeInt(general.ETHENE_BURN_TIME);
dataStream.writeInt(general.METHANE_BURN_TIME);
dataStream.writeDouble(general.ENERGY_PER_REDSTONE); dataStream.writeDouble(general.ENERGY_PER_REDSTONE);
dataStream.writeDouble(general.DISASSEMBLER_USAGE); dataStream.writeDouble(general.DISASSEMBLER_USAGE);
dataStream.writeInt(general.VOICE_PORT); dataStream.writeInt(general.VOICE_PORT);
@ -138,6 +139,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
general.TO_TE = dataStream.readDouble(); general.TO_TE = dataStream.readDouble();
general.FROM_H2 = dataStream.readDouble(); general.FROM_H2 = dataStream.readDouble();
general.ETHENE_BURN_TIME = dataStream.readInt(); general.ETHENE_BURN_TIME = dataStream.readInt();
general.METHANE_BURN_TIME = dataStream.readInt();
general.ENERGY_PER_REDSTONE = dataStream.readDouble(); general.ENERGY_PER_REDSTONE = dataStream.readDouble();
general.DISASSEMBLER_USAGE = dataStream.readDouble(); general.DISASSEMBLER_USAGE = dataStream.readDouble();
general.VOICE_PORT = dataStream.readInt(); general.VOICE_PORT = dataStream.readInt();

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

@ -181,6 +181,7 @@ public class MekanismGenerators implements IModule
})); }));
FuelHandler.addGas(GasRegistry.getGas("ethene"), general.ETHENE_BURN_TIME, general.FROM_H2 + generators.bioGeneration * 2 * general.ETHENE_BURN_TIME); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus FuelHandler.addGas(GasRegistry.getGas("ethene"), general.ETHENE_BURN_TIME, general.FROM_H2 + generators.bioGeneration * 2 * general.ETHENE_BURN_TIME); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus
FuelHandler.addGas(GasRegistry.getGas("methane"), general.METHANE_BURN_TIME, general.FROM_H2 + generators.bioGeneration * general.METHANE_BURN_TIME);
} }
@Override @Override
@ -204,7 +205,7 @@ public class MekanismGenerators implements IModule
dataStream.writeDouble(generators.heatGenerationLava); dataStream.writeDouble(generators.heatGenerationLava);
dataStream.writeDouble(generators.heatGenerationNether); dataStream.writeDouble(generators.heatGenerationNether);
dataStream.writeInt(generators.heatGenerationFluidRate); dataStream.writeInt(generators.heatGenerationFluidRate);
dataStream.writeBoolean(generators.heatGenEnable) dataStream.writeBoolean(generators.heatGenEnable);
dataStream.writeDouble(generators.solarGeneration); dataStream.writeDouble(generators.solarGeneration);
dataStream.writeDouble(generators.windGenerationMin); dataStream.writeDouble(generators.windGenerationMin);