diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 9f208375c..ae49eb2b8 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -52,6 +52,7 @@ public class MekanismConfig public static int armoredJetpackDamageMax; public static boolean aestheticWorldDamage; public static boolean opsBypassRestrictions; + public static double solarEvaporationSpeed; } public static class client diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 87c190e22..f03823b03 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -259,6 +259,7 @@ public class CommonProxy general.armoredJetpackDamageMax = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ArmoredJepackDamageMax", 115).getInt(); general.aestheticWorldDamage = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AestheticWorldDamage", true).getBoolean(); general.opsBypassRestrictions = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OpsBypassRestrictions", true).getBoolean(); + general.solarEvaporationSpeed = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SolarEvaporationSpeed", 1.0D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 877a0eefe..652d6c723 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -10,7 +10,6 @@ import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.InventoryNetwork; import mekanism.common.InventoryNetwork.AcceptorData; import mekanism.common.base.ILogisticalTransporter; @@ -20,7 +19,6 @@ import mekanism.common.content.transporter.TransporterPathfinder.Pathfinder.Dest import mekanism.common.content.transporter.TransporterStack.Path; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.InventoryUtils; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -72,7 +70,7 @@ public final class TransporterPathfinder return new Destination(ret, true, null, 0).setPathType(Path.NONE); } else { - Destination newPath = TransporterPathfinder.getNewBasePath((ILogisticalTransporter)((ITransmitterTile)start.getTileEntity(worldObj)).getTransmitter(), transportStack, 0); + Destination newPath = TransporterPathfinder.getNewBasePath(((ITransporterTile)start.getTileEntity(worldObj)).getTransmitter(), transportStack, 0); if(newPath != null && TransporterManager.didEmit(transportStack.itemStack, newPath.rejected)) { @@ -264,11 +262,33 @@ public final class TransporterPathfinder return paths; } + public static boolean checkPath(World world, List path, TransporterStack stack) + { + for(int i = path.size()-1; i > 0; i--) + { + TileEntity tile = path.get(i).getTileEntity(world); + + if(!(tile instanceof ITransporterTile)) + { + return false; + } + + ITransporterTile transporterTile = (ITransporterTile)tile; + + if(transporterTile.getTransmitter() == null || (transporterTile.getTransmitter().getColor() != null && transporterTile.getTransmitter().getColor() != stack.color)) + { + return false; + } + } + + return true; + } + public static Destination getPath(DestChecker checker, EnumSet sides, ILogisticalTransporter start, Coord4D dest, TransporterStack stack, ItemStack rejects, int min) { List test = PathfinderCache.getCache(start.coord(), dest, sides); - if(test != null) + if(test != null && checkPath(start.world(), test, stack)) { return new Destination(test, false, rejects, 0).calculateScore(start.world()); } @@ -296,7 +316,7 @@ public final class TransporterPathfinder { return null; } - + return paths.get(0); } diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 7e9d020d3..fbd347873 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -58,6 +58,7 @@ public class PacketConfigSync implements IMessageHandler