From e293f12fb854e6f39ca9a94c05aeccc57ee32fb9 Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Sat, 30 Nov 2024 19:03:21 -0500 Subject: [PATCH] Refresh Notfine options on world load (#760) --- .../java/jss/notfine/proxy/ClientProxy.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/jss/notfine/proxy/ClientProxy.java b/src/main/java/jss/notfine/proxy/ClientProxy.java index c4d67fefb..354b766a1 100644 --- a/src/main/java/jss/notfine/proxy/ClientProxy.java +++ b/src/main/java/jss/notfine/proxy/ClientProxy.java @@ -1,19 +1,23 @@ package jss.notfine.proxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import jss.notfine.config.NotFineConfig; import jss.notfine.core.Settings; import jss.notfine.core.SettingsManager; import net.minecraft.client.Minecraft; -import net.minecraft.client.settings.GameSettings; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.WorldEvent; public class ClientProxy extends CommonProxy { @Override public void preInit(FMLPreInitializationEvent event) { + FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); + if(!NotFineConfig.allowAdvancedOpenGL) { Minecraft.getMinecraft().gameSettings.advancedOpengl = false; } @@ -29,12 +33,13 @@ public class ClientProxy extends CommonProxy { } } - @Override - public void init(FMLInitializationEvent event) { } - @Override public void postInit(FMLPostInitializationEvent event) { SettingsManager.settingsFile.loadSettings(); } + @SubscribeEvent + public void worldLoad(WorldEvent.Load event) { + SettingsManager.graphicsUpdated(); + } }