From bc3274825afbd0340c31df811e8fa01ed3f34016 Mon Sep 17 00:00:00 2001 From: Richard Carter Date: Sun, 23 Jul 2017 17:04:24 -0400 Subject: [PATCH] Some performance-oriented refactoring of TileComponentConfig Add new type "SideConfig" which is observable, this could come in handy later. Add hasSideForData method in componentConfig, which is much more efficient than calling getSidesForData().contains. Refactor duplicate calls to getConfig into single instances. getConfig is a nontrivial method. --- .../network/PacketConfigurationUpdate.java | 2 +- .../common/tile/TileEntityGasTank.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 2 +- .../common/tile/component/SideConfig.java | 56 ++++++++++++ .../tile/component/TileComponentConfig.java | 87 +++++++++++-------- .../tile/component/TileComponentEjector.java | 15 ++-- .../TileEntityAdvancedElectricMachine.java | 8 +- .../prefab/TileEntityElectricMachine.java | 2 +- .../mekanism/common/util/MekanismUtils.java | 59 ++++++++----- 9 files changed, 163 insertions(+), 70 deletions(-) create mode 100644 src/main/java/mekanism/common/tile/component/SideConfig.java diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 05a36b884..5b8b3ed66 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -60,7 +60,7 @@ public class PacketConfigurationUpdate implements IMessageHandler sideConfigs = new HashMap(); - public Map> sideOutputs = new HashMap>(); - public Map ejecting = new HashMap(); - public Map canEject = new HashMap(); + private Map sideConfigs = new HashMap<>(); + private Map> sideOutputs = new HashMap<>(); + private Map ejecting = new HashMap<>(); + private Map canEject = new HashMap<>(); - public List transmissions = new ArrayList(); + public List transmissions = new ArrayList<>(); public TileComponentConfig(TileEntityContainerBlock tile, TransmissionType... types) { @@ -59,43 +59,48 @@ public class TileComponentConfig implements ITileComponent transmissions.add(type); } - sideOutputs.put(type.ordinal(), new ArrayList()); - ejecting.put(type.ordinal(), false); - canEject.put(type.ordinal(), true); + sideOutputs.put(type, new ArrayList<>()); + ejecting.put(type, false); + canEject.put(type, true); } - + public EnumSet getSidesForData(TransmissionType type, EnumFacing facing, int dataIndex) { EnumSet ret = EnumSet.noneOf(EnumFacing.class); + SideConfig config = getConfig(type); + EnumFacing[] translatedFacings = MekanismUtils.getBaseOrientations(facing); - for(EnumFacing f : EnumFacing.VALUES) + for(int i = 0; i < EnumFacing.VALUES.length; i++) { - EnumFacing side = MekanismUtils.getBaseOrientation(f, facing); - - if(getConfig(type)[side.ordinal()] == dataIndex) + if(config.get(translatedFacings[i]) == dataIndex) { - ret.add(f); + ret.add(translatedFacings[i]); } } return ret; } + + public boolean hasSideForData(TransmissionType type, EnumFacing facing, int dataIndex, EnumFacing sideToTest) + { + return getConfig(type).get(sideToTest) == dataIndex; + } public void setCanEject(TransmissionType type, boolean eject) { - canEject.put(type.ordinal(), eject); + canEject.put(type, eject); } public boolean canEject(TransmissionType type) { - return canEject.get(type.ordinal()); + return canEject.get(type); } public void fillConfig(TransmissionType type, int data) { byte sideData = (byte)data; - setConfig(type, new byte[] {sideData, sideData, sideData, sideData, sideData, sideData}); + setConfig(type, sideData, sideData, sideData, sideData, sideData, sideData); } public void setIOConfig(TransmissionType type) @@ -115,25 +120,31 @@ public class TileComponentConfig implements ITileComponent fillConfig(type, 1); setCanEject(type, false); } - + public void setConfig(TransmissionType type, byte[] config) { - sideConfigs.put(type.ordinal(), config); + assert config.length == EnumFacing.VALUES.length; + setConfig(type, config[0], config[1], config[2], config[3], config[4], config[5]); + } + + public void setConfig(TransmissionType type, byte d, byte u, byte n, byte s, byte w, byte e) + { + sideConfigs.put(type, new SideConfig(d, u, n, s, w, e)); } public void addOutput(TransmissionType type, SideData data) { - sideOutputs.get(type.ordinal()).add(data); + sideOutputs.get(type).add(data); } public ArrayList getOutputs(TransmissionType type) { - return sideOutputs.get(type.ordinal()); + return sideOutputs.get(type); } - public byte[] getConfig(TransmissionType type) + public SideConfig getConfig(TransmissionType type) { - return sideConfigs.get(type.ordinal()); + return sideConfigs.get(type); } public SideData getOutput(TransmissionType type, EnumFacing side, EnumFacing facing) @@ -152,8 +163,9 @@ public class TileComponentConfig implements ITileComponent { return EMPTY; } - - int index = getConfig(type)[side.ordinal()]; + + SideConfig sideConfig = getConfig(type); + int index = sideConfig.get(side); if(index == -1) { @@ -161,7 +173,8 @@ public class TileComponentConfig implements ITileComponent } else if(index > getOutputs(type).size()-1) { - index = getConfig(type)[side.ordinal()] = 0; + sideConfig.set(side, (byte) 0); + index = 0; } return getOutputs(type).get(index); @@ -184,8 +197,8 @@ public class TileComponentConfig implements ITileComponent { if(nbtTags.getByteArray("config" + type.ordinal()).length > 0) { - sideConfigs.put(type.ordinal(), nbtTags.getByteArray("config" + type.ordinal())); - ejecting.put(type.ordinal(), nbtTags.getBoolean("ejecting" + type.ordinal())); + sideConfigs.put(type, new SideConfig(nbtTags.getByteArray("config" + type.ordinal()))); + ejecting.put(type, nbtTags.getBoolean("ejecting" + type.ordinal())); } } } @@ -207,9 +220,9 @@ public class TileComponentConfig implements ITileComponent { byte[] array = new byte[6]; dataStream.readBytes(array); - - sideConfigs.put(type.ordinal(), array); - ejecting.put(type.ordinal(), dataStream.readBoolean()); + + sideConfigs.put(type, new SideConfig(array)); + ejecting.put(type, dataStream.readBoolean()); } } @@ -218,8 +231,8 @@ public class TileComponentConfig implements ITileComponent { for(TransmissionType type : transmissions) { - nbtTags.setByteArray("config" + type.ordinal(), sideConfigs.get(type.ordinal())); - nbtTags.setBoolean("ejecting" + type.ordinal(), ejecting.get(type.ordinal())); + nbtTags.setByteArray("config" + type.ordinal(), sideConfigs.get(type).asByteArray()); + nbtTags.setBoolean("ejecting" + type.ordinal(), ejecting.get(type)); } nbtTags.setBoolean("sideDataStored", true); @@ -237,8 +250,8 @@ public class TileComponentConfig implements ITileComponent for(TransmissionType type : transmissions) { - data.add(sideConfigs.get(type.ordinal())); - data.add(ejecting.get(type.ordinal())); + data.add(sideConfigs.get(type).asByteArray()); + data.add(ejecting.get(type)); } } @@ -247,12 +260,12 @@ public class TileComponentConfig implements ITileComponent public boolean isEjecting(TransmissionType type) { - return ejecting.get(type.ordinal()); + return ejecting.get(type); } public void setEjecting(TransmissionType type, boolean eject) { - ejecting.put(type.ordinal(), eject); + ejecting.put(type, eject); MekanismUtils.saveChunk(tileEntity); } } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 0610c9d72..6d49e2873 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -153,13 +153,18 @@ public class TileComponentEjector implements ITileComponent List outputSides = new ArrayList(); ISideConfiguration configurable = (ISideConfiguration)tileEntity; - for(int i = 0; i < configurable.getConfig().getConfig(type).length; i++) + SideConfig sideConfig = configurable.getConfig().getConfig(type); + ArrayList outputs = configurable.getConfig().getOutputs(type); + + EnumFacing[] facings = MekanismUtils.getBaseOrientations(tileEntity.facing); + + for(int i = 0; i < EnumFacing.VALUES.length; i++) { - EnumFacing side = MekanismUtils.getBaseOrientation(EnumFacing.getFront(i), tileEntity.facing); - - if(configurable.getConfig().getConfig(type)[side.ordinal()] == configurable.getConfig().getOutputs(type).indexOf(data)) + EnumFacing side = facings[i]; + + if(sideConfig.get(side) == outputs.indexOf(data)) { - outputSides.add(EnumFacing.getFront(i)); + outputSides.add(EnumFacing.VALUES[i]); } } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java index fe3ceccd1..2b1a0d75d 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java @@ -60,10 +60,10 @@ public abstract class TileEntityAdvancedElectricMachine outputs = config.getConfig().getOutputs(type); + SideConfig sideConfig = config.getConfig().getConfig(type); + int max = outputs.size() - 1; + int current = outputs.indexOf(outputs.get(sideConfig.get(direction))); if(current < max) { - config.getConfig().getConfig(type)[side] = (byte)(current+1); + sideConfig.set(direction, (byte) (current+1)); } else if(current == max) { - config.getConfig().getConfig(type)[side] = 0; + sideConfig.set(direction, (byte) 0); } - TileEntity tile = (TileEntity)config; - + assert config instanceof TileEntity; + TileEntity tile = (TileEntity) config; tile.markDirty(); } @@ -578,19 +595,21 @@ public final class MekanismUtils */ public static void decrementOutput(ISideConfiguration config, TransmissionType type, EnumFacing direction) { - int side = direction.ordinal(); - int max = config.getConfig().getOutputs(type).size()-1; - int current = config.getConfig().getOutputs(type).indexOf(config.getConfig().getOutputs(type).get(config.getConfig().getConfig(type)[side])); + ArrayList outputs = config.getConfig().getOutputs(type); + SideConfig sideConfig = config.getConfig().getConfig(type); + int max = outputs.size()-1; + int current = outputs.indexOf(outputs.get(sideConfig.get(direction))); if(current > 0) { - config.getConfig().getConfig(type)[side] = (byte)(current-1); + sideConfig.set(direction, (byte)(current - 1)); } else if(current == 0) { - config.getConfig().getConfig(type)[side] = (byte)max; + sideConfig.set(direction, (byte)max); } + assert config instanceof TileEntity; TileEntity tile = (TileEntity)config; tile.markDirty(); }