commit whatever this is

Author: ghzdude

src/main/java/com/cleanroommc/modularui/factory/HoloGuiManager.java

@@ -59,7 +59,6 @@ public static <T extends GuiData> void open(@NotNull UIFactory<T> factory, @NotN
                 .screenScale(0.5f)
                 .inFrontOf(player, 5, true)
                 .open(screen -> {
-                    screen.setContainer(container);
                     screen.setPanel(panel);
                     //HoloUI.registerSyncedHoloUI(panel, screen);
                 }, player.getEntityWorld());
@@ -97,7 +96,6 @@ public static <T extends GuiData> void open(int windowId, @NotNull UIFactory<T>
                 .open(screen1 -> {
                     screen1.setPanel(panel);
                     screen1.setWrapper(guiScreenWrapper);
-                    //HoloUI.registerSyncedHoloUI(panel, screen1);
                 }, player.getEntityWorld());
     }
 

src/main/java/com/cleanroommc/modularui/holoui/HoloScreenEntity.java

@@ -1,5 +1,7 @@
 package com.cleanroommc.modularui.holoui;
 
+import com.cleanroommc.modularui.api.IMuiScreen;
+import com.cleanroommc.modularui.api.MCHelper;
 import com.cleanroommc.modularui.screen.*;
 
 import net.minecraft.block.Block;
@@ -24,8 +26,7 @@
 @ApiStatus.Experimental
 public class HoloScreenEntity extends Entity {
 
-    private GuiContainerWrapper wrapper;
-    private ModularContainer container;
+    private IMuiScreen wrapper;
     private ModularPanel panel;
     private final Plane3D plane3D;
     private static final DataParameter<Byte> ORIENTATION = EntityDataManager.createKey(HoloScreenEntity.class, DataSerializers.BYTE);
@@ -39,16 +40,11 @@ public HoloScreenEntity(World world) {
         this(world, new Plane3D());
     }
 
-    public void setWrapper(GuiContainerWrapper wrapper) {
+    public void setWrapper(IMuiScreen wrapper) {
         this.wrapper = wrapper;
-        this.wrapper.setWorldAndResolution(Minecraft.getMinecraft(), (int) this.plane3D.getWidth(), (int) this.plane3D.getHeight());
-        this.getScreen().getContext().holoScreen = this;
-        this.getScreen().getContext().isHoloScreen = true;
-        setContainer(wrapper.getScreen().getContainer());
-    }
-
-    public void setContainer(ModularContainer container) {
-        this.container = container;
+        this.wrapper.getGuiScreen().setWorldAndResolution(Minecraft.getMinecraft(), (int) this.plane3D.getWidth(), (int) this.plane3D.getHeight());
+        this.wrapper.getScreen().getContext().holoScreen = this;
+        this.wrapper.getScreen().getContext().isHoloScreen = true;
     }
 
     public void setPanel(ModularPanel panel) {
@@ -59,7 +55,7 @@ public ModularScreen getScreen() {
         return this.getWrapper().getScreen();
     }
 
-    public GuiContainerWrapper getWrapper() {
+    public IMuiScreen getWrapper() {
         return this.wrapper;
     }
 
@@ -110,8 +106,9 @@ public void onEntityUpdate() {
                 this.getEntityWorld().removeEntity(this);
                 return;
             }
-            if (w != this.wrapper.width || h != this.wrapper.height) {
-                this.wrapper.onResize(Minecraft.getMinecraft(), w, h);
+            var wrapper = this.wrapper.getGuiScreen();
+            if (w != wrapper.width || h != wrapper.height) {
+                wrapper.onResize(Minecraft.getMinecraft(), w, h);
             }
             this.wrapper.getScreen().onUpdate();
         }

src/main/java/com/cleanroommc/modularui/holoui/HoloUI.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.holoui;
 
+import net.minecraft.client.renderer.Vector3d;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
@@ -23,21 +24,25 @@ public static Builder builder() {
     public static class Builder {
 
         private double x, y, z;
+        private Vec3d from, to;
         private Plane3D plane3D = new Plane3D();
         private ScreenOrientation orientation = ScreenOrientation.FIXED;
 
+        private Builder() {
+            from = to = Vec3d.ZERO;
+        }
+
         public Builder at(double x, double y, double z) {
             this.x = x;
             this.y = y;
             this.z = z;
+            this.from = new Vec3d(this.x - 0.5D, this.y - 0.5D, this.z - 0.5D);
+            this.to = new Vec3d(this.x + 0.5D, this.y + 0.5D, this.z + 0.5D);
             return this;
         }
 
         public Builder at(BlockPos pos) {
-            this.x = pos.getX() + 0.5D;
-            this.y = pos.getY() + 0.5D;
-            this.z = pos.getZ() + 0.5D;
-            return this;
+            return at(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D);
         }
 
         public Builder inFrontOf(EntityPlayer player, double distance, boolean fixed) {
@@ -79,20 +84,12 @@ public Builder plane(Plane3D plane) {
         }
 
         public void open(Consumer<HoloScreenEntity> entityConsumer, World world) {
-//            JeiSettingsImpl jeiSettings = new JeiSettingsImpl();
-//            jeiSettings.disableJei();
-//            screen.getContext().setJeiSettings(jeiSettings);
-
-//            wrapper.getScreen().getContext().isHoloScreen = true;
+            this.plane3D.setBounds(this.from, this.to);
             HoloScreenEntity screen = new HoloScreenEntity(world, this.plane3D);
             screen.setPosition(this.x, this.y, this.z);
             screen.setOrientation(this.orientation);
             entityConsumer.accept(screen);
             screen.spawnInWorld();
-//            holoScreenEntity.setPosition(this.x, this.y, this.z);
-//            holoScreenEntity.setWrapper(wrapper);
-//            holoScreenEntity.spawnInWorld();
-//            holoScreenEntity.setOrientation(this.orientation);
         }
 
         public void reposition(EntityPlayer player, Collection<HoloScreenEntity> screens) {

src/main/java/com/cleanroommc/modularui/holoui/Plane3D.java

@@ -22,6 +22,8 @@ public class Plane3D {
     private float aX = 0.5f, aY = 0.5f;
     private Vec3d normal = Direction.NORTH.asVec3d();
     private Vec3d rotation = this.normal;
+    private Vec3d from = Vec3d.ZERO;
+    private Vec3d to = new Vec3d(1, 1, 0);
 
 
     public void transform() {
@@ -61,6 +63,11 @@ public void transform(Vec3d target, Vec3d orig) {
         GlStateManager.translate(-(this.w / 2f), -(this.h / 2f), 0);
     }
 
+    public void setBounds(Vec3d from, Vec3d to) {
+        this.from = from;
+        this.to = to;
+    }
+
     public void setSize(float w, float h) {
         this.w = w;
         this.h = h;

src/main/java/com/cleanroommc/modularui/holoui/ScreenEntityRender.java

@@ -1,9 +1,11 @@
 package com.cleanroommc.modularui.holoui;
 
+import com.cleanroommc.modularui.api.IMuiScreen;
 import com.cleanroommc.modularui.screen.GuiContainerWrapper;
 import com.cleanroommc.modularui.utils.Animator;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.culling.ICamera;
 import net.minecraft.client.renderer.entity.Render;
@@ -28,7 +30,7 @@
  */
 @ApiStatus.Experimental
 public class ScreenEntityRender extends Render<HoloScreenEntity> {
-    private static final Map<UUID, GuiContainerWrapper> lookingPlayers = new Object2ObjectOpenHashMap<>();
+    private static final Map<UUID, IMuiScreen> lookingPlayers = new Object2ObjectOpenHashMap<>();
 
     public ScreenEntityRender(RenderManager renderManager) {
         super(renderManager);
@@ -42,7 +44,7 @@ protected ResourceLocation getEntityTexture(@NotNull HoloScreenEntity entity) {
 
     @Override
     public void doRender(@NotNull HoloScreenEntity entity, double x, double y, double z, float entityYaw, float partialTicks) {
-        GuiContainerWrapper screenWrapper = entity.getWrapper();
+        var screenWrapper = entity.getWrapper();
         if (screenWrapper == null) return;
         var screen = screenWrapper.getScreen();
 
@@ -73,7 +75,7 @@ public void doRender(@NotNull HoloScreenEntity entity, double x, double y, doubl
     public static void clickScreen(EntityPlayer player) {
         if (lookingPlayers.containsKey(player.getUniqueID())) {
             try {
-                lookingPlayers.get(player.getUniqueID()).handleMouseInput();
+                lookingPlayers.get(player.getUniqueID()).getGuiScreen().handleMouseInput();
             } catch (Throwable throwable1) {
                 CrashReport c = CrashReport.makeCrashReport(throwable1, "Updating screen events");
                 c.makeCategory("Affected screen")