Merge branch 'dev' into janino-scripts

# Conflicts:
#	repositories.gradle
This commit is contained in:
bigguy345 committed 2026-01-13 18:18:06 +02:00
commit 88d43f8199
93 files changed
+13097 -181

No files matched your search

@@ -24,7 +24,9 @@ import noppes.npcs.client.gui.util.IGuiData;
import noppes.npcs.client.gui.util.IJTextAreaListener;
import noppes.npcs.client.gui.util.ITextChangeListener;
import noppes.npcs.client.gui.util.ITextfieldListener;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.RecipeAnvil;
import noppes.npcs.controllers.data.RecipeCarpentry;
import noppes.npcs.controllers.data.RecipeScript;
@@ -64,8 +66,7 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback
this.anvil = false;
this.recipeId = recipe.id;
hookList.add(RecipeScript.ScriptType.PRE.function);
hookList.add(RecipeScript.ScriptType.POST.function);
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_RECIPE));
RecipeScriptPacket.Get(false, recipeId);
}
@@ -82,8 +83,7 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback
this.anvil = true;
this.recipeId = recipe.id;
hookList.add(RecipeScript.ScriptType.PRE.function);
hookList.add(RecipeScript.ScriptType.POST.function);
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_RECIPE));
RecipeScriptPacket.Get(true, recipeId);
}