Mapper backend refactor and texture deco improvements (#280)

* mapper backend refactor & texturedeco improvements

* change texture deco cache path

* fixes & optimisations

* reviews

* fix

* fix exception

* remove reflection & javadocs

* completions can consider all params

* fix issues with custom mapper classes

* spotless

* fix weird bwm crash

Author: brachy84

src/main/java/com/cleanroommc/groovyscript/GroovyScript.java

@@ -15,7 +15,7 @@
 import com.cleanroommc.groovyscript.event.EventHandler;
 import com.cleanroommc.groovyscript.helper.JsonHelper;
 import com.cleanroommc.groovyscript.helper.StyleConstant;
-import com.cleanroommc.groovyscript.mapper.ObjectMapper;
+import com.cleanroommc.groovyscript.mapper.AbstractObjectMapper;
 import com.cleanroommc.groovyscript.mapper.ObjectMapperManager;
 import com.cleanroommc.groovyscript.network.CReload;
 import com.cleanroommc.groovyscript.network.NetworkHandler;
@@ -166,7 +166,7 @@ public static void initializeGroovyPreInit() {
         ObjectMapperManager.init();
         StandardInfoParserRegistry.init();
         ModSupport.init();
-        for (ObjectMapper<?> goh : ObjectMapperManager.getObjectMappers()) {
+        for (AbstractObjectMapper<?> goh : ObjectMapperManager.getObjectMappers()) {
             getSandbox().registerBinding(goh);
         }
         if (FMLLaunchHandler.isDeobfuscatedEnvironment()) Documentation.generate();

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/BetterWithAddons.java

@@ -27,13 +27,19 @@ public BetterWithAddons() {
     }
 
     /**
-     * Because Better With Addons checks if the ingredient is an instanceof {@link betterwithaddons.util.IHasSize IHasSize}
-     * to determine if the Ingredient has an amount, we have to use their custom Ingredient.
-     * <p>
-     * If this isn't used, then the recipe may appear correctly in JEI but will actually only consume 1 when done in-game.
+     * This is required for grs to not crash when bwm is not loaded for some reason.
      */
-    public static Ingredient fromIIngredient(IIngredient ingredient) {
-        return new IngredientSized(ingredient.toMcIngredient(), ingredient.getAmount());
+    public static class FromIngredient {
+
+        /**
+         * Because Better With Addons checks if the ingredient is an instanceof {@link betterwithaddons.util.IHasSize IHasSize}
+         * to determine if the Ingredient has an amount, we have to use their custom Ingredient.
+         * <p>
+         * If this isn't used, then the recipe may appear correctly in JEI but will actually only consume 1 when done in-game.
+         */
+        public static Ingredient fromIIngredient(IIngredient ingredient) {
+            return new IngredientSized(ingredient.toMcIngredient(), ingredient.getAmount());
+        }
     }
 
     public static boolean isBetterWithEverything() {

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/DryingBox.java

@@ -77,7 +77,7 @@ public void validate(GroovyLog.Msg msg) {
         @RecipeBuilderRegistrationMethod
         public @Nullable CherryBoxRecipe register() {
             if (!validate()) return null;
-            CherryBoxRecipe recipe = new CherryBoxRecipe(BlockCherryBox.CherryBoxType.DRYING, BetterWithAddons.fromIIngredient(input.get(0)), output.get(0));
+            CherryBoxRecipe recipe = new CherryBoxRecipe(BlockCherryBox.CherryBoxType.DRYING, BetterWithAddons.FromIngredient.fromIIngredient(input.get(0)), output.get(0));
             ModSupport.BETTER_WITH_ADDONS.get().dryingBox.add(recipe);
             return recipe;
         }

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/FireNet.java

@@ -78,7 +78,7 @@ public void validate(GroovyLog.Msg msg) {
         @RecipeBuilderRegistrationMethod
         public @Nullable NetRecipe register() {
             if (!validate()) return null;
-            NetRecipe recipe = new NetRecipe(BlockNettedScreen.SifterType.FIRE, BetterWithAddons.fromIIngredient(input.get(0)), 0, output.toArray(new ItemStack[0]));
+            NetRecipe recipe = new NetRecipe(BlockNettedScreen.SifterType.FIRE, BetterWithAddons.FromIngredient.fromIIngredient(input.get(0)), 0, output.toArray(new ItemStack[0]));
             ModSupport.BETTER_WITH_ADDONS.get().fireNet.add(recipe);
             return recipe;
         }

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/Packing.java

@@ -85,7 +85,7 @@ public void validate(GroovyLog.Msg msg) {
         @RecipeBuilderRegistrationMethod
         public @Nullable PackingRecipe register() {
             if (!validate()) return null;
-            PackingRecipe recipe = new PackingRecipe(BetterWithAddons.fromIIngredient(input.get(0)), compress);
+            PackingRecipe recipe = new PackingRecipe(BetterWithAddons.FromIngredient.fromIIngredient(input.get(0)), compress);
             recipe.setJeiOutput(IngredientHelper.isEmpty(jeiOutput) ? IngredientHelper.toItemStack(compress) : jeiOutput);
             ModSupport.BETTER_WITH_ADDONS.get().packing.add(recipe);
             return recipe;

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/SandNet.java

@@ -91,7 +91,7 @@ public void validate(GroovyLog.Msg msg) {
         @RecipeBuilderRegistrationMethod
         public @Nullable NetRecipe register() {
             if (!validate()) return null;
-            NetRecipe recipe = new NetRecipe(BlockNettedScreen.SifterType.SAND, BetterWithAddons.fromIIngredient(input.get(0)), sand, output.toArray(new ItemStack[0]));
+            NetRecipe recipe = new NetRecipe(BlockNettedScreen.SifterType.SAND, BetterWithAddons.FromIngredient.fromIIngredient(input.get(0)), sand, output.toArray(new ItemStack[0]));
             ModSupport.BETTER_WITH_ADDONS.get().sandNet.add(recipe);
             return recipe;
         }

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/SoakingBox.java

@@ -77,7 +77,7 @@ public void validate(GroovyLog.Msg msg) {
         @RecipeBuilderRegistrationMethod
         public @Nullable CherryBoxRecipe register() {
             if (!validate()) return null;
-            CherryBoxRecipe recipe = new CherryBoxRecipe(BlockCherryBox.CherryBoxType.SOAKING, BetterWithAddons.fromIIngredient(input.get(0)), output.get(0));
+            CherryBoxRecipe recipe = new CherryBoxRecipe(BlockCherryBox.CherryBoxType.SOAKING, BetterWithAddons.FromIngredient.fromIIngredient(input.get(0)), output.get(0));
             ModSupport.BETTER_WITH_ADDONS.get().soakingBox.add(recipe);
             return recipe;
         }

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/Spindle.java

@@ -87,7 +87,7 @@ public void validate(GroovyLog.Msg msg) {
         @RecipeBuilderRegistrationMethod
         public @Nullable SpindleRecipe register() {
             if (!validate()) return null;
-            SpindleRecipe recipe = new SpindleRecipe(popoff, BetterWithAddons.fromIIngredient(input.get(0)), output.toArray(new ItemStack[0]));
+            SpindleRecipe recipe = new SpindleRecipe(popoff, BetterWithAddons.FromIngredient.fromIIngredient(input.get(0)), output.toArray(new ItemStack[0]));
             ModSupport.BETTER_WITH_ADDONS.get().spindle.add(recipe);
             return recipe;
         }

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/Tatara.java

@@ -76,7 +76,7 @@ public void validate(GroovyLog.Msg msg) {
         @RecipeBuilderRegistrationMethod
         public @Nullable SmeltingRecipe register() {
             if (!validate()) return null;
-            SmeltingRecipe recipe = new SmeltingRecipe(BetterWithAddons.fromIIngredient(input.get(0)), output.get(0));
+            SmeltingRecipe recipe = new SmeltingRecipe(BetterWithAddons.FromIngredient.fromIIngredient(input.get(0)), output.get(0));
             ModSupport.BETTER_WITH_ADDONS.get().tatara.add(recipe);
             return recipe;
         }

src/main/java/com/cleanroommc/groovyscript/compat/mods/betterwithaddons/Transmutation.java

@@ -86,7 +86,7 @@ public void validate(GroovyLog.Msg msg) {
         @RecipeBuilderRegistrationMethod
         public @Nullable TransmutationRecipe register() {
             if (!validate()) return null;
-            TransmutationRecipe recipe = new TransmutationRecipe(BetterWithAddons.fromIIngredient(input.get(0)), spirits, output.get(0));
+            TransmutationRecipe recipe = new TransmutationRecipe(BetterWithAddons.FromIngredient.fromIIngredient(input.get(0)), spirits, output.get(0));
             ModSupport.BETTER_WITH_ADDONS.get().transmutation.add(recipe);
             return recipe;
         }