From edf0fe1a38e9197ec267c01066e34422377408d8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 26 Jul 2017 12:42:56 -0700 Subject: [PATCH 1/7] Updated minor compat --- src/main/java/mekanism/common/integration/OreDictManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 7038a6da5..a8f61e805 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -32,7 +32,7 @@ import net.minecraftforge.oredict.OreDictionary; public final class OreDictManager { - private static final List minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium"); + private static final List minorCompat = Arrays.asList("Nickel", "Aluminum", "Uranium", "Draconium", "Platinum", "Iridium"); public static void init() { From 48c748e55e2f57262c19c13adbf44b1a5264def7 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 26 Jul 2017 14:04:26 -0700 Subject: [PATCH 2/7] Kill off some unused code --- .../mekanism/common/base/IEnergyWrapper.java | 1 - .../common/tile/TileEntityChargepad.java | 7 +------ .../common/tile/TileEntityDigitalMiner.java | 7 ------- .../common/tile/TileEntityElectricPump.java | 6 ------ .../common/tile/TileEntityEnergyCube.java | 6 ------ .../mekanism/common/tile/TileEntityFactory.java | 6 ------ .../common/tile/TileEntityFluidicPlenisher.java | 6 ------ .../common/tile/TileEntityInductionPort.java | 12 +----------- .../mekanism/common/tile/TileEntityLaser.java | 7 +------ .../common/tile/TileEntityLogisticalSorter.java | 9 ++------- .../tile/TileEntityQuantumEntangloporter.java | 16 +++++++--------- .../common/tile/TileEntityResistiveHeater.java | 9 ++------- .../common/tile/TileEntitySeismicVibrator.java | 9 ++------- .../tile/prefab/TileEntityBasicMachine.java | 9 ++------- .../tile/prefab/TileEntityElectricBlock.java | 10 +++------- .../common/tile/TileEntityGenerator.java | 6 ------ .../tile/reactor/TileEntityReactorBlock.java | 10 +++------- .../tile/reactor/TileEntityReactorPort.java | 6 ------ .../tile/turbine/TileEntityTurbineValve.java | 7 +------ 19 files changed, 25 insertions(+), 124 deletions(-) diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 9c231c4e6..c051f41b0 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -27,7 +27,6 @@ public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, I public EnumSet getOutputtingSides(); public boolean sideIsOutput(EnumFacing side); - public EnumSet getConsumingSides(); public boolean sideIsConsumer(EnumFacing side); public double getMaxOutput(); diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 51540ed55..5878f1729 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -170,13 +170,8 @@ public class TileEntityChargepad extends TileEntityNoisyBlock } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.of(EnumFacing.DOWN, facing.getOpposite()); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return side == EnumFacing.DOWN || side == facing.getOpposite(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 602769200..4a8e6624b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1560,19 +1560,12 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return false; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing), EnumFacing.DOWN); - } - @Override public boolean sideIsConsumer(EnumFacing side) { return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing) || side == EnumFacing.DOWN; } - @Override public TileComponentSecurity getSecurity() { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 48301963d..5df71925d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -415,12 +415,6 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I return false; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(facing.getOpposite()); - } - @Override public boolean sideIsConsumer(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index c6549c176..0f68c7af6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -155,12 +155,6 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo return true; } - @Override - public EnumSet getConsumingSides() - { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); - } - @Override public boolean sideIsConsumer(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 5df3f9693..12cc53ddc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -389,12 +389,6 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } } - @Override - public EnumSet getConsumingSides() - { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); - } - @Override public boolean sideIsConsumer(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 55b5e7b5d..468b93207 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -378,12 +378,6 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen return false; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(facing.getOpposite()); - } - @Override public boolean sideIsConsumer(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index d14643187..a067767dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -112,18 +112,8 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - if(structure != null && !mode) - { - return EnumSet.allOf(EnumFacing.class); - } - - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return (structure != null && !mode); } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 2ab5706e5..31094747e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -119,13 +119,8 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.of(facing.getOpposite()); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return side == facing.getOpposite(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 69c2cc5aa..463cbfe5a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -551,15 +551,10 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { return false; } - + @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 4459b21cc..4614d0338 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -373,26 +373,24 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean sideIsOutput(EnumFacing side) { - if (!hasFrequency()) + public boolean sideIsOutput(EnumFacing side) + { + if(!hasFrequency()) { return false; } + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 2, side); } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { - if (!hasFrequency()) + if(!hasFrequency()) { return false; } + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); } diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 951ead305..0a9060de7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -123,15 +123,10 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I } } } - - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing)); - } @Override - public boolean sideIsConsumer(EnumFacing side) { + public boolean sideIsConsumer(EnumFacing side) + { return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 57a1902c7..af8e62f5d 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -206,15 +206,10 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement { return controlType; } - - @Override - public EnumSet getConsumingSides() - { - return EnumSet.of(facing.getOpposite()); - } @Override - public boolean sideIsConsumer(EnumFacing side) { + public boolean sideIsConsumer(EnumFacing side) + { return side == facing.getOpposite(); } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java index 1e94bf290..98cd8e60e 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java @@ -39,15 +39,10 @@ public abstract class TileEntityBasicMachine, guiLocation = location; } - - @Override - public EnumSet getConsumingSides() - { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); - } @Override - public boolean sideIsConsumer(EnumFacing side) { + public boolean sideIsConsumer(EnumFacing side) + { return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index 637d0a596..1825013de 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -108,18 +108,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public boolean sideIsOutput(EnumFacing side) { + public boolean sideIsOutput(EnumFacing side) + { return false; } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.allOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return true; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index db1b03243..726c56cda 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -116,12 +116,6 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement return output; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.noneOf(EnumFacing.class); - } - @Override public boolean sideIsConsumer(EnumFacing side) { return false; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 3f423e422..7a445809e 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -83,18 +83,14 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock } @Override - public boolean sideIsOutput(EnumFacing side) { + public boolean sideIsOutput(EnumFacing side) + { return false; } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return false; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 85895f821..8fbb53418 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -295,12 +295,6 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl return true; } - @Override - public EnumSet getConsumingSides() - { - return EnumSet.noneOf(EnumFacing.class); - } - @Override public boolean sideIsConsumer(EnumFacing side) { return false; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index dc1aeae00..5dbd8501a 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -103,13 +103,8 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public EnumSet getConsumingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsConsumer(EnumFacing side) { return false; } From 6342e0cdb07e28c62a04d4f46323f706151fcb27 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Thu, 27 Jul 2017 11:37:23 +0200 Subject: [PATCH 3/7] Fix dev environment after adding SD compat --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 8ae2d65e7..af50f6b6e 100644 --- a/build.gradle +++ b/build.gradle @@ -105,6 +105,8 @@ dependencies { deobfCompile "com.mod-buildcraft:buildcraft-api:${config.buildcraft_version}" compile ("com.jaquadro.minecraft.storagedrawers:StorageDrawers:${config.minecraft_version}-${config.storagedrawers_version}:api") { exclude module: "Chameleon" // we only use the API, which doesn't need Chameleon + exclude module: "jei_1.11.2" + exclude module: "Hwyla" } } From 6ef08e90f158f31248895c2814d8b6937bde5798 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 27 Jul 2017 09:33:09 -0700 Subject: [PATCH 4/7] Another cleanup --- .../mekanism/common/base/IEnergyWrapper.java | 1 - .../common/tile/TileEntityEnergyCube.java | 6 ----- .../common/tile/TileEntityInductionPort.java | 25 +++--------------- .../tile/TileEntityQuantumEntangloporter.java | 8 ------ .../tile/prefab/TileEntityElectricBlock.java | 6 ----- .../java/mekanism/common/util/CableUtils.java | 26 ++++++++++++------- .../TileEntityAdvancedSolarGenerator.java | 7 +---- .../common/tile/TileEntityGenerator.java | 9 ++----- .../common/tile/TileEntitySolarGenerator.java | 7 +---- .../tile/reactor/TileEntityReactorBlock.java | 6 ----- .../tile/reactor/TileEntityReactorPort.java | 6 ----- .../tile/turbine/TileEntityTurbineValve.java | 23 ++-------------- 12 files changed, 25 insertions(+), 105 deletions(-) diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index c051f41b0..f73b72c5d 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -24,7 +24,6 @@ import cofh.api.energy.IEnergyReceiver; }) public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory { - public EnumSet getOutputtingSides(); public boolean sideIsOutput(EnumFacing side); public boolean sideIsConsumer(EnumFacing side); diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 0f68c7af6..4e5052ca0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -161,12 +161,6 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); } - @Override - public EnumSet getOutputtingSides() - { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); - } - @Override public boolean sideIsOutput(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index a067767dd..5d599aa29 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -80,34 +80,15 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } } } - + @Override - public EnumSet getOutputtingSides() + public boolean sideIsOutput(EnumFacing side) { if(structure != null && mode) - { - EnumSet set = EnumSet.allOf(EnumFacing.class); - - for(EnumFacing side : EnumFacing.VALUES) - { - if(structure.locations.contains(Coord4D.get(this).offset(side))) - { - set.remove(side); - } - } - - return set; - } - - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsOutput(EnumFacing side) { - if (structure != null && mode) { return !structure.locations.contains(Coord4D.get(this).offset(side)); } + return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 4614d0338..96c2449d7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -60,8 +60,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public List publicCache = new ArrayList(); public List privateCache = new ArrayList(); - - public static final EnumSet nothing = EnumSet.noneOf(EnumFacing.class); public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; @@ -366,12 +364,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return data; } - @Override - public EnumSet getOutputtingSides() - { - return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); - } - @Override public boolean sideIsOutput(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index 1825013de..0cb276221 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -101,12 +101,6 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } } - @Override - public EnumSet getOutputtingSides() - { - return EnumSet.noneOf(EnumFacing.class); - } - @Override public boolean sideIsOutput(EnumFacing side) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index f339b1309..cffde9691 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,10 +1,13 @@ package mekanism.common.util; -import java.util.*; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Function; import mekanism.api.Coord4D; -import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; @@ -39,17 +42,20 @@ public final class CableUtils * @param sides - set of sides to check * @return boolean[] of adjacent connections */ - public static boolean[] getConnections(TileEntity tileEntity, Set sides) + public static boolean[] getConnections(TileEntity tileEntity, Function sideFunction) { boolean[] connectable = new boolean[] {false, false, false, false, false, false}; Coord4D coord = Coord4D.get(tileEntity); - for(EnumFacing side : sides) + for(EnumFacing side : EnumFacing.values()) { - TileEntity tile = coord.offset(side).getTileEntity(tileEntity.getWorld()); - - connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side); - connectable[side.ordinal()] |= isCable(tile); + if(sideFunction.apply(side)) + { + TileEntity tile = coord.offset(side).getTileEntity(tileEntity.getWorld()); + + connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side); + connectable[side.ordinal()] |= isCable(tile); + } } return connectable; @@ -185,9 +191,9 @@ public final class CableUtils if(energyToSend > 0) { List outputtingSides = new LinkedList<>(); - boolean[] connectable = getConnections((TileEntity)emitter, emitter.getOutputtingSides()); + boolean[] connectable = getConnections((TileEntity)emitter, side -> emitter.sideIsOutput(side)); - for(EnumFacing side : emitter.getOutputtingSides()) + for(EnumFacing side : EnumFacing.values()) { if(connectable[side.ordinal()]) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 98aa47409..0f3e2d81b 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -20,13 +20,8 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i } @Override - public EnumSet getOutputtingSides() + public boolean sideIsOutput(EnumFacing side) { - return EnumSet.of(facing); - } - - @Override - public boolean sideIsOutput(EnumFacing side) { return side == facing; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 726c56cda..34b69850b 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -117,14 +117,9 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement } @Override - public boolean sideIsConsumer(EnumFacing side) { - return false; - } - - @Override - public EnumSet getOutputtingSides() + public boolean sideIsConsumer(EnumFacing side) { - return EnumSet.of(facing); + return false; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 7d973fb07..30662db26 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -189,13 +189,8 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public EnumSet getOutputtingSides() + public boolean sideIsOutput(EnumFacing side) { - return EnumSet.of(EnumFacing.getFront(0)); - } - - @Override - public boolean sideIsOutput(EnumFacing side) { return side == EnumFacing.DOWN; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 7a445809e..d703724f6 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -76,12 +76,6 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock attempted = false; } - @Override - public EnumSet getOutputtingSides() - { - return EnumSet.noneOf(EnumFacing.class); - } - @Override public boolean sideIsOutput(EnumFacing side) { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 8fbb53418..e7a1ec655 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -284,12 +284,6 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } } - @Override - public EnumSet getOutputtingSides() - { - return EnumSet.allOf(EnumFacing.class); - } - @Override public boolean sideIsOutput(EnumFacing side) { return true; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index 5dbd8501a..3778a9c6f 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -73,32 +73,13 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public EnumSet getOutputtingSides() + public boolean sideIsOutput(EnumFacing side) { if(structure != null) - { - EnumSet set = EnumSet.allOf(EnumFacing.class); - - for(EnumFacing side : EnumFacing.VALUES) - { - if(structure.locations.contains(Coord4D.get(this).offset(side))) - { - set.remove(side); - } - } - - return set; - } - - return EnumSet.noneOf(EnumFacing.class); - } - - @Override - public boolean sideIsOutput(EnumFacing side) { - if (structure != null) { return !structure.locations.contains(Coord4D.get(this).offset(side)); } + return false; } From 7330ca285c171ae44c0dfecbcc8aca6df2af42d1 Mon Sep 17 00:00:00 2001 From: meitangdehulu Date: Fri, 28 Jul 2017 00:37:05 +0800 Subject: [PATCH 5/7] Update entity names Transmitters(#190-211) --- .../主要/资源/资产/mekanism/郎}/zh_cn.lang | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) rename {src/main/resources/assets/mekanism/lang => SRC/主要/资源/资产/mekanism/郎}/zh_cn.lang (95%) diff --git a/src/main/resources/assets/mekanism/lang/zh_cn.lang b/SRC/主要/资源/资产/mekanism/郎/zh_cn.lang similarity index 95% rename from src/main/resources/assets/mekanism/lang/zh_cn.lang rename to SRC/主要/资源/资产/mekanism/郎/zh_cn.lang index 1347cb4c3..cbce2c42b 100644 --- a/src/main/resources/assets/mekanism/lang/zh_cn.lang +++ b/SRC/主要/资源/资产/mekanism/郎/zh_cn.lang @@ -187,28 +187,28 @@ tile.OreBlock.CopperOre.name=铜矿石 tile.OreBlock.TinOre.name=锡矿石 //Transmitters -item.MultipartTransmitter.BasicPressurizedTube.name=基础加压管道 -item.MultipartTransmitter.AdvancedPressurizedTube.name=高级加压管道 -item.MultipartTransmitter.ElitePressurizedTube.name=精英加压管道 -item.MultipartTransmitter.UltimatePressurizedTube.name=终极加压管道 -item.MultipartTransmitter.BasicUniversalCable.name=基础通用线缆 -item.MultipartTransmitter.AdvancedUniversalCable.name=高级通用线缆 -item.MultipartTransmitter.EliteUniversalCable.name=精英通用线缆 -item.MultipartTransmitter.UltimateUniversalCable.name=终极通用线缆 -item.MultipartTransmitter.BasicMechanicalPipe.name=基础机械管道 -item.MultipartTransmitter.AdvancedMechanicalPipe.name=高级机械管道 -item.MultipartTransmitter.EliteMechanicalPipe.name=精英机械管道 -item.MultipartTransmitter.UltimateMechanicalPipe.name=终极机械管道 -item.MultipartTransmitter.BasicLogisticalTransporter.name=基础物流管道 -item.MultipartTransmitter.AdvancedLogisticalTransporter.name=高级物流管道 -item.MultipartTransmitter.EliteLogisticalTransporter.name=精英物流管道 -item.MultipartTransmitter.UltimateLogisticalTransporter.name=终极物流管道 -item.MultipartTransmitter.RestrictiveTransporter.name=限制传送管道 -item.MultipartTransmitter.DiversionTransporter.name=转移传送管道 -item.MultipartTransmitter.BasicThermodynamicConductor.name=基础热导线缆 -item.MultipartTransmitter.AdvancedThermodynamicConductor.name=高级热导线缆 -item.MultipartTransmitter.EliteThermodynamicConductor.name=精英热导线缆 -item.MultipartTransmitter.UltimateThermodynamicConductor.name=终极热导线缆 +tile.Transmitter.BasicPressurizedTube.name=基础加压管道 +tile.Transmitter.AdvancedPressurizedTube.name=高级加压管道 +tile.Transmitter.ElitePressurizedTube.name=精英加压管道 +tile.Transmitter.UltimatePressurizedTube.name=终极加压管道 +tile.Transmitter.BasicUniversalCable.name=基础通用线缆 +tile.Transmitter.AdvancedUniversalCable.name=高级通用线缆 +tile.Transmitter.EliteUniversalCable.name=精英通用线缆 +tile.Transmitter.UltimateUniversalCable.name=终极通用线缆 +tile.Transmitter.BasicMechanicalPipe.name=基础机械管道 +tile.Transmitter.AdvancedMechanicalPipe.name=高级机械管道 +tile.Transmitter.EliteMechanicalPipe.name=精英机械管道 +tile.Transmitter.UltimateMechanicalPipe.name=终极机械管道 +tile.Transmitter.BasicLogisticalTransporter.name=基础物流管道 +tile.Transmitter.AdvancedLogisticalTransporter.name=高级物流管道 +tile.Transmitter.EliteLogisticalTransporter.name=精英物流管道 +tile.Transmitter.UltimateLogisticalTransporter.name=终极物流管道 +tile.Transmitter.RestrictiveTransporter.name=限制传送管道 +tile.Transmitter.DiversionTransporter.name=转移传送管道 +tile.Transmitter.BasicThermodynamicConductor.name=基础热导线缆 +tile.Transmitter.AdvancedThermodynamicConductor.name=高级热导线缆 +tile.Transmitter.EliteThermodynamicConductor.name=精英热导线缆 +tile.Transmitter.UltimateThermodynamicConductor.name=终极热导线缆 //Glow Panel item.GlowPanel.name=荧光板 From be533753785b8d6f40b610fe4c6d2a95b4edcba1 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Fri, 28 Jul 2017 12:27:31 +0800 Subject: [PATCH 6/7] move zh_cn lang file back to thr correct place --- .../mekanism/郎 => src/main/resources/assets/mekanism/lang}/zh_cn.lang | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {SRC/主要/资源/资产/mekanism/郎 => src/main/resources/assets/mekanism/lang}/zh_cn.lang (100%) diff --git a/SRC/主要/资源/资产/mekanism/郎/zh_cn.lang b/src/main/resources/assets/mekanism/lang/zh_cn.lang similarity index 100% rename from SRC/主要/资源/资产/mekanism/郎/zh_cn.lang rename to src/main/resources/assets/mekanism/lang/zh_cn.lang From 9801b12b62d93a21b8ed5774fcb6f38fd847980a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 31 Jul 2017 18:38:46 -0700 Subject: [PATCH 7/7] Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218) Also, fixed client render update delay --- .../api/transmitters/DynamicNetwork.java | 7 +++- .../TransmitterNetworkRegistry.java | 15 +++---- .../mekanism/client/voice/VoiceClient.java | 41 +++++-------------- .../transmitters/grid/FluidNetwork.java | 2 +- 4 files changed, 23 insertions(+), 42 deletions(-) diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 707cc23bb..cb212004e 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -212,6 +212,11 @@ public abstract class DynamicNetwork> implemen transmittersAdded.add(transmitter); } + for(IGridTransmitter transmitter : net.transmittersToAdd) + { + transmittersToAdd.add(transmitter); + } + possibleAcceptors.putAll(net.possibleAcceptors); for(Entry> entry : net.acceptorDirections.entrySet()) @@ -394,7 +399,7 @@ public abstract class DynamicNetwork> implemen public void queueClientUpdate(Collection> newTransmitters) { transmittersAdded.addAll(newTransmitters); - updateDelay = 3; + updateDelay = 5; } public static class TransmittersAddedEvent extends Event diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index b9e4c06cf..92721b2bc 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -246,10 +246,10 @@ public class TransmitterNetworkRegistry public void start() { - iterate(startPoint.coord(), null); + iterate(startPoint.coord()); } - public void iterate(Coord4D from, EnumFacing fromDirection) + public void iterate(Coord4D from) { if(iterated.contains(from)) { @@ -269,14 +269,11 @@ public class TransmitterNetworkRegistry for(EnumFacing direction : EnumFacing.VALUES) { - if(direction != fromDirection) + Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction); + + if(directionCoord != null && !iterated.contains(directionCoord)) { - Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction); - - if(!(directionCoord == null || iterated.contains(directionCoord))) - { - iterate(directionCoord, direction.getOpposite()); - } + iterate(directionCoord); } } } diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index 7ccdc92fd..0fcdaf530 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -65,37 +65,16 @@ public class VoiceClient extends Thread Mekanism.logger.info("VoiceServer: Stopping client connection..."); try { - try { - inputThread.interrupt(); - outputThread.interrupt(); - } catch(Exception e) {} - - try { - interrupt(); - } catch(Exception e) {} - - try { - inputThread.close(); - outputThread.close(); - } catch(Exception e) {} - - try { - output.flush(); - output.close(); - output = null; - } catch(Exception e) {} - - try { - input.close(); - input = null; - } catch(Exception e) {} - - try { - socket.close(); - socket = null; - } catch(Exception e) {} - - + inputThread.interrupt(); + outputThread.interrupt(); + inputThread.close(); + outputThread.close(); + output.close(); + input.close(); + socket.close(); + + interrupt(); + running = false; } catch(Exception e) { Mekanism.logger.error("VoiceServer: Error while stopping client connection."); diff --git a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java index 2c73efbb6..3a61b8139 100644 --- a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java @@ -242,7 +242,7 @@ public class FluidNetwork extends DynamicNetwork if(didTransfer != prevTransfer || needsUpdate) { - MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer)); + MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer)); needsUpdate = false; }