Various Fixes/Improvements with PanelSyncHandler, Draggables, and Widgets

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

@@ -32,7 +32,6 @@ public class ClientProxy extends CommonProxy {
     void preInit(FMLPreInitializationEvent event) {
         super.preInit(event);
 
-        MinecraftForge.EVENT_BUS.register(ClientEventHandler.class);
         MinecraftForge.EVENT_BUS.register(ClientScreenHandler.class);
         MinecraftForge.EVENT_BUS.register(OverlayManager.class);
         MinecraftForge.EVENT_BUS.register(KeyBindHandler.class);

src/main/java/com/cleanroommc/modularui/api/IPanelHandler.java

@@ -2,6 +2,7 @@
 
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.screen.SecondaryPanel;
+import com.cleanroommc.modularui.value.sync.ItemSlotSH;
 import com.cleanroommc.modularui.value.sync.PanelSyncHandler;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 
@@ -34,6 +35,8 @@ static IPanelHandler simple(ModularPanel parent, SecondaryPanel.IPanelBuilder pr
         return new SecondaryPanel(parent, provider, subPanel);
     }
 
+    boolean isPanelOpen();
+
     /**
      * Opens the panel. If there is no cached panel, one will be created.
      * Can be called on both sides if this handler is synced.
@@ -60,9 +63,9 @@ static IPanelHandler simple(ModularPanel parent, SecondaryPanel.IPanelBuilder pr
 
     /**
      * Deletes the current cached panel. Should not be used frequently.
-     * This only works on non synced panels. Otherwise, it crashes.
+     * This only works on panels which don't have {@link ItemSlotSH} sync handlers.
      *
-     * @throws UnsupportedOperationException if this handler is synced
+     * @throws UnsupportedOperationException if this handler has ItemSlot sync handlers
      */
     void deleteCachedPanel();
 

src/main/java/com/cleanroommc/modularui/api/drawable/IKey.java

@@ -130,7 +130,7 @@ static IKey comp(@NotNull IKey... keys) {
      * @param getter string supplier
      * @return dynamic text key
      */
-    static IKey dynamic(@NotNull Supplier<String> getter) {
+    static IKey dynamic(@NotNull Supplier<@NotNull String> getter) {
         return new DynamicKey(getter);
     }
 
@@ -181,15 +181,15 @@ default StyledText alignment(Alignment alignment) {
         return withStyle().alignment(alignment);
     }
 
-    default StyledText color(int color) {
+    default StyledText color(@Nullable Integer color) {
         return withStyle().color(color);
     }
 
     default StyledText scale(float scale) {
         return withStyle().scale(scale);
     }
 
-    default StyledText shadow(boolean shadow) {
+    default StyledText shadow(@Nullable Boolean shadow) {
         return withStyle().shadow(shadow);
     }
 

src/main/java/com/cleanroommc/modularui/drawable/text/AnimatedText.java

@@ -10,6 +10,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import org.jetbrains.annotations.Nullable;
+
 public class AnimatedText extends StyledText {
 
     private String fullString;
@@ -111,7 +113,7 @@ public AnimatedText alignment(Alignment alignment) {
     }
 
     @Override
-    public AnimatedText color(int color) {
+    public AnimatedText color(@Nullable Integer color) {
         return (AnimatedText) super.color(color);
     }
 
@@ -121,7 +123,7 @@ public AnimatedText scale(float scale) {
     }
 
     @Override
-    public AnimatedText shadow(boolean shadow) {
+    public AnimatedText shadow(@Nullable Boolean shadow) {
         return (AnimatedText) super.shadow(shadow);
     }
 

src/main/java/com/cleanroommc/modularui/drawable/text/CompoundKey.java

@@ -1,7 +1,7 @@
 package com.cleanroommc.modularui.drawable.text;
 
-import com.cleanroommc.modularui.ClientEventHandler;
 import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.screen.ClientScreenHandler;
 
 public class CompoundKey extends BaseKey {
 
@@ -17,8 +17,8 @@ public CompoundKey(IKey... keys) {
 
     @Override
     public String get() {
-        if (ClientEventHandler.getTicks() != this.time) {
-            this.time = ClientEventHandler.getTicks();
+        if (ClientScreenHandler.getTicks() != this.time) {
+            this.time = ClientScreenHandler.getTicks();
             StringBuilder builder = new StringBuilder();
             for (IKey key : this.keys) {
                 builder.append(key.get());

src/main/java/com/cleanroommc/modularui/drawable/text/DynamicKey.java

@@ -1,12 +1,14 @@
 package com.cleanroommc.modularui.drawable.text;
 
+import java.util.Objects;
 import java.util.function.Supplier;
 
 public class DynamicKey extends BaseKey {
 
     private final Supplier<String> supplier;
 
     public DynamicKey(Supplier<String> supplier) {
+        Objects.requireNonNull(supplier.get(), "IKey returns a null string!");
         this.supplier = supplier;
     }
 

src/main/java/com/cleanroommc/modularui/drawable/text/LangKey.java

@@ -1,6 +1,6 @@
 package com.cleanroommc.modularui.drawable.text;
 
-import com.cleanroommc.modularui.ClientEventHandler;
+import com.cleanroommc.modularui.screen.ClientScreenHandler;
 
 import net.minecraft.client.resources.I18n;
 
@@ -48,10 +48,10 @@ public Supplier<Object[]> getArgsSupplier() {
 
     @Override
     public String get() {
-        if (this.time == ClientEventHandler.getTicks()) {
+        if (this.time == ClientScreenHandler.getTicks()) {
             return this.string;
         }
-        this.time = ClientEventHandler.getTicks();
+        this.time = ClientScreenHandler.getTicks();
         this.string = I18n.format(Objects.requireNonNull(this.keySupplier.get()), this.argsSupplier.get()).replaceAll("\\\\n", "\n");
         return string;
     }

src/main/java/com/cleanroommc/modularui/drawable/text/StyledText.java

@@ -10,6 +10,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+import org.jetbrains.annotations.Nullable;
+
 public class StyledText extends BaseKey {
 
     private final IKey key;
@@ -72,7 +74,7 @@ public StyledText alignment(Alignment alignment) {
     }
 
     @Override
-    public StyledText color(int color) {
+    public StyledText color(@Nullable Integer color) {
         this.color = color;
         return this;
     }
@@ -84,7 +86,7 @@ public StyledText scale(float scale) {
     }
 
     @Override
-    public StyledText shadow(boolean shadow) {
+    public StyledText shadow(@Nullable Boolean shadow) {
         this.shadow = shadow;
         return this;
     }

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

@@ -51,6 +51,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
 import java.io.IOException;
@@ -65,6 +66,7 @@ public class ClientScreenHandler {
     private static ModularScreen currentScreen = null;
     private static Character lastChar = null;
     private static final FpsCounter fpsCounter = new FpsCounter();
+    private static long ticks = 0L;
 
     @SubscribeEvent
     public static void onGuiOpen(GuiOpenEvent event) {
@@ -148,9 +150,22 @@ public static void onTick(TickEvent.ClientTickEvent event) {
             if (checkGui()) {
                 currentScreen.onUpdate();
             }
+            ticks++;
         }
     }
 
+    @SubscribeEvent
+    public static void preDraw(TickEvent.RenderTickEvent event) {
+        if (event.phase == TickEvent.Phase.START) {
+            GL11.glEnable(GL11.GL_STENCIL_TEST);
+        }
+        Stencil.reset();
+    }
+
+    public static long getTicks() {
+        return ticks;
+    }
+
     public static void onFrameUpdate() {
         OverlayStack.foreach(ModularScreen::onFrameUpdate, true);
         if (currentScreen != null) currentScreen.onFrameUpdate();

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

@@ -624,9 +624,13 @@ public final boolean isMainPanel() {
     }
 
     @ApiStatus.Internal
-    public void setSyncHandler(@Nullable PanelSyncHandler syncHandler) {
+    @Override
+    public void setSyncHandler(@Nullable SyncHandler syncHandler) {
+        if (!isValidSyncHandler(syncHandler))
+            throw new IllegalStateException("Panel SyncHandler's must implement IPanelHandler!");
+
         super.setSyncHandler(syncHandler);
-        setPanelHandler(syncHandler);
+        setPanelHandler((IPanelHandler) syncHandler);
     }
 
     @NotNull

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

@@ -63,6 +63,11 @@ public boolean isSubPanel() {
         return subPanel;
     }
 
+    @Override
+    public boolean isPanelOpen() {
+        return this.open;
+    }
+
     @Override
     public void openPanel() {
         if (this.open) return;