Skip to content

Commit 03e5e70

Browse files
committed
fixes
1 parent ce646ba commit 03e5e70

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/main/java/com/cleanroommc/modularui/screen/ClientScreenHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ private static void drawItemStack(GuiContainer mcScreen, ItemStack stack, int x,
490490
((GuiScreenAccessor) mcScreen).getItemRender().zLevel = 200.0F;
491491
FontRenderer font = stack.getItem().getFontRenderer(stack);
492492
if (font == null) font = ((GuiScreenAccessor) mcScreen).getFontRenderer();
493-
GlStateManager.enableDepth();
493+
Platform.setupDrawItem();
494494
((GuiScreenAccessor) mcScreen).getItemRender().renderItemAndEffectIntoGUI(stack, x, y);
495495
((GuiScreenAccessor) mcScreen).getItemRender().renderItemOverlayIntoGUI(font, stack, x, y - (((GuiContainerAccessor) mcScreen).getDraggedStack().isEmpty() ? 0 : 8), altText);
496496
GlStateManager.disableDepth();

src/main/java/com/cleanroommc/modularui/screen/NEAAnimationHandler.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,14 @@ public static void pickupAllPost(ModularContainer container, Int2ObjectArrayMap<
7272
}
7373
}
7474

75-
public static ItemStack injectVirtualStack(GuiContainer guiContainer, ModularSlot slot) {
75+
public static ItemStack injectVirtualStack(ItemStack original, GuiContainer guiContainer, ModularSlot slot) {
7676
if (!slot.isPhantom() && ModularUI.Mods.NEA.isLoaded() && NEAConfig.moveAnimationTime > 0) {
77-
return ItemMoveAnimation.getVirtualStack(guiContainer, slot);
77+
ItemStack virtual = ItemMoveAnimation.getVirtualStack(guiContainer, slot);
78+
if (virtual != null) {
79+
return virtual;
80+
}
7881
}
79-
return null;
82+
return original;
8083
}
8184

8285
public static float injectHoverScale(GuiContainer guiContainer, ModularSlot slot) {

src/main/java/com/cleanroommc/modularui/test/ItemEditorGui.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ private void setStack(ItemStack stack) {
4545

4646
@Override
4747
public ModularPanel buildUI(GuiData data, PanelSyncManager syncManager, UISettings settings) {
48-
ItemStack itemStack = syncManager.getPlayer().getHeldItemMainhand();
48+
ItemStack itemStack = data.getPlayer().getHeldItemMainhand();
4949
if (!itemStack.isEmpty()) {
5050
setStack(itemStack.copy());
51-
syncManager.getPlayer().setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY);
51+
data.getPlayer().setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY);
5252
syncManager.addCloseListener(player -> {
5353
if (!getStack().isEmpty()) {
5454
if (syncManager.getPlayer().getHeldItemMainhand().isEmpty()) {

src/main/java/com/cleanroommc/modularui/widgets/slot/ItemSlot.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,7 @@ private void drawSlot(ModularSlot slotIn) {
222222
GuiDraw.drawRect(1, 1, 16, 16, -2130706433);
223223
}
224224

225-
ItemStack virtualStack = NEAAnimationHandler.injectVirtualStack(guiContainer, slotIn);
226-
if (virtualStack != null) {
227-
itemstack = virtualStack;
228-
}
225+
itemstack = NEAAnimationHandler.injectVirtualStack(itemstack, guiContainer, slotIn);
229226

230227
if (!itemstack.isEmpty()) {
231228
GlStateManager.enableDepth();

0 commit comments

Comments
 (0)