From aea8513eb0f88056643cdbb3c4dddf303ceeed6f Mon Sep 17 00:00:00 2001
From: Mysticpasta1 <ethana5tc@outlook.com>
Date: Sun, 5 Mar 2023 09:29:50 -0600
Subject: [PATCH] beep

---
 build.gradle                                         |  6 +++---
 src/main/java/net/montoyo/wd/SharedProxy.java        |  3 ---
 src/main/java/net/montoyo/wd/WebDisplays.java        |  2 --
 src/main/java/net/montoyo/wd/client/ClientProxy.java | 12 ++++--------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 872868a..8432cd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    mappings channel: 'official', version: '1.19'
+    mappings channel: 'official', version: '1.19.2'
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -75,10 +75,10 @@ dependencies {
     minecraft 'net.minecraftforge:forge:1.19.2-43.2.6'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
-    implementation "com.github.Mysticpasta1:mcef-forge:15062b66a7"
+    implementation "com.github.Mysticpasta1:mcef-forge:107b3b848a"
     implementation "curse.maven:cloth_config_forge-348521:3972423"
     //implementation "curse.maven:SU-370704:4410614" //TODO This is borked Luigi!
-    implementation "curse.maven:spark-361579:4381167"
+    //implementation "curse.maven:spark-361579:4381167"
 }
 
 sourceSets {
diff --git a/src/main/java/net/montoyo/wd/SharedProxy.java b/src/main/java/net/montoyo/wd/SharedProxy.java
index 3ae201a..f308f19 100644
--- a/src/main/java/net/montoyo/wd/SharedProxy.java
+++ b/src/main/java/net/montoyo/wd/SharedProxy.java
@@ -27,9 +27,6 @@ public class SharedProxy {
     public void init() {
     }
 
-    public void postInit() {
-    }
-
     public Level getWorld(ResourceKey<Level> dim) {
         return getServer().getLevel(dim);
     }
diff --git a/src/main/java/net/montoyo/wd/WebDisplays.java b/src/main/java/net/montoyo/wd/WebDisplays.java
index 99c95df..f955576 100644
--- a/src/main/java/net/montoyo/wd/WebDisplays.java
+++ b/src/main/java/net/montoyo/wd/WebDisplays.java
@@ -171,11 +171,9 @@ public class WebDisplays {
 
         MinecraftForge.EVENT_BUS.register(this);
 
-
         //Other things
         PROXY.init();
 
-        PROXY.postInit();
         hasOC = ModList.get().isLoaded("opencomputers");
         hasCC = ModList.get().isLoaded("computercraft");
 
diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java
index a6a7e39..8ddd1b5 100644
--- a/src/main/java/net/montoyo/wd/client/ClientProxy.java
+++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java
@@ -95,7 +95,8 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
 
     }
 
-    private Minecraft mc;
+    private Minecraft mc = Minecraft.getInstance();
+
     private net.montoyo.mcef.api.API mcef;
     private MinePadRenderer minePadRenderer;
     private JSQueryDispatcher jsDispatcher;
@@ -128,8 +129,9 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
 
     /**************************************** INHERITED METHODS ****************************************/
     @SubscribeEvent
-    public static void onClientSetup(FMLClientSetupEvent event) {
+    public void onClientSetup(FMLClientSetupEvent event) {
         BlockEntityRenderers.register(TileInit.SCREEN_BLOCK_ENTITY.get(), new ScreenRenderer.ScreenRendererProvider());
+        ((ReloadableResourceManager) Minecraft.getInstance().getResourceManager()).registerReloadListener(this);
     }
 
     @SubscribeEvent
@@ -144,7 +146,6 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
 
     @Override
     public void preInit() {
-        mc = Minecraft.getInstance();
         MinecraftForge.EVENT_BUS.register(this);
         mcef = MCEFApi.getAPI();
         if(mcef != null)
@@ -165,11 +166,6 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer
         findAdvancementToProgressField();
     }
 
-    @Override
-    public void postInit() {
-        ((ReloadableResourceManager) mc.getResourceManager()).registerReloadListener(this);
-    }
-
     @Override
     public Level getWorld(ResourceKey<Level> dim) {
         Level ret = mc.level;