partially fix rebase

CleanroomMC · Oct 3, 2024 · 92764ea · 92764ea
1 parent f7cc59c
commit 92764ea
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/src/main/java/com/cleanroommc/modularui/factory/HoloGuiManager.java b/src/main/java/com/cleanroommc/modularui/factory/HoloGuiManager.java
@@ -88,7 +88,7 @@ public static <T extends GuiData> void open(int windowId, @NotNull UIFactory<T>
         WidgetTree.collectSyncValues(syncManager, panel);
         ModularScreen screen = factory.createScreen(guiData, panel);
         screen.getContext().setJeiSettings(jeiSettings);
-        GuiScreenWrapper guiScreenWrapper = new GuiScreenWrapper(new ModularContainer(player, syncManager, panel.getName()), screen);
+        GuiContainerWrapper guiScreenWrapper = new GuiContainerWrapper(new ModularContainer(player, syncManager, panel.getName()), screen);
         guiScreenWrapper.inventorySlots.windowId = windowId;
         HoloUI.builder()
 //                .screenScale(0.25f)

diff --git a/src/main/java/com/cleanroommc/modularui/holoui/HoloScreenEntity.java b/src/main/java/com/cleanroommc/modularui/holoui/HoloScreenEntity.java
@@ -1,9 +1,6 @@
 package com.cleanroommc.modularui.holoui;
 
-import com.cleanroommc.modularui.screen.GuiScreenWrapper;
-import com.cleanroommc.modularui.screen.ModularContainer;
-import com.cleanroommc.modularui.screen.ModularPanel;
-import com.cleanroommc.modularui.screen.ModularScreen;
+import com.cleanroommc.modularui.screen.*;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;

diff --git a/src/main/java/com/cleanroommc/modularui/holoui/Plane3D.java b/src/main/java/com/cleanroommc/modularui/holoui/Plane3D.java
@@ -2,12 +2,14 @@
 
 import com.cleanroommc.modularui.utils.GuiUtils;
 
+import com.cleanroommc.modularui.utils.Matrix4f;
+
+import com.cleanroommc.modularui.utils.Vector3f;
+
 import net.minecraft.client.renderer.GlStateManager;
 
 import net.minecraft.util.math.Vec3d;
 import org.jetbrains.annotations.ApiStatus;
-import org.lwjgl.util.vector.Matrix4f;
-import org.lwjgl.util.vector.Vector3f;
 
 /**
  * Highly experimental

diff --git a/src/main/java/com/cleanroommc/modularui/holoui/ScreenEntityRender.java b/src/main/java/com/cleanroommc/modularui/holoui/ScreenEntityRender.java
@@ -1,6 +1,5 @@
 package com.cleanroommc.modularui.holoui;
 
-import com.cleanroommc.modularui.ModularUI;
 import com.cleanroommc.modularui.screen.GuiContainerWrapper;
 import com.cleanroommc.modularui.utils.Animator;
 
@@ -57,8 +56,8 @@ public void doRender(@NotNull HoloScreenEntity entity, double x, double y, doubl
             plane3D.transform();
         }
         var mouse = calculateMousePos(player.getPositionVector().add(0, player.getEyeHeight(), 0), entity, player.getLookVec());
-        screenWrapper.drawScreen(mouse.getX(), mouse.getY(), partialTicks);
-//        screen.drawScreen(mouse.getX(), mouse.getY(), partialTicks);
+//        screenWrapper.drawScreen(mouse.getX(), mouse.getY(), partialTicks);
+        screen.drawScreen(mouse.getX(), mouse.getY(), partialTicks);
         screen.onFrameUpdate();
 
         UUID id = player.getUniqueID();

diff --git a/src/main/java/com/cleanroommc/modularui/widgets/ItemSlot.java b/src/main/java/com/cleanroommc/modularui/widgets/ItemSlot.java
@@ -221,8 +221,8 @@ private void drawSlot(Slot slotIn) {
         }
 
         float z = 100f;
-        // todo fix
-        ((GuiAccessor) guiScreen).setZLevel(z);
+        float zStart = ((GuiAccessor) guiScreen).getZLevel();
+        ((GuiAccessor) guiScreen).setZLevel(zStart + z);
         renderItem.zLevel += z;
 
         if (!flag1) {
@@ -235,7 +235,7 @@ private void drawSlot(Slot slotIn) {
                 // render the item itself
 //                renderItem.renderItemAndEffectIntoGUI(guiScreen.mc.player, itemstack, 1, 1);
 //                guiScreen.getItemRenderer().renderItemAndEffectIntoGUI(guiScreen.mc.player, itemstack, 1, 1);
-                guiScreen.drawItem(itemstack, 1, 1);
+                renderItem.renderItemIntoGUI(itemstack, 1, 1);
                 if (amount < 0) {
                     amount = itemstack.getCount();
                 }
@@ -276,8 +276,7 @@ private void drawSlot(Slot slotIn) {
             }
         }
 
-        // todo fix
-        ((GuiAccessor) guiScreen).setZLevel(0f);
+        ((GuiAccessor) guiScreen).setZLevel(zStart);
         renderItem.zLevel -= z;
     }