diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 1969d6987..ae8810b99 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -7,7 +7,7 @@ import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.client.gui.element.gauge.GuiEnergyGauge; import mekanism.client.gui.element.tab.GuiMatrixTab; import mekanism.client.gui.element.tab.GuiMatrixTab.MatrixTab; -import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.inventory.container.ContainerInductionMatrixStats; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -21,7 +21,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class GuiMatrixStats extends GuiMekanismTile { public GuiMatrixStats(InventoryPlayer inventory, TileEntityInductionCasing tile) { - super(tile, new ContainerNull(inventory.player, tile)); + super(tile, new ContainerInductionMatrixStats(inventory, tile)); ResourceLocation resource = getGuiLocation(); addGuiElement(new GuiMatrixTab(this, tileEntity, MatrixTab.MAIN, resource)); addGuiElement(new GuiEnergyGauge(() -> tileEntity, GuiEnergyGauge.Type.STANDARD, this, resource, 6, 13)); @@ -77,4 +77,4 @@ public class GuiMatrixStats extends GuiMekanismTile { protected ResourceLocation getGuiLocation() { return MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index d6ff7ac0e..205c6b905 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -35,6 +35,7 @@ import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; import mekanism.common.inventory.container.ContainerFuelwoodHeater; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.inventory.container.ContainerInductionMatrix; +import mekanism.common.inventory.container.ContainerInductionMatrixStats; import mekanism.common.inventory.container.ContainerLaserAmplifier; import mekanism.common.inventory.container.ContainerLaserTractorBeam; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; @@ -371,7 +372,7 @@ public class CommonProxy implements IGuiProvider { case 49: return new ContainerInductionMatrix(player.inventory, (TileEntityInductionCasing) tileEntity); case 50: - return new ContainerNull(player, (TileEntityContainerBlock) tileEntity); + return new ContainerInductionMatrixStats(player.inventory, (TileEntityInductionCasing) tileEntity); case 51: return new ContainerNull(player, (TileEntityContainerBlock) tileEntity); case 52: @@ -470,4 +471,4 @@ public class CommonProxy implements IGuiProvider { public void throwApiPresentException() { throw new RuntimeException(String.join(" ", API_PRESENT_MESSAGE)); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java b/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java index bc521803f..c9328fb4a 100644 --- a/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java +++ b/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java @@ -1,10 +1,8 @@ package mekanism.common.content.matrix; -import io.netty.buffer.ByteBuf; import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.TileNetworkList; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; @@ -201,37 +199,6 @@ public class SynchronizedMatrixData extends SynchronizedData { + private static final int DOUBLE_PARTS = 4; + private static final int DOUBLE_PROPERTIES = 5; + private static final int FIRST_INT_PROPERTY = DOUBLE_PARTS * DOUBLE_PROPERTIES; + + private final long[] lastDoubleValues = new long[DOUBLE_PROPERTIES]; + private final int[] lastIntValues = new int[5]; + public ContainerInductionMatrix(InventoryPlayer inventory, TileEntityInductionCasing tile) { super(tile, inventory); } + @Override + public void addListener(@Nonnull IContainerListener listener) { + super.addListener(listener); + sendAllMatrixData(listener); + cacheMatrixData(); + } + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + long[] doubleValues = getDoubleValues(); + int[] intValues = getIntValues(); + for (IContainerListener listener : listeners) { + for (int valueIndex = 0; valueIndex < doubleValues.length; valueIndex++) { + if (doubleValues[valueIndex] != lastDoubleValues[valueIndex]) { + sendDouble(listener, valueIndex, doubleValues[valueIndex]); + } + } + for (int valueIndex = 0; valueIndex < intValues.length; valueIndex++) { + if (intValues[valueIndex] != lastIntValues[valueIndex]) { + listener.sendWindowProperty(this, FIRST_INT_PROPERTY + valueIndex, intValues[valueIndex]); + } + } + } + System.arraycopy(doubleValues, 0, lastDoubleValues, 0, doubleValues.length); + System.arraycopy(intValues, 0, lastIntValues, 0, intValues.length); + } + + @Override + public void updateProgressBar(int property, int value) { + SynchronizedMatrixData structure = getOrCreateClientStructure(); + if (property < FIRST_INT_PROPERTY) { + int valueIndex = property / DOUBLE_PARTS; + int part = property % DOUBLE_PARTS; + long oldBits = getDoubleValues()[valueIndex]; + int shift = part * Short.SIZE; + long mask = 0xFFFFL << shift; + long newBits = (oldBits & ~mask) | (((long) value & 0xFFFFL) << shift); + setDoubleValue(structure, valueIndex, Double.longBitsToDouble(newBits)); + } else { + setIntValue(structure, property - FIRST_INT_PROPERTY, value); + } + } + + private void sendAllMatrixData(IContainerListener listener) { + long[] doubleValues = getDoubleValues(); + for (int valueIndex = 0; valueIndex < doubleValues.length; valueIndex++) { + sendDouble(listener, valueIndex, doubleValues[valueIndex]); + } + int[] intValues = getIntValues(); + for (int valueIndex = 0; valueIndex < intValues.length; valueIndex++) { + listener.sendWindowProperty(this, FIRST_INT_PROPERTY + valueIndex, intValues[valueIndex]); + } + } + + private void sendDouble(IContainerListener listener, int valueIndex, long value) { + int firstProperty = valueIndex * DOUBLE_PARTS; + for (int part = 0; part < DOUBLE_PARTS; part++) { + listener.sendWindowProperty(this, firstProperty + part, (int) (value >>> (part * Short.SIZE) & 0xFFFFL)); + } + } + + private void cacheMatrixData() { + long[] doubleValues = getDoubleValues(); + int[] intValues = getIntValues(); + System.arraycopy(doubleValues, 0, lastDoubleValues, 0, doubleValues.length); + System.arraycopy(intValues, 0, lastIntValues, 0, intValues.length); + } + + private long[] getDoubleValues() { + SynchronizedMatrixData structure = tileEntity.structure; + return new long[]{ + Double.doubleToRawLongBits(structure == null ? 0 : structure.getEnergy()), + Double.doubleToRawLongBits(structure == null ? 0 : structure.getStorageCap()), + Double.doubleToRawLongBits(structure == null ? 0 : structure.getTransferCap()), + Double.doubleToRawLongBits(structure == null ? 0 : structure.getLastInput()), + Double.doubleToRawLongBits(structure == null ? 0 : structure.getLastOutput()) + }; + } + + private int[] getIntValues() { + SynchronizedMatrixData structure = tileEntity.structure; + return new int[]{ + structure == null ? 0 : structure.volWidth, + structure == null ? 0 : structure.volHeight, + structure == null ? 0 : structure.volLength, + structure == null ? 0 : structure.getCellCount(), + structure == null ? 0 : structure.getProviderCount() + }; + } + + private SynchronizedMatrixData getOrCreateClientStructure() { + if (tileEntity.structure == null) { + tileEntity.structure = new SynchronizedMatrixData(); + } + return tileEntity.structure; + } + + private void setDoubleValue(SynchronizedMatrixData structure, int valueIndex, double value) { + switch (valueIndex) { + case 0: + structure.setCachedTotal(value); + break; + case 1: + structure.setStorageCap(value); + break; + case 2: + structure.setTransferCap(value); + break; + case 3: + structure.setLastInput(value); + break; + case 4: + structure.setLastOutput(value); + break; + default: + } + } + + private void setIntValue(SynchronizedMatrixData structure, int valueIndex, int value) { + switch (valueIndex) { + case 0: + structure.volWidth = value; + break; + case 1: + structure.volHeight = value; + break; + case 2: + structure.volLength = value; + break; + case 3: + structure.setClientCells(value); + break; + case 4: + structure.setClientProviders(value); + break; + default: + } + } + @Override protected void addSlots() { addSlotToContainer(new SlotCharge(tileEntity, 0, 146, 20)); addSlotToContainer(new SlotDischarge(tileEntity, 1, 146, 51)); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrixStats.java b/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrixStats.java new file mode 100644 index 000000000..061434347 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrixStats.java @@ -0,0 +1,28 @@ +package mekanism.common.inventory.container; + +import javax.annotation.Nonnull; +import mekanism.common.tile.TileEntityInductionCasing; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; + +public class ContainerInductionMatrixStats extends ContainerInductionMatrix { + + public ContainerInductionMatrixStats(InventoryPlayer inventory, TileEntityInductionCasing tile) { + super(inventory, tile); + } + + @Override + protected void addSlots() { + } + + @Override + protected void addInventorySlots(InventoryPlayer inventory) { + } + + @Nonnull + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { + return ItemStack.EMPTY; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index ab539b5c0..3c4ad789a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -1,8 +1,6 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; -import mekanism.api.TileNetworkList; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; import mekanism.common.capabilities.Capabilities; @@ -20,7 +18,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.items.CapabilityItemHandler; public class TileEntityInductionCasing extends TileEntityMultiblock implements IStrictEnergyStorage, IComputerIntegration { @@ -61,25 +58,6 @@ public class TileEntityInductionCasing extends TileEntityMultiblock