From 978fb5e794762b58c2e8b54f168e11765811cea3 Mon Sep 17 00:00:00 2001 From: tommyTT Date: Sun, 25 Sep 2016 17:38:57 +0200 Subject: [PATCH] #39 Hiding Items in JEI 1.10.2 - JEI wasn't started when CraftTweaker tried to apply the operations which caused a NPE and stopped the rest of the scripts from loading - reloading the scripts didn't apply the actions correctly --- .../main/java/minetweaker/mods/jei/JEI.java | 52 ++++++++++++++++++- .../minetweaker/mods/jei/JEIAddonPlugin.java | 23 +++----- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java b/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java index 751e48b..1fc0aa8 100644 --- a/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java +++ b/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEI.java @@ -2,11 +2,15 @@ package minetweaker.mods.jei; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; +import minetweaker.MineTweakerImplementationAPI; +import minetweaker.annotations.OnRegister; import minetweaker.api.item.IItemStack; import stanhebben.zenscript.annotations.NotNull; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import java.util.LinkedList; + import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.mods.jei.JEIAddonPlugin.jeiHelpers; @@ -35,6 +39,36 @@ public class JEI { MineTweakerAPI.apply(new JEIHideItemAction(item)); } + /** + * Register callbacks otherwise the load order with JEI is all messed up. + */ + @OnRegister + public static void onRegister() { + // discard all not yet applied actions before a reload + MineTweakerImplementationAPI.onReloadEvent(event -> { + apply.clear(); + }); + + // after the reload JEI needs to be reloaded as well + MineTweakerImplementationAPI.onPostReload(event -> { + // on server start, this will still be null since JEI only registers the addons when a player joins + if (jeiHelpers != null) { + jeiHelpers.reload(); + } + }); + } + + // list of all hide actions that need to be applied after JEI is available + private static LinkedList apply = new LinkedList<>(); + + /** + * JEI is available and the Hiding of the actions can now be applied. + */ + public static void onJEIStarted() { + apply.forEach(JEIHideItemAction::doApply); + apply.clear(); + } + private static class JEIHideItemAction implements IUndoableAction { private final IItemStack stack; public JEIHideItemAction(IItemStack stack) { @@ -43,7 +77,20 @@ public class JEI { @Override public void apply() { - jeiHelpers.getItemBlacklist().addItemToBlacklist(getItemStack(stack)); + // just register until the JEI addon is registered, otherwise the jeiHelpers are null + apply.add(this); + } + + /** + * Really adds the item to the blacklist when JEI is available + */ + void doApply() { + if (jeiHelpers != null) { + jeiHelpers.getItemBlacklist().addItemToBlacklist(getItemStack(stack)); + } else { + // Should not happen, but in case only log an error + MineTweakerImplementationAPI.logger.logError("JEI not initialized yet!"); + } } @Override @@ -53,7 +100,8 @@ public class JEI { @Override public void undo() { - jeiHelpers.getItemBlacklist().removeItemFromBlacklist(getItemStack(stack)); + // Doesn't need to be called since on reload of JEI the blacklist will be cleared anyway + // jeiHelpers.getItemBlacklist().removeItemFromBlacklist(getItemStack(stack)); } @Override diff --git a/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java b/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java index 3a87172..2d876df 100644 --- a/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java +++ b/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java @@ -1,13 +1,10 @@ package minetweaker.mods.jei; import mezz.jei.api.*; -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.util.IEventHandler; @mezz.jei.api.JEIPlugin public class JEIAddonPlugin implements IModPlugin { - private static boolean eventAdded = false; public static IJeiHelpers jeiHelpers; public static IItemRegistry itemRegistry; public static IRecipeRegistry recipeRegistry; @@ -15,23 +12,17 @@ public class JEIAddonPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { - this.jeiHelpers = registry.getJeiHelpers(); - this.itemRegistry = registry.getItemRegistry(); + jeiHelpers = registry.getJeiHelpers(); + itemRegistry = registry.getItemRegistry(); + + // The blacklist items must be registered here, otherwise the item filters are already created and + // anything that is added doesn't have an effect + JEI.onJEIStarted(); } @Override public void onRuntimeAvailable(IJeiRuntime iJeiRuntime) { - this.recipeRegistry = iJeiRuntime.getRecipeRegistry(); - if (!eventAdded) { - MineTweakerImplementationAPI.onPostReload(new IEventHandler() { - @Override - public void handle(MineTweakerImplementationAPI.ReloadEvent event) { - jeiHelpers.reload(); - } - }); - eventAdded = true; - } - + recipeRegistry = iJeiRuntime.getRecipeRegistry(); }