Implement Holo UI

src/main/java/com/cleanroommc/modularui/CommonProxy.java

@@ -31,6 +31,7 @@ public class CommonProxy {
     void preInit(FMLPreInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(CommonProxy.class);
         MinecraftForge.EVENT_BUS.register(GuiManager.class);
+        MinecraftForge.EVENT_BUS.register(HoloGuiManager.class);
 
         if (ModularUIConfig.enableTestGuis) {
             MinecraftForge.EVENT_BUS.register(TestBlock.class);
@@ -40,6 +41,7 @@ void preInit(FMLPreInitializationEvent event) {
         NetworkHandler.init();
 
         GuiFactories.init();
+        GuiManager.registerFactory(HoloGuiFactory.INSTANCE);
     }
 
     void postInit(FMLPostInitializationEvent event) {
@@ -61,6 +63,7 @@ public static void registerBlocks(RegistryEvent.Register<EntityEntry> event) {
                 .id("modular_screen", 0)
                 .name("ModularScreen")
                 .entity(HoloScreenEntity.class)
+                .tracker(100, 20, false)
                 .factory(HoloScreenEntity::new)
                 .build());
     }

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

@@ -37,7 +37,7 @@
 
 public class GuiManager {
 
-    private static final Object2ObjectMap<String, UIFactory<?>> FACTORIES = new Object2ObjectOpenHashMap<>(16);
+    protected static final Object2ObjectMap<String, UIFactory<?>> FACTORIES = new Object2ObjectOpenHashMap<>(16);
 
     private static IMuiScreen lastMui;
     private static final List<EntityPlayer> openedContainers = new ArrayList<>(4);

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

@@ -0,0 +1,43 @@
+package com.cleanroommc.modularui.factory;
+
+import com.cleanroommc.modularui.api.IGuiHolder;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.PacketBuffer;
+
+import net.minecraft.util.EnumHand;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+public class HoloGuiFactory extends AbstractUIFactory<HandGuiData>{
+
+    public static final HoloGuiFactory INSTANCE = new HoloGuiFactory();
+
+    protected HoloGuiFactory() {
+        super("mui:holo");
+    }
+
+    public static void open(EntityPlayerMP player, EnumHand hand) {
+        Objects.requireNonNull(player);
+        Objects.requireNonNull(hand);
+        HandGuiData guiData = new HandGuiData(player, hand);
+        HoloGuiManager.open(INSTANCE, guiData, player);
+    }
+    @Override
+    public @NotNull IGuiHolder<HandGuiData> getGuiHolder(HandGuiData data) {
+        return Objects.requireNonNull(castGuiHolder(data.getUsedItemStack().getItem()), "Item was not a gui holder!");
+    }
+
+    @Override
+    public void writeGuiData(HandGuiData guiData, PacketBuffer buffer) {
+        buffer.writeByte(guiData.getHand().ordinal());
+    }
+
+    @Override
+    public @NotNull HandGuiData readGuiData(EntityPlayer player, PacketBuffer buffer) {
+        return new HandGuiData(player, EnumHand.values()[buffer.readByte()]);
+    }
+}

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

@@ -0,0 +1,143 @@
+package com.cleanroommc.modularui.factory;
+
+import com.cleanroommc.modularui.api.JeiSettings;
+import com.cleanroommc.modularui.api.UIFactory;
+import com.cleanroommc.modularui.holoui.HoloScreenEntity;
+import com.cleanroommc.modularui.holoui.HoloUI;
+import com.cleanroommc.modularui.holoui.ScreenEntityRender;
+import com.cleanroommc.modularui.network.NetworkHandler;
+import com.cleanroommc.modularui.network.packets.OpenGuiPacket;
+import com.cleanroommc.modularui.screen.*;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.widget.WidgetTree;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.PacketBuffer;
+import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.FakePlayer;
+import net.minecraftforge.event.entity.player.PlayerContainerEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.InputEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import io.netty.buffer.Unpooled;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class HoloGuiManager extends GuiManager {
+
+
+    private static GuiScreenWrapper lastMui;
+
+    public static <T extends GuiData> void open(@NotNull UIFactory<T> factory, @NotNull T guiData, EntityPlayerMP player) {
+        if (player instanceof FakePlayer) return;
+        // create panel, collect sync handlers and create container
+        guiData.setJeiSettings(JeiSettings.DUMMY);
+        PanelSyncManager syncManager = new PanelSyncManager();
+        ModularPanel panel = factory.createPanel(guiData, syncManager);
+        List<HoloScreenEntity> screens = player.world.getEntities(HoloScreenEntity.class, entity -> entity.isName(panel.getName()));
+        if (!screens.isEmpty()) {
+            for (HoloScreenEntity screen : screens) {
+                screen.setDead();
+            }
+            /*HoloUI.builder()
+                    .inFrontOf(player, 5, true)
+                    .reposition(player, screens);
+            NetworkHandler.sendToPlayer(new SyncHoloPacket(panel.getName()), player);
+            ModularUI.LOGGER.warn("reposition the holo, sync to client");
+            return;*/
+        }
+        WidgetTree.collectSyncValues(syncManager, panel);
+        ModularContainer container = new ModularContainer(player, syncManager, panel.getName());
+        HoloUI.builder()
+                .screenScale(0.5f)
+                .inFrontOf(player, 5, true)
+                .open(screen -> {
+                    screen.setPanel(panel);
+                    //HoloUI.registerSyncedHoloUI(panel, screen);
+                }, player.getEntityWorld());
+        // sync to client
+//        player.getNextWindowId();
+//        player.closeContainer();
+//        int windowId = player.currentWindowId;
+        PacketBuffer buffer = new PacketBuffer(Unpooled.buffer());
+        factory.writeGuiData(guiData, buffer);
+        NetworkHandler.sendToPlayer(new OpenGuiPacket<>(0, factory, buffer), player);
+        // open container // this mimics forge behaviour
+//        player.openContainer = container;
+//        player.openContainer.windowId = windowId;
+//        player.openContainer.addListener(player);
+        // finally invoke event
+        MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, container));
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static <T extends GuiData> void open(int windowId, @NotNull UIFactory<T> factory, @NotNull PacketBuffer data, @NotNull EntityPlayerSP player) {
+        T guiData = factory.readGuiData(player, data);
+        JeiSettingsImpl jeiSettings = new JeiSettingsImpl();
+        guiData.setJeiSettings(jeiSettings);
+        PanelSyncManager syncManager = new PanelSyncManager();
+        ModularPanel panel = factory.createPanel(guiData, syncManager);
+        WidgetTree.collectSyncValues(syncManager, panel);
+        ModularScreen screen = factory.createScreen(guiData, panel);
+        screen.getContext().setJeiSettings(jeiSettings);
+        GuiContainerWrapper guiScreenWrapper = new GuiContainerWrapper(new ModularContainer(player, syncManager, panel.getName()), screen);
+        guiScreenWrapper.inventorySlots.windowId = windowId;
+        HoloUI.builder()
+//                .screenScale(0.25f)
+                .inFrontOf(player, 5, true)
+                .screenScale(0.5f)
+                .open(screen1 -> {
+                    screen1.setPanel(panel);
+                    screen1.setWrapper(guiScreenWrapper);
+                }, player.getEntityWorld());
+    }
+
+    public static void reposition(String panel, EntityPlayer player) {
+        HoloUI.builder()
+//                .screenScale(0.25f)
+                .inFrontOf(player, 5, true)
+                .reposition(player, player.world.getEntities(HoloScreenEntity.class, entity -> entity.isName(panel)));
+    }
+
+    //todo make this a mixin instead of using event to cancel arm animation stuff
+    @SideOnly(Side.CLIENT)
+    @SubscribeEvent
+    public static void onClick(InputEvent.MouseInputEvent event) {
+        var player = Minecraft.getMinecraft().player;
+        if (player != null && player.getHeldItemMainhand().isEmpty() && player.getHeldItemOffhand().isEmpty()) {
+            ScreenEntityRender.clickScreen(player);
+        }
+    }
+
+
+    @SideOnly(Side.CLIENT)
+    @SubscribeEvent
+    public static void onGuiOpen(GuiOpenEvent event) {
+        if (lastMui != null && event.getGui() == null) {
+            if (lastMui.getScreen().getPanelManager().isOpen()) {
+                lastMui.getScreen().getPanelManager().closeAll();
+            }
+            lastMui.getScreen().getPanelManager().dispose();
+            lastMui = null;
+        } else if (event.getGui() instanceof GuiScreenWrapper screenWrapper) {
+            if (lastMui == null) {
+                lastMui = screenWrapper;
+            } else if (lastMui == event.getGui()) {
+                lastMui.getScreen().getPanelManager().reopen();
+            } else {
+                if (lastMui.getScreen().getPanelManager().isOpen()) {
+                    lastMui.getScreen().getPanelManager().closeAll();
+                }
+                lastMui.getScreen().getPanelManager().dispose();
+                lastMui = screenWrapper;
+            }
+        }
+    }
+}

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

@@ -1,8 +1,8 @@
 package com.cleanroommc.modularui.holoui;
 
-import com.cleanroommc.modularui.screen.GuiContainerWrapper;
-import com.cleanroommc.modularui.screen.ModularContainer;
-import com.cleanroommc.modularui.screen.ModularScreen;
+import com.cleanroommc.modularui.api.IMuiScreen;
+import com.cleanroommc.modularui.api.MCHelper;
+import com.cleanroommc.modularui.screen.*;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
@@ -26,8 +26,8 @@
 @ApiStatus.Experimental
 public class HoloScreenEntity extends Entity {
 
-    private GuiContainerWrapper wrapper;
-    private ModularScreen screen;
+    private IMuiScreen wrapper;
+    private ModularPanel panel;
     private final Plane3D plane3D;
     private static final DataParameter<Byte> ORIENTATION = EntityDataManager.createKey(HoloScreenEntity.class, DataSerializers.BYTE);
 
@@ -40,22 +40,34 @@ public HoloScreenEntity(World world) {
         this(world, new Plane3D());
     }
 
-    public void setScreen(ModularScreen screen) {
-        this.screen = screen;
-        this.wrapper = new GuiContainerWrapper(new ModularContainer(null), screen);
-        this.wrapper.setWorldAndResolution(Minecraft.getMinecraft(), (int) this.plane3D.getWidth(), (int) this.plane3D.getHeight());
+    public void setWrapper(IMuiScreen wrapper) {
+        this.wrapper = wrapper;
+        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) {
+        this.panel = panel;
     }
 
     public ModularScreen getScreen() {
-        return this.screen;
+        return this.getWrapper().getScreen();
     }
 
-    public GuiContainerWrapper getWrapper() {
+    public IMuiScreen getWrapper() {
         return this.wrapper;
     }
 
     public void spawnInWorld() {
         getEntityWorld().spawnEntity(this);
+        if (world.isRemote)
+            onResize();
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void onResize() {
+        getScreen().onResize((int) plane3D.getWidth(), (int) plane3D.getHeight());
     }
 
     public void setOrientation(ScreenOrientation orientation) {
@@ -66,6 +78,11 @@ public ScreenOrientation getOrientation() {
         return ScreenOrientation.values()[this.dataManager.get(ORIENTATION)];
     }
 
+    public boolean isName(String name) {
+        if (this.panel == null) return false;
+        return this.panel.getName().equals(name);
+    }
+
     public Plane3D getPlane3D() {
         return this.plane3D;
     }
@@ -84,18 +101,23 @@ public void onEntityUpdate() {
         this.prevPosZ = this.posZ;
         this.prevRotationPitch = this.rotationPitch;
         this.prevRotationYaw = this.rotationYaw;
-        if (this.world.isRemote) {
-            this.extinguish();
-        }
+
         if (this.posY < -64.0D) {
             this.outOfWorld();
         }
 
         if (this.world.isRemote) {
+            this.extinguish();
             int w = (int) this.plane3D.getWidth(), h = (int) this.plane3D.getHeight();
-            if (w != this.wrapper.width || h != this.wrapper.height) {
-                this.wrapper.onResize(Minecraft.getMinecraft(), w, h);
+            if (this.wrapper == null) {
+                this.getEntityWorld().removeEntity(this);
+                return;
+            }
+            var wrapper = this.wrapper.getGuiScreen();
+            if (w != wrapper.width || h != wrapper.height) {
+                wrapper.onResize(Minecraft.getMinecraft(), w, h);
             }
+            this.wrapper.getScreen().onUpdate();
         }
 
         this.firstUpdate = false;