From 979ed7f5662b5889bfeb17dd7cffc0b3063f572a Mon Sep 17 00:00:00 2001 From: UselessBullets <80850784+UselessBullets@users.noreply.github.com> Date: Sat, 16 Dec 2023 08:39:26 -0600 Subject: [PATCH] Slot changes --- .../Gui/Slots/SlotCraftingDisplayLegacy.java | 45 +++++++++++++++++-- .../useless/legacyui/Gui/Slots/SlotNull.java | 27 +++++------ .../legacyui/Gui/Slots/SlotOldGuidebook.java | 39 ---------------- 3 files changed, 51 insertions(+), 60 deletions(-) delete mode 100644 src/main/java/useless/legacyui/Gui/Slots/SlotOldGuidebook.java diff --git a/src/main/java/useless/legacyui/Gui/Slots/SlotCraftingDisplayLegacy.java b/src/main/java/useless/legacyui/Gui/Slots/SlotCraftingDisplayLegacy.java index 6fd3e09..1d9d1de 100644 --- a/src/main/java/useless/legacyui/Gui/Slots/SlotCraftingDisplayLegacy.java +++ b/src/main/java/useless/legacyui/Gui/Slots/SlotCraftingDisplayLegacy.java @@ -1,10 +1,12 @@ package useless.legacyui.Gui.Slots; import net.minecraft.core.item.ItemStack; +import net.minecraft.core.player.inventory.slot.Slot; import useless.prismaticlibe.gui.slot.IHighlighting; import useless.prismaticlibe.gui.slot.IResizable; -public class SlotCraftingDisplayLegacy extends SlotOldGuidebook implements IHighlighting, IResizable { +public class SlotCraftingDisplayLegacy extends Slot implements IHighlighting, IResizable { + public ItemStack item; private final boolean highlighted; private final int highlightColor; private final int slotWidth; @@ -12,22 +14,56 @@ public SlotCraftingDisplayLegacy(int id, int x, int y, ItemStack item, boolean d this(id, x, y, item, discovered, highlight, color, 16); } public SlotCraftingDisplayLegacy(int id, int x, int y, ItemStack item, boolean discovered, boolean highlight, int color, int width) { - super(id, x, y, item, discovered); + super(null, id, x, y); + this.item = item; + this.discovered = discovered; highlighted = highlight; highlightColor = color; slotWidth = width; } + @Override + public ItemStack decrStackSize(int i) { + return null; + } - public boolean canPutStackInSlot(ItemStack itemstack) { - return false; + @Override + public boolean hasStack() { + return this.item != null; + } + + @Override + public int getSlotStackLimit() { + return this.item.getMaxStackSize(); + } + + @Override + public ItemStack getStack() { + return this.item; + } + + @Override + public void onPickupFromSlot(ItemStack itemstack) { } + @Override + public void onSlotChanged() { + } + + @Override public void putStack(ItemStack itemstack) { } + + @Override + public boolean canPutStackInSlot(ItemStack itemstack) { + return false; + } + + @Override public boolean enableDragAndPickup() { return false; } + @Override public boolean allowItemInteraction() { return false; } @@ -51,4 +87,5 @@ public boolean drawStandardHighlight() { public int getWidth() { return slotWidth; } + } \ No newline at end of file diff --git a/src/main/java/useless/legacyui/Gui/Slots/SlotNull.java b/src/main/java/useless/legacyui/Gui/Slots/SlotNull.java index 11fe3ec..53448df 100644 --- a/src/main/java/useless/legacyui/Gui/Slots/SlotNull.java +++ b/src/main/java/useless/legacyui/Gui/Slots/SlotNull.java @@ -12,50 +12,43 @@ public ItemStack decrStackSize(int i) { return null; } - public int getBackgroundIconIndex() { - return -1; - } - + @Override public boolean hasStack() { return false; } + @Override public int getSlotStackLimit() { return 0; } + @Override public ItemStack getStack() { return null; } - - public boolean isHere(IInventory iinventory, int i) { - return iinventory == this.inventory && i == this.slotIndex; - } - + @Override public boolean canPutStackInSlot(ItemStack itemstack) { return false; } + @Override public void onPickupFromSlot(ItemStack itemstack) { - return; } - + @Override public void onSlotChanged() { - return; } - + @Override public IInventory getInventory() { return null; } - + @Override public void putStack(ItemStack itemstack) { - return; } - + @Override public boolean enableDragAndPickup() { return false; } - + @Override public boolean allowItemInteraction() { return false; } diff --git a/src/main/java/useless/legacyui/Gui/Slots/SlotOldGuidebook.java b/src/main/java/useless/legacyui/Gui/Slots/SlotOldGuidebook.java deleted file mode 100644 index 534a820..0000000 --- a/src/main/java/useless/legacyui/Gui/Slots/SlotOldGuidebook.java +++ /dev/null @@ -1,39 +0,0 @@ -package useless.legacyui.Gui.Slots; - -import net.minecraft.core.item.ItemStack; -import net.minecraft.core.player.inventory.slot.Slot; - -public class SlotOldGuidebook extends Slot { - public ItemStack item; - - public SlotOldGuidebook(int id, int x, int y, ItemStack item, boolean discovered) { - super(null, id, x, y); - this.item = item; - this.discovered = discovered; - } - - public ItemStack decrStackSize(int i) { - return null; - } - - public boolean hasStack() { - return this.item != null; - } - - public int getSlotStackLimit() { - return this.item.getMaxStackSize(); - } - - public ItemStack getStack() { - return this.item; - } - - public void onPickupFromSlot(ItemStack itemstack) { - } - - public void onSlotChanged() { - } - - public void putStack(ItemStack itemstack) { - } -} \ No newline at end of file