Skip to content

Don't make labels unstackable after insertion into the Aspect Library #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UltraProdigy merged 4 commits into from
Jan 8, 2026
Merged

Don't make labels unstackable after insertion into the Aspect Library #109

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
963c230
Don't add unnecessary aspects tag to labels in aspect library
devpikachu Dec 30, 2025
9244f0b
Correctly pass null
devpikachu Dec 30, 2025
a133a05
Merge branch 'master' into fix/20338
devpikachu Jan 6, 2026
65ede5d
Merge branch 'master' into fix/20338
UltraProdigy Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions src/main/java/witchinggadgets/common/gui/ContainerLabelLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package witchinggadgets.common.gui;

import javax.annotation.Nullable;

import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
Expand All @@ -12,6 +14,7 @@

public class ContainerLabelLibrary extends Container {

private static final String TAG_ASPECTS = "Aspects";
private static final int LABEL_INPUT_SLOT = 0;
private static final int LABEL_OUTPUT_SLOT = 1;
private static final int SLOT_COUNT = 2;
Expand Down Expand Up @@ -59,7 +62,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slot) {
Slot clickedSlot = inventorySlots.get(slot);
switch (slot) {
case LABEL_INPUT_SLOT:
return transferLabelsWithAspect(new AspectList());
return transferLabelsWithAspect(null);
case LABEL_OUTPUT_SLOT:
if ((clickedSlot).getHasStack()) {
ItemStack clickedStack = clickedSlot.getStack();
Expand All @@ -79,7 +82,9 @@ private void transferInventoryToLabels(Slot clickedSlot) {
Slot labelSlot = inventorySlots.get(LABEL_INPUT_SLOT);
ItemStack labels = labelSlot.getStack();
if (labels == null) {
((IEssentiaContainerItem) clickedItem.getItem()).setAspects(clickedItem, new AspectList());
if (clickedItem.hasTagCompound() && clickedItem.stackTagCompound.hasKey(TAG_ASPECTS)) {
clickedItem.stackTagCompound.removeTag(TAG_ASPECTS);
}
labelSlot.putStack(clickedItem);
clickedSlot.decrStackSize(clickedItem.stackSize);
} else {
Expand All @@ -95,17 +100,19 @@ private void transferInventoryToLabels(Slot clickedSlot) {
}
}

private ItemStack transferLabelsWithAspect(AspectList aspects) {
private ItemStack transferLabelsWithAspect(@Nullable AspectList aspects) {
Slot labelSlot = inventorySlots.get(LABEL_INPUT_SLOT);
ItemStack labels = labelSlot.getStack();
ItemStack returnStack = null;
if (labelSlot.getHasStack()) {
// Set the labels to the given aspect (Empty list is none)
((IEssentiaContainerItem) labels.getItem()).setAspects(labels, aspects);
// Set the labels to the given aspect if one is given
if (aspects != null) ((IEssentiaContainerItem) labels.getItem()).setAspects(labels, aspects);
returnStack = labels.copy();
if (!this.mergeItemStack(labels, SLOT_COUNT, this.inventorySlots.size(), true)) {
// Set un-transferred labels back to no aspects
((IEssentiaContainerItem) labels.getItem()).setAspects(labels, new AspectList());
if (labels.hasTagCompound() && labels.stackTagCompound.hasKey(TAG_ASPECTS)) {
labels.stackTagCompound.removeTag(TAG_ASPECTS);
}
return null;
}
if (labels.stackSize == 0) {
Expand All @@ -114,7 +121,9 @@ private ItemStack transferLabelsWithAspect(AspectList aspects) {
labelSlot.onSlotChanged();
}
// Set un-transferred labels back to no aspects
((IEssentiaContainerItem) labels.getItem()).setAspects(labels, new AspectList());
if (labels.hasTagCompound() && labels.stackTagCompound.hasKey(TAG_ASPECTS)) {
labels.stackTagCompound.removeTag(TAG_ASPECTS);
}
}
return returnStack;
}
Expand All @@ -128,7 +137,9 @@ public ItemStack slotClick(int slotId, int dragType, int clickTypeIn, EntityPlay
// Accept all label items no matter their aspect, and clear their aspect
if (labelSlot.isItemValid(heldStack)) {
if (labels == null) {
((IEssentiaContainerItem) heldStack.getItem()).setAspects(heldStack, new AspectList());
if (heldStack.hasTagCompound() && heldStack.stackTagCompound.hasKey(TAG_ASPECTS)) {
heldStack.stackTagCompound.removeTag(TAG_ASPECTS);
}
labelSlot.putStack(heldStack);
heldStack = null;
} else {
Expand Down