static event listener -> instanced

Author: brachy84

.editorconfig

@@ -3,7 +3,7 @@ charset = utf-8
 end_of_line = crlf
 indent_size = 4
 indent_style = space
-insert_final_newline = false
+insert_final_newline = true
 max_line_length = 120
 tab_width = 4
 ij_continuation_indent_size = 8

gradle.properties

@@ -66,7 +66,7 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = true
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
-mixinsPackage = core.mixin
+mixinsPackage = core.mixins
 # Automatically generates a mixin config json if enabled, with the name mixins.modid.json
 generateMixinConfig = false
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!

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

@@ -32,7 +32,7 @@ public class CommonProxy {
 
     void preInit(FMLPreInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(this);
-        MinecraftForge.EVENT_BUS.register(GuiManager.class);
+        MinecraftForge.EVENT_BUS.register(new GuiManager());
 
         if (ModularUIConfig.enableTestGuis) {
             MinecraftForge.EVENT_BUS.register(TestBlock.class);
@@ -84,7 +84,7 @@ public void onConfigChange(ConfigChangedEvent.OnConfigChangedEvent event) {
     }
 
     @SubscribeEvent
-    public static void onTick(TickEvent.PlayerTickEvent event) {
+    public void onTick(TickEvent.PlayerTickEvent event) {
         if (event.player.openContainer instanceof ModularContainer container) {
             container.onUpdate();
         }

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

@@ -139,7 +139,7 @@ static void openScreen(ModularScreen screen, UISettings settings) {
     }
 
     @SubscribeEvent
-    public static void onTick(TickEvent.ServerTickEvent event) {
+    public void onTick(TickEvent.ServerTickEvent event) {
         if (event.phase == TickEvent.Phase.END) {
             openedContainers.clear();
         }

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

@@ -79,15 +79,15 @@ public class ClientScreenHandler {
     private static long ticks = 0L;
 
     private static IMuiScreen lastMui;
-    
+
     public static boolean guiIsClosing;
 
     // we need to know the actual gui and not some fake bs some other mod overwrites
     @SubscribeEvent(priority = EventPriority.LOWEST)
-    public static void onGuiOpen(GuiOpenEvent event) {
+    public void onGuiOpen(GuiOpenEvent event) {
         GuiScreen newGui = event.getGui();
         guiIsClosing = newGui == null;
-        
+
         defaultContext.reset();
         if (lastMui != null && newGui == null) {
             if (lastMui.getScreen().getPanelManager().isOpen()) {
@@ -130,7 +130,7 @@ public static void onGuiOpen(GuiOpenEvent event) {
     }
 
     @SubscribeEvent
-    public static void onGuiInit(GuiScreenEvent.InitGuiEvent.Post event) {
+    public void onGuiInit(GuiScreenEvent.InitGuiEvent.Post event) {
         defaultContext.updateScreenArea(event.getGui().width, event.getGui().height);
         if (checkGui(event.getGui())) {
             currentScreen.onResize(event.getGui().width, event.getGui().height);
@@ -140,14 +140,14 @@ public static void onGuiInit(GuiScreenEvent.InitGuiEvent.Post event) {
 
     // before JEI
     @SubscribeEvent(priority = EventPriority.HIGH)
-    public static void onGuiInputHigh(GuiScreenEvent.KeyboardInputEvent.Pre event) throws IOException {
+    public void onGuiInputHigh(GuiScreenEvent.KeyboardInputEvent.Pre event) throws IOException {
         defaultContext.updateEventState();
         inputEvent(event, InputPhase.EARLY);
     }
 
     // after JEI
     @SubscribeEvent(priority = EventPriority.LOW)
-    public static void onGuiInputLow(GuiScreenEvent.KeyboardInputEvent.Pre event) throws IOException {
+    public void onGuiInputLow(GuiScreenEvent.KeyboardInputEvent.Pre event) throws IOException {
         inputEvent(event, InputPhase.LATE);
     }
 
@@ -160,7 +160,7 @@ private static void inputEvent(GuiScreenEvent.KeyboardInputEvent.Pre event, Inpu
 
     // before JEI
     @SubscribeEvent(priority = EventPriority.HIGH)
-    public static void onGuiInputHigh(GuiScreenEvent.MouseInputEvent.Pre event) throws IOException {
+    public void onGuiInputHigh(GuiScreenEvent.MouseInputEvent.Pre event) throws IOException {
         defaultContext.updateEventState();
         if (checkGui(event.getGui())) currentScreen.getContext().updateEventState();
         if (handleMouseInput(Mouse.getEventButton(), currentScreen, event.getGui())) {
@@ -180,7 +180,7 @@ public static void onGuiInputHigh(GuiScreenEvent.MouseInputEvent.Pre event) thro
     }
 
     @SubscribeEvent(priority = EventPriority.LOW)
-    public static void onGuiDraw(GuiScreenEvent.DrawScreenEvent.Pre event) {
+    public void onGuiDraw(GuiScreenEvent.DrawScreenEvent.Pre event) {
         int mx = event.getMouseX(), my = event.getMouseY();
         float pt = event.getRenderPartialTicks();
         defaultContext.updateState(mx, my, pt);
@@ -200,7 +200,7 @@ public static void onGuiDraw(GuiScreenEvent.DrawScreenEvent.Post event) {
     }
 
     @SubscribeEvent
-    public static void onTick(TickEvent.ClientTickEvent event) {
+    public void onTick(TickEvent.ClientTickEvent event) {
         if (event.phase == TickEvent.Phase.END) {
             OverlayStack.onTick();
             defaultContext.tick();
@@ -212,7 +212,7 @@ public static void onTick(TickEvent.ClientTickEvent event) {
     }
 
     @SubscribeEvent
-    public static void preDraw(TickEvent.RenderTickEvent event) {
+    public void preDraw(TickEvent.RenderTickEvent event) {
         if (event.phase == TickEvent.Phase.START) {
             GL11.glEnable(GL11.GL_STENCIL_TEST);
         }
@@ -446,7 +446,7 @@ public static void drawContainer(ModularScreen muiScreen, GuiContainer mcScreen,
         MinecraftForge.EVENT_BUS.post(new GuiContainerEvent.DrawForeground(mcScreen, mouseX, mouseY));
         GlStateManager.popMatrix();
 
-        InventoryPlayer inventoryplayer = Minecraft.getMinecraft().player.inventory;
+        InventoryPlayer inventoryplayer = Platform.getClientPlayer().inventory;
         ItemStack itemstack = acc.getDraggedStack().isEmpty() ? inventoryplayer.getItemStack() : acc.getDraggedStack();
         GlStateManager.translate((float) x, (float) y, 0.0F);
         if (!itemstack.isEmpty()) {

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

@@ -31,7 +31,7 @@ public void draw(GuiContext context, int x, int y, int width, int height, Widget
     }.asIcon().height(3);
 
     @SubscribeEvent
-    public static void onItemUse(PlayerInteractEvent.RightClickItem event) {
+    public void onItemUse(PlayerInteractEvent.RightClickItem event) {
         if (event.getEntityPlayer().getEntityWorld().isRemote && event.getItemStack().getItem() == Items.DIAMOND) {
             //GuiManager.openClientUI(Platform.getClientPlayer(), new TestGui());
             /*HoloUI.builder()
@@ -44,7 +44,7 @@ public static void onItemUse(PlayerInteractEvent.RightClickItem event) {
     }
 
     @SubscribeEvent
-    public static void onRichTooltip(RichTooltipEvent.Pre event) {
+    public void onRichTooltip(RichTooltipEvent.Pre event) {
         if (enabledRichTooltipEventTest) {
             event.getTooltip()
                     .add(IKey.str("Powered By: ").style(TextFormatting.GOLD, TextFormatting.ITALIC))