mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 20:42:17 +00:00
Update lots of APIs, most notably BC and an actual 1.7 version of CC
Conflicts: build.properties src/api/java/buildcraft/api/core/BlockIndex.java src/api/java/buildcraft/api/core/BuildCraftAPI.java src/api/java/buildcraft/api/fuels/IFuel.java src/api/java/buildcraft/api/mj/BatteryObject.java src/api/java/buildcraft/api/mj/IBatteryIOObject.java src/api/java/buildcraft/api/mj/IBatteryObject.java src/api/java/buildcraft/api/mj/IOMode.java src/api/java/buildcraft/api/mj/MjAPI.java src/api/java/buildcraft/api/mj/MjBattery.java src/api/java/buildcraft/api/power/PowerHandler.java src/api/java/buildcraft/api/recipes/CraftingResult.java src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java src/api/java/buildcraft/api/transport/IPipe.java src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/EnergyNetwork.java src/main/java/mekanism/common/FuelHandler.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java src/main/java/mekanism/common/multipart/MultipartMekanism.java src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java src/main/java/mekanism/common/multipart/PartUniversalCable.java src/main/java/mekanism/common/network/PacketConfigSync.java src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java src/main/java/mekanism/common/tile/TileEntityElectricBlock.java src/main/java/mekanism/common/util/CableUtils.java src/main/java/mekanism/common/util/MekanismUtils.java src/main/java/mekanism/common/util/TransporterUtils.java src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
This commit is contained in:
1 parent
21dc5253a4
commit
b31aa92844
99 files changed
+1628
-1939
No files matched your search
@@ -41,15 +41,14 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
dataStream.writeInt(general.UPDATE_DELAY);
|
||||
dataStream.writeDouble(general.FROM_IC2);
|
||||
dataStream.writeDouble(general.TO_IC2);
|
||||
dataStream.writeDouble(general.FROM_BC);
|
||||
dataStream.writeDouble(general.TO_BC);
|
||||
dataStream.writeDouble(general.FROM_TE);
|
||||
dataStream.writeDouble(general.TO_TE);
|
||||
dataStream.writeDouble(general.FROM_H2);
|
||||
dataStream.writeDouble(general.ENERGY_PER_REDSTONE);
|
||||
dataStream.writeInt(general.VOICE_PORT);
|
||||
dataStream.writeInt(general.maxUpgradeMultiplier);
|
||||
dataStream.writeInt(general.activeType.ordinal());
|
||||
dataStream.writeDouble(general.minerSilkMultiplier);
|
||||
dataStream.writeBoolean(general.blacklistBC);
|
||||
dataStream.writeBoolean(general.blacklistIC2);
|
||||
dataStream.writeBoolean(general.blacklistRF);
|
||||
|
||||
@@ -101,21 +100,17 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
general.UPDATE_DELAY = dataStream.readInt();
|
||||
general.FROM_IC2 = dataStream.readDouble();
|
||||
general.TO_IC2 = dataStream.readDouble();
|
||||
general.FROM_BC = dataStream.readDouble();
|
||||
general.TO_BC = dataStream.readDouble();
|
||||
general.FROM_TE = dataStream.readDouble();
|
||||
general.TO_TE = dataStream.readDouble();
|
||||
general.FROM_H2 = dataStream.readDouble();
|
||||
general.ENERGY_PER_REDSTONE = dataStream.readDouble();
|
||||
general.VOICE_PORT = dataStream.readInt();
|
||||
general.maxUpgradeMultiplier = dataStream.readInt();
|
||||
general.activeType = EnergyType.values()[dataStream.readInt()];
|
||||
general.minerSilkMultiplier = dataStream.readDouble();
|
||||
general.blacklistBC = dataStream.readBoolean();
|
||||
general.blacklistIC2 = dataStream.readBoolean();
|
||||
general.blacklistRF = dataStream.readBoolean();
|
||||
|
||||
general.TO_TE = general.TO_BC*10;
|
||||
general.FROM_TE = general.FROM_BC/10;
|
||||
|
||||
usage.enrichmentChamberUsage = dataStream.readDouble();
|
||||
usage.osmiumCompressorUsage = dataStream.readDouble();
|
||||
usage.combinerUsage = dataStream.readDouble();
|
||||
|
||||
Reference in new issue
Block a user