From 2411a1be4ddfce6f923bd148e39e8839161561ee Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Wed, 8 Nov 2017 14:56:40 +0800 Subject: [PATCH] change ArrayList to a non null list implementation for network data --- src/main/java/mekanism/api/Coord4D.java | 14 +++++++++-- .../mekanism/client/gui/GuiDigitalMiner.java | 13 +++++----- .../client/gui/GuiDigitalMinerConfig.java | 13 +++++----- .../client/gui/GuiElectrolyticSeparator.java | 7 +++--- .../java/mekanism/client/gui/GuiFactory.java | 4 +-- .../client/gui/GuiFormulaicAssemblicator.java | 25 ++++++++++--------- .../java/mekanism/client/gui/GuiGasTank.java | 3 ++- .../client/gui/GuiLaserAmplifier.java | 7 +++--- .../client/gui/GuiLogisticalSorter.java | 11 ++++---- .../client/gui/GuiMetallurgicInfuser.java | 4 +-- .../client/gui/GuiQuantumEntangloporter.java | 9 ++++--- .../client/gui/GuiResistiveHeater.java | 3 ++- .../client/gui/GuiRotaryCondensentrator.java | 3 ++- .../mekanism/client/gui/GuiSecurityDesk.java | 11 ++++---- .../mekanism/client/gui/GuiTeleporter.java | 11 +++----- .../client/gui/element/GuiAmplifierTab.java | 3 ++- .../client/gui/element/GuiSortingTab.java | 3 ++- .../mekanism/common/base/ITileComponent.java | 2 +- .../mekanism/common/base/ITileNetwork.java | 2 +- .../mekanism/common/base/TileNetworkList.java | 23 +++++++++++++++++ .../capabilities/DefaultTileNetwork.java | 5 ++-- .../entangloporter/InventoryFrequency.java | 3 ++- .../content/miner/MItemStackFilter.java | 5 ++-- .../common/content/miner/MMaterialFilter.java | 5 ++-- .../common/content/miner/MModIDFilter.java | 5 ++-- .../common/content/miner/MOreDictFilter.java | 5 ++-- .../common/content/miner/MinerFilter.java | 3 ++- .../content/transporter/TItemStackFilter.java | 5 ++-- .../content/transporter/TMaterialFilter.java | 5 ++-- .../content/transporter/TModIDFilter.java | 5 ++-- .../content/transporter/TOreDictFilter.java | 5 ++-- .../transporter/TransporterFilter.java | 3 ++- .../content/transporter/TransporterStack.java | 3 ++- .../mekanism/common/frequency/Frequency.java | 3 ++- .../common/frequency/FrequencyManager.java | 3 ++- .../multipart/MultipartTileNetworkJoiner.java | 7 +++--- .../mekanism/common/item/ItemBlockBasic.java | 5 ++-- .../common/item/ItemBlockEnergyCube.java | 3 ++- .../common/item/ItemBlockGasTank.java | 3 ++- .../common/item/ItemBlockGlowPanel.java | 3 ++- .../common/item/ItemBlockMachine.java | 3 ++- .../common/item/ItemBlockTransmitter.java | 3 ++- .../common/item/ItemConfigurator.java | 3 ++- .../TileEntityInternalMultiblock.java | 5 ++-- .../network/PacketConfigurationUpdate.java | 5 ++-- .../common/network/PacketDataRequest.java | 3 ++- .../common/network/PacketDigitalMinerGui.java | 3 ++- .../common/network/PacketEditFilter.java | 11 ++++---- .../common/network/PacketNewFilter.java | 11 ++++---- .../network/PacketOredictionificatorGui.java | 3 ++- .../network/PacketPortableTeleporter.java | 5 ++-- .../common/network/PacketTileEntity.java | 5 ++-- .../common/security/SecurityFrequency.java | 3 ++- .../tile/TileEntityAmbientAccumulator.java | 4 +-- .../mekanism/common/tile/TileEntityBin.java | 9 ++++--- .../common/tile/TileEntityBoilerCasing.java | 5 ++-- .../common/tile/TileEntityBoundingBlock.java | 7 +++--- .../common/tile/TileEntityChargepad.java | 5 ++-- .../tile/TileEntityChemicalCrystallizer.java | 5 ++-- .../TileEntityChemicalDissolutionChamber.java | 5 ++-- .../tile/TileEntityChemicalInfuser.java | 4 +-- .../tile/TileEntityChemicalOxidizer.java | 5 ++-- .../common/tile/TileEntityChemicalWasher.java | 4 +-- .../common/tile/TileEntityDigitalMiner.java | 19 +++++++------- .../common/tile/TileEntityDynamicTank.java | 7 +++--- .../common/tile/TileEntityElectricPump.java | 4 +-- .../tile/TileEntityElectrolyticSeparator.java | 4 +-- .../common/tile/TileEntityEnergyCube.java | 7 +++--- .../common/tile/TileEntityFactory.java | 5 ++-- .../common/tile/TileEntityFluidTank.java | 9 ++++--- .../tile/TileEntityFluidicPlenisher.java | 4 +-- .../TileEntityFormulaicAssemblicator.java | 4 +-- .../common/tile/TileEntityFuelwoodHeater.java | 7 +++--- .../common/tile/TileEntityGasTank.java | 7 +++--- .../common/tile/TileEntityGlowPanel.java | 5 ++-- .../tile/TileEntityInductionCasing.java | 5 ++-- .../common/tile/TileEntityInductionCell.java | 5 ++-- .../common/tile/TileEntityInductionPort.java | 5 ++-- .../tile/TileEntityInductionProvider.java | 5 ++-- .../mekanism/common/tile/TileEntityLaser.java | 5 ++-- .../common/tile/TileEntityLaserAmplifier.java | 7 +++--- .../tile/TileEntityLaserTractorBeam.java | 7 +++--- .../tile/TileEntityLogisticalSorter.java | 15 +++++------ .../tile/TileEntityMetallurgicInfuser.java | 5 ++-- .../common/tile/TileEntityMultiblock.java | 7 +++--- .../tile/TileEntityOredictionificator.java | 13 +++++----- .../mekanism/common/tile/TileEntityPRC.java | 4 +-- .../tile/TileEntityQuantumEntangloporter.java | 3 ++- .../tile/TileEntityResistiveHeater.java | 7 +++--- .../tile/TileEntityRotaryCondensentrator.java | 5 ++-- .../common/tile/TileEntitySecurityDesk.java | 4 +-- .../tile/TileEntitySeismicVibrator.java | 7 +++--- .../tile/TileEntitySolarNeutronActivator.java | 7 +++--- .../tile/TileEntitySuperheatingElement.java | 3 ++- .../common/tile/TileEntityTeleporter.java | 5 ++-- ...ileEntityThermalEvaporationController.java | 7 +++--- .../component/TileComponentChunkLoader.java | 4 +-- .../tile/component/TileComponentConfig.java | 3 ++- .../tile/component/TileComponentEjector.java | 3 ++- .../tile/component/TileComponentSecurity.java | 4 +-- .../tile/component/TileComponentUpgrade.java | 6 ++--- .../TileEntityAdvancedElectricMachine.java | 5 ++-- .../tile/prefab/TileEntityBasicBlock.java | 9 ++++--- .../tile/prefab/TileEntityElectricBlock.java | 5 ++-- .../common/tile/prefab/TileEntityMachine.java | 7 +++--- .../prefab/TileEntityOperationalMachine.java | 5 ++-- .../TileEntityDiversionTransporter.java | 9 ++++--- .../TileEntityLogisticalTransporter.java | 9 ++++--- .../transmitter/TileEntityMechanicalPipe.java | 4 +-- .../TileEntityPressurizedTube.java | 4 +-- .../tile/transmitter/TileEntitySidedPipe.java | 5 ++-- .../TileEntityThermodynamicConductor.java | 5 ++-- .../transmitter/TileEntityUniversalCable.java | 4 +-- .../client/gui/GuiIndustrialTurbine.java | 4 +-- .../generators/client/gui/GuiReactorFuel.java | 5 ++-- .../client/gui/GuiReactorLogicAdapter.java | 9 ++++--- .../generators/common/FusionReactor.java | 5 ++-- .../common/tile/TileEntityBioGenerator.java | 5 ++-- .../common/tile/TileEntityGasGenerator.java | 5 ++-- .../common/tile/TileEntityGenerator.java | 7 +++--- .../common/tile/TileEntityHeatGenerator.java | 5 ++-- .../common/tile/TileEntitySolarGenerator.java | 5 ++-- .../common/tile/TileEntityWindGenerator.java | 5 ++-- .../reactor/TileEntityReactorController.java | 5 ++-- .../TileEntityReactorLogicAdapter.java | 5 ++-- .../tile/reactor/TileEntityReactorPort.java | 5 ++-- .../tile/turbine/TileEntityTurbineCasing.java | 5 ++-- .../tile/turbine/TileEntityTurbineRotor.java | 9 ++++--- 128 files changed, 419 insertions(+), 340 deletions(-) create mode 100644 src/main/java/mekanism/common/base/TileNetworkList.java diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index f1cbd7054..1abb3b6c8 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.common.base.TileNetworkList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -141,9 +142,18 @@ public class Coord4D } /** - * Writes this Coord4D's data to an ArrayList for packet transfer. - * @param data - the ArrayList to add the data to + * Writes this Coord4D's data to an TileNetworkList for packet transfer. + * @param data - the TileNetworkList to add the data to */ + public void write(TileNetworkList data) + { + data.add(x); + data.add(y); + data.add(z); + data.add(dimensionId); + } + + @Deprecated//binary compat - use write(TileNetworkData) public void write(ArrayList data) { data.add(x); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index e4a3cbd0d..dcbfdfb4e 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -17,6 +17,7 @@ import mekanism.client.gui.element.GuiVisualsTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.miner.ThreadMinerSearch.State; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; @@ -111,14 +112,14 @@ public class GuiDigitalMiner extends GuiMekanism if(guibutton.id == 0) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } else if(guibutton.id == 1) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(4); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -303,7 +304,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -313,7 +314,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -323,7 +324,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(5); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -333,7 +334,7 @@ public class GuiDigitalMiner extends GuiMekanism { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(9); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 258f2c861..db611200a 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -14,6 +14,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.OreDictCache; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.miner.MItemStackFilter; import mekanism.common.content.miner.MMaterialFilter; import mekanism.common.content.miner.MModIDFilter; @@ -241,7 +242,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 14 && yAxis <= yStart + 20) { // Process up button click - final ArrayList data = new ArrayList<>(); + final TileNetworkList data = new TileNetworkList(); data.add(11); data.add(getFilterIndex() + i); @@ -257,7 +258,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 21 && yAxis <= yStart + 27) { // Process down button click - final ArrayList data = new ArrayList<>(); + final TileNetworkList data = new TileNetworkList(); data.add(12); data.add(getFilterIndex() + i); @@ -322,7 +323,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(xAxis >= 11 && xAxis <= 25 && yAxis >= 141 && yAxis <= 155) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(10); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -692,7 +693,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), 32)); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(6); data.add(toUse); @@ -708,7 +709,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { int toUse = Math.max(0, Math.min(Integer.parseInt(minField.getText()), tileEntity.maxY)); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(7); data.add(toUse); @@ -724,7 +725,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { int toUse = Math.max(tileEntity.minY, Math.min(Integer.parseInt(maxField.getText()), 255)); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(8); data.add(toUse); diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index b5fe5ad88..174883009 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -20,6 +20,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityElectrolyticSeparator; @@ -84,16 +85,14 @@ public class GuiElectrolyticSeparator extends GuiMekanism if(xAxis > 8 && xAxis < 17 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList<>(); - data.add((byte)0); + TileNetworkList data = TileNetworkList.of((byte)0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } else if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList<>(); - data.add((byte)1); + TileNetworkList data = TileNetworkList.of((byte)1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 92d701ab6..dbfb3024b 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -18,6 +18,7 @@ import mekanism.common.Mekanism; import mekanism.common.Tier.FactoryTier; import mekanism.common.base.IFactory.MachineFuelType; import mekanism.common.base.IFactory.RecipeType; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -168,8 +169,7 @@ public class GuiFactory extends GuiMekanism if(!stack.isEmpty() && stack.getItem() instanceof ItemGaugeDropper) { - ArrayList data = new ArrayList<>(); - data.add(1); + TileNetworkList data = TileNetworkList.of(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 39672cb06..43e7d65f4 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -17,6 +17,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -250,8 +251,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(4); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -264,8 +265,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -275,8 +276,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(2); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -285,8 +286,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -299,8 +300,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -309,8 +310,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(xAxis >= 26 && xAxis <= 42 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(5); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 89a07706a..c30c6e3d0 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; @@ -95,7 +96,7 @@ public class GuiGasTank extends GuiMekanism if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index b2f55c585..33b7d0914 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -12,6 +12,7 @@ import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerLaserAmplifier; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLaserAmplifier; @@ -169,7 +170,7 @@ public class GuiLaserAmplifier extends GuiMekanism return; } - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(0); data.add(toUse); @@ -192,7 +193,7 @@ public class GuiLaserAmplifier extends GuiMekanism return; } - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(1); data.add(toUse); @@ -208,7 +209,7 @@ public class GuiLaserAmplifier extends GuiMekanism { int toUse = Math.max(0, Integer.parseInt(timerField.getText())); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(2); data.add(toUse); diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 276c063a3..b81f32d79 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -17,6 +17,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismSounds; import mekanism.common.OreDictCache; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.transporter.TItemStackFilter; import mekanism.common.content.transporter.TMaterialFilter; import mekanism.common.content.transporter.TModIDFilter; @@ -261,7 +262,7 @@ public class GuiLogisticalSorter extends GuiMekanism if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 14 && yAxis <= yStart + 20) { // Process up button click - final ArrayList data = new ArrayList<>(); + final TileNetworkList data = new TileNetworkList(); data.add(3); data.add(getFilterIndex() + i); @@ -277,7 +278,7 @@ public class GuiLogisticalSorter extends GuiMekanism if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 21 && yAxis <= yStart + 27) { // Process down button click - final ArrayList data = new ArrayList<>(); + final TileNetworkList data = new TileNetworkList(); data.add(4); data.add(getFilterIndex() + i); @@ -317,7 +318,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Check for auto eject button if(xAxis >= 12 && xAxis <= 26 && yAxis >= 110 && yAxis <= 124) { - final ArrayList data = new ArrayList<>(); + final TileNetworkList data = new TileNetworkList(); data.add(1); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -327,7 +328,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Check for round robin button if(xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98) { - final ArrayList data = new ArrayList<>(); + final TileNetworkList data = new TileNetworkList(); data.add(2); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -343,7 +344,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Check for default colour button if(xAxis >= 13 && xAxis <= 29 && yAxis >= 137 && yAxis <= 153) { - final ArrayList data = new ArrayList<>(); + final TileNetworkList data = new TileNetworkList(); data.add(0); data.add(mouseBtn); diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 4ebb6dc2e..56f081783 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -20,6 +20,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMetallurgicInfuser; @@ -119,8 +120,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism if(xAxis > 148 && xAxis < 168 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList<>(); - data.add(0); + TileNetworkList data = TileNetworkList.of(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 8810678bd..038f93f2c 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -12,6 +12,7 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.inventory.container.ContainerQuantumEntangloporter; @@ -107,8 +108,8 @@ public class GuiQuantumEntangloporter extends GuiMekanism { return; } - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(0); data.add(freq); data.add(!privateMode); @@ -270,8 +271,8 @@ public class GuiQuantumEntangloporter extends GuiMekanism if(selection != -1) { Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(1); data.add(freq.name); data.add(freq.publicFreq); diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index f81689983..2db5b0c1d 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -14,6 +14,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.inventory.container.ContainerResistiveHeater; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -121,7 +122,7 @@ public class GuiResistiveHeater extends GuiMekanism { int toUse = Integer.parseInt(energyUsageField.getText()); - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(toUse); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index e731eb89d..a3f5e4226 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -19,6 +19,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityRotaryCondensentrator; @@ -153,7 +154,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism if(xAxis >= 4 && xAxis <= 22 && yAxis >= 4 && yAxis <= 22) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index 52d9f3fea..3b6149f66 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -10,6 +10,7 @@ import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiScrollList; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerSecurityDesk; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile.SecurityMode; @@ -86,8 +87,8 @@ public class GuiSecurityDesk extends GuiMekanism { return; } - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(0); data.add(trusted); @@ -154,8 +155,8 @@ public class GuiSecurityDesk extends GuiMekanism trustedField.setText(""); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); if(xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) { @@ -235,7 +236,7 @@ public class GuiSecurityDesk extends GuiMekanism { if(tileEntity != null) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(1); data.add(tileEntity.frequency.trusted.get(selection)); diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 49d4f141c..67a796412 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -19,6 +19,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.inventory.container.ContainerNull; @@ -205,10 +206,7 @@ public class GuiTeleporter extends GuiMekanism if(tileEntity != null) { - ArrayList data = new ArrayList<>(); - data.add(0); - data.add(freq); - data.add(!privateMode); + TileNetworkList data = TileNetworkList.of(0, freq, !privateMode); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } @@ -387,10 +385,7 @@ public class GuiTeleporter extends GuiMekanism if(tileEntity != null) { - ArrayList data = new ArrayList<>(); - data.add(1); - data.add(freq.name); - data.add(freq.publicFreq); + TileNetworkList data = TileNetworkList.of(1, freq.name, freq.publicFreq); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } diff --git a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java index d9e7f7315..985dc8748 100644 --- a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java @@ -6,6 +6,7 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.LangUtils; @@ -78,7 +79,7 @@ public class GuiAmplifierTab extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index 9bc3c33c8..ae80830e8 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -6,6 +6,7 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.LangUtils; @@ -77,7 +78,7 @@ public class GuiSortingTab extends GuiElement { if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index 278703286..b8668e0be 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -16,7 +16,7 @@ public interface ITileComponent void write(NBTTagCompound nbtTags); - void write(ArrayList data); + void write(TileNetworkList data); void invalidate(); } diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index 32c9a62ca..b5f6fd249 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -22,5 +22,5 @@ public interface ITileNetwork * @param data - list of data * @return ArrayList of network data */ - ArrayList getNetworkedData(ArrayList data); + TileNetworkList getNetworkedData(TileNetworkList data); } diff --git a/src/main/java/mekanism/common/base/TileNetworkList.java b/src/main/java/mekanism/common/base/TileNetworkList.java new file mode 100644 index 000000000..10989055e --- /dev/null +++ b/src/main/java/mekanism/common/base/TileNetworkList.java @@ -0,0 +1,23 @@ +package mekanism.common.base; + +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class TileNetworkList extends NonNullList +{ + public TileNetworkList(){ + super(new ArrayList<>(), null); + } + + public TileNetworkList(@Nonnull List contents){ + super(contents, null); + } + + public static TileNetworkList of(@Nonnull Object... contents){ + return new TileNetworkList(Arrays.asList(contents)); + } +} diff --git a/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java index 5cc824043..3fec15030 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java +++ b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java @@ -2,9 +2,8 @@ package mekanism.common.capabilities; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraftforge.common.capabilities.CapabilityManager; @@ -14,7 +13,7 @@ public class DefaultTileNetwork implements ITileNetwork public void handlePacketData(ByteBuf dataStream) throws Exception {} @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { return data; } diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 15bdd3c45..08b958744 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -9,6 +9,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.PacketHandler; import mekanism.common.Tier; +import mekanism.common.base.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.util.InventoryUtils; import net.minecraft.item.ItemStack; @@ -124,7 +125,7 @@ public class InventoryFrequency extends Frequency } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { super.write(data); diff --git a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java index b9c9913a6..78b26a976 100644 --- a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java +++ b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java @@ -2,8 +2,7 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - +import mekanism.common.base.TileNetworkList; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.Item; @@ -61,7 +60,7 @@ public class MItemStackFilter extends MinerFilter } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(0); diff --git a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java index 92cf312a3..758c82139 100644 --- a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java +++ b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java @@ -2,8 +2,7 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - +import mekanism.common.base.TileNetworkList; import mekanism.common.content.transporter.Finder.MaterialFinder; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -54,7 +53,7 @@ public class MMaterialFilter extends MinerFilter } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(2); diff --git a/src/main/java/mekanism/common/content/miner/MModIDFilter.java b/src/main/java/mekanism/common/content/miner/MModIDFilter.java index b05302b5c..63a74c26c 100644 --- a/src/main/java/mekanism/common/content/miner/MModIDFilter.java +++ b/src/main/java/mekanism/common/content/miner/MModIDFilter.java @@ -2,9 +2,8 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.transporter.Finder.ModIDFinder; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -45,7 +44,7 @@ public class MModIDFilter extends MinerFilter } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(3); diff --git a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java index 770597ca7..835e5c9ff 100644 --- a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java +++ b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java @@ -2,9 +2,8 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.transporter.Finder.OreDictFinder; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -45,7 +44,7 @@ public class MOreDictFilter extends MinerFilter } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(1); diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index c7c265923..9aad2f8ac 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.common.base.TileNetworkList; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.Item; @@ -40,7 +41,7 @@ public abstract class MinerFilter } } - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(requireStack); diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index 6ff03ecdc..1b3543967 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -2,8 +2,7 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - +import mekanism.common.base.TileNetworkList; import mekanism.common.content.transporter.Finder.ItemStackFinder; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -81,7 +80,7 @@ public class TItemStackFilter extends TransporterFilter } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(0); diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index c581023d8..4ce715c85 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -2,8 +2,7 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - +import mekanism.common.base.TileNetworkList; import mekanism.common.content.transporter.Finder.MaterialFinder; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -58,7 +57,7 @@ public class TMaterialFilter extends TransporterFilter } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(2); diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index 1c8e23e55..d8f8d7228 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -2,9 +2,8 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.transporter.Finder.ModIDFinder; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -48,7 +47,7 @@ public class TModIDFilter extends TransporterFilter } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(3); diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index 59a3272fe..0ba34f9a5 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -2,9 +2,8 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.transporter.Finder.OreDictFinder; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -48,7 +47,7 @@ public class TOreDictFilter extends TransporterFilter } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(1); diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index c30eb9405..813733bfd 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -7,6 +7,7 @@ import java.util.Arrays; import java.util.List; import mekanism.api.EnumColor; +import mekanism.common.base.TileNetworkList; import mekanism.common.util.TransporterUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -50,7 +51,7 @@ public abstract class TransporterFilter } } - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(allowDefault); diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 4c3434138..1393ba4c4 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.PacketHandler; import mekanism.common.base.ILogisticalTransporter; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransitRequest.TransitResponse; import mekanism.common.content.transporter.TransporterPathfinder.Destination; @@ -45,7 +46,7 @@ public class TransporterStack public Path pathType; - public void write(ILogisticalTransporter transporter, ArrayList data) + public void write(ILogisticalTransporter transporter, TileNetworkList data) { if(color != null) { diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index e0fffad5d..96a54aede 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -9,6 +9,7 @@ import java.util.UUID; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; @@ -116,7 +117,7 @@ public class Frequency publicFreq = nbtTags.getBoolean("publicFreq"); } - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(name); data.add(ownerUUID.toString()); diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index 1140e290c..c20603321 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -12,6 +12,7 @@ import java.util.Set; import java.util.UUID; import mekanism.api.Coord4D; +import mekanism.common.base.TileNetworkList; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; @@ -238,7 +239,7 @@ public class FrequencyManager } } - public void writeFrequencies(ArrayList data) + public void writeFrequencies(TileNetworkList data) { data.add(frequencies.size()); diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java index a7f9c298d..fe2455c12 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -12,6 +12,7 @@ import mcmultipart.api.slot.EnumFaceSlot; import mcmultipart.api.slot.IPartSlot; import mcmultipart.api.world.IMultipartBlockAccess; import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -91,9 +92,9 @@ public class MultipartTileNetworkJoiner implements ITileNetwork } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { - ArrayList childData = new ArrayList<>(); + TileNetworkList childData = new TileNetworkList(); for(byte slotValue : tileSideMap.keySet()) { tileSideMap.get(slotValue).getNetworkedData(childData); @@ -111,7 +112,7 @@ public class MultipartTileNetworkJoiner implements ITileNetwork * @param data The network data list * @param facing The side this part is attached to or null for the center slot */ - public static void addMultipartHeader(TileEntity entity, ArrayList data, EnumFacing facing) + public static void addMultipartHeader(TileEntity entity, TileNetworkList data, EnumFacing facing) { int tileNetworkParts = 0; IMultipartContainer container = MultipartMekanism.getContainer(entity.getWorld(), entity.getPos()); diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 151d9bf79..ee69a0f91 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -17,6 +17,7 @@ import mekanism.common.Tier.BinTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.base.ITierItem; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -258,7 +259,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } } else if(type == BasicBlockType.INDUCTION_PROVIDER) @@ -268,7 +269,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index abca3ffcb..c164a97df 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -22,6 +22,7 @@ import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.MekanismHooks; @@ -164,7 +165,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index a6314a879..903a8738c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -20,6 +20,7 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; @@ -122,7 +123,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index 921227e85..e0dd8ed7b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -6,6 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGlowPanel; import mekanism.common.util.LangUtils; @@ -60,7 +61,7 @@ public class ItemBlockGlowPanel extends ItemBlock if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index a39c0eacd..dbf1e757c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -32,6 +32,7 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; @@ -409,7 +410,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec factory.setRecipeType(recipeType); world.notifyNeighborsOfStateChange(pos, tileEntity.getBlockType(), true); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } if(tileEntity instanceof ISustainedTank) diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java index 4a5231609..3ba63511a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -13,6 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.base.ITierItem; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.transmitter.TileEntitySidedPipe; @@ -62,7 +63,7 @@ public class ItemBlockTransmitter extends ItemBlock implements ITierItem if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 1cecfe3b3..40642719e 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -17,6 +17,7 @@ import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.base.IItemNetwork; import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.MekanismHooks; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -111,7 +112,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool if(config instanceof TileEntityBasicBlock) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } } else { diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java index 6b1f1465e..952527ffc 100644 --- a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -2,9 +2,8 @@ package mekanism.common.multiblock; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -33,7 +32,7 @@ public class TileEntityInternalMultiblock extends TileEntityBasicBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 80efa6a91..000338f8b 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -11,6 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -62,7 +63,7 @@ public class PacketConfigurationUpdate implements IMessageHandler())), new Range4D(message.coord4D)); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(message.coord4D, network.getNetworkedData(new TileNetworkList())), new Range4D(message.coord4D)); } else if(message.packetType == ConfigurationPacket.EJECT_COLOR) { @@ -103,7 +104,7 @@ public class PacketConfigurationUpdate implements IMessageHandler())), (EntityPlayerMP)p); + Mekanism.packetHandler.sendTo(new TileEntityMessage(message.coord4D, network.getNetworkedData(new TileNetworkList())), (EntityPlayerMP)p); } } }, player); diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index f53545057..75139ef7c 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -9,6 +9,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -58,7 +59,7 @@ public class PacketDataRequest implements IMessageHandler())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), network.getNetworkedData(new TileNetworkList())), (EntityPlayerMP)player); } } }, player); diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 0b778c06b..2ccf4f761 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -14,6 +14,7 @@ import mekanism.client.gui.GuiMModIDFilter; import mekanism.client.gui.GuiMOreDictFilter; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; @@ -160,7 +161,7 @@ public class PacketDigitalMinerGui implements IMessageHandler())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(obj, tile.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)player); } } } diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index bf8544dd3..6de39d048 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.miner.MinerFilter; import mekanism.common.content.transporter.TransporterFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; @@ -54,7 +55,7 @@ public class PacketEditFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(sorter), sorter.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); } } else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) @@ -77,7 +78,7 @@ public class PacketEditFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(miner), miner.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); } } else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) @@ -100,7 +101,7 @@ public class PacketEditFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(oredictionificator), oredictionificator.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); } } } @@ -176,8 +177,8 @@ public class PacketEditFilter implements IMessageHandler data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); if(type == 0) { diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 246ae4627..ecfafcf12 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.miner.MinerFilter; import mekanism.common.content.transporter.TransporterFilter; import mekanism.common.network.PacketNewFilter.NewFilterMessage; @@ -42,7 +43,7 @@ public class PacketNewFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(sorter), sorter.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); } } else if(message.type == 1 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) @@ -53,7 +54,7 @@ public class PacketNewFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(miner), miner.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); } } else if(message.type == 2 && message.coord4D.getTileEntity(worldServer) instanceof TileEntityOredictionificator) @@ -64,7 +65,7 @@ public class PacketNewFilter implements IMessageHandler())), (EntityPlayerMP)iterPlayer); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(oredictionificator), oredictionificator.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)iterPlayer); } } } @@ -114,8 +115,8 @@ public class PacketNewFilter implements IMessageHandler data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); if(type == 0) { diff --git a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java index 2cb6727cc..856600590 100644 --- a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java +++ b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java @@ -9,6 +9,7 @@ import mekanism.client.gui.GuiOredictionificator; import mekanism.client.gui.GuiOredictionificatorFilter; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.network.PacketOredictionificatorGui.OredictionificatorGuiMessage; @@ -143,7 +144,7 @@ public class PacketOredictionificatorGui implements IMessageHandler())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(obj, tile.getFilterPacket(new TileNetworkList())), (EntityPlayerMP)player); } } } diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index ed9cf120d..d28789e32 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.item.ItemPortableTeleporter; @@ -301,8 +302,8 @@ public class PacketPortableTeleporter implements IMessageHandler data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(publicCache.size()); for(Frequency freq : publicCache) diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index cfe99f918..cda6b7c26 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CapabilityUtils; @@ -56,13 +57,13 @@ public class PacketTileEntity implements IMessageHandler parameters; + public TileNetworkList parameters; public ByteBuf storedBuffer = null; public TileEntityMessage() {} - public TileEntityMessage(Coord4D coord, ArrayList params) + public TileEntityMessage(Coord4D coord, TileNetworkList params) { coord4D = coord; parameters = params; diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java index 8592a09e0..dad821ceb 100644 --- a/src/main/java/mekanism/common/security/SecurityFrequency.java +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -7,6 +7,7 @@ import java.util.UUID; import mekanism.common.HashList; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.security.ISecurityTile.SecurityMode; import net.minecraft.nbt.NBTTagCompound; @@ -86,7 +87,7 @@ public class SecurityFrequency extends Frequency } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { super.write(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java index b5b6205ad..4f67e6923 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java +++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Random; import mekanism.api.gas.Gas; @@ -10,6 +9,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; +import mekanism.common.base.TileNetworkList; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.IntegerInput; import mekanism.common.recipe.machines.AmbientGasRecipe; @@ -84,7 +84,7 @@ public class TileEntityAmbientAccumulator extends TileEntityContainerBlock imple } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { if(collectedGas.getGasType() != null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 164de9f55..8d7e437e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -14,6 +14,7 @@ import mekanism.common.Tier.BinTier; import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.ITierUpgradeable; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransitRequest; import mekanism.common.content.transporter.TransitRequest.TransitResponse; @@ -84,7 +85,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento tier = BinTier.values()[upgradeTier.ordinal()]; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); markDirty(); return true; @@ -333,7 +334,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -465,7 +466,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento if(!world.isRemote) { MekanismUtils.saveChunk(this); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); prevCount = getItemCount(); sortStacks(); } @@ -610,7 +611,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento if(clientActive != active) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); clientActive = active; } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 7a84436e3..9d1f386e7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -11,6 +11,7 @@ import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.boiler.BoilerCache; import mekanism.common.content.boiler.BoilerUpdateProtocol; @@ -179,7 +180,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); player.openGui(Mekanism.instance, 54, world, getPos().getX(), getPos().getY(), getPos().getZ()); return true; @@ -213,7 +214,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 49e9c8abd..a2987caf9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -35,7 +36,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork { mainPos = pos; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -71,7 +72,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork } prevPower = power; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } } @@ -115,7 +116,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data.add(mainPos.getX()); data.add(mainPos.getY()); diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index ca3756d46..34ccfd85b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -14,6 +14,7 @@ import mekanism.api.Range4D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; @@ -187,7 +188,7 @@ public class TileEntityChargepad extends TileEntityNoisyBlock if(clientActive != active) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } clientActive = active; @@ -229,7 +230,7 @@ public class TileEntityChargepad extends TileEntityNoisyBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); data.add(isActive); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 278936cba..e042b7150 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess; import mekanism.api.gas.Gas; @@ -18,6 +16,7 @@ import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; @@ -170,7 +169,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityOperationalMachine } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 211770d34..c91841d77 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -15,6 +13,7 @@ import mekanism.common.MekanismFluids; import mekanism.common.Upgrade; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; @@ -242,7 +241,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityMachine impl } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 140f34e82..45bf0ac33 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.List; import mekanism.api.gas.Gas; @@ -18,6 +17,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; @@ -202,7 +202,7 @@ public class TileEntityChemicalInfuser extends TileEntityMachine implements IGas } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 76335b93f..a250b5825 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -11,6 +9,7 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; @@ -190,7 +189,7 @@ public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine imp } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 5cd5f7e78..29c5ddf30 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.List; import mekanism.api.gas.Gas; @@ -19,6 +18,7 @@ import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; @@ -210,7 +210,7 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index ae0bc6f94..9712cfe26 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -23,6 +23,7 @@ import mekanism.common.base.IAdvancedBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.chunkloading.IChunkLoader; @@ -330,7 +331,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getSmallPacket(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getSmallPacket(new TileNetworkList())), (EntityPlayerMP)player); } } @@ -645,7 +646,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(!world.isRemote) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), (EntityPlayerMP)player); } } @@ -789,7 +790,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP)player); } return; @@ -893,7 +894,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -941,7 +942,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return data; } - public ArrayList getSmallPacket(ArrayList data) + public TileNetworkList getSmallPacket(TileNetworkList data) { super.getNetworkedData(data); @@ -971,7 +972,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return data; } - public ArrayList getGenericPacket(ArrayList data) + public TileNetworkList getGenericPacket(TileNetworkList data) { super.getNetworkedData(data); @@ -1012,7 +1013,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return data; } - public ArrayList getFilterPacket(ArrayList data) + public TileNetworkList getFilterPacket(TileNetworkList data) { super.getNetworkedData(data); @@ -1093,7 +1094,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(clientActive != active) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); clientActive = active; } @@ -1414,7 +1415,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP)player); } return null; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 8c47018ed..388158005 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -11,6 +11,7 @@ import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IFluidContainerManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.BlockBasic; import mekanism.common.content.tank.SynchronizedTankData; import mekanism.common.content.tank.SynchronizedTankData.ValveData; @@ -133,7 +134,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -144,7 +145,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); player.openGui(Mekanism.instance, 18, world, getPos().getX(), getPos().getY(), getPos().getZ()); } else { @@ -183,7 +184,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 0a6c97cb3..a8d830705 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -20,6 +19,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.usage; @@ -290,7 +290,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 35dc0740d..c35791a40 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.List; import mekanism.api.gas.Gas; @@ -19,6 +18,7 @@ import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.computer.IComputerIntegration; @@ -359,7 +359,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 2d4b9c181..0fda9d2be 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -16,6 +16,7 @@ import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITierUpgradeable; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -99,7 +100,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo if(newScale != prevScale) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } prevScale = newScale; @@ -116,7 +117,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo tier = EnergyCubeTier.values()[upgradeTier.ordinal()]; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); markDirty(); return true; @@ -245,7 +246,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 71a1ae61d..757311b47 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -33,6 +33,7 @@ import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITierUpgradeable; import mekanism.common.base.SoundWrapper; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; @@ -232,7 +233,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt factory.upgraded = true; factory.markDirty(); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(factory), factory.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(factory))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(factory), factory.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(factory))); return true; } @@ -825,7 +826,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 7f0aef24a..389c19a94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -18,6 +18,7 @@ import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.base.ITierUpgradeable; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -97,7 +98,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc tier = FluidTankTier.values()[upgradeTier.ordinal()]; fluidTank.setCapacity(tier.storage); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); markDirty(); return true; @@ -182,7 +183,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if(needsPacket) { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(50)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), Coord4D.get(this).getTargetPoint(50)); } needsPacket = false; @@ -405,7 +406,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -439,7 +440,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index a07c5dd8f..fe377ee68 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; import java.util.LinkedHashSet; @@ -17,6 +16,7 @@ import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; @@ -246,7 +246,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 664e5acbf..a8e091361 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; @@ -14,6 +13,7 @@ import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; @@ -714,7 +714,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 9f8a2202e..eebd42d9c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -9,6 +9,7 @@ import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -76,7 +77,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement if(updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -168,7 +169,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -201,7 +202,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 472576b6a..125b1f5fb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -22,6 +22,7 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITierUpgradeable; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -169,7 +170,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH tier = GasTankTier.values()[upgradeTier.ordinal()]; gasTank.setMaxGas(tier.storage); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); markDirty(); return true; @@ -285,7 +286,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), (EntityPlayerMP)player); } return; @@ -344,7 +345,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java index 74961a3ad..54d8f25ad 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java +++ b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java @@ -2,12 +2,11 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.capabilities.Capabilities; @@ -45,7 +44,7 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { if(Mekanism.hooks.MCMPLoaded) { diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 5cfd1bcaa..35a4178c7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.matrix.MatrixCache; import mekanism.common.content.matrix.MatrixUpdateProtocol; @@ -67,7 +68,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); player.openGui(Mekanism.instance, 49, world, getPos().getX(), getPos().getY(), getPos().getZ()); return true; @@ -77,7 +78,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index ee977e22c..010f8316c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -2,10 +2,9 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Tier.InductionCellTier; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.LangUtils; @@ -49,7 +48,7 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data.add(tier.ordinal()); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 0d7976269..a5c8a9f40 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -18,6 +18,7 @@ import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IEnergyWrapper; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; import mekanism.common.config.MekanismConfig.general; @@ -163,7 +164,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -461,7 +462,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement String modeText = " " + (mode ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils.transOutputInput(mode) + "."; player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.inductionPortMode") + modeText)); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); markDirty(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java index bc6b782c5..162e21fce 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java @@ -2,9 +2,8 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.Tier.InductionProviderTier; +import mekanism.common.base.TileNetworkList; import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -41,7 +40,7 @@ public class TileEntityInductionProvider extends TileEntityBasicBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 764c5c486..a325037dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -10,6 +10,7 @@ import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -129,7 +130,7 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat if(clientActive != active) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); clientActive = active; } } @@ -153,7 +154,7 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 2754fb35f..7f6b2eff1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -12,6 +12,7 @@ import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.computer.IComputerIntegration; @@ -131,7 +132,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { on = true; lastFired = firing; - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(50D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), Coord4D.get(this).getTargetPoint(50D)); } LaserInfo info = LaserManager.fireLaser(this, facing, firing, world); @@ -169,7 +170,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { on = false; diggingProgress = 0; - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(50D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), Coord4D.get(this).getTargetPoint(50D)); } if(outputMode != RedstoneOutput.ENTITY_DETECTION) @@ -244,7 +245,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index b13b6cf35..033d926cc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -10,6 +10,7 @@ import mekanism.api.lasers.ILaserReceptor; import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -105,7 +106,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme { on = true; lastFired = firing; - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(50D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), Coord4D.get(this).getTargetPoint(50D)); } LaserInfo info = LaserManager.fireLaser(this, facing, firing, world); @@ -142,7 +143,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme { on = false; diggingProgress = 0; - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(50D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), Coord4D.get(this).getTargetPoint(50D)); } } } @@ -208,7 +209,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 0fc7981f8..9b1422ee6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -16,6 +16,7 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.client; @@ -168,7 +169,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP)player); } } } @@ -371,7 +372,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -401,7 +402,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen return data; } - public ArrayList getGenericPacket(ArrayList data) + public TileNetworkList getGenericPacket(TileNetworkList data) { super.getNetworkedData(data); @@ -425,7 +426,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } - public ArrayList getFilterPacket(ArrayList data) + public TileNetworkList getFilterPacket(TileNetworkList data) { super.getNetworkedData(data); @@ -493,7 +494,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -522,7 +523,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(clientActive != active) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); if(active && client.enableMachineSounds) { @@ -829,7 +830,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP)player); } return null; diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index e13bf5c89..83e670688 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess; import mekanism.api.infuse.InfuseObject; @@ -19,6 +17,7 @@ import mekanism.common.Upgrade; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITierUpgradeable; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; @@ -338,7 +337,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index f2c0c5b38..f3753fffd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.multiblock.IMultiblock; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; @@ -121,7 +122,7 @@ public abstract class TileEntityMultiblock> extend } } - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } prevStructure = structure != null; @@ -164,7 +165,7 @@ public abstract class TileEntityMultiblock> extend if(tileEntity != null && tileEntity.isRendering) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); } } } @@ -179,7 +180,7 @@ public abstract class TileEntityMultiblock> extend public abstract MultiblockManager getManager(); @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 3626a7608..c2f249ddb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -15,6 +15,7 @@ import mekanism.common.OreDictCache; import mekanism.common.PacketHandler; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -67,7 +68,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP)player); } } @@ -270,7 +271,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -289,7 +290,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple return data; } - public ArrayList getGenericPacket(ArrayList data) + public TileNetworkList getGenericPacket(TileNetworkList data) { super.getNetworkedData(data); @@ -302,7 +303,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } - public ArrayList getFilterPacket(ArrayList data) + public TileNetworkList getFilterPacket(TileNetworkList data) { super.getNetworkedData(data); @@ -323,7 +324,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { if(!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -463,7 +464,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple index = nbtTags.getInteger("index"); } - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(filter); data.add(index); diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index fbfa264de..03a534ccf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -2,7 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Map; import mekanism.api.EnumColor; @@ -20,6 +19,7 @@ import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; @@ -212,7 +212,7 @@ public class TileEntityPRC extends TileEntityBasicMachine getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 0959d7440..0658f2ccc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -24,6 +24,7 @@ import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.config.MekanismConfig.general; @@ -373,7 +374,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 97253fac6..accfccf00 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -9,6 +9,7 @@ import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; @@ -118,7 +119,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I if(packet) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } } @@ -201,7 +202,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -299,7 +300,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index c65b5f543..e7476880a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -19,6 +19,7 @@ import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; @@ -197,7 +198,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), (EntityPlayerMP)player); } return; @@ -229,7 +230,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index 9d34fe175..3bbf97a9a 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -2,13 +2,13 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.UUID; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IBoundingBlock; +import mekanism.common.base.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.network.PacketSecurityUpdate.SecurityPacket; @@ -254,7 +254,7 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index a6d70beee..81574627b 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -10,6 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.usage; @@ -79,7 +80,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement if(updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -152,7 +153,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -169,7 +170,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 1671ee8c9..caae95c06 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -22,6 +22,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -99,7 +100,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im if(updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -215,7 +216,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -401,7 +402,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); updateDelay = 10; clientActive = active; diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index 7914dadad..03b0bf063 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.multiblock.TileEntityInternalMultiblock; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -40,7 +41,7 @@ public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock if(packet && !world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 6cc54ce88..ae6d373fa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -17,6 +17,7 @@ import mekanism.common.PacketHandler; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.frequency.Frequency; @@ -142,7 +143,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo if(shouldRender != prevShouldRender) { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(40D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), Coord4D.get(this).getTargetPoint(40D)); } prevShouldRender = shouldRender; @@ -636,7 +637,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index f2e9a98f4..691e796bf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -13,6 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IActiveState; import mekanism.common.base.ITankManager; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.content.tank.TankUpdateProtocol; @@ -148,7 +149,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { if(Math.abs((float)inputTank.getFluidAmount()/inputTank.getCapacity()-prevScale) > 0.01) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); prevScale = (float)inputTank.getFluidAmount()/inputTank.getCapacity(); } } @@ -197,7 +198,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva if(structured != clientStructured) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); clientStructured = structured; } @@ -602,7 +603,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java index 08bed654e..32de7f5ce 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java @@ -2,7 +2,6 @@ package mekanism.common.tile.component; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -11,6 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.config.MekanismConfig.general; import mekanism.common.tile.prefab.TileEntityContainerBlock; @@ -188,7 +188,7 @@ public class TileComponentChunkLoader implements ITileComponent } @Override - public void write(ArrayList data) {} + public void write(TileNetworkList data) {} @Override public void invalidate() diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 5e8e65a9b..6366ebde9 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -13,6 +13,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; import mekanism.common.SideData.IOState; import mekanism.common.base.ITileComponent; +import mekanism.common.base.TileNetworkList; import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -244,7 +245,7 @@ public class TileComponentConfig implements ITileComponent } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(transmissions.size()); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 9d29e5b62..d3a87b609 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -16,6 +16,7 @@ import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.ITileComponent; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransitRequest; import mekanism.common.content.transporter.TransitRequest.TransitResponse; @@ -362,7 +363,7 @@ public class TileComponentEjector implements ITileComponent } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(strictInput); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java index b7608fc41..53d7e9ec7 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -2,13 +2,13 @@ package mekanism.common.tile.component; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.UUID; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ITileComponent; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; @@ -205,7 +205,7 @@ public class TileComponentSecurity implements ITileComponent } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(securityMode.ordinal()); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index d847d318e..ca7b4b1b1 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -2,7 +2,6 @@ package mekanism.common.tile.component; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -14,6 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeItem; +import mekanism.common.base.TileNetworkList; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.nbt.NBTTagCompound; @@ -78,7 +78,7 @@ public class TileComponentUpgrade implements ITileComponent tileEntity.inventory.get(upgradeSlot).shrink(1); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); tileEntity.markDirty(); } } @@ -193,7 +193,7 @@ public class TileComponentUpgrade implements ITileComponent } @Override - public void write(ArrayList data) + public void write(TileNetworkList data) { data.add(upgrades.size()); diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java index 2b1a0d75d..19cabdc2d 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java @@ -2,8 +2,6 @@ package mekanism.common.tile.prefab; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -18,6 +16,7 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.Upgrade; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ITierUpgradeable; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.AdvancedMachineInput; @@ -337,7 +336,7 @@ public abstract class TileEntityAdvancedElectricMachine getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java index 80a59db6d..037333ff5 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java @@ -12,6 +12,7 @@ import mekanism.common.Mekanism; import mekanism.common.base.IChunkLoadHandler; import mekanism.common.base.ITileComponent; import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; @@ -84,7 +85,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe { for(EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), (EntityPlayerMP)player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), (EntityPlayerMP)player); } } } @@ -140,7 +141,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data.add(facing == null ? -1 : facing.ordinal()); data.add(redstone); @@ -241,7 +242,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe if(!(facing == clientFacing || world.isRemote)) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); markDirty(); clientFacing = facing; } @@ -284,7 +285,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe if(redstone != power) { redstone = power; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); onPowerChange(); } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index b98343287..b81d331aa 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -9,9 +9,8 @@ import ic2.api.energy.tile.IEnergyEmitter; import ic2.api.energy.tile.IEnergyTile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.base.IEnergyWrapper; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; import mekanism.common.config.MekanismConfig.general; @@ -151,7 +150,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java index 659108639..1cf4a854b 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java @@ -10,6 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IUpgradeTile; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; @@ -73,7 +74,7 @@ public abstract class TileEntityMachine extends TileEntityNoisyBlock implements if(updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } } @@ -92,7 +93,7 @@ public abstract class TileEntityMachine extends TileEntityNoisyBlock implements if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); updateDelay = 10; clientActive = active; @@ -139,7 +140,7 @@ public abstract class TileEntityMachine extends TileEntityNoisyBlock implements } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java index 28690a360..210c16360 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java @@ -2,9 +2,8 @@ package mekanism.common.tile.prefab; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.Upgrade; +import mekanism.common.base.TileNetworkList; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -42,7 +41,7 @@ public class TileEntityOperationalMachine extends TileEntityMachine } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java index e6586863d..2a13da372 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -73,7 +74,7 @@ public class TileEntityDiversionTransporter extends TileEntityLogisticalTranspor } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data = super.getNetworkedData(data); @@ -88,9 +89,9 @@ public class TileEntityDiversionTransporter extends TileEntityLogisticalTranspor } @Override - public ArrayList getSyncPacket(TransporterStack stack, boolean kill) + public TileNetworkList getSyncPacket(TransporterStack stack, boolean kill) { - ArrayList data = super.getSyncPacket(stack, kill); + TileNetworkList data = super.getSyncPacket(stack, kill); data.add(modes[0]); data.add(modes[1]); @@ -127,7 +128,7 @@ public class TileEntityDiversionTransporter extends TileEntityLogisticalTranspor notifyTileChange(); player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); Coord4D coord = new Coord4D(getPos(), getWorld()); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new ArrayList<>())), new Range4D(coord)); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new TileNetworkList())), new Range4D(coord)); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index 6af5ee0c2..d584bfd65 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -14,6 +14,7 @@ import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TransporterTier; import mekanism.common.base.ILogisticalTransporter; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; @@ -243,7 +244,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data.add(0); @@ -269,9 +270,9 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter getSyncPacket(TransporterStack stack, boolean kill) + public TileNetworkList getSyncPacket(TransporterStack stack, boolean kill) { - ArrayList data = new ArrayList<>(); + TileNetworkList data = new TileNetworkList(); if(Mekanism.hooks.MCMPLoaded) { @@ -350,7 +351,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter())), new Range4D(new Coord4D(getPos(), getWorld()))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(new Coord4D(getPos(), getWorld()), getNetworkedData(new TileNetworkList())), new Range4D(new Coord4D(getPos(), getWorld()))); player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleColor") + ": " + (getTransmitter().getColor() != null ? getTransmitter().getColor().getColoredName() : EnumColor.BLACK + LangUtils.localize("gui.none")))); return EnumActionResult.SUCCESS; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index 43c8ac291..6e2efd5b9 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -2,7 +2,6 @@ package mekanism.common.tile.transmitter; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Collection; import mekanism.api.transmitters.TransmissionType; @@ -11,6 +10,7 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.PipeTier; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.CapabilityWrapperManager; import mekanism.common.transmitters.grid.FluidNetwork; @@ -320,7 +320,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data.add(tier.ordinal()); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java index 1b25eb575..e38c70d48 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java @@ -2,7 +2,6 @@ package mekanism.common.tile.transmitter; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Collection; import mekanism.api.gas.Gas; @@ -13,6 +12,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TubeTier; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.grid.GasNetwork; @@ -303,7 +303,7 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data.add(tier.ordinal()); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index a87d4f63c..94a6cea25 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -16,6 +16,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.base.ITileNetwork; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.BlockTransmitter; import mekanism.common.block.property.PropertyConnection; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; @@ -106,7 +107,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet if(sendDesc) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); sendDesc = false; } } @@ -372,7 +373,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { if(Mekanism.hooks.MCMPLoaded) { diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java index 425447183..f3ca64f50 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java @@ -14,6 +14,7 @@ import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.ConductorTier; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -122,7 +123,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter())), new Range4D(coord)); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new TileNetworkList())), new Range4D(coord)); } @Override @@ -149,7 +150,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data.add(tier.ordinal()); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index 64d1efa49..d85556666 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -7,7 +7,6 @@ import ic2.api.energy.tile.IEnergySource; import ic2.api.energy.tile.IEnergyTile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -19,6 +18,7 @@ import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.CableTier; import mekanism.common.base.EnergyAcceptorWrapper; +import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; @@ -407,7 +407,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { data.add(tier.ordinal()); diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 894e8b7b0..20bd996cb 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -13,6 +13,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.inventory.container.ContainerFilter; @@ -178,8 +179,7 @@ public class GuiIndustrialTurbine extends GuiMekanism if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { - ArrayList data = new ArrayList<>(); - data.add((byte)0); + TileNetworkList data = TileNetworkList.of((byte)0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index ef8560c23..ebd585745 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -161,8 +162,8 @@ public class GuiReactorFuel extends GuiMekanism { int toUse = Math.max(0, Integer.parseInt(injectionRateField.getText())); toUse -= toUse%2; - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(0); data.add(toUse); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index f30feb88d..086ec2cab 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -9,6 +9,7 @@ import mekanism.client.gui.GuiMekanism; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.base.TileNetworkList; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; @@ -123,8 +124,8 @@ public class GuiReactorLogicAdapter extends GuiMekanism if(xAxis >= 23 && xAxis <= 34 && yAxis >= 19 && yAxis <= 30) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(0); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); @@ -139,8 +140,8 @@ public class GuiReactorLogicAdapter extends GuiMekanism if(type != tileEntity.logicType) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); - - ArrayList data = new ArrayList<>(); + + TileNetworkList data = new TileNetworkList(); data.add(1); data.add(type.ordinal()); diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index e2e451724..e1410c4ba 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -15,6 +15,7 @@ import mekanism.api.gas.GasTank; import mekanism.common.LaserManager; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; @@ -312,7 +313,7 @@ public class FusionReactor if(!controller.getWorld().isRemote) { - Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList<>())), controller.getWorld().provider.getDimension()); + Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new TileNetworkList())), controller.getWorld().provider.getDimension()); } } @@ -349,7 +350,7 @@ public class FusionReactor if(!controller.getWorld().isRemote) { - Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList<>())), controller.getWorld().provider.getDimension()); + Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new TileNetworkList())), controller.getWorld().provider.getDimension()); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 08fd9bb8c..b5a643fae 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -2,13 +2,12 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.common.FluidSlot; import mekanism.common.MekanismItems; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.ItemDataUtils; @@ -199,7 +198,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); data.add(bioFuelSlot.fluidStored); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 983fb473a..f24b32e03 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -2,8 +2,6 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -14,6 +12,7 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.FuelHandler; import mekanism.common.FuelHandler.FuelGas; import mekanism.common.base.ISustainedData; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ChargeUtils; @@ -258,7 +257,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 17676753f..c3944145c 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -11,6 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IHasSound; import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -86,7 +87,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement if(updateDelay == 0 && clientActive != isActive) { clientActive = isActive; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -145,7 +146,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement if(clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); updateDelay = general.UPDATE_DELAY; clientActive = active; @@ -178,7 +179,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 35cd304e7..c2f98a112 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -2,13 +2,12 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; @@ -258,7 +257,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index dfcb5b7f8..1a56faf16 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -2,8 +2,7 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; @@ -178,7 +177,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); data.add(seesSun); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index 8ee6b7433..fd1777230 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -2,10 +2,9 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - import mekanism.api.Coord4D; import mekanism.common.base.IBoundingBlock; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; @@ -70,7 +69,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index 2f998ff48..ad4e432f9 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -13,6 +13,7 @@ import mekanism.common.MekanismFluids; import mekanism.common.base.IActiveState; import mekanism.common.base.IHasSound; import mekanism.common.base.SoundWrapper; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.client; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; @@ -115,7 +116,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen if(!world.isRemote && (getReactor().isBurning() != clientBurning || Math.abs(getReactor().getPlasmaTemp() - clientTemp) > 1000000)) { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), Coord4D.get(this).getTargetPoint(50D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), Coord4D.get(this).getTargetPoint(50D)); clientBurning = getReactor().isBurning(); clientTemp = getReactor().getPlasmaTemp(); } @@ -203,7 +204,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 3f62af9fa..d48dc6213 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -2,8 +2,7 @@ package mekanism.generators.common.tile.reactor; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; - +import mekanism.common.base.TileNetworkList; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.util.LangUtils; import net.minecraft.init.Items; @@ -126,7 +125,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); 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 4763bbd0c..0ad7368ca 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -17,6 +17,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; +import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; @@ -450,7 +451,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); @@ -467,7 +468,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl fluidEject = !fluidEject; String modeText = " " + (fluidEject ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils.transOutputInput(fluidEject) + "."; player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.reactorPortEject") + modeText)); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); markDirty(); } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index d8cd82b09..330f6cb20 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -9,6 +9,7 @@ import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.multiblock.MultiblockCache; @@ -133,7 +134,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); player.openGui(MekanismGenerators.instance, 6, world, getPos().getX(), getPos().getY(), getPos().getZ()); return true; @@ -175,7 +176,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java index 5d6e8a23c..c5e3ef106 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.TileNetworkList; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraft.block.Block; @@ -53,7 +54,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock } buildRotors(); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } private void buildRotors() @@ -117,7 +118,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock rotor.hasComplex = false; } - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rotor.getNetworkedData(new ArrayList<>())), new Range4D(coord)); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, rotor.getNetworkedData(new TileNetworkList())), new Range4D(coord)); } } @@ -151,7 +152,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock if(getHousedBlades() != prev) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<>())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); } } @@ -223,7 +224,7 @@ public class TileEntityTurbineRotor extends TileEntityBasicBlock } @Override - public ArrayList getNetworkedData(ArrayList data) + public TileNetworkList getNetworkedData(TileNetworkList data) { super.getNetworkedData(data);