mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 16:55:12 +00:00
resolved merge conflicts with dev
This commit is contained in:
1 parent
c3e032dcf2
commit
cd92c340c7
8 files changed
+81
-22
No files matched your search
@@ -2,6 +2,7 @@ package noppes.npcs.client.gui.script;
|
||||
|
||||
import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.api.handler.IScriptHookHandler;
|
||||
import noppes.npcs.client.gui.global.GuiNpcManageRecipes;
|
||||
import noppes.npcs.constants.ScriptContext;
|
||||
import noppes.npcs.controllers.ScriptContainer;
|
||||
@@ -10,6 +11,8 @@ import noppes.npcs.controllers.data.RecipeAnvil;
|
||||
import noppes.npcs.controllers.data.RecipeCarpentry;
|
||||
import noppes.npcs.controllers.data.RecipeScript;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class GuiScriptRecipe extends GuiScriptInterface {
|
||||
|
||||
public final int recipeId;
|
||||
|
||||
Reference in new issue
Block a user