Adds Groovyscript support for crafting

build.gradle

@@ -69,6 +69,9 @@ repositories {
 dependencies {
     implementation 'Red-Studio-Ragnarok:Red-Core:0.4-Dev-2'
     sources 'Red-Studio-Ragnarok:Red-Core:0.4-Dev-2:sources@jar'
+    compileOnly('com.cleanroommc:groovyscript:0.7.2'){
+        transitive = false
+    }
 
     jmh 'org.openjdk.jmh:jmh-core:1.36'
     jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.36'

src/main/java/com/paneedah/mwc/MWC.java

@@ -14,17 +14,14 @@
 import com.paneedah.weaponlib.command.CraftingFileCommand;
 import com.paneedah.weaponlib.command.DebugCommand;
 import com.paneedah.weaponlib.config.BalancePackManager;
-import com.paneedah.weaponlib.crafting.CraftingFileManager;
 import io.redstudioragnarok.redcore.RedCore;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.event.*;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import net.minecraftforge.fml.relauncher.FMLLaunchHandler;
@@ -153,7 +150,6 @@ public void serverStarting(FMLServerStartingEvent serverStartingEvent) {
         serverStartingEvent.registerServerCommand(new BalancePackCommand());
         serverStartingEvent.registerServerCommand(new CraftingFileCommand());
         BalancePackManager.loadDirectory();
-        CraftingFileManager.getInstance().loadDirectory();
     }
 
     public static void updateDebugHandler() {

src/main/java/com/paneedah/mwc/groovyscript/MWCGroovyPlugin.java

@@ -0,0 +1,28 @@
+package com.paneedah.mwc.groovyscript;
+
+import com.cleanroommc.groovyscript.api.GroovyPlugin;
+import com.cleanroommc.groovyscript.compat.mods.GroovyContainer;
+import com.paneedah.mwc.groovyscript.script.CraftingStation;
+
+import static com.paneedah.mwc.utils.ModReference.ID;
+import static com.paneedah.mwc.utils.ModReference.NAME;
+
+public class MWCGroovyPlugin implements GroovyPlugin {
+
+    public static final CraftingStation craftingStation = new CraftingStation();
+
+    @Override
+    public String getModId() {
+        return ID;
+    }
+
+    @Override
+    public String getModName() {
+        return NAME;
+    }
+
+    @Override
+    public void onCompatLoaded(GroovyContainer<?> groovyContainer) {
+        groovyContainer.getVirtualizedRegistrar().addFieldsOf(this);
+    }
+}

src/main/java/com/paneedah/mwc/groovyscript/recipes/GSCrafting.java

@@ -0,0 +1,44 @@
+package com.paneedah.mwc.groovyscript.recipes;
+
+import com.paneedah.weaponlib.crafting.CraftingEntry;
+import com.paneedah.weaponlib.crafting.CraftingGroup;
+import com.paneedah.weaponlib.crafting.IModernCraftingRecipe;
+import net.minecraft.item.ItemStack;
+
+public class GSCrafting implements IModernCraftingRecipe {
+
+    private final ItemStack output;
+    private CraftingEntry[] recipe;
+    private CraftingGroup group;
+
+    public GSCrafting(ItemStack output, CraftingGroup group, CraftingEntry... recipe){
+        this.output = output;
+        this.group = group;
+        this.recipe = recipe;
+    }
+
+    @Override
+    public CraftingEntry[] getModernRecipe() {
+        return this.recipe;
+    }
+
+    @Override
+    public ItemStack getItemStack() {
+        return this.output;
+    }
+
+    @Override
+    public CraftingGroup getCraftingGroup() {
+        return this.group;
+    }
+
+    @Override
+    public void setCraftingRecipe(CraftingEntry[] recipe) {
+        this.recipe = recipe;
+    }
+
+    @Override
+    public void setCraftingGroup(CraftingGroup group) {
+        this.group = group;
+    }
+}

src/main/java/com/paneedah/mwc/groovyscript/script/CraftingStation.java

@@ -0,0 +1,169 @@
+package com.paneedah.mwc.groovyscript.script;
+
+import com.cleanroommc.groovyscript.api.GroovyLog;
+import com.cleanroommc.groovyscript.api.IIngredient;
+import com.cleanroommc.groovyscript.helper.ingredient.OreDictIngredient;
+import com.cleanroommc.groovyscript.helper.recipe.AbstractRecipeBuilder;
+import com.cleanroommc.groovyscript.registry.VirtualizedRegistry;
+import com.paneedah.mwc.groovyscript.recipes.GSCrafting;
+import com.paneedah.weaponlib.crafting.CraftingEntry;
+import com.paneedah.weaponlib.crafting.CraftingGroup;
+import com.paneedah.weaponlib.crafting.CraftingRegistry;
+import com.paneedah.weaponlib.crafting.IModernCraftingRecipe;
+
+import java.util.ArrayList;
+
+import static com.paneedah.mwc.groovyscript.MWCGroovyPlugin.craftingStation;
+import static com.paneedah.weaponlib.crafting.CraftingGroup.*;
+import static com.paneedah.weaponlib.crafting.CraftingRegistry.*;
+
+public class CraftingStation extends VirtualizedRegistry<IModernCraftingRecipe> {
+
+    @Override
+    public void onReload() {
+        this.removeScripted().forEach(CraftingRegistry::deleteRecipeRegistry);
+        this.restoreFromBackup().forEach(CraftingRegistry::registerRecipe);
+    }
+
+    /**
+     * Remove ALL recipes. no matter the category.
+     */
+    public void removeAll() {
+        for (ArrayList<IModernCraftingRecipe> list : craftingMap.values()) {
+            for (IModernCraftingRecipe recipe : list) {
+                deleteRecipeRegistry(recipe);
+                this.addBackup(recipe);
+            }
+        }
+    }
+
+    /**
+     * Remove Recipe that outputs given Ingredient.
+     *
+     * @param ingredient Target Ingredient. any recipe with matching output will be removed.
+     */
+    public void remove(IIngredient ingredient) {
+        for (ArrayList<IModernCraftingRecipe> list : craftingMap.values()) {
+            for (IModernCraftingRecipe recipe : list) {
+                if (ingredient.test(recipe.getItemStack())) {
+                    deleteRecipeRegistry(recipe);
+                    this.addBackup(recipe);
+                }
+            }
+        }
+    }
+
+    /**
+     * Remove ALL recipes of Given Category.
+     *
+     * @param group CraftingGroup to remove all recipes inside. valid values = "GUN", "ATTACHMENT_NORMAL", "ATTACHMENT_MODIFICATION", "BULLET", "MAGAZINE"
+     */
+    public void removeAllinGroup(String group) {
+        clearGroup(CraftingGroup.valueOf(group));
+    }
+
+    public void removeinGroup(IIngredient ingredient, CraftingGroup group) {
+        for (IModernCraftingRecipe recipe : craftingMap.get(group)) {
+            if (ingredient.test(recipe.getItemStack())) {
+                deleteRecipeRegistry(recipe);
+                this.addBackup(recipe);
+            }
+        }
+    }
+
+    public void removeinGroup(IIngredient ingredient, String group) {
+        removeinGroup(ingredient, CraftingGroup.valueOf(group));
+    }
+
+    public void addRecipe(IModernCraftingRecipe crafting) {
+        registerRecipe(crafting);
+        this.addScripted(crafting);
+    }
+
+    /**
+     * Start Recipe Builder for GroovyScript.
+     */
+    public RecipeBuilder recipeBuilder() {
+        return new RecipeBuilder();
+    }
+
+    public static class RecipeBuilder extends AbstractRecipeBuilder<GSCrafting> {
+
+        @Override
+        public String getErrorMsg() {
+            return "Error adding Modern Warefare Cubed Workbench Recipe: "+this.name;
+        }
+
+        @Override
+        public void validate(GroovyLog.Msg msg) {
+            //max input == container size of crafting station.
+            this.validateItems(msg, 1, 27,1,1);
+        }
+
+        private final ArrayList<Double> yields = new ArrayList<>();
+        private double yield = 1.0;
+
+        private CraftingGroup group = GUN;
+
+        /**
+         * Add Ingredient of recipe With ItemStack
+         *
+         * @param ingredient crafting ingredient
+         * @return AbstractRecipeBuilder
+         */
+        @Override
+        public AbstractRecipeBuilder<GSCrafting> input(IIngredient ingredient) {
+            this.yields.add(this.yield);
+            return super.input(ingredient);
+        }
+
+        /**
+         * Set return Yield of upcoming Ingredient.
+         *
+         * @param yield return Yield of upcoming ingredients
+         * @return this RecipeBuilder
+         */
+        public RecipeBuilder setYield(double yield) {
+            this.yield = yield;
+            return this;
+        }
+
+        /**
+         * Set Category of Recipe
+         *
+         * @param group: name of the Group. valid values = "GUN", "ATTACHMENT_NORMAL", "ATTACHMENT_MODIFICATION", "BULLET", "MAGAZINE"
+         * @return this RecipeBuilder
+         */
+        public RecipeBuilder setGroup(String group) {
+            this.group = CraftingGroup.valueOf(group);
+            return this;
+        }
+
+        /**
+         * Finalize the recipe and register it
+         *
+         * @return Finished Recipe
+         */
+        @Override
+        public GSCrafting register() {
+            if (!this.validate())
+                return null;
+
+            ArrayList<CraftingEntry> entries = new ArrayList<>();
+
+            for(int i = 0; i < this.input.size(); i++){
+                IIngredient ingredient = this.input.get(i);
+                if (ingredient instanceof OreDictIngredient) {
+                    OreDictIngredient dict = (OreDictIngredient) ingredient;
+                    entries.add(new CraftingEntry(dict.getFirst().getItem(), dict.getOreDict(), dict.getAmount(), this.yields.get(i)));
+                } else {
+                    entries.add(new CraftingEntry(ingredient.getMatchingStacks()[0].getItem(), ingredient.getAmount(), this.yields.get(i)));
+                }
+            }
+
+            GSCrafting recipe = new GSCrafting(this.output.get(0), this.group, entries.toArray(new CraftingEntry[0]));
+            craftingStation.addRecipe(recipe);
+            return recipe;
+        }
+    }
+}

src/main/java/com/paneedah/mwc/init/MWCRecipes.java

@@ -1,9 +1,17 @@
 package com.paneedah.mwc.init;
 
+import com.paneedah.weaponlib.crafting.CraftingFileManager;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
+import static com.paneedah.mwc.utils.ModReference.ID;
+
+@Mod.EventBusSubscriber(modid =ID)
 public class MWCRecipes {
     public static void register() {
         // Smelting Recipes not supported by JSON.
@@ -16,4 +24,9 @@ public static void register() {
         GameRegistry.addSmelting(MWCItems.sulfurDust, new ItemStack(Items.GUNPOWDER), 0.7f);
         GameRegistry.addSmelting(Items.COAL, new ItemStack(MWCItems.graphiteChunk), 2f);
     }
+
+    @SubscribeEvent
+    public static void registerItems(RegistryEvent.Register<IRecipe> itemRegistryEvent) {
+        CraftingFileManager.getInstance().loadDirectory();
+    }
 }

src/main/java/com/paneedah/mwc/items/equipment/carryable/ItemCarryable.java

@@ -6,7 +6,7 @@
 import com.paneedah.weaponlib.config.BalancePackManager;
 import com.paneedah.weaponlib.crafting.CraftingEntry;
 import com.paneedah.weaponlib.crafting.CraftingGroup;
-import com.paneedah.weaponlib.crafting.IModernCrafting;
+import com.paneedah.weaponlib.crafting.IModernCraftingRecipe;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.Item;
@@ -21,7 +21,7 @@
 
 import static com.paneedah.mwc.utils.ModReference.RED_LOG;
 
-public class ItemCarryable extends Item implements IModernCrafting {
+public class ItemCarryable extends Item implements IModernCraftingRecipe {
 
     public abstract static class Builder<T extends Builder<T>> {
 
@@ -265,8 +265,8 @@ public CraftingEntry[] getModernRecipe() {
     }
 
     @Override
-    public Item getItem() {
-        return this;
+    public ItemStack getItemStack() {
+        return new ItemStack(this);
     }
 
     @Override

src/main/java/com/paneedah/mwc/network/handlers/WorkbenchServerMessageHandler.java

@@ -5,7 +5,7 @@
 import com.paneedah.mwc.network.messages.WorkbenchServerMessage;
 import com.paneedah.weaponlib.crafting.CraftingEntry;
 import com.paneedah.weaponlib.crafting.CraftingRegistry;
-import com.paneedah.weaponlib.crafting.IModernCrafting;
+import com.paneedah.weaponlib.crafting.IModernCraftingRecipe;
 import com.paneedah.weaponlib.crafting.ammopress.TileEntityAmmoPress;
 import com.paneedah.weaponlib.crafting.base.TileEntityStation;
 import com.paneedah.weaponlib.crafting.workbench.TileEntityWorkbench;
@@ -45,7 +45,7 @@ public IMessage onMessage(final WorkbenchServerMessage workbenchServerMessage, f
                     if (tileEntity instanceof TileEntityAmmoPress) {
                         // Since it's based on a queue, you can add whatever you'd like, and it will merely refuse to craft it until you have the resources available.
                         final TileEntityAmmoPress press = (TileEntityAmmoPress) station;
-                        final ItemStack newStack = new ItemStack(CraftingRegistry.getModernCrafting(workbenchServerMessage.getCraftingGroup(), workbenchServerMessage.getCraftingName()).getItem(), workbenchServerMessage.getQuantity());
+                        final ItemStack newStack = new ItemStack(CraftingRegistry.getModernCrafting(workbenchServerMessage.getCraftingGroup(), workbenchServerMessage.getCraftingName()).getItemStack().getItem(), workbenchServerMessage.getQuantity());
 
                         if (press.hasStack()) {
                             final ItemStack topQueue = press.getCraftingQueue().getLast();
@@ -116,9 +116,9 @@ public IMessage onMessage(final WorkbenchServerMessage workbenchServerMessage, f
                             continue;
 
                         final ItemStack stack = station.mainInventory.getStackInSlot(i);
-                        if (stack.getItem() instanceof IModernCrafting && ((IModernCrafting) stack.getItem()).getModernRecipe() != null && (station.dismantleStatus[i - 9] == -1 || station.dismantleStatus[i - 9] > station.dismantleDuration[i - 9])) {
+                        if (stack.getItem() instanceof IModernCraftingRecipe && ((IModernCraftingRecipe) stack.getItem()).getModernRecipe() != null && (station.dismantleStatus[i - 9] == -1 || station.dismantleStatus[i - 9] > station.dismantleDuration[i - 9])) {
                             station.dismantleStatus[i - 9] = 0;
-                            station.dismantleDuration[i - 9] = ((TileEntityStation) tileEntity).getDismantlingTime(((IModernCrafting) stack.getItem()));
+                            station.dismantleDuration[i - 9] = ((TileEntityStation) tileEntity).getDismantlingTime(((IModernCraftingRecipe) stack.getItem()));
                         }
                     }
 

src/main/java/com/paneedah/weaponlib/CustomArmor.java

@@ -3,7 +3,7 @@
 import com.paneedah.weaponlib.crafting.CraftingEntry;
 import com.paneedah.weaponlib.crafting.CraftingGroup;
 import com.paneedah.weaponlib.crafting.CraftingRegistry;
-import com.paneedah.weaponlib.crafting.IModernCrafting;
+import com.paneedah.weaponlib.crafting.IModernCraftingRecipe;
 import com.paneedah.weaponlib.model.ModelBaseRendererWrapper;
 import com.paneedah.weaponlib.model.WrappableModel;
 import net.minecraft.client.entity.AbstractClientPlayer;
@@ -35,7 +35,7 @@
 import static com.paneedah.mwc.proxies.ClientProxy.MC;
 import static com.paneedah.mwc.utils.ModReference.ID;
 
-public class CustomArmor extends ItemArmor implements ExposureProtection , ISpecialArmor, IModernCrafting {
+public class CustomArmor extends ItemArmor implements ExposureProtection , ISpecialArmor, IModernCraftingRecipe {
 
     private static final String ACTIVE_ATTACHMENT_TAG = "ActiveAttachments";
 
@@ -782,8 +782,8 @@ public CraftingEntry[] getModernRecipe() {
 	}
 
 	@Override
-	public Item getItem() {
-		return this;
+	public ItemStack getItemStack() {
+		return new ItemStack(this);
 	}
 
 	@Override