diff --git a/Mekanism.txt b/Mekanism.txt index 0f7567b8c..281604ac0 100644 --- a/Mekanism.txt +++ b/Mekanism.txt @@ -1 +1 @@ -1.7.10:9.10.19:(13/09/22) Fixes fluidstack duplication and more \ No newline at end of file +1.7.10:9.10.20:(13/09/22) Fixes looping crash & more diff --git a/README.md b/README.md index f6828f9fb..be67bcd1a 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,26 @@ Mekanism CE also has two dependencies that it requires, as a modpack creator DO + [ForgeMultipart](https://files.thorfusion.com/mekanism/ForgeMultipart-1.7.10-1.2.0.347-universal.jar) + [CodeChickenLib](https://files.thorfusion.com/mekanism/CodeChickenLib-1.7.10-1.1.3.141-universal.jar) -## Modifications by +## Changes + +### Featured changes + +| Some Differences | MK | MK:[CE](https://www.curseforge.com/minecraft/mc-mods/mekanism-ce) | MK:[kmecpp](https://www.curseforge.com/minecraft/mc-mods/mekanism-patched) | +| --------------------------------------------------------------------------------------------------------- | ------------------ | ----------------------------------------------------------------- | -------------------------------------------------------------------------- | +| Open Source | :heavy_check_mark: | :heavy_check_mark: | :x: | +| Dupe: Chemical Washer | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: Fluidtank | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: [Fluidstack](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/49) | :x: | :heavy_check_mark: | :x: | +| Dupe: Factories | :x: | :heavy_check_mark: | :heavy_check_mark: | +| Dupe: Bins | :x: | :heavy_check_mark: | :heavy_check_mark: | +| BUG: [Osmium Compressor](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/32) | :x: | :heavy_check_mark: | :x: | +| BUG: [Storage Meter](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/40) | :x: | :heavy_check_mark: | :x: | +| BUG: [Looping crash MK+RR+BC](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/33) | :x: | :heavy_check_mark: | :x: | +| FEATURE: [TerralizationCompat](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/issues/30) | :x: | :heavy_check_mark: | :x: | +| FEATURE: [Biofuel cycle rework](https://github.com/Thorfusion/Mekanism-1.7.10-Community-Edition/pull/48) | :x: | :heavy_check_mark: | :x: | +| NEW FEATURES, BUGFIXES & MORE! | :x: | :heavy_check_mark: | :x: | + +### Full changelog #### Clienthax : + dupe bug with chemical washer and fluidtank, fixes issue with railcraft @@ -75,6 +94,7 @@ Mekanism CE also has two dependencies that it requires, as a modpack creator DO + removed the native cape module, the auto updater module and voiceserver Thorfusion#51 + fixed config for HeatGenerationFluidRate + disabled prefilled tanks by default ++ fixed looping crash with MK+RR+BC Thorfusion#33 #### [Pokemonplatin](https://github.com/Pokemonplatin) - Mekanism CE Team + Teleporter and Quantum Entangloporter now have a trusted channel for smp Thorfusion#22 @@ -92,6 +112,7 @@ Mekanism CE also has two dependencies that it requires, as a modpack creator DO + [Large feature] Reworked the bio-fuel cycle Thorfusion#48 + added lazuli ingots and lead infusion Thorfusion#50 + fixed energy storage meter increasing when generating no energy in industrial turbine Thorfusion#40 ++ Fix plastic properties Thorfusion#60 ## All contributors get capes diff --git a/build.properties b/build.properties index d922400c3..eee3544ef 100644 --- a/build.properties +++ b/build.properties @@ -4,5 +4,5 @@ FMP_version=1.2.0.347 CCLIB_version=1.1.3.141 NEI_version=1.0.5.120 CCC_version=1.0.7.48 -mod_version=9.10.19a-LE -alt_version=9, 10, 19 +mod_version=9.10.21 +alt_version=9, 10, 21 diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index cdf30b769..9aae8a9ef 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -74,6 +74,9 @@ public class MekanismConfig public static boolean OreDictOsmium; public static boolean OreDictPlatinum; public static boolean enableSiliconCompat; + public static int IC2SinkTier; + public static int IC2SourceTier; + public static int digitalMinerMaxRadius; } public static class client @@ -170,7 +173,6 @@ public class MekanismConfig public static class tools { public static double armorSpawnRate; - public static boolean enableTools = true; } public static class recipes diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 1d35a4df8..1588686da 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -683,7 +684,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { if(!radiusField.getText().isEmpty()) { - int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), 32)); + int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), MekanismConfig.general.digitalMinerMaxRadius)); ArrayList data = new ArrayList(); data.add(6); diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index a8f7967c0..d9766e355 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -165,18 +165,13 @@ public class GuiFactory extends GuiMekanism int xAxis = (x - (width - xSize) / 2); int yAxis = (y - (height - ySize) / 2); - if(xAxis > 8 && xAxis < 168 && yAxis > 78 && yAxis < 83) + if(xAxis > 144 && xAxis < 168 && yAxis > 83 && yAxis < 93) { - ItemStack stack = mc.thePlayer.inventory.getItemStack(); - - if(stack != null && stack.getItem() instanceof ItemGaugeDropper) - { - ArrayList data = new ArrayList(); - data.add(1); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); - } + ArrayList data = new ArrayList(); + data.add(1); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 072c76765..b56e47d5e 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -121,7 +121,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism int xAxis = (x - (width - xSize) / 2); int yAxis = (y - (height - ySize) / 2); - if(xAxis > 148 && xAxis < 168 && yAxis > 73 && yAxis < 82) + if(xAxis > 144 && xAxis < 168 && yAxis > 72 && yAxis < 83) { ArrayList data = new ArrayList(); data.add(0); diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 5e10c5f18..4980be01d 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -101,6 +101,8 @@ public class GuiQuantumEntangloporter extends GuiMekanism buttonList.add(protectedButton); buttonList.add(setButton); buttonList.add(deleteButton); + + access = ISecurityTile.SecurityMode.TRUSTED; } public void setFrequency(String freq) @@ -113,6 +115,9 @@ public class GuiQuantumEntangloporter extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); data.add(freq); + if (access == null) { + return; + } data.add(access.ordinal()); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 72caa6acf..09190c4de 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -310,9 +310,12 @@ public class CommonProxy implements IGuiProvider general.OreDictOsmium = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictOsmium", true).getBoolean(); general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); + general.digitalMinerMaxRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DigitalMinerMaxRadius", 32, "Select range from 1 to 64, we do not recommend going over 32", 1, 64).getInt(); + general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 4, "Tier level for machines, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); + general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 4, "Tier level for generators, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); - String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "J", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); + String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); if(s != null) { diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 5ead4daa5..9fd36df50 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -4,6 +4,7 @@ import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -30,9 +31,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { wrapper = new RFAcceptor((IEnergyReceiver)tileEntity); } - else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) + else if(MekanismUtils.useIC2() && CableUtils.getIC2Tile(tileEntity) instanceof IEnergySink) { - wrapper = new IC2Acceptor((IEnergySink)tileEntity); + wrapper = new IC2Acceptor((IEnergySink)CableUtils.getIC2Tile(tileEntity)); } if(wrapper != null) diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 70970d683..78846c352 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -105,9 +105,9 @@ public class PartUniversalCable extends PartTransmitter 0) @@ -115,7 +115,7 @@ public class PartUniversalCable extends PartTransmitter