Reload stuff when the config changes

mezz · Dec 12, 2015 · 9617178 · 9617178
1 parent 45a66fd
commit 9617178
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/src/main/java/mezz/jei/JustEnoughItems.java b/src/main/java/mezz/jei/JustEnoughItems.java
@@ -35,8 +35,6 @@ public class JustEnoughItems {
 
 	public static PacketHandler packetHandler;
 
-	private Set<ASMDataTable.ASMData> modPlugins;
-
 	@NetworkCheckHandler
 	public boolean checkModLists(Map<String, String> modList, Side side) {
 		Config.recipeTransferEnabled = modList.containsKey(Constants.MOD_ID);
@@ -46,7 +44,6 @@ public boolean checkModLists(Map<String, String> modList, Side side) {
 
 	@Mod.EventHandler
 	public void preInit(@Nonnull FMLPreInitializationEvent event) {
-		modPlugins = event.getAsmData().getAll(JEIPlugin.class.getCanonicalName());
 		packetHandler = new PacketHandler();
 		JEIManager.guiHelper = new GuiHelper();
 		JEIManager.itemBlacklist = new ItemBlacklist();
@@ -61,6 +58,6 @@ public void init(@Nonnull FMLInitializationEvent event) {
 
 	@Mod.EventHandler
 	public void startJEI(@Nonnull FMLModIdMappingEvent event) {
-		common.startJEI(modPlugins);
+		common.startJEI();
 	}
 }
diff --git a/src/main/java/mezz/jei/ProxyCommon.java b/src/main/java/mezz/jei/ProxyCommon.java
@@ -25,7 +25,7 @@ public void init(@Nonnull FMLInitializationEvent event) {
 
 	}
 
-	public void startJEI(@Nonnull Set<ASMDataTable.ASMData> modPlugins) {
+	public void startJEI() {
 		JEIManager.itemRegistry = new ItemRegistryDummy();
 		JEIManager.recipeRegistry = new RecipeRegistryDummy();
 	}

diff --git a/src/main/java/mezz/jei/ProxyCommonClient.java b/src/main/java/mezz/jei/ProxyCommonClient.java
@@ -22,6 +22,7 @@
 
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JEIManager;
+import mezz.jei.api.JEIPlugin;
 import mezz.jei.config.Config;
 import mezz.jei.config.Constants;
 import mezz.jei.config.KeyBindings;
@@ -34,6 +35,7 @@ public class ProxyCommonClient extends ProxyCommon {
 	@Nullable
 	private ItemFilter itemFilter;
 	private GuiEventHandler guiEventHandler;
+	private Set<ASMDataTable.ASMData> modPlugins;
 
 	private void initVersionChecker() {
 		final NBTTagCompound compound = new NBTTagCompound();
@@ -46,6 +48,7 @@ private void initVersionChecker() {
 	public void preInit(@Nonnull FMLPreInitializationEvent event) {
 		Config.preInit(event);
 		initVersionChecker();
+		modPlugins = event.getAsmData().getAll(JEIPlugin.class.getCanonicalName());
 	}
 
 	@Override
@@ -59,7 +62,7 @@ public void init(@Nonnull FMLInitializationEvent event) {
 	}
 
 	@Override
-	public void startJEI(@Nonnull Set<ASMDataTable.ASMData> modPlugins) {
+	public void startJEI() {
 		JEIManager.itemRegistry = new ItemRegistry();
 		JEIManager.recipeRegistry = createRecipeRegistry(modPlugins);
 
@@ -68,6 +71,13 @@ public void startJEI(@Nonnull Set<ASMDataTable.ASMData> modPlugins) {
 		guiEventHandler.setItemListOverlay(itemListOverlay);
 	}
 
+	private void restartJEI() {
+		// check that JEI has been started before, if not do nothing
+		if (JEIManager.itemRegistry != null) {
+			startJEI();
+		}
+	}
+
 	@Override
 	public void resetItemFilter() {
 		if (itemFilter != null) {
@@ -83,11 +93,13 @@ public void sendPacketToServer(PacketJEI packet) {
 		}
 	}
 
+	// subscribe to Post event so that addon mods that use the config can do their stuff first
 	@SubscribeEvent
-	public void onConfigChanged(@Nonnull ConfigChangedEvent.OnConfigChangedEvent eventArgs) {
+	public void onConfigChanged(@Nonnull ConfigChangedEvent.PostConfigChangedEvent eventArgs) {
 		if (Constants.MOD_ID.equals(eventArgs.modID)) {
-			Config.syncConfig();
-			resetItemFilter();
+			if (Config.syncConfig()) {
+				restartJEI(); // reload everything, configs can change available recipes
+			}
 		}
 	}
 

diff --git a/src/main/java/mezz/jei/config/Config.java b/src/main/java/mezz/jei/config/Config.java
@@ -37,7 +37,7 @@ public static void preInit(@Nonnull FMLPreInitializationEvent event) {
 		syncConfig();
 	}
 
-	public static void syncConfig() {
+	public static boolean syncConfig() {
 		configFile.addCategory(categoryMode);
 		configFile.addCategory(categoryInterface);
 		configFile.addCategory(categoryAdvanced);
@@ -56,9 +56,11 @@ public static void syncConfig() {
 		itemBlacklist.clear();
 		Collections.addAll(itemBlacklist, itemBlacklistArray);
 
-		if (configFile.hasChanged()) {
+		boolean configChanged = configFile.hasChanged();
+		if (configChanged) {
 			configFile.save();
 		}
+		return configChanged;
 	}
 
 	private static void updateBlacklist() {