From 4dd1e81c2738d00a4eab05a9a1b9301fce455c61 Mon Sep 17 00:00:00 2001 From: Richard Freimer Date: Sat, 8 Jun 2019 04:51:37 -0400 Subject: [PATCH] Use sendToAllTracking for update packets (#5496) * Don't check Y height for sending update packets. Seems to fix compat with cubic chunks #5262 * First pass transitioning from using sendToReceivers to using built in forge stuff * Make code cleaner to read with helper methods * Fix accidental extra code from a local branch issue I had * Further improve readability * Rename method * shortcut if player not in same dimension & use EMP.server for the reference --- src/main/java/mekanism/api/MekanismAPI.java | 2 +- src/main/java/mekanism/api/Range4D.java | 25 ++++++++----- .../mekanism/client/gui/GuiDigitalMiner.java | 12 +++--- .../client/gui/GuiDigitalMinerConfig.java | 12 +++--- .../client/gui/GuiElectrolyticSeparator.java | 5 +-- .../java/mekanism/client/gui/GuiFactory.java | 3 +- .../client/gui/GuiFormulaicAssemblicator.java | 15 +++----- .../java/mekanism/client/gui/GuiGasTank.java | 3 +- .../client/gui/GuiLaserAmplifier.java | 7 ++-- .../client/gui/GuiLogisticalSorter.java | 12 +++--- .../client/gui/GuiMetallurgicInfuser.java | 3 +- .../client/gui/GuiQuantumEntangloporter.java | 5 +-- .../client/gui/GuiResistiveHeater.java | 3 +- .../client/gui/GuiRotaryCondensentrator.java | 3 +- .../mekanism/client/gui/GuiSecurityDesk.java | 7 ++-- .../mekanism/client/gui/GuiTeleporter.java | 5 +-- .../client/gui/element/GuiAmplifierTab.java | 3 +- .../client/gui/element/GuiSortingTab.java | 3 +- .../java/mekanism/common/PacketHandler.java | 37 ++++++++++++++++--- .../mekanism/common/base/ITileNetwork.java | 9 +++++ .../mekanism/common/item/ItemBlockBasic.java | 10 +---- .../common/item/ItemBlockEnergyCube.java | 7 +--- .../common/item/ItemBlockGasTank.java | 7 +--- .../common/item/ItemBlockGlowPanel.java | 7 +--- .../common/item/ItemBlockMachine.java | 6 +-- .../common/item/ItemBlockTransmitter.java | 7 +--- .../common/item/ItemConfigurator.java | 8 +--- .../network/PacketConfigurationUpdate.java | 6 +-- .../common/network/PacketDataRequest.java | 3 +- .../common/network/PacketEditFilter.java | 7 ++-- .../common/network/PacketNewFilter.java | 7 ++-- .../network/PacketPortableTeleporter.java | 3 +- .../common/network/PacketTileEntity.java | 8 ++++ .../mekanism/common/tile/TileEntityBin.java | 8 ++-- .../common/tile/TileEntityBoilerCasing.java | 4 +- .../common/tile/TileEntityBoundingBlock.java | 5 +-- .../common/tile/TileEntityChargepad.java | 5 +-- .../common/tile/TileEntityDigitalMiner.java | 10 ++--- .../common/tile/TileEntityDynamicTank.java | 6 +-- .../common/tile/TileEntityEnergyCube.java | 7 +--- .../common/tile/TileEntityFactory.java | 5 +-- .../common/tile/TileEntityFluidTank.java | 8 ++-- .../common/tile/TileEntityFuelwoodHeater.java | 6 +-- .../common/tile/TileEntityGasTank.java | 6 +-- .../tile/TileEntityInductionCasing.java | 5 +-- .../common/tile/TileEntityInductionPort.java | 4 +- .../common/tile/TileEntityLaserAmplifier.java | 6 +-- .../tile/TileEntityLaserTractorBeam.java | 6 +-- .../tile/TileEntityLogisticalSorter.java | 7 ++-- .../common/tile/TileEntityMultiblock.java | 7 +--- .../tile/TileEntityOredictionificator.java | 6 +-- .../tile/TileEntityResistiveHeater.java | 6 +-- .../tile/TileEntityRotaryCondensentrator.java | 3 +- .../tile/TileEntitySeismicVibrator.java | 6 +-- .../tile/TileEntitySolarNeutronActivator.java | 6 +-- .../tile/TileEntitySuperheatingElement.java | 6 +-- .../common/tile/TileEntityTeleporter.java | 6 +-- ...ileEntityThermalEvaporationController.java | 6 +-- .../tile/component/TileComponentUpgrade.java | 6 +-- .../tile/prefab/TileEntityBasicBlock.java | 7 ++-- .../tile/prefab/TileEntityEffectsBlock.java | 5 +-- .../TileEntityDiversionTransporter.java | 5 +-- .../TileEntityLogisticalTransporter.java | 5 +-- .../tile/transmitter/TileEntitySidedPipe.java | 4 +- .../TileEntityThermodynamicConductor.java | 6 +-- .../common/transmitters/TransporterImpl.java | 5 +-- .../client/gui/GuiIndustrialTurbine.java | 3 +- .../generators/client/gui/GuiReactorFuel.java | 2 +- .../client/gui/GuiReactorLogicAdapter.java | 5 +-- .../generators/common/FusionReactor.java | 7 +--- .../reactor/TileEntityReactorController.java | 2 +- .../tile/reactor/TileEntityReactorPort.java | 4 +- .../tile/turbine/TileEntityTurbineCasing.java | 4 +- .../tile/turbine/TileEntityTurbineRotor.java | 5 +-- 74 files changed, 196 insertions(+), 289 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index f5cff537d..38bfb6fc6 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -18,7 +18,7 @@ public class MekanismAPI { /** * The version of the api classes - may not always match the mod's version */ - public static final String API_VERSION = "9.7.5"; + public static final String API_VERSION = "9.7.6"; /** * Mekanism debug mode diff --git a/src/main/java/mekanism/api/Range4D.java b/src/main/java/mekanism/api/Range4D.java index 350bfe457..3558c8a11 100644 --- a/src/main/java/mekanism/api/Range4D.java +++ b/src/main/java/mekanism/api/Range4D.java @@ -3,6 +3,7 @@ package mekanism.api; import java.util.HashSet; import java.util.Set; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.fml.common.FMLCommonHandler; public class Range4D { @@ -36,13 +37,7 @@ public class Range4D { } public Range4D(Coord4D coord) { - xMin = coord.x; - yMin = coord.y; - zMin = coord.z; - xMax = coord.x + 1; - yMax = coord.y + 1; - zMax = coord.z + 1; - dimensionId = coord.dimensionId; + this(coord.x, coord.y, coord.z, coord.x + 1, coord.y + 1, coord.z + 1, coord.dimensionId); } public static Range4D getChunkRange(EntityPlayer player) { @@ -77,8 +72,20 @@ public class Range4D { } public boolean intersects(Range4D range) { - return (xMax + 1 - 1.E-05D > range.xMin) && (range.xMax + 1 - 1.E-05D > xMin) && (yMax + 1 - 1.E-05D > range.yMin) && - (range.yMax + 1 - 1.E-05D > yMin) && (zMax + 1 - 1.E-05D > range.zMin) && (range.zMax + 1 - 1.E-05D > zMin); + return (xMax + 0.99999 > range.xMin) && (range.xMax + 0.99999 > xMin) && (yMax + 0.99999 > range.yMin) && + (range.yMax + 0.99999 > yMin) && (zMax + 0.99999 > range.zMin) && (range.zMax + 0.99999 > zMin); + } + + public boolean hasPlayerInRange(EntityPlayerMP player) { + if (player.dimension != dimensionId) { + return false; + } + //Ignore height for partial Cubic chunks support as range comparision gets used ignoring player height normally anyways + int radius = player.server.getPlayerList().getViewDistance() * 16; + int playerX = (int) player.posX; + int playerZ = (int) player.posZ; + return (playerX + radius + 0.99999 > xMin) && (xMax + 0.99999 > playerX - radius) && + (playerZ + radius + 0.99999 > zMin) && (zMax + 1 - 0.99999 > playerZ - radius); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 90978a0eb..3e383e504 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -98,10 +98,10 @@ public class GuiDigitalMiner extends GuiMekanismTile { super.actionPerformed(guibutton); if (guibutton.id == 0) { TileNetworkList data = TileNetworkList.withContents(3); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } else if (guibutton.id == 1) { TileNetworkList data = TileNetworkList.withContents(4); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } else if (guibutton.id == 2) { Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } @@ -226,25 +226,25 @@ public class GuiDigitalMiner extends GuiMekanismTile { if (xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } if (xAxis >= 147 && xAxis <= 161 && yAxis >= 63 && yAxis <= 77) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(1); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } if (xAxis >= 131 && xAxis <= 145 && yAxis >= 47 && yAxis <= 61) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(5); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } if (xAxis >= 131 && xAxis <= 145 && yAxis >= 63 && yAxis <= 77) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(9); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } } } diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 1f4cd02d7..51b77a3f2 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -190,7 +190,7 @@ public class GuiDigitalMinerConfig extends GuiMekanismTile= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 14 && yAxis <= yStart + 20) { // Process up button click final TileNetworkList data = TileNetworkList.withContents(11, getFilterIndex() + i); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); return; } @@ -200,7 +200,7 @@ public class GuiDigitalMinerConfig extends GuiMekanismTile= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 21 && yAxis <= yStart + 27) { // Process down button click final TileNetworkList data = TileNetworkList.withContents(12, getFilterIndex() + i); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); return; } @@ -248,7 +248,7 @@ public class GuiDigitalMinerConfig extends GuiMekanismTile= 11 && xAxis <= 25 && yAxis >= 141 && yAxis <= 155) { TileNetworkList data = TileNetworkList.withContents(10); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } @@ -524,7 +524,7 @@ public class GuiDigitalMinerConfig extends GuiMekanismTile 8 && xAxis < 17 && yAxis > 73 && yAxis < 82) { TileNetworkList data = TileNetworkList.withContents((byte) 0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } else if (xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { TileNetworkList data = TileNetworkList.withContents((byte) 1); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(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 a19e9434d..8d78c20fa 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.io.IOException; import java.util.Arrays; -import mekanism.api.Coord4D; import mekanism.api.TileNetworkList; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfuseType; @@ -136,7 +135,7 @@ public class GuiFactory extends GuiMekanismTile { ItemStack stack = mc.player.inventory.getItemStack(); if (!stack.isEmpty() && stack.getItem() instanceof ItemGaugeDropper) { TileNetworkList data = TileNetworkList.withContents(1); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(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 90c6a738b..9871b0d13 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.io.IOException; import java.util.Arrays; -import mekanism.api.Coord4D; import mekanism.api.TileNetworkList; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -34,7 +33,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.ItemHandlerHelper; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiFormulaicAssemblicator extends GuiMekanismTile { @@ -87,7 +85,6 @@ public class GuiFormulaicAssemblicator extends GuiMekanismTile= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(4); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } if (tileEntity.isRecipe) { @@ -208,20 +205,20 @@ public class GuiFormulaicAssemblicator extends GuiMekanismTile= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(1); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } } if (xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(2); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } if (xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(3); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } } } @@ -230,13 +227,13 @@ public class GuiFormulaicAssemblicator extends GuiMekanismTile= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } if (xAxis >= 26 && xAxis <= 42 && yAxis >= 75 && yAxis <= 91) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(5); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } } } diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index f0d321ff5..405dfedf3 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -1,7 +1,6 @@ package mekanism.client.gui; import java.io.IOException; -import mekanism.api.Coord4D; import mekanism.api.TileNetworkList; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSecurityTab; @@ -78,7 +77,7 @@ public class GuiGasTank extends GuiMekanismTile { int yAxis = y - (height - ySize) / 2; if (xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { TileNetworkList data = TileNetworkList.withContents(0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 2f96d42b6..63e6f6bc2 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -1,7 +1,6 @@ package mekanism.client.gui; import java.io.IOException; -import mekanism.api.Coord4D; import mekanism.api.TileNetworkList; import mekanism.client.gui.element.GuiAmplifierTab; import mekanism.client.gui.element.GuiGauge.Type; @@ -146,7 +145,7 @@ public class GuiLaserAmplifier extends GuiMekanismTile return; } TileNetworkList data = TileNetworkList.withContents(0, toUse); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); minField.setText(""); } } @@ -161,7 +160,7 @@ public class GuiLaserAmplifier extends GuiMekanismTile return; } TileNetworkList data = TileNetworkList.withContents(1, toUse); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); maxField.setText(""); } } @@ -170,7 +169,7 @@ public class GuiLaserAmplifier extends GuiMekanismTile if (!timerField.getText().isEmpty()) { int toUse = Math.max(0, Integer.parseInt(timerField.getText())); TileNetworkList data = TileNetworkList.withContents(2, toUse); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); timerField.setText(""); } } diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 933dd82df..b663a7490 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -202,7 +202,7 @@ public class GuiLogisticalSorter extends GuiMekanismTile= 12 && xAxis <= 26 && yAxis >= 110 && yAxis <= 124) { final TileNetworkList data = TileNetworkList.withContents(1); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } // Check for round robin button if (xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98) { final TileNetworkList data = TileNetworkList.withContents(2); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } // Check for single item button if (xAxis >= 12 && xAxis <= 26 && yAxis >= 58 && yAxis <= 72) { final TileNetworkList data = TileNetworkList.withContents(5); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } @@ -269,7 +269,7 @@ public class GuiLogisticalSorter extends GuiMekanismTile= 13 && xAxis <= 29 && yAxis >= 137 && yAxis <= 153) { final TileNetworkList data = TileNetworkList.withContents(0, mouseBtn); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(MekanismSounds.DING); } } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 9acb19874..0dffda52a 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.io.IOException; import java.util.Arrays; -import mekanism.api.Coord4D; import mekanism.api.TileNetworkList; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -98,7 +97,7 @@ public class GuiMetallurgicInfuser extends GuiMekanismTile 148 && xAxis < 168 && yAxis > 73 && yAxis < 82) { TileNetworkList data = TileNetworkList.withContents(0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(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 d0d3b6084..1d567db2f 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.TileNetworkList; import mekanism.client.gui.element.GuiScrollList; @@ -81,7 +80,7 @@ public class GuiQuantumEntangloporter extends GuiMekanismTile= 4 && xAxis <= 22 && yAxis >= 4 && yAxis <= 22) { TileNetworkList data = TileNetworkList.withContents(0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index 88441ef8d..a7aa4c37e 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.TileNetworkList; import mekanism.client.gui.element.GuiScrollList; @@ -61,7 +60,7 @@ public class GuiSecurityDesk extends GuiMekanismTile { return; } TileNetworkList data = TileNetworkList.withContents(0, trusted); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } public void updateButtons() { @@ -123,7 +122,7 @@ public class GuiSecurityDesk extends GuiMekanismTile { } } if (!data.isEmpty()) { - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } } } @@ -158,7 +157,7 @@ public class GuiSecurityDesk extends GuiMekanismTile { int selection = scrollList.getSelection(); if (tileEntity.frequency != null && selection != -1) { TileNetworkList data = TileNetworkList.withContents(1, tileEntity.frequency.trusted.get(selection)); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); scrollList.clearSelection(); } } diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 9c38e96bd..049871ee4 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.TileNetworkList; import mekanism.client.ClientTickHandler; @@ -272,7 +271,7 @@ public class GuiTeleporter extends GuiMekanismTile { Frequency freq = privateMode ? getPrivateCache().get(selection) : getPublicCache().get(selection); if (tileEntity != null) { TileNetworkList data = TileNetworkList.withContents(1, freq.name, freq.publicFreq); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } else { Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DEL_FREQ, currentHand, freq)); Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, currentHand, null)); @@ -383,7 +382,7 @@ public class GuiTeleporter extends GuiMekanismTile { } if (tileEntity != null) { TileNetworkList data = TileNetworkList.withContents(0, freq, !privateMode); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); } else { Frequency newFreq = new Frequency(freq, null).setPublic(!privateMode); Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.SET_FREQ, currentHand, newFreq)); diff --git a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java index cc0aceb74..e58080960 100644 --- a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java @@ -1,6 +1,5 @@ package mekanism.client.gui.element; -import mekanism.api.Coord4D; import mekanism.api.TileNetworkList; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; @@ -58,7 +57,7 @@ public class GuiAmplifierTab extends GuiTileEntityElement { public void mouseClicked(int xAxis, int yAxis, int button) { if (button == 0 && inBounds(xAxis, yAxis)) { TileNetworkList data = TileNetworkList.withContents(0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } } diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 8a5c44df3..768bdfcb2 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -5,7 +5,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.UUID; import javax.annotation.Nonnull; +import mekanism.api.Coord4D; import mekanism.api.Range4D; +import mekanism.common.base.ITileNetwork; import mekanism.common.config.MekanismConfig; import mekanism.common.network.PacketBoxBlacklist; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; @@ -69,13 +71,16 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; @@ -238,10 +243,7 @@ public class PacketHandler { * @param message - message to send */ public void sendToAll(IMessage message) { - MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); - for (EntityPlayerMP player : server.getPlayerList().getPlayers()) { - sendTo(message, player); - } + netHandler.sendToAll(message); } /** @@ -250,7 +252,7 @@ public class PacketHandler { * @param message - the message to send * @param point - the TargetPoint around which to send */ - public void sendToAllAround(IMessage message, NetworkRegistry.TargetPoint point) { + public void sendToAllAround(IMessage message, TargetPoint point) { netHandler.sendToAllAround(message, point); } @@ -291,11 +293,34 @@ public class PacketHandler { } } + public void sendUpdatePacket(TILE tile) { + sendToAllTracking(new TileEntityMessage(tile), tile); + } + + public void sendToAllTracking(IMessage message, TileEntity tile) { + BlockPos pos = tile.getPos(); + sendToAllTracking(message, tile.getWorld().provider.getDimension(), pos.getX(), pos.getY(), pos.getZ()); + } + + public void sendToAllTracking(IMessage message, Coord4D point) { + sendToAllTracking(message, point.dimensionId, point.x, point.y, point.z); + } + + public void sendToAllTracking(IMessage message, int dimension, double x, double y, double z) { + //Range is ignored for sendToAllTracking, and only gets sent to clients that have the location loaded + sendToAllTracking(message, new TargetPoint(dimension, x, y, z, 1)); + } + + public void sendToAllTracking(IMessage message, TargetPoint point) { + netHandler.sendToAllTracking(message, point); + } + + //TODO: change Network stuff over to using this public void sendToReceivers(IMessage message, Range4D range) { MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if (server != null) { for (EntityPlayerMP player : server.getPlayerList().getPlayers()) { - if (player.dimension == range.dimensionId && Range4D.getChunkRange(player).intersects(range)) { + if (range.hasPlayerInRange(player)) { sendTo(message, player); } } diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index 45e0e0337..1fedc0cb4 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -25,4 +25,13 @@ public interface ITileNetwork { * @return ArrayList of network data */ TileNetworkList getNetworkedData(TileNetworkList data); + + /** + * Gets an ArrayList of data this tile entity keeps synchronized with the client. + * + * @return ArrayList of network data + */ + default TileNetworkList getNetworkedData() { + return getNetworkedData(new TileNetworkList()); + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 708e78a24..53ff2ec51 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -2,10 +2,7 @@ package mekanism.common.item; import java.util.List; import javax.annotation.Nonnull; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.MekKeyHandler; @@ -15,7 +12,6 @@ import mekanism.common.MekanismBlocks; import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.inventory.InventoryBin; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tier.BaseTier; import mekanism.common.tier.BinTier; import mekanism.common.tier.InductionCellTier; @@ -184,15 +180,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt TileEntityInductionCell tileEntity = (TileEntityInductionCell) world.getTileEntity(pos); tileEntity.tier = InductionCellTier.values()[getBaseTier(stack).ordinal()]; if (!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), - new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket(tileEntity); } } else if (type == BasicBlockType.INDUCTION_PROVIDER) { TileEntityInductionProvider tileEntity = (TileEntityInductionProvider) world.getTileEntity(pos); tileEntity.tier = InductionProviderTier.values()[getBaseTier(stack).ordinal()]; if (!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), - new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket(tileEntity); } } TileEntity tileEntity = world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 318ef3800..bd5310887 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -6,10 +6,7 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; import java.util.UUID; import javax.annotation.Nonnull; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.api.energy.IEnergizedItem; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekKeyHandler; @@ -25,7 +22,6 @@ import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; @@ -134,8 +130,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS } ((ISustainedInventory) tileEntity).setInventory(getInventory(stack)); if (!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), - new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket(tileEntity); } } return place; diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 44fd31c3e..c5915f2de 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -3,10 +3,7 @@ package mekanism.common.item; import java.util.List; import java.util.UUID; import javax.annotation.Nonnull; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -19,7 +16,6 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.config.MekanismConfig; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; @@ -104,8 +100,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI ((ISustainedInventory) tileEntity).setInventory(getInventory(stack)); if (!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), - tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket(tileEntity); } } return place; diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index 41535703d..37f845bf7 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -2,14 +2,10 @@ package mekanism.common.item; import javax.annotation.Nonnull; import mcmultipart.api.multipart.IMultipart; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.multipart.MultipartMekanism; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGlowPanel; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; @@ -56,8 +52,7 @@ public class ItemBlockGlowPanel extends ItemBlockMultipartAble { } tileEntity.setColour(col); if (!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), - new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket(tileEntity); } } return place; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 0e06a825a..1a33d9460 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -12,8 +12,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismClient; @@ -41,7 +39,6 @@ import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; import mekanism.common.inventory.InventoryPersonalChest; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; @@ -319,8 +316,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 TileNetworkList())), - new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket(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 0c98b1ab2..9f91af3e8 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -3,10 +3,7 @@ package mekanism.common.item; import java.util.List; import javax.annotation.Nonnull; import mcmultipart.api.multipart.IMultipart; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; @@ -15,7 +12,6 @@ import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.multipart.MultipartMekanism; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tier.BaseTier; import mekanism.common.tier.CableTier; import mekanism.common.tier.ConductorTier; @@ -63,8 +59,7 @@ public class ItemBlockTransmitter extends ItemBlockMultipartAble implements ITie TileEntitySidedPipe tileEntity = (TileEntitySidedPipe) world.getTileEntity(pos); tileEntity.setBaseTier(getBaseTier(stack)); if (!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), - new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket(tileEntity); } } return place; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 8cd13c136..19d10477b 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -11,12 +11,9 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.IMekWrench; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; @@ -24,7 +21,6 @@ import mekanism.common.base.IItemNetwork; import mekanism.common.base.ISideConfiguration; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.MekanismHooks; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.tile.prefab.TileEntityContainerBlock; @@ -106,9 +102,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool + getToggleModeText(transmissionType) + ": " + data.color + data.localize() + " (" + data.color.getColoredName() + ")")); if (config instanceof TileEntityBasicBlock) { - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock) config; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), - new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket((TileEntityBasicBlock) config); } } else { SecurityUtils.displayNoAccess(player); diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index e9514d016..1379be16e 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -2,8 +2,6 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; @@ -49,7 +47,7 @@ public class PacketConfigurationUpdate implements IMessageHandler TileEntityMessage(TILE tile) { + this(Coord4D.get(tile), tile.getNetworkedData()); + } + + public TileEntityMessage(TileEntity tile, TileNetworkList params) { + this(Coord4D.get(tile), params); + } + public TileEntityMessage(Coord4D coord, TileNetworkList params) { coord4D = coord; parameters = params; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index aafc7ef12..f1b5ed29d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; @@ -16,7 +15,6 @@ import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransitRequest; import mekanism.common.content.transporter.TransitRequest.TransitResponse; import mekanism.common.item.ItemBlockBasic; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tier.BaseTier; import mekanism.common.tier.BinTier; import mekanism.common.tile.prefab.TileEntityBasicBlock; @@ -80,7 +78,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento return false; } tier = BinTier.values()[upgradeTier.ordinal()]; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); markDirty(); return true; } @@ -351,7 +349,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento super.markDirty(); if (!world.isRemote) { MekanismUtils.saveChunk(this); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); prevCount = getItemCount(); sortStacks(); } @@ -470,7 +468,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento public void setActive(boolean active) { isActive = active; if (clientActive != active) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); clientActive = active; } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 150b057a8..09e40a045 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -6,7 +6,6 @@ import java.util.Set; import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.capabilities.Capabilities; @@ -15,7 +14,6 @@ import mekanism.common.content.boiler.BoilerUpdateProtocol; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.MultiblockManager; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -145,7 +143,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0) { for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getSmallPacket(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this, getSmallPacket(new TileNetworkList())), (EntityPlayerMP) player); } } prevEnergy = getEnergy(); @@ -521,7 +521,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public void openInventory(@Nonnull EntityPlayer player) { super.openInventory(player); if (!world.isRemote) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this), (EntityPlayerMP) player); } } @@ -631,7 +631,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I MekanismUtils.saveChunk(this); for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this, getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); } return; } @@ -809,7 +809,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public void setActive(boolean active) { isActive = active; if (clientActive != active) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); clientActive = active; } } @@ -1001,7 +1001,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return new Object[]{searcher != null ? searcher.found : 0}; } for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(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 ac7db6dae..c3028a6b4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -5,7 +5,6 @@ import java.util.HashSet; import java.util.Set; import javax.annotation.Nonnull; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.base.IFluidContainerManager; @@ -15,7 +14,6 @@ import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.content.tank.TankCache; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.multiblock.MultiblockManager; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.InventoryUtils; @@ -105,7 +103,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock 0) { updateDelay--; if (updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } } @@ -176,7 +174,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement public void setActive(boolean active) { isActive = active; if (clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(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 493152bdf..3b37b4132 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -2,9 +2,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -135,7 +133,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } tier = GasTankTier.values()[upgradeTier.ordinal()]; gasTank.setMaxGas(tier.getStorage()); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); markDirty(); return true; } @@ -243,7 +241,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH dumping = GasMode.values()[index]; } for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this), (EntityPlayerMP) player); } return; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index fb087d61e..5cc5612c9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -2,8 +2,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; -import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; @@ -13,7 +11,6 @@ import mekanism.common.content.matrix.MatrixUpdateProtocol; import mekanism.common.content.matrix.SynchronizedMatrixData; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.multiblock.MultiblockManager; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; @@ -57,7 +54,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock 0) { for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this, getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); } } @@ -385,7 +384,7 @@ public class TileEntityLogisticalSorter extends TileEntityEffectsBlock implement @Override public void openInventory(@Nonnull EntityPlayer player) { if (!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } } @@ -608,7 +607,7 @@ public class TileEntityLogisticalSorter extends TileEntityEffectsBlock implement } for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this, getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); } return null; } diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 770d58a31..3d7a5edfe 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import javax.annotation.Nullable; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; @@ -14,7 +13,6 @@ import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.multiblock.UpdateProtocol; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; @@ -121,7 +119,7 @@ public abstract class TileEntityMultiblock> extend } } - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(thisCoord, getNetworkedData(new TileNetworkList())), new Range4D(thisCoord)); + Mekanism.packetHandler.sendUpdatePacket(this); } prevStructure = structure != null; @@ -152,8 +150,7 @@ public abstract class TileEntityMultiblock> extend for (Coord4D obj : structure.locations) { TileEntityMultiblock tileEntity = (TileEntityMultiblock) obj.getTileEntity(world); if (tileEntity != null && tileEntity.isRendering) { - Coord4D tileCoord = Coord4D.get(tileEntity); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(tileCoord, tileEntity.getNetworkedData(new TileNetworkList())), new Range4D(tileCoord)); + Mekanism.packetHandler.sendUpdatePacket(tileEntity); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index e8a986da8..10516812c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -4,9 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.Arrays; import java.util.List; import javax.annotation.Nonnull; -import mekanism.api.Coord4D; import mekanism.api.IConfigCardAccess.ISpecialConfigData; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.HashList; import mekanism.common.Mekanism; @@ -61,7 +59,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple if (!world.isRemote) { if (playersUsing.size() > 0) { for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this, getGenericPacket(new TileNetworkList())), (EntityPlayerMP) player); } } @@ -236,7 +234,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple @Override public void openInventory(@Nonnull EntityPlayer player) { if (!world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 2488c5648..865a340e7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; @@ -12,7 +11,6 @@ import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig; import mekanism.common.integration.computer.IComputerIntegration; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.prefab.TileEntityEffectsBlock; @@ -97,7 +95,7 @@ public class TileEntityResistiveHeater extends TileEntityEffectsBlock implements soundScale = newSoundScale; if (packet) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } } } @@ -241,7 +239,7 @@ public class TileEntityResistiveHeater extends TileEntityEffectsBlock implements public void setActive(boolean active) { isActive = active; if (clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(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 d7172f010..5e8787146 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import mekanism.api.Coord4D; import mekanism.api.TileNetworkList; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -160,7 +159,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement mode = mode == 0 ? 1 : 0; } for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this), (EntityPlayerMP) player); } return; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index c9cb30958..7032cfb79 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -3,7 +3,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; @@ -11,7 +10,6 @@ import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.config.MekanismConfig; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.prefab.TileEntityElectricBlock; @@ -67,7 +65,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement if (updateDelay > 0) { updateDelay--; if (updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } } @@ -139,7 +137,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement public void setActive(boolean active) { isActive = active; if (clientActive != active && updateDelay == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(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 0ee0d8580..b1dc56573 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import java.util.List; import javax.annotation.Nonnull; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -23,7 +22,6 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.capabilities.Capabilities; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.SolarNeutronRecipe; @@ -107,7 +105,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im // Every 20 ticks (once a second), send update to client. Note that this is a 50% reduction in network // traffic from previous implementation that send the update every 10 ticks. if (world.getTotalWorldTime() % 20 == 0) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } int newRedstoneLevel = getRedstoneLevel(); @@ -301,7 +299,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im boolean stateChange = isActive != active; if (stateChange) { isActive = active; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index 826c17b6d..49576d4b6 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -1,12 +1,8 @@ package mekanism.common.tile; -import mekanism.api.Coord4D; -import mekanism.api.Range4D; -import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.multiblock.TileEntityInternalMultiblock; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import net.minecraft.util.ITickable; @@ -32,7 +28,7 @@ public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock super.setMultiblock(id); if (packet && !world.isRemote) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index b7840c9cc..674f3256c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -9,7 +9,6 @@ import java.util.UUID; import javax.annotation.Nonnull; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -163,8 +162,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo shouldRender = status == 1 || status > 4; if (shouldRender != prevShouldRender) { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), - Coord4D.get(this).getTargetPoint(40D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(this), Coord4D.get(this).getTargetPoint(40D)); //This also means the comparator output changed so notify the neighbors we have a change MekanismUtils.notifyLoadedNeighborsOfTileChange(world, Coord4D.get(this)); } @@ -334,7 +332,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo entity.changeDimension(coord.dimensionId, (world, entity2, yaw) -> entity2.setPositionAndUpdate(coord.x + 0.5, coord.y + 1, coord.z + 0.5)); } else { entity.setPositionAndUpdate(coord.x + 0.5, coord.y + 1, coord.z + 0.5); - Mekanism.packetHandler.sendToReceivers(new EntityMoveMessage(entity), new Range4D(new Coord4D(entity))); + Mekanism.packetHandler.sendToAllTracking(new EntityMoveMessage(entity), new Coord4D(entity)); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index e9e94d1eb..9ba6e9107 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -6,7 +6,6 @@ import java.util.Set; import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.IEvaporationSolar; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; @@ -14,7 +13,6 @@ import mekanism.common.base.ITankManager; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig; import mekanism.common.content.tank.TankUpdateProtocol; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.FluidInput; @@ -134,7 +132,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva } if (structured) { if (Math.abs((float) inputTank.getFluidAmount() / inputTank.getCapacity() - prevScale) > 0.01) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); prevScale = (float) inputTank.getFluidAmount() / inputTank.getCapacity(); } } @@ -170,7 +168,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva clearStructure(); structured = buildStructure(); if (structured != clientStructured) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); clientStructured = structured; } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index dba51c4a7..8baebf911 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -6,14 +6,11 @@ import java.util.EnumSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeItem; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.nbt.NBTTagCompound; @@ -67,8 +64,7 @@ public class TileComponentUpgrade implements ITileComponent { upgradeTicks = 0; addUpgrade(type); tileEntity.inventory.get(upgradeSlot).shrink(1); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new TileNetworkList())), - new Range4D(Coord4D.get(tileEntity))); + Mekanism.packetHandler.sendUpdatePacket(tileEntity); tileEntity.markDirty(); } } else { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java index 627ecc471..897c2d1ea 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Set; import javax.annotation.Nonnull; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.base.ITileComponent; @@ -88,7 +87,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe if (!world.isRemote) { if (doAutoSync && playersUsing.size() > 0) { for (EntityPlayer player : playersUsing) { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), (EntityPlayerMP) player); + Mekanism.packetHandler.sendTo(new TileEntityMessage(this), (EntityPlayerMP) player); } } } @@ -201,7 +200,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe facing = EnumFacing.byIndex(direction); } if (!(facing == clientFacing || world.isRemote)) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); markDirty(); clientFacing = facing; } @@ -239,7 +238,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe boolean power = world.getRedstonePowerFromNeighbors(getPos()) > 0; if (redstone != power) { redstone = power; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); onPowerChange(); } } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityEffectsBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityEffectsBlock.java index 97b32e1c6..60aed1b3f 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityEffectsBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityEffectsBlock.java @@ -2,8 +2,6 @@ package mekanism.common.tile.prefab; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; -import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -11,7 +9,6 @@ import mekanism.common.Upgrade; import mekanism.common.base.IActiveState; import mekanism.common.base.IUpgradeTile; import mekanism.common.config.MekanismConfig; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; @@ -145,7 +142,7 @@ public abstract class TileEntityEffectsBlock extends TileEntityElectricBlock imp boolean stateChange = isActive != active; if (stateChange) { isActive = active; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); } } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java index 6a38e7893..24f5ff73b 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java @@ -6,12 +6,10 @@ import java.util.Set; import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.common.Mekanism; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.content.transporter.TransporterStack; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; @@ -109,8 +107,7 @@ public class TileEntityDiversionTransporter extends TileEntityLogisticalTranspor notifyTileChange(); player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); - Coord4D coord = new Coord4D(getPos(), getWorld()); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new TileNetworkList())), new Range4D(coord)); + Mekanism.packetHandler.sendUpdatePacket(this); 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 c93a58fd1..5b485ec01 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -8,7 +8,6 @@ import java.util.Set; import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; @@ -21,7 +20,6 @@ import mekanism.common.content.transporter.TransitRequest; import mekanism.common.content.transporter.TransitRequest.TransitResponse; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.integration.multipart.MultipartTileNetworkJoiner; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tier.BaseTier; import mekanism.common.tier.TransporterTier; import mekanism.common.transmitters.TransporterImpl; @@ -285,8 +283,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) { TileNetworkList data = TileNetworkList.withContents((byte) 0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(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 df495abae..80e13ff8c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -135,7 +135,7 @@ public class GuiReactorFuel extends GuiMekanismTile int toUse = Math.max(0, Integer.parseInt(injectionRateField.getText())); toUse -= toUse % 2; TileNetworkList data = TileNetworkList.withContents(0, toUse); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); injectionRateField.setText(""); } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index aca6fe34d..295f35a6e 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -1,7 +1,6 @@ package mekanism.generators.client.gui; import java.io.IOException; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.TileNetworkList; import mekanism.client.gui.GuiMekanismTile; @@ -91,7 +90,7 @@ public class GuiReactorLogicAdapter extends GuiMekanismTile= 23 && xAxis <= 34 && yAxis >= 19 && yAxis <= 30) { SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); TileNetworkList data = TileNetworkList.withContents(0); - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + Mekanism.packetHandler.sendToServer(new TileEntityMessage(tileEntity, data)); return; } for (ReactorLogic type : ReactorLogic.values()) { @@ -99,7 +98,7 @@ public class GuiReactorLogicAdapter extends GuiMekanismTile 1000000)) { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), Coord4D.get(this).getTargetPoint(50D)); + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(this), Coord4D.get(this).getTargetPoint(50D)); clientBurning = getReactor().isBurning(); clientTemp = getReactor().getPlasmaTemp(); } 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 54fc81d2a..20a40bc9f 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -7,7 +7,6 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.IHeatTransfer; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -18,7 +17,6 @@ import mekanism.common.MekanismFluids; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.capabilities.Capabilities; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.HeatUtils; @@ -384,7 +382,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl String modeText = " " + (fluidEject ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils.transOutputInput(fluidEject) + "."; player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.reactorPortEject") + modeText)); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendUpdatePacket(this); markDirty(); } return EnumActionResult.SUCCESS; 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 754a1d51f..83ee31f7c 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -3,7 +3,6 @@ package mekanism.generators.common.tile.turbine; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.TileNetworkList; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; @@ -11,7 +10,6 @@ import mekanism.common.config.MekanismConfig; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank.GasMode; import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.util.InventoryUtils; @@ -114,7 +112,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock