mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'master' into development
Conflicts: src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/item/ItemAtomicDisassembler.java src/main/java/mekanism/common/network/PacketConfigSync.java src/main/java/mekanism/generators/common/MekanismGenerators.java
This commit is contained in:
commit
b2e532964c
5 files changed
+19
-15
No files matched your search
@@ -44,7 +44,9 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
dataStream.writeDouble(general.FROM_TE);
|
||||
dataStream.writeDouble(general.TO_TE);
|
||||
dataStream.writeDouble(general.FROM_H2);
|
||||
dataStream.writeInt(general.ETHENE_BURN_TIME);
|
||||
dataStream.writeDouble(general.ENERGY_PER_REDSTONE);
|
||||
dataStream.writeDouble(general.DISASSEMBLER_USAGE);
|
||||
dataStream.writeInt(general.VOICE_PORT);
|
||||
dataStream.writeInt(general.maxUpgradeMultiplier);
|
||||
dataStream.writeInt(general.activeType.ordinal());
|
||||
@@ -104,7 +106,9 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
general.FROM_TE = dataStream.readDouble();
|
||||
general.TO_TE = dataStream.readDouble();
|
||||
general.FROM_H2 = dataStream.readDouble();
|
||||
general.ETHENE_BURN_TIME = dataStream.readInt();
|
||||
general.ENERGY_PER_REDSTONE = dataStream.readDouble();
|
||||
general.DISASSEMBLER_USAGE = dataStream.readDouble();
|
||||
general.VOICE_PORT = dataStream.readInt();
|
||||
general.maxUpgradeMultiplier = dataStream.readInt();
|
||||
general.activeType = EnergyType.values()[dataStream.readInt()];
|
||||
|
||||
Reference in new issue
Block a user