From e82e89b7ba2ac0b4cc245cd76c7095c3c6ff5a45 Mon Sep 17 00:00:00 2001 From: Shadow1590 <> Date: Wed, 12 Mar 2025 23:38:11 +0100 Subject: [PATCH 1/4] Added gui, activity control and filter --- .../client/gui/GUIDislocatorInhibitor.java | 145 +++++++++++ .../client/gui/GuiHandler.java | 13 + .../draconicevolution/common/CommonProxy.java | 6 + .../blocks/machine/DislocatorInhibitor.java | 60 ++++- .../ContainerDislocatorInhibitor.java | 60 +++++ .../common/inventory/SlotFakeItem.java | 25 ++ .../common/items/tools/Magnet.java | 2 +- .../DislocatorInhibitorButtonPacket.java | 55 +++++ .../common/network/SlotFakeClickPacket.java | 49 ++++ .../tileentities/TileDislocatorInhibitor.java | 230 +++++++++++++++++- .../assets/draconicevolution/lang/en_US.lang | 1 + .../textures/gui/Inhibitor.png | Bin 0 -> 2943 bytes 12 files changed, 629 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java create mode 100644 src/main/resources/assets/draconicevolution/textures/gui/Inhibitor.png diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java new file mode 100644 index 00000000..c3cce1de --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java @@ -0,0 +1,145 @@ +package com.brandon3055.draconicevolution.client.gui; + +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; +import com.brandon3055.draconicevolution.common.inventory.SlotFakeItem; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButtonPacket; +import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import java.util.ArrayList; + +@SideOnly(Side.CLIENT) +public class GUIDislocatorInhibitor extends GuiContainer { + + private static final ResourceLocation texture = new ResourceLocation( + References.MODID.toLowerCase(), + "textures/gui/Inhibitor.png"); + private int range = 5; + private TileDislocatorInhibitor.ActivityControlType activityControlType = TileDislocatorInhibitor.ActivityControlType.ALWAYS_ACTIVE; + private boolean whitelist = false; + + private final ContainerDislocatorInhibitor container; + + public GUIDislocatorInhibitor(InventoryPlayer playerInventory, TileDislocatorInhibitor inhibitor) { + super(inhibitor.getGuiContainer(playerInventory)); + this.container = (ContainerDislocatorInhibitor) inventorySlots; + + xSize = 176; + ySize = 142; + + syncWithServer(); + } + + @Override + @SuppressWarnings("unchecked") + public void initGui() { + super.initGui(); + buttonList.clear(); + buttonList.add(new GuiButtonAHeight(0, guiLeft + 7, guiTop + 11, 18, 18, "-")); + buttonList.add(new GuiButtonAHeight(1, guiLeft + 97, guiTop + 11, 18, 18, "+")); + buttonList.add(new GuiButtonAHeight(2, guiLeft + 151, guiTop + 11, 18, 18, activityControlType.name().substring(0, 1))); + buttonList.add(new GuiButtonAHeight(3, guiLeft + 151, guiTop + 33, 18, 18, whitelist ? "W" : "B")); + } + + @Override + protected void drawGuiContainerForegroundLayer(int x, int y) { + drawGuiText(); + // todo draw grey outs for fake item slots + // todo draw button icons + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { + + GL11.glColor4f(1, 1, 1, 1); + + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + } + + @Override + public void drawScreen(int x, int y, float partialTicks) { + super.drawScreen(x, y, partialTicks); + ArrayList lines = new ArrayList<>(); + if ((x - guiLeft > 7 && x - guiLeft < 25) && (y - guiTop > 11 && y - guiTop < 29)) { + lines.add("Increase Range"); + } else if ((x - guiLeft > 97 && x - guiLeft < 115) && (y - guiTop > 11 && y - guiTop < 29)) { + lines.add("Decrease Range"); + } else if ((x - guiLeft > 151 && x - guiLeft < 169) && (y - guiTop > 11 && y - guiTop < 29)) { + switch (activityControlType) { + case ALWAYS_ACTIVE -> lines.add("Active regardles of redstone power"); + case WITH_REDSTONE -> lines.add("Active with redstone power"); + case WITHOUT_REDSTONE -> lines.add("Active without redstone power"); + case NEVER_ACTIVE -> lines.add("Always inactive"); + } + lines.add("Click to cycle through activity control"); + } else if ((x - guiLeft > 151 && x - guiLeft < 169) && (y - guiTop > 33 && y - guiTop < 51)) { + if (whitelist) { + lines.add("Only items in filter will be blocked"); + } else { + lines.add("Items in filter will NOT be blocked"); + } + } + if (!lines.isEmpty()) { + drawHoveringText(lines, x, y, fontRendererObj); + } + } + + @Override + protected void handleMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType) { + if (slotIn instanceof SlotFakeItem sfi) { + DraconicEvolution.network.sendToServer(new SlotFakeClickPacket((byte) sfi.getSlotIndex())); + } else { + super.handleMouseClick(slotIn, slotId, clickedButton, clickType); + } + } + + + + @Override + protected void actionPerformed(GuiButton button) { + switch (button.id) { + case 0 -> { // Range - + range = Math.max(range - 1, TileDislocatorInhibitor.MINIMUM_RANGE); + DraconicEvolution.network.sendToServer(new DislocatorInhibitorButtonPacket((byte) 0, (byte) range)); + } + case 1 -> { // Range + + range = Math.min(range + 1, TileDislocatorInhibitor.MAXIMUM_RANGE); + DraconicEvolution.network.sendToServer(new DislocatorInhibitorButtonPacket((byte) 0, (byte) range)); + } + case 2 -> { // Cycle Activity control + activityControlType = activityControlType.getNext(); + byte controlMode = (byte) (activityControlType.ordinal()); + DraconicEvolution.network.sendToServer(new DislocatorInhibitorButtonPacket((byte) 1, controlMode)); + } + case 3 -> { // Toggle Whitelist/Blacklist mode + whitelist = !whitelist; + byte whitelistMode = (byte) (whitelist ? 1 : 0); + DraconicEvolution.network.sendToServer(new DislocatorInhibitorButtonPacket((byte) 2, whitelistMode)); + } + } + } + + private void drawGuiText() { + fontRendererObj.drawString("Range:", 40, 17, 0x000000, false); + fontRendererObj.drawString(String.valueOf(range), range < 10 ? 78 : 75, 17, 0x000000, false); + } + + private void syncWithServer() { + TileDislocatorInhibitor inhibitor = container.getTileEntity(); + whitelist = inhibitor.isWhitelist(); + range = inhibitor.getRange(); + activityControlType = inhibitor.getActivityControlType(); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java index 2b3098ae..a999be0c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java @@ -1,5 +1,7 @@ package com.brandon3055.draconicevolution.client.gui; +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -53,6 +55,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUIID_FLOW_GATE = 13; public static final int GUIID_REACTOR = 14; public static final int GUIID_UPGRADE_MODIFIER = 15; + public static final int GUIID_DISLOCATOR_INHIBITOR = 16; public static final int GUIID_CONTAINER_TEMPLATE = 100; public GuiHandler() { @@ -116,6 +119,11 @@ public class GuiHandler implements IGuiHandler { return new ContainerUpgradeModifier(player.inventory, upgradeModifier); } } + case GUIID_DISLOCATOR_INHIBITOR -> { + if (tile instanceof TileDislocatorInhibitor inhibitor) { + return new ContainerDislocatorInhibitor(player.inventory, inhibitor); + } + } } return null; @@ -199,6 +207,11 @@ public class GuiHandler implements IGuiHandler { new ContainerUpgradeModifier(player.inventory, upgradeModifier)); } } + case GUIID_DISLOCATOR_INHIBITOR -> { + if (tile instanceof TileDislocatorInhibitor inhibitor) { + return new GUIDislocatorInhibitor(player.inventory, inhibitor); + } + } } return null; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index 3d1ffd2a..73e6386a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -1,5 +1,7 @@ package com.brandon3055.draconicevolution.common; +import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButtonPacket; +import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; import net.minecraft.client.audio.ISound; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -211,6 +213,10 @@ public class CommonProxy { .registerMessage(MagnetTogglePacket.Handler.class, MagnetTogglePacket.class, 19, Side.SERVER); DraconicEvolution.network .registerMessage(MagnetToggleAckPacket.Handler.class, MagnetToggleAckPacket.class, 20, Side.CLIENT); + DraconicEvolution.network + .registerMessage(DislocatorInhibitorButtonPacket.Handler.class, DislocatorInhibitorButtonPacket.class, 21, Side.SERVER); + DraconicEvolution.network + .registerMessage(SlotFakeClickPacket.Handler.class, SlotFakeClickPacket.class, 22, Side.SERVER); } public void registerTileEntities() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java index 72633119..46e2d519 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java @@ -1,11 +1,18 @@ package com.brandon3055.draconicevolution.common.blocks.machine; +import com.brandon3055.draconicevolution.client.gui.GuiHandler; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -20,13 +27,15 @@ import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhib import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + public class DislocatorInhibitor extends BlockDE implements ITileEntityProvider { public DislocatorInhibitor() { this.setBlockName(Strings.dislocatorInhibitor); this.setCreativeTab(DraconicEvolution.tabBlocksItems); this.setStepSound(soundTypeStone); - ModBlocks.register(this); + ModBlocks.register(this, InfusedObsidianItemBlock.class); } @Override @@ -50,20 +59,43 @@ public class DislocatorInhibitor extends BlockDE implements ITileEntityProvider } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float prx, - float pry, float prz) { + public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side) { + return true; + } + + private void updateRedstoneStatus(World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); if (tile != null) { if (tile instanceof TileDislocatorInhibitor te) { - if (!player.isSneaking()) te.increaseRange(); - else te.decreaseRange(); - - if (world.isRemote) player.addChatMessage(new ChatComponentText("Range: " + te.getRange())); + if (te.isRedstoneActive() ^ world.isBlockIndirectlyGettingPowered(x, y, z)) { + te.setRedstoneActive(world.isBlockIndirectlyGettingPowered(x, y, z)); + world.markBlockForUpdate(x, y, z); + } } } + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block neighbor) { + updateRedstoneStatus(world, x, y, z); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float prx, + float pry, float prz) { + + if (!world.isRemote) { + FMLNetworkHandler + .openGui(player, DraconicEvolution.instance, GuiHandler.GUIID_DISLOCATOR_INHIBITOR, world, x, y, z); + } return true; } + @Override + public void onPostBlockPlaced(World world, int x, int y, int z, int meta) { + updateRedstoneStatus(world, x, y, z); + } + @Override public void breakBlock(World worldIn, int x, int y, int z, Block blockBroken, int meta) { TileEntity tile = worldIn.getTileEntity(x, y, z); @@ -81,4 +113,18 @@ public class DislocatorInhibitor extends BlockDE implements ITileEntityProvider public void registerBlockIcons(IIconRegister iconRegister) { blockIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + "inhibitor_block"); } + + public static class InfusedObsidianItemBlock extends ItemBlock { + + public InfusedObsidianItemBlock(Block p_i45328_1_) { + super(p_i45328_1_); + } + + @SideOnly(Side.CLIENT) + @Override + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { + list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("info.dislocatorInhibitor.txt")); + super.addInformation(p_77624_1_, p_77624_2_, list, p_77624_4_); + } + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java new file mode 100644 index 00000000..ac77ef22 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java @@ -0,0 +1,60 @@ +package com.brandon3055.draconicevolution.common.container; + +import com.brandon3055.draconicevolution.common.inventory.SlotFakeItem; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerDislocatorInhibitor extends Container { + + private TileDislocatorInhibitor inhibitor; + + public ContainerDislocatorInhibitor(InventoryPlayer playerInventory, TileDislocatorInhibitor inhibitor) { + this.inhibitor = inhibitor; + + bindPlayerInventory(playerInventory); + addContainerSlots(inhibitor); + } + + private void bindPlayerInventory(InventoryPlayer invPlayer) { + for (int x = 0; x < 9; x++) { + addSlotToContainer(new Slot(invPlayer, x, 8 + 18 * x, 118)); + } + + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 9; x++) { + addSlotToContainer(new Slot(invPlayer, x + y * 9 + 9, 8 + 18 * x, 60 + y * 18)); + } + } + } + + public void addContainerSlots(TileDislocatorInhibitor tileInhibitor) { + for (int i = 0; i < 8; i++) { + addSlotToContainer(new SlotFakeItem(tileInhibitor, i, 8 + 18 * i, 34)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return inhibitor.isUseableByPlayer(player); + } + + + @Override + public boolean canDragIntoSlot(Slot p_94531_1_) { + return false; + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slot) { + this.inhibitor.addItemFilter(player.inventory.getStackInSlot(slot)); + return null; + } + + public TileDislocatorInhibitor getTileEntity() { + return inhibitor; + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java b/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java new file mode 100644 index 00000000..c1fa7fc8 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java @@ -0,0 +1,25 @@ +package com.brandon3055.draconicevolution.common.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class SlotFakeItem extends Slot { + + + public SlotFakeItem(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y); + } + + @Override + public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { + super.onPickupFromSlot(p_82870_1_, p_82870_2_); + } + + @Override + public int getSlotStackLimit() { + return 1; + } + +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java index f6bfca86..25d41f3f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java @@ -115,7 +115,7 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem { for (EntityItem item : items) { if (item.getEntityItem() == null || ModHelper.isAE2EntityFloatingItem(item) - || TileDislocatorInhibitor.isInInhibitorRange(world, item.posX, item.posY, item.posZ)) { + || TileDislocatorInhibitor.isBlockedByInhibitor(world, item)) { continue; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java new file mode 100644 index 00000000..013b2f3d --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java @@ -0,0 +1,55 @@ +package com.brandon3055.draconicevolution.common.network; + +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + +public class DislocatorInhibitorButtonPacket implements IMessage { + + private short index = 0; + private short value = 0; + + public DislocatorInhibitorButtonPacket() {} + + public DislocatorInhibitorButtonPacket(byte index, short value) { + this.index = index; + this.value = value; + } + + @Override + public void toBytes(ByteBuf bytes) { + bytes.writeByte(index); + bytes.writeByte(value); + } + + @Override + public void fromBytes(ByteBuf bytes) { + index = bytes.readByte(); + value = bytes.readByte(); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(DislocatorInhibitorButtonPacket message, MessageContext ctx) { + if (!(ctx.getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { + return null; + } + TileDislocatorInhibitor tile = container.getTileEntity(); + if (tile == null) { + return null; + } + + switch (message.index) { + case 0 -> tile.setRange(message.value); + case 1 -> tile.setActivityControl(message.value); + case 2 -> tile.setWhitelist(message.value); + } + ctx.getServerHandler().playerEntity.worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord); + return null; + } + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java new file mode 100644 index 00000000..d2162652 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java @@ -0,0 +1,49 @@ +package com.brandon3055.draconicevolution.common.network; + +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; + +public class SlotFakeClickPacket implements IMessage { + + private short slotIndex = 0; + + public SlotFakeClickPacket() {} + + public SlotFakeClickPacket(byte slotIndex) { + this.slotIndex = slotIndex; + } + + @Override + public void toBytes(ByteBuf bytes) { + bytes.writeByte(slotIndex); + } + + @Override + public void fromBytes(ByteBuf bytes) { + slotIndex = bytes.readByte(); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(SlotFakeClickPacket message, MessageContext ctx) { + if (!(ctx.getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { + return null; + } + TileDislocatorInhibitor tile = container.getTileEntity(); + if (tile == null) { + return null; + } + ItemStack currentItem = ctx.getServerHandler().playerEntity.inventory.getItemStack(); + tile.setFilterItem(message.slotIndex, currentItem); + + ctx.getServerHandler().playerEntity.worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord); + return null; + } + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java index ebf965ba..42c2df6d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java @@ -3,6 +3,14 @@ package com.brandon3055.draconicevolution.common.tileentities; import java.util.HashMap; import java.util.HashSet; +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; @@ -10,22 +18,34 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class TileDislocatorInhibitor extends TileEntity { +public class TileDislocatorInhibitor extends TileEntity implements IInventory { public static final int MAXIMUM_RANGE = 16; public static final int MINIMUM_RANGE = 1; + public static final int FILTER_SLOTS = 8; public static final HashMap> inhibitors = new HashMap<>(); + private boolean redstoneActive = false; + private ActivityControlType activityControlType = ActivityControlType.ALWAYS_ACTIVE; private boolean registered = false; private int range = 5; - public static boolean isInInhibitorRange(World world, double x, double y, double z) { + private boolean whitelist = false; + private final ItemStack[] filter = new ItemStack[FILTER_SLOTS]; + + public static boolean isBlockedByInhibitor(World world, EntityItem item) { HashSet list = inhibitors.get(world); if (list == null) { return false; } for (TileDislocatorInhibitor inhibitor : list) { - if (inhibitor.isInRange(x, y, z)) { + if (!inhibitor.shouldBeActive()) { + continue; + } + if (!inhibitor.isBlockingItem(item.getEntityItem())) { + continue; + } + if (inhibitor.isInRange(item.posX, item.posY, item.posZ)) { return true; } } @@ -65,15 +85,37 @@ public class TileDislocatorInhibitor extends TileEntity { this.range = value; } - public void increaseRange() { - if (range < MAXIMUM_RANGE) { - range++; + public boolean isBlockingItem(ItemStack item) { + boolean blocked = false; + for (ItemStack itemStack : filter) { + if (itemStack == null) { + continue; + } + if (itemStack.getItem() == item.getItem()) { + blocked = true; + break; + } } + if (whitelist) { + return blocked; + } + return !blocked; } - public void decreaseRange() { - if (range > MINIMUM_RANGE) { - range--; + public boolean shouldBeActive() { + switch (activityControlType) { + case NEVER_ACTIVE -> { + return false; + } + case WITH_REDSTONE -> { + return redstoneActive; + } + case WITHOUT_REDSTONE -> { + return !redstoneActive; + } + default -> { + return true; + } } } @@ -85,6 +127,130 @@ public class TileDislocatorInhibitor extends TileEntity { && z <= this.zCoord + range + 1; } + public void setActivityControl(int index) { + if (index < 0 || index >= ActivityControlType.values().length) { + return; + } + this.activityControlType = ActivityControlType.values()[index]; + } + + public ActivityControlType getActivityControlType() { + return activityControlType; + } + + public boolean isRedstoneActive() { + return redstoneActive; + } + + public void setRedstoneActive(boolean redstoneActive) { + this.redstoneActive = redstoneActive; + } + + public void setFilterItem(int slot, ItemStack item) { + if (slot < 0 || slot >= FILTER_SLOTS) { + return; + } + filter[slot] = item.copy(); + } + + public void addItemFilter(ItemStack itemStack) { + if (itemStack == null) { + return; + } + for (int i = 0; i < FILTER_SLOTS; i++) { + if (filter[i] == null) { + filter[i] = itemStack.copy(); + return; + } + } + } + + public boolean isWhitelist() { + return whitelist; + } + + public void setWhitelist(short value) { + this.whitelist = value == 1; + } + + @Override + public String getInventoryName() { + return "Dislocator Inhibitor"; + } + + @Override + public int getSizeInventory() { + return FILTER_SLOTS; + } + + @Override + public ItemStack getStackInSlot(int slotIn) { + if (slotIn < 0 || slotIn >= FILTER_SLOTS) { + return null; + } + return this.filter[slotIn]; + } + + @Override + public ItemStack decrStackSize(int index, int count) { + ItemStack item = this.filter[index]; + this.filter[index] = null; + if (item == null) { + return null; + } + item.stackSize = 0; + return item; + } + + @Override + public ItemStack getStackInSlotOnClosing(int index) { + return null; + } + + @Override + public void setInventorySlotContents(int index, ItemStack stack) { + if (stack != null) { + this.filter[index] = stack.copy(); + this.filter[index].stackSize = 0; + } else { + this.filter[index] = null; + } + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return true; + } + + @Override + public void openInventory() { + + } + + @Override + public void closeInventory() { + + } + + @Override + public boolean isItemValidForSlot(int index, ItemStack stack) { + return true; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int getInventoryStackLimit() { + return 1; + } + + public Container getGuiContainer(InventoryPlayer playerInventory) { + return new ContainerDislocatorInhibitor(playerInventory, this); + } + @Override public Packet getDescriptionPacket() { NBTTagCompound tagCompound = new NBTTagCompound(); @@ -101,12 +267,58 @@ public class TileDislocatorInhibitor extends TileEntity { @Override public void writeToNBT(NBTTagCompound compound) { compound.setInteger("Range", range); + compound.setBoolean("RedstoneAcitve", redstoneActive); + compound.setString("ActivityControl", activityControlType.name()); + compound.setBoolean("Whitelist", whitelist); + + int i = 0; + for (ItemStack item : filter) { + NBTTagCompound itemTag = new NBTTagCompound(); + if (item != null) { + item.writeToNBT(itemTag); + compound.setTag("Item" + i, itemTag); + } + i++; + } super.writeToNBT(compound); } @Override public void readFromNBT(NBTTagCompound compound) { range = compound.getInteger("Range"); + redstoneActive = compound.getBoolean("RedstoneAcitve"); + activityControlType = ActivityControlType.valueOf(compound.getString("ActivityControl")); + whitelist = compound.getBoolean("Whitelist"); + + for (int i = 0; i < FILTER_SLOTS; i++) { + NBTBase tag = compound.getTag("Item" + i); + if (tag instanceof NBTTagCompound) { + filter[i] = ItemStack.loadItemStackFromNBT((NBTTagCompound) tag); + } else { + filter[i] = null; + } + } super.readFromNBT(compound); } + + public enum ActivityControlType { + + ALWAYS_ACTIVE, + WITH_REDSTONE, + WITHOUT_REDSTONE, + NEVER_ACTIVE + ; + + public ActivityControlType getNext() { + return switch (this) { + case ALWAYS_ACTIVE -> ActivityControlType.WITH_REDSTONE; + case WITH_REDSTONE -> ActivityControlType.WITHOUT_REDSTONE; + case WITHOUT_REDSTONE -> ActivityControlType.NEVER_ACTIVE; + default -> ActivityControlType.ALWAYS_ACTIVE; + }; + } + + } + + } diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 8e1d1b40..27a866ac 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -306,6 +306,7 @@ info.de.wirelessConnections.txt=Wireless Connections info.infusedObsidian.txt=This block is wither resistant +info.dislocatorInhibitor.txt=Magnet blocker enchantment.draconicevolution.reaperEnchant=Reaper diff --git a/src/main/resources/assets/draconicevolution/textures/gui/Inhibitor.png b/src/main/resources/assets/draconicevolution/textures/gui/Inhibitor.png new file mode 100644 index 0000000000000000000000000000000000000000..b3b45dffe972c693b3e863c470c89bab798ea5f3 GIT binary patch literal 2943 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 literal 0 HcmV?d00001 From ca32c009622d1071665f90ac97ebc379e5cef744 Mon Sep 17 00:00:00 2001 From: Shadow1590 <> Date: Thu, 13 Mar 2025 20:24:06 +0100 Subject: [PATCH 2/4] Gui upgrades plus translations --- .../client/gui/GUIDislocatorInhibitor.java | 61 +++++++++++++----- .../blocks/machine/DislocatorInhibitor.java | 2 +- .../tileentities/TileDislocatorInhibitor.java | 4 +- .../assets/draconicevolution/lang/en_US.lang | 13 +++- .../textures/gui/Inhibitor.png | Bin 2943 -> 2304 bytes 5 files changed, 60 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java index c3cce1de..118542aa 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java @@ -15,6 +15,9 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; import java.util.ArrayList; @@ -48,15 +51,15 @@ public class GUIDislocatorInhibitor extends GuiContainer { buttonList.clear(); buttonList.add(new GuiButtonAHeight(0, guiLeft + 7, guiTop + 11, 18, 18, "-")); buttonList.add(new GuiButtonAHeight(1, guiLeft + 97, guiTop + 11, 18, 18, "+")); - buttonList.add(new GuiButtonAHeight(2, guiLeft + 151, guiTop + 11, 18, 18, activityControlType.name().substring(0, 1))); - buttonList.add(new GuiButtonAHeight(3, guiLeft + 151, guiTop + 33, 18, 18, whitelist ? "W" : "B")); + buttonList.add(new GuiButtonAHeight(2, guiLeft + 151, guiTop + 11, 18, 18, "")); + buttonList.add(new GuiButtonAHeight(3, guiLeft + 151, guiTop + 33, 18, 18, "")); } @Override protected void drawGuiContainerForegroundLayer(int x, int y) { drawGuiText(); - // todo draw grey outs for fake item slots - // todo draw button icons + drawGreyOutSlots(); + drawButtonIcons(); } @Override @@ -73,22 +76,22 @@ public class GUIDislocatorInhibitor extends GuiContainer { super.drawScreen(x, y, partialTicks); ArrayList lines = new ArrayList<>(); if ((x - guiLeft > 7 && x - guiLeft < 25) && (y - guiTop > 11 && y - guiTop < 29)) { - lines.add("Increase Range"); + lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.range.increase.txt")); } else if ((x - guiLeft > 97 && x - guiLeft < 115) && (y - guiTop > 11 && y - guiTop < 29)) { - lines.add("Decrease Range"); + lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.range.decrease.txt")); } else if ((x - guiLeft > 151 && x - guiLeft < 169) && (y - guiTop > 11 && y - guiTop < 29)) { switch (activityControlType) { - case ALWAYS_ACTIVE -> lines.add("Active regardles of redstone power"); - case WITH_REDSTONE -> lines.add("Active with redstone power"); - case WITHOUT_REDSTONE -> lines.add("Active without redstone power"); - case NEVER_ACTIVE -> lines.add("Always inactive"); + case ALWAYS_ACTIVE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.always.txt")); + case WITH_REDSTONE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.with.txt")); + case WITHOUT_REDSTONE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.without.txt")); + case NEVER_ACTIVE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.never.txt")); } - lines.add("Click to cycle through activity control"); + lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.cycle.txt")); } else if ((x - guiLeft > 151 && x - guiLeft < 169) && (y - guiTop > 33 && y - guiTop < 51)) { if (whitelist) { - lines.add("Only items in filter will be blocked"); + lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.whitelist.txt")); } else { - lines.add("Items in filter will NOT be blocked"); + lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.blacklist.txt")); } } if (!lines.isEmpty()) { @@ -105,8 +108,6 @@ public class GUIDislocatorInhibitor extends GuiContainer { } } - - @Override protected void actionPerformed(GuiButton button) { switch (button.id) { @@ -132,10 +133,38 @@ public class GUIDislocatorInhibitor extends GuiContainer { } private void drawGuiText() { - fontRendererObj.drawString("Range:", 40, 17, 0x000000, false); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.range.txt"), + 40, 17, 0x000000, false); fontRendererObj.drawString(String.valueOf(range), range < 10 ? 78 : 75, 17, 0x000000, false); } + private void drawButtonIcons() { + GL11.glColor4f(1, 1, 1, 1); + + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + + // activity control button + drawTexturedModalRect(151, 11, 0, 142 + (18 * activityControlType.ordinal()), 18, 18); + + // whitelist button + drawTexturedModalRect(151, 33, 18, 142 + (whitelist ? 0 : 18), 18, 18); + } + + private void drawGreyOutSlots() { + + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5f); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + for (int i = 0; i < 8; i++) { + drawTexturedModalRect(7 + i * 18, 33, 36, 142, 18, 18); + } + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_LIGHTING); + } + private void syncWithServer() { TileDislocatorInhibitor inhibitor = container.getTileEntity(); whitelist = inhibitor.isWhitelist(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java index 46e2d519..1d5490f9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java @@ -123,7 +123,7 @@ public class DislocatorInhibitor extends BlockDE implements ITileEntityProvider @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("info.dislocatorInhibitor.txt")); + list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("info.de.dislocatorInhibitor.txt")); super.addInformation(p_77624_1_, p_77624_2_, list, p_77624_4_); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java index 42c2df6d..f80a3fbc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java @@ -150,7 +150,7 @@ public class TileDislocatorInhibitor extends TileEntity implements IInventory { if (slot < 0 || slot >= FILTER_SLOTS) { return; } - filter[slot] = item.copy(); + setInventorySlotContents(slot, item); } public void addItemFilter(ItemStack itemStack) { @@ -159,7 +159,7 @@ public class TileDislocatorInhibitor extends TileEntity implements IInventory { } for (int i = 0; i < FILTER_SLOTS; i++) { if (filter[i] == null) { - filter[i] = itemStack.copy(); + setInventorySlotContents(i, itemStack); return; } } diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 27a866ac..83f2ab4d 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -297,6 +297,8 @@ info.de.manual.nav1.txt=Navigation Tips info.de.manual.nav2.txt=Press Backspace to go to the previous page. info.de.manual.nav3.txt=Hold shift to scroll faster. +info.de.dislocatorInhibitor.txt=Magnet blocker + //Energy Net info.de.modeIn.txt=Mode: Input info.de.modeOut.txt=Mode: Output @@ -306,7 +308,6 @@ info.de.wirelessConnections.txt=Wireless Connections info.infusedObsidian.txt=This block is wither resistant -info.dislocatorInhibitor.txt=Magnet blocker enchantment.draconicevolution.reaperEnchant=Reaper @@ -654,6 +655,16 @@ gui.de.ShieldRecovery.txt=Shield Recovery gui.de.MoveSpeed.txt=Move Speed gui.de.JumpBoost.txt=Jump Boost +gui.de.dislocatorInhibitor.range.txt=Range: +gui.de.dislocatorInhibitor.tooltip.range.increase.txt=Increase Range +gui.de.dislocatorInhibitor.tooltip.range.decrease.txt=Decrease Range +gui.de.dislocatorInhibitor.tooltip.activity.always.txt=Active regardles of redstone power +gui.de.dislocatorInhibitor.tooltip.activity.with.txt=Active with redstone power +gui.de.dislocatorInhibitor.tooltip.activity.without.txt=Active without redstone power +gui.de.dislocatorInhibitor.tooltip.activity.never.txt=Always inactive +gui.de.dislocatorInhibitor.tooltip.activity.cycle.txt=Click to cycle through activity control +gui.de.dislocatorInhibitor.tooltip.whitelist.txt=Only items in filter will be blocked +gui.de.dislocatorInhibitor.tooltip.blacklist.txt=Items in filter will NOT be blocked //Potions ---------------------------------------------------------------------------------------------------------------------------------------- potion.de.effect.txt=Effect diff --git a/src/main/resources/assets/draconicevolution/textures/gui/Inhibitor.png b/src/main/resources/assets/draconicevolution/textures/gui/Inhibitor.png index b3b45dffe972c693b3e863c470c89bab798ea5f3..798f32079a13bc05afa2602a2e202b5e613aae35 100644 GIT binary patch literal 2304 zcmchX4K!5i8pof#8)n8wra|a~9g-u5N*Cp0wwe&aiV7(dQ*I}O(CDynkaKRClG7EP zGp#w1qlj)FD*3p5&}}k0rzko@rZM?ghLSOnyLX*+?>+0>weDT(u66f%_ulV%_wzpQ z^Z&j7{T2lJd+BN|&;kJ6jo#eN00`MdfT2mg!V}N)02uc-ay^36o{zi`#~U16bbl=G zEA4{JY@_&{e`0o&8tEVPvVRcKr@MMV|J5g9EjhTg&sQO)K4w?XX%@3220p%LKjZ3^ zH`C_w-}K2$j7#?OdZfJ6n*pCYxYRgJ-6;=sZ?kJ0P3NUNmCn_f4zN5S66SN$xrqks zuIxT(L;5vu`FeCaMyPUkY~P+7wq1yx|$l$+NJ$-gWijAHvrfM$cAQ#NOiIK>KZ5N6tc!o^ZdUA?1Kab%x{o z=y$J$6((g`<9}5q3ld)^pXSB0*eE53@vjejp#EC2g}5duf<6^97A6>MOdXP6#P;Zk zX=@^EDoTEA^NY1s2(di_spkUbHJu#@oB%L80Uvyyp9&+i0Ik2_VyLA6K~G|4kj$z zJZr=Nzee%Gp_GArsNaIzc@~ExJG4@4Bse^Y^@3N;+TC`9e|`xtuue2&0f#M{EPDUg z)%ZQu`chGgy?H6T z$0N$CE|QPAcO!Rlq{qPOp8vVmcV{M3@=jCcaGck4Z-0weW5vpl>L2uxgfN*W-C+)5nyl-Y1S zYNr%SC||fy3k&n9b>5PLEP{$fCFB+tEc6iyDO%B`b==I|-USU;LRk1oN5!p_dG0)<)e?t|l4%EEpZba2<9jRl2 z7;J`#oqMH+Ma%X{S8$=*8q5wpDY{Z+R z2l0C}EkQeoQjlBu4@r?(Lll9ge^0=TLh_dKokT=V!3!xYza3m(^0M z?NVdp2wB0W8=qxj#|iJJMHjZAT`2R2Y)M|Gwk38#1fV_^$8nPz(inj2{bJIk`pH5* zFd%ZKfh6RaVrFv*f%V0`0zmc^GusdDaxvTKWH7S%+yDMACZR--XL;k z!Wtu-&y;ZCNvB$z$C(FA2sOk@3-|3&ok8GBD`M-?-d4TnE#THQ?>s5B*=ZX8&Qc=3 z4OiF+Khwvpvh18RDrc01ee`kLthp;xlqdlFSXyc%#{U}+!&esM&u&0LYu%aIg~|rE z8a4zTIXl{%hrzfbS-v2SfePF68=IHn%NJ%t>(oR>gY-(>5(eRJh)-+w?z86v0KSAK z5%&WN2v??%?t&r;C#G?RFp{n4D91qUfqq(*dX7KhwCi#Y++yQM{_T!-P^YO%nFNhM zbuvHd)wuCX{6s2{j^Z$drS}mG;1C{}^t@3Gi|nVxkm>&CtE8WE4s~vR Tcraiim22Y$e{S`<$n3uZ#63l7 literal 2943 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 From c437a2a440fec541b9eec76be0a67776d24bc173 Mon Sep 17 00:00:00 2001 From: Shadow1590 <> Date: Thu, 13 Mar 2025 20:26:00 +0100 Subject: [PATCH 3/4] Spotless --- .../client/gui/GUIDislocatorInhibitor.java | 45 +++++++++++-------- .../client/gui/GuiHandler.java | 4 +- .../draconicevolution/common/CommonProxy.java | 11 +++-- .../blocks/machine/DislocatorInhibitor.java | 10 ++--- .../ContainerDislocatorInhibitor.java | 6 +-- .../common/inventory/SlotFakeItem.java | 1 - .../DislocatorInhibitorButtonPacket.java | 4 +- .../common/network/SlotFakeClickPacket.java | 7 ++- .../tileentities/TileDislocatorInhibitor.java | 7 ++- 9 files changed, 54 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java index 118542aa..c71269bd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java @@ -1,5 +1,17 @@ package com.brandon3055.draconicevolution.client.gui; +import java.util.ArrayList; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import org.lwjgl.opengl.GL11; + import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.inventory.SlotFakeItem; @@ -7,20 +19,9 @@ import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButtonPacket; import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.GuiScreenEvent; -import net.minecraftforge.common.MinecraftForge; -import org.lwjgl.opengl.GL11; - -import java.util.ArrayList; @SideOnly(Side.CLIENT) public class GUIDislocatorInhibitor extends GuiContainer { @@ -81,10 +82,14 @@ public class GUIDislocatorInhibitor extends GuiContainer { lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.range.decrease.txt")); } else if ((x - guiLeft > 151 && x - guiLeft < 169) && (y - guiTop > 11 && y - guiTop < 29)) { switch (activityControlType) { - case ALWAYS_ACTIVE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.always.txt")); - case WITH_REDSTONE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.with.txt")); - case WITHOUT_REDSTONE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.without.txt")); - case NEVER_ACTIVE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.never.txt")); + case ALWAYS_ACTIVE -> lines + .add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.always.txt")); + case WITH_REDSTONE -> lines + .add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.with.txt")); + case WITHOUT_REDSTONE -> lines + .add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.without.txt")); + case NEVER_ACTIVE -> lines + .add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.never.txt")); } lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.cycle.txt")); } else if ((x - guiLeft > 151 && x - guiLeft < 169) && (y - guiTop > 33 && y - guiTop < 51)) { @@ -133,8 +138,12 @@ public class GUIDislocatorInhibitor extends GuiContainer { } private void drawGuiText() { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.range.txt"), - 40, 17, 0x000000, false); + fontRendererObj.drawString( + StatCollector.translateToLocal("gui.de.dislocatorInhibitor.range.txt"), + 40, + 17, + 0x000000, + false); fontRendererObj.drawString(String.valueOf(range), range < 10 ? 78 : 75, 17, 0x000000, false); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java index a999be0c..a0fb4961 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java @@ -1,7 +1,5 @@ package com.brandon3055.draconicevolution.client.gui; -import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; -import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -11,6 +9,7 @@ import com.brandon3055.draconicevolution.client.gui.componentguis.GUIManual; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIReactor; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIToolConfig; import com.brandon3055.draconicevolution.common.container.ContainerAdvTool; +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.container.ContainerDissEnchanter; import com.brandon3055.draconicevolution.common.container.ContainerDraconiumChest; import com.brandon3055.draconicevolution.common.container.ContainerEnergyInfuser; @@ -22,6 +21,7 @@ import com.brandon3055.draconicevolution.common.container.ContainerSunDial; import com.brandon3055.draconicevolution.common.container.ContainerUpgradeModifier; import com.brandon3055.draconicevolution.common.container.ContainerWeatherController; import com.brandon3055.draconicevolution.common.inventory.InventoryTool; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; import com.brandon3055.draconicevolution.common.tileentities.TileDissEnchanter; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; import com.brandon3055.draconicevolution.common.tileentities.TileEnergyInfuser; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index 73e6386a..589a153f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -1,7 +1,5 @@ package com.brandon3055.draconicevolution.common; -import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButtonPacket; -import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; import net.minecraft.client.audio.ISound; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -40,6 +38,7 @@ import com.brandon3055.draconicevolution.common.magic.PotionHandler; import com.brandon3055.draconicevolution.common.network.BlockUpdatePacket; import com.brandon3055.draconicevolution.common.network.ButtonPacket; import com.brandon3055.draconicevolution.common.network.ContributorPacket; +import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButtonPacket; import com.brandon3055.draconicevolution.common.network.GenericParticlePacket; import com.brandon3055.draconicevolution.common.network.ItemConfigPacket; import com.brandon3055.draconicevolution.common.network.MagnetToggleAckPacket; @@ -50,6 +49,7 @@ import com.brandon3055.draconicevolution.common.network.PlacedItemPacket; import com.brandon3055.draconicevolution.common.network.PlayerDetectorButtonPacket; import com.brandon3055.draconicevolution.common.network.PlayerDetectorStringPacket; import com.brandon3055.draconicevolution.common.network.ShieldHitPacket; +import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; import com.brandon3055.draconicevolution.common.network.SpeedRequestPacket; import com.brandon3055.draconicevolution.common.network.TeleporterPacket; import com.brandon3055.draconicevolution.common.network.TileObjectPacket; @@ -213,8 +213,11 @@ public class CommonProxy { .registerMessage(MagnetTogglePacket.Handler.class, MagnetTogglePacket.class, 19, Side.SERVER); DraconicEvolution.network .registerMessage(MagnetToggleAckPacket.Handler.class, MagnetToggleAckPacket.class, 20, Side.CLIENT); - DraconicEvolution.network - .registerMessage(DislocatorInhibitorButtonPacket.Handler.class, DislocatorInhibitorButtonPacket.class, 21, Side.SERVER); + DraconicEvolution.network.registerMessage( + DislocatorInhibitorButtonPacket.Handler.class, + DislocatorInhibitorButtonPacket.class, + 21, + Side.SERVER); DraconicEvolution.network .registerMessage(SlotFakeClickPacket.Handler.class, SlotFakeClickPacket.class, 22, Side.SERVER); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java index 1d5490f9..92fddf0d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java @@ -1,16 +1,14 @@ package com.brandon3055.draconicevolution.common.blocks.machine; -import com.brandon3055.draconicevolution.client.gui.GuiHandler; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; @@ -18,17 +16,17 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.gui.GuiHandler; import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.BlockDE; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; - public class DislocatorInhibitor extends BlockDE implements ITileEntityProvider { public DislocatorInhibitor() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java index ac77ef22..3fb10133 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java @@ -1,13 +1,14 @@ package com.brandon3055.draconicevolution.common.container; -import com.brandon3055.draconicevolution.common.inventory.SlotFakeItem; -import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.brandon3055.draconicevolution.common.inventory.SlotFakeItem; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; + public class ContainerDislocatorInhibitor extends Container { private TileDislocatorInhibitor inhibitor; @@ -42,7 +43,6 @@ public class ContainerDislocatorInhibitor extends Container { return inhibitor.isUseableByPlayer(player); } - @Override public boolean canDragIntoSlot(Slot p_94531_1_) { return false; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java b/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java index c1fa7fc8..1d990be1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; public class SlotFakeItem extends Slot { - public SlotFakeItem(IInventory inventory, int id, int x, int y) { super(inventory, id, x, y); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java index 013b2f3d..5f5a20e6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java @@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.network; import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -35,7 +36,8 @@ public class DislocatorInhibitorButtonPacket implements IMessage { @Override public IMessage onMessage(DislocatorInhibitorButtonPacket message, MessageContext ctx) { - if (!(ctx.getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { + if (!(ctx + .getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { return null; } TileDislocatorInhibitor tile = container.getTileEntity(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java index d2162652..aedfbfc8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java @@ -1,12 +1,14 @@ package com.brandon3055.draconicevolution.common.network; +import net.minecraft.item.ItemStack; + import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; public class SlotFakeClickPacket implements IMessage { @@ -32,7 +34,8 @@ public class SlotFakeClickPacket implements IMessage { @Override public IMessage onMessage(SlotFakeClickPacket message, MessageContext ctx) { - if (!(ctx.getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { + if (!(ctx + .getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { return null; } TileDislocatorInhibitor tile = container.getTileEntity(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java index f80a3fbc..04dc9b43 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java @@ -3,7 +3,6 @@ package com.brandon3055.draconicevolution.common.tileentities; import java.util.HashMap; import java.util.HashSet; -import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -18,6 +17,8 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; + public class TileDislocatorInhibitor extends TileEntity implements IInventory { public static final int MAXIMUM_RANGE = 16; @@ -306,8 +307,7 @@ public class TileDislocatorInhibitor extends TileEntity implements IInventory { ALWAYS_ACTIVE, WITH_REDSTONE, WITHOUT_REDSTONE, - NEVER_ACTIVE - ; + NEVER_ACTIVE; public ActivityControlType getNext() { return switch (this) { @@ -320,5 +320,4 @@ public class TileDislocatorInhibitor extends TileEntity implements IInventory { } - } From dd3366bdc355a7ddf80703f1bc16ad19c6743e54 Mon Sep 17 00:00:00 2001 From: Shadow1590 <> Date: Fri, 14 Mar 2025 00:19:10 +0100 Subject: [PATCH 4/4] NEI drag and drop handling --- .../client/gui/GUIDislocatorInhibitor.java | 50 ++++++++++++++++++- .../common/inventory/SlotFakeItem.java | 13 +++++ .../common/network/SlotFakeClickPacket.java | 10 ++-- 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java index c71269bd..9197ba64 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java @@ -1,12 +1,15 @@ package com.brandon3055.draconicevolution.client.gui; import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -20,11 +23,16 @@ import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButto import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GUIDislocatorInhibitor extends GuiContainer { +@Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") +public class GUIDislocatorInhibitor extends GuiContainer implements INEIGuiHandler { private static final ResourceLocation texture = new ResourceLocation( References.MODID.toLowerCase(), @@ -107,7 +115,8 @@ public class GUIDislocatorInhibitor extends GuiContainer { @Override protected void handleMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType) { if (slotIn instanceof SlotFakeItem sfi) { - DraconicEvolution.network.sendToServer(new SlotFakeClickPacket((byte) sfi.getSlotIndex())); + DraconicEvolution.network.sendToServer( + new SlotFakeClickPacket((byte) sfi.getSlotIndex(), this.mc.thePlayer.inventory.getItemStack())); } else { super.handleMouseClick(slotIn, slotId, clickedButton, clickType); } @@ -137,6 +146,43 @@ public class GUIDislocatorInhibitor extends GuiContainer { } } + @Override + public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) { + return currentVisibility; + } + + @Override + public Iterable getItemSpawnSlots(GuiContainer gui, ItemStack item) { + return null; + } + + @Override + public List getInventoryAreas(GuiContainer gui) { + return Collections.emptyList(); + } + + @Override + public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) { + if (gui instanceof GUIDislocatorInhibitor) { + for (var slot : container.inventorySlots) { + if (slot instanceof SlotFakeItem sfi) { + if (sfi.isOverSlot(mousex - this.guiLeft, mousey - this.guiTop)) { + draggedStack.stackSize = 0; + DraconicEvolution.network + .sendToServer(new SlotFakeClickPacket((byte) sfi.getSlotIndex(), draggedStack)); + return true; + } + } + } + } + return false; + } + + @Override + public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) { + return false; + } + private void drawGuiText() { fontRendererObj.drawString( StatCollector.translateToLocal("gui.de.dislocatorInhibitor.range.txt"), diff --git a/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java b/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java index 1d990be1..38bd648a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java @@ -16,9 +16,22 @@ public class SlotFakeItem extends Slot { super.onPickupFromSlot(p_82870_1_, p_82870_2_); } + @Override + public boolean isItemValid(ItemStack stack) { + // this is here so NEI CheatItemHandler does not eat the handleDragNDrop event + return false; + } + @Override public int getSlotStackLimit() { return 1; } + public boolean isOverSlot(int mouseX, int mouseY) { + if (xDisplayPosition < mouseX && mouseX <= xDisplayPosition + 18) { + return yDisplayPosition < mouseY && mouseY <= yDisplayPosition + 18; + } + return false; + } + } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java index aedfbfc8..698a884c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java @@ -5,6 +5,7 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; +import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -13,21 +14,25 @@ import io.netty.buffer.ByteBuf; public class SlotFakeClickPacket implements IMessage { private short slotIndex = 0; + private ItemStack stack; public SlotFakeClickPacket() {} - public SlotFakeClickPacket(byte slotIndex) { + public SlotFakeClickPacket(byte slotIndex, ItemStack stack) { this.slotIndex = slotIndex; + this.stack = stack; } @Override public void toBytes(ByteBuf bytes) { bytes.writeByte(slotIndex); + ByteBufUtils.writeItemStack(bytes, stack); } @Override public void fromBytes(ByteBuf bytes) { slotIndex = bytes.readByte(); + stack = ByteBufUtils.readItemStack(bytes); } public static class Handler implements IMessageHandler { @@ -42,8 +47,7 @@ public class SlotFakeClickPacket implements IMessage { if (tile == null) { return null; } - ItemStack currentItem = ctx.getServerHandler().playerEntity.inventory.getItemStack(); - tile.setFilterItem(message.slotIndex, currentItem); + tile.setFilterItem(message.slotIndex, message.stack); ctx.getServerHandler().playerEntity.worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord); return null;