diff --git a/build.gradle b/build.gradle index 695fe1f..c9f75b6 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.2' + mappings channel: 'official', version: '1.19' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') @@ -74,7 +74,7 @@ repositories{ dependencies { minecraft 'net.minecraftforge:forge:1.19.2-43.2.6' annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' - + implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:107b3b848a") implementation fg.deobf("curse.maven:cloth_config_forge-348521:3972423") implementation fg.deobf("curse.maven:SU-370704:4410614") diff --git a/src/main/java/net/montoyo/wd/SharedProxy.java b/src/main/java/net/montoyo/wd/SharedProxy.java index f308f19..3ae201a 100644 --- a/src/main/java/net/montoyo/wd/SharedProxy.java +++ b/src/main/java/net/montoyo/wd/SharedProxy.java @@ -27,6 +27,9 @@ public class SharedProxy { public void init() { } + public void postInit() { + } + public Level getWorld(ResourceKey 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 f955576..99c95df 100644 --- a/src/main/java/net/montoyo/wd/WebDisplays.java +++ b/src/main/java/net/montoyo/wd/WebDisplays.java @@ -171,9 +171,11 @@ 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 8ddd1b5..a6a7e39 100644 --- a/src/main/java/net/montoyo/wd/client/ClientProxy.java +++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java @@ -95,8 +95,7 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer } - private Minecraft mc = Minecraft.getInstance(); - + private Minecraft mc; private net.montoyo.mcef.api.API mcef; private MinePadRenderer minePadRenderer; private JSQueryDispatcher jsDispatcher; @@ -129,9 +128,8 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer /**************************************** INHERITED METHODS ****************************************/ @SubscribeEvent - public void onClientSetup(FMLClientSetupEvent event) { + public static void onClientSetup(FMLClientSetupEvent event) { BlockEntityRenderers.register(TileInit.SCREEN_BLOCK_ENTITY.get(), new ScreenRenderer.ScreenRendererProvider()); - ((ReloadableResourceManager) Minecraft.getInstance().getResourceManager()).registerReloadListener(this); } @SubscribeEvent @@ -146,6 +144,7 @@ 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) @@ -166,6 +165,11 @@ public class ClientProxy extends SharedProxy implements IDisplayHandler, IJSQuer findAdvancementToProgressField(); } + @Override + public void postInit() { + ((ReloadableResourceManager) mc.getResourceManager()).registerReloadListener(this); + } + @Override public Level getWorld(ResourceKey dim) { Level ret = mc.level;