Avaritia compat

build.gradle

@@ -107,6 +107,16 @@ dependencies {
 
     implementation 'mezz.jei:jei_1.12.2:4.16.1.302'
 
+    compileOnly rfg.deobf('curse.maven:codechicken_lib_1_8-242818:2779848')
+    if (project.debug_avaritia.toBoolean() || project.debug_draconic_evolution.toBoolean()) {
+        runtimeOnly rfg.deobf('curse.maven:codechicken_lib_1_8-242818:2779848')
+    }
+
+    compileOnly rfg.deobf('curse.maven:avaritia_1_10-261348:3143349')
+    if (project.debug_avaritia.toBoolean()) {
+        runtimeOnly rfg.deobf('curse.maven:avaritia_1_10-261348:3143349')
+    }
+
     compileOnly rfg.deobf("curse.maven:ctm-267602:2915363")
     compileOnly rfg.deobf("curse.maven:chisel-235279:2915375")
     if (project.debug_chisel.toBoolean()) {
@@ -150,7 +160,7 @@ dependencies {
     if (project.debug_blood_magic.toBoolean()) {
         runtimeOnly rfg.deobf('curse.maven:blood-magic-224791:2822288')
     }
-    
+
     compileOnly rfg.deobf('curse.maven:cyclops-core-232758:3159497')
     if (project.debug_evilcraft.toBoolean() || project.debug_integrated_dynamics.toBoolean()) {
         runtimeOnly rfg.deobf('curse.maven:cyclops-core-232758:3159497')
@@ -203,6 +213,7 @@ dependencies {
 
     compileOnly rfg.deobf('curse.maven:draconic_evolution-223565:3431261')
     compileOnly rfg.deobf('curse.maven:brandons_core-231382:3408276')
+
     if (project.debug_draconic_evolution.toBoolean()) {
         runtimeOnly rfg.deobf('curse.maven:draconic_evolution-223565:3431261')
         runtimeOnly rfg.deobf('curse.maven:brandons_core-231382:3408276')

examples/avaritia.groovy

@@ -0,0 +1,44 @@
+
+mods.avaritia.ExtremeCrafting.removeByOutput(item('avaritia:resource', 6))
+mods.avaritia.ExtremeCrafting.shapedBuilder()
+        .matrix([[item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot')],
+                 [item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot')],
+                 [item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot')],
+                 [item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot')],
+                 [item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot')],
+                 [item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot')],
+                 [item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot'),item('minecraft:gold_ingot')]])
+        .output(item('minecraft:gold_block'))
+        .register()
+
+mods.avaritia.ExtremeCrafting.shapedBuilder()
+        .output(item('minecraft:stone') * 64)
+        .matrix(
+                'DLLLLLDDD',
+                '  DNIGIND',
+                'DDDNIGIND',
+                '  DLLLLLD')
+        .key('D', item('minecraft:diamond'))
+        .key('L', item('minecraft:redstone'))
+        .key('N', item('minecraft:stone').reuse()) // stone will not be consumed in the recipe
+        .key('I', item('minecraft:iron_ingot'))
+        .key('G', item('minecraft:gold_ingot'))
+        .register()
+
+mods.avaritia.ExtremeCrafting.shapelessBuilder()
+        .output(item('minecraft:stone') * 64)
+        .input(item('minecraft:stone'),
+                item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),
+                item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),
+                item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),
+                item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),
+                item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'),item('minecraft:stone'))
+        .register()
+
+mods.avaritia.Compressor.removeByOutput(item('avaritia:singularity', 0))
+mods.avaritia.Compressor.add(item('minecraft:nether_star'), item('minecraft:clay_ball'), 100) // the last number is the required input amount
+mods.avaritia.Compressor.recipeBuilder()
+        .input(item('minecraft:clay_ball'))
+        .output(item('minecraft:nether_star'))
+        .inputCount(100) // required input amount
+        .register()

gradle.properties

@@ -18,25 +18,27 @@ coremod_plugin_class_name = com.cleanroommc.groovyscript.core.GroovyScriptCore
 
 # Debug mod compat
 debug_actually_additions = false
+debug_adv_mortars = false
 debug_applied_energistics_2 = false
+debug_astral = false
+debug_avaritia = false
+debug_blood_magic = false
+debug_botania = false
 debug_chisel = false
-debug_mekanism = false
+debug_compact_machines = false
+debug_draconic_evolution = false
+debug_enderio = false
 debug_evilcraft = false
+debug_extended_crafting = false
+debug_forestry = false
+debug_immersive_engineering = false
 debug_integrated_dynamics = false
-debug_thermal = false
-debug_thaum = false
 debug_industrial_craft_2_classic = false
 debug_industrial_craft_2_experimental = false
-debug_draconic_evolution = false
-debug_immersive_engineering = false
-debug_enderio = false
-debug_astral = false
+debug_inspirations = false
+debug_mekanism = false
 debug_roots = false
-debug_blood_magic = false
+debug_thaum = false
+debug_thermal = false
 debug_tinkers = false
-debug_extended_crafting = false
-debug_adv_mortars = false
-debug_botania = false
-debug_forestry = false
-debug_inspirations = false
-debug_compact_machines = false
+debug_woot = false

src/main/java/com/cleanroommc/groovyscript/compat/mods/ModSupport.java

@@ -6,6 +6,7 @@
 import com.cleanroommc.groovyscript.compat.mods.advancedmortars.AdvancedMortars;
 import com.cleanroommc.groovyscript.compat.mods.appliedenergistics2.AppliedEnergistics2;
 import com.cleanroommc.groovyscript.compat.mods.astralsorcery.AstralSorcery;
+import com.cleanroommc.groovyscript.compat.mods.avaritia.Avaritia;
 import com.cleanroommc.groovyscript.compat.mods.bloodmagic.BloodMagic;
 import com.cleanroommc.groovyscript.compat.mods.botania.Botania;
 import com.cleanroommc.groovyscript.compat.mods.chisel.Chisel;
@@ -47,30 +48,31 @@ public class ModSupport implements IDynamicGroovyProperty {
     public static final ModSupport INSTANCE = new ModSupport(); // Just for Binding purposes
 
     public static final Container<ActuallyAdditions> ACTUALLY_ADDITIONS = new Container<>("actuallyadditions", "Actually Additions", ActuallyAdditions::new, "aa");
+    public static final Container<AdvancedMortars> ADVANCED_MORTARS = new Container<>("advancedmortars", "Advanced Mortars", AdvancedMortars::new);
+    public static final Container<AppliedEnergistics2> APPLIED_ENERGISTICS_2 = new Container<>("appliedenergistics2", "Applied Energistics 2", AppliedEnergistics2::new, "ae2");
     public static final Container<AstralSorcery> ASTRAL_SORCERY = new Container<>("astralsorcery", "Astral Sorcery", AstralSorcery::new, "astral", "astral_sorcery", "as");
+    public static final Container<Avaritia> AVARITIA = new Container<>("avaritia", "Avaritia", Avaritia::new);
+    public static final Container<BloodMagic> BLOOD_MAGIC = new Container<>("bloodmagic", "Blood Magic: Alchemical Wizardry", BloodMagic::new, "bm");
+    public static final Container<Botania> BOTANIA = new Container<>("botania", "Botania", Botania::new);
     public static final Container<Chisel> CHISEL = new Container<>("chisel", "Chisel", Chisel::new);
+    public static final Container<CompactMachines> COMPACT_MACHINES = new Container<>("compactmachines3", "Compact Machines 3", CompactMachines::new, "compactmachines");
+    public static final Container<DraconicEvolution> DRACONIC_EVOLUTION = new Container<>("draconicevolution", "Draconic Evolution", DraconicEvolution::new, "de");
     public static final Container<EnderIO> ENDER_IO = new Container<>("enderio", "Ender IO", EnderIO::new, "eio");
+    public static final Container<EvilCraft> EVILCRAFT = new Container<>("evilcraft", "EvilCraft", EvilCraft::new);
+    public static final Container<ExtendedCrafting> EXTENDED_CRAFTING = new Container<>("extendedcrafting", "Extended Crafting", ExtendedCrafting::new);
+    public static final Container<Forestry> FORESTRY = new Container<>("forestry", "Forestry", Forestry::new);
+    public static final Container<ImmersiveEngineering> IMMERSIVE_ENGINEERING = new Container<>("immersiveengineering", "Immersive Engineering", ImmersiveEngineering::new, "ie");
+    public static final Container<IC2> INDUSTRIALCRAFT = new Container<>("ic2", "Industrial Craft 2", IC2::new, "industrialcraft");
+    public static final Container<Inspirations> INSPIRATIONS = new Container<>("inspirations", "Inspirations", Inspirations::new);
+    public static final Container<IntegratedDynamics> INTEGRATED_DYNAMICS = new Container<>("integrateddynamics", "Integrated Dynamics", IntegratedDynamics::new, "id");
     public static final Container<JustEnoughItems> JEI = new Container<>("jei", "Just Enough Items", JustEnoughItems::new, "hei");
-    public static final Container<Thaumcraft> THAUMCRAFT = new Container<>("thaumcraft", "Thaumcraft", Thaumcraft::new, "tc", "thaum");
-    public static final Container<Botania> BOTANIA = new Container<>("botania", "Botania", Botania::new);
     public static final Container<Mekanism> MEKANISM = new Container<>("mekanism", "Mekanism", Mekanism::new);
-    public static final Container<AppliedEnergistics2> APPLIED_ENERGISTICS_2 = new Container<>("appliedenergistics2", "Applied Energistics 2", AppliedEnergistics2::new, "ae2");
+    public static final Container<Roots> ROOTS = new Container<>("roots", "Roots 3", Roots::new);
+    public static final Container<Thaumcraft> THAUMCRAFT = new Container<>("thaumcraft", "Thaumcraft", Thaumcraft::new, "tc", "thaum");
     public static final Container<ThermalExpansion> THERMAL_EXPANSION = new Container<>("thermalexpansion", "Thermal Expansion", ThermalExpansion::new, "te", "thermal");
-    public static final Container<TinkersConstruct> TINKERS_CONSTRUCT = new Container<>("tconstruct", "Tinkers' Construct", TinkersConstruct::new, "ticon", "tinkersconstruct");
     public static final Container<TinkersComplement> TINKERS_COMPLEMENT = new Container<>("tcomplement", "Tinkers Complement", TinkersComplement::new, "tcomp", "tinkerscomplement");
-    public static final Container<DraconicEvolution> DRACONIC_EVOLUTION = new Container<>("draconicevolution", "Draconic Evolution", DraconicEvolution::new, "de");
-    public static final Container<Roots> ROOTS = new Container<>("roots", "Roots 3", Roots::new);
-    public static final Container<BloodMagic> BLOOD_MAGIC = new Container<>("bloodmagic", "Blood Magic: Alchemical Wizardry", BloodMagic::new, "bm");
-    public static final Container<EvilCraft> EVILCRAFT = new Container<>("evilcraft", "EvilCraft", EvilCraft::new);
-    public static final Container<IntegratedDynamics> INTEGRATED_DYNAMICS = new Container<>("integrateddynamics", "Integrated Dynamics", IntegratedDynamics::new, "id");
-    public static final Container<ImmersiveEngineering> IMMERSIVE_ENGINEERING = new Container<>("immersiveengineering", "Immersive Engineering", ImmersiveEngineering::new, "ie");
-    public static final Container<IC2> INDUSTRIALCRAFT = new Container<>("ic2", "Industrial Craft 2", IC2::new, "industrialcraft");
-    public static final Container<ExtendedCrafting> EXTENDED_CRAFTING = new Container<>("extendedcrafting", "Extended Crafting", ExtendedCrafting::new);
-    public static final Container<Forestry> FORESTRY = new Container<>("forestry", "Forestry", Forestry::new);
-    public static final Container<AdvancedMortars> ADVANCED_MORTARS = new Container<>("advancedmortars", "Advanced Mortars", AdvancedMortars::new);
+    public static final Container<TinkersConstruct> TINKERS_CONSTRUCT = new Container<>("tconstruct", "Tinkers' Construct", TinkersConstruct::new, "ticon", "tinkersconstruct");
     public static final Container<Woot> WOOT = new Container<>("woot", "Woot", Woot::new);
-    public static final Container<Inspirations> INSPIRATIONS = new Container<>("inspirations", "Inspirations", Inspirations::new);
-    public static final Container<CompactMachines> COMPACT_MACHINES = new Container<>("compactmachines3", "Compact Machines 3", CompactMachines::new, "compactmachines");
 
     public static Collection<Container<? extends ModPropertyContainer>> getAllContainers() {
         return new ObjectOpenHashSet<>(containers.values());

src/main/java/com/cleanroommc/groovyscript/compat/mods/avaritia/Avaritia.java

@@ -0,0 +1,14 @@
+package com.cleanroommc.groovyscript.compat.mods.avaritia;
+
+import com.cleanroommc.groovyscript.compat.mods.ModPropertyContainer;
+
+public class Avaritia extends ModPropertyContainer {
+
+    public final ExtremeCrafting extremeCrafting = new ExtremeCrafting();
+    public final Compressor compressor = new Compressor();
+
+    public Avaritia() {
+        addRegistry(this.extremeCrafting);
+        addRegistry(this.compressor);
+    }
+}

src/main/java/com/cleanroommc/groovyscript/compat/mods/avaritia/Compressor.java

@@ -0,0 +1,124 @@
+package com.cleanroommc.groovyscript.compat.mods.avaritia;
+
+import com.cleanroommc.groovyscript.api.GroovyLog;
+import com.cleanroommc.groovyscript.api.IIngredient;
+import com.cleanroommc.groovyscript.helper.SimpleObjectStream;
+import com.cleanroommc.groovyscript.helper.ingredient.IngredientHelper;
+import com.cleanroommc.groovyscript.helper.recipe.AbstractRecipeBuilder;
+import com.cleanroommc.groovyscript.registry.VirtualizedRegistry;
+import morph.avaritia.recipe.AvaritiaRecipeManager;
+import morph.avaritia.recipe.compressor.CompressorRecipe;
+import morph.avaritia.recipe.compressor.ICompressorRecipe;
+import net.minecraft.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+
+public class Compressor extends VirtualizedRegistry<ICompressorRecipe> {
+
+    @Override
+    public void onReload() {
+        removeScripted().forEach(recipe -> AvaritiaRecipeManager.COMPRESSOR_RECIPES.values().removeIf(r -> r == recipe));
+        restoreFromBackup().forEach(recipe -> AvaritiaRecipeManager.COMPRESSOR_RECIPES.put(recipe.getRegistryName(), recipe));
+    }
+
+    public boolean remove(ICompressorRecipe recipe) {
+        recipe = AvaritiaRecipeManager.COMPRESSOR_RECIPES.remove(recipe.getRegistryName());
+        if (recipe != null) {
+            addBackup(recipe);
+            return true;
+        }
+        return false;
+    }
+
+    public boolean removeByOutput(ItemStack output) {
+        if (IngredientHelper.isEmpty(output)) {
+            GroovyLog.msg("Error removing avaritia compressor recipe")
+                    .add("output must not be empty")
+                    .error()
+                    .post();
+            return false;
+        }
+        return AvaritiaRecipeManager.COMPRESSOR_RECIPES.values().removeIf(recipe -> {
+            if (recipe != null && recipe.getResult().isItemEqual(output)) {
+                addBackup(recipe);
+                return true;
+            }
+            return false;
+        });
+    }
+
+    public void removeAll() {
+        AvaritiaRecipeManager.COMPRESSOR_RECIPES.values().forEach(this::addBackup);
+        AvaritiaRecipeManager.COMPRESSOR_RECIPES.values().clear();
+    }
+
+    public SimpleObjectStream<ICompressorRecipe> streamRecipes() {
+        return new SimpleObjectStream<>(AvaritiaRecipeManager.COMPRESSOR_RECIPES.values()).setRemover(this::remove);
+    }
+
+    public RecipeBuilder recipeBuilder() {
+        return new RecipeBuilder();
+    }
+
+    public void add(ICompressorRecipe recipe) {
+        AvaritiaRecipeManager.COMPRESSOR_RECIPES.put(recipe.getRegistryName(), recipe);
+        addScripted(recipe);
+    }
+
+    public void add(ItemStack output, IIngredient input, int cost) {
+        recipeBuilder()
+                .inputCount(cost)
+                .input(input)
+                .output(output)
+                .register();
+    }
+
+    public class RecipeBuilder extends AbstractRecipeBuilder<ICompressorRecipe> {
+
+        private int inputCount = 300;
+
+        @Override
+        public AbstractRecipeBuilder<ICompressorRecipe> input(IIngredient ingredient) {
+            if (ingredient == null) return this;
+            if (ingredient.getAmount() > 1) {
+                this.inputCount = ingredient.getAmount();
+            }
+            return super.input(ingredient.withAmount(1));
+        }
+
+        public RecipeBuilder inputCount(int inputCount) {
+            this.inputCount = inputCount;
+            return this;
+        }
+
+        @Override
+        public String getRecipeNamePrefix() {
+            return "avaritia_compressor_";
+        }
+
+        @Override
+        public String getErrorMsg() {
+            return "Error adding Avaritia compressor recipe";
+        }
+
+        @Override
+        public void validate(GroovyLog.Msg msg) {
+            validateItems(msg, 1, 1, 1, 1);
+            validateFluids(msg);
+            validateName();
+            if (this.inputCount <= 0) {
+                this.inputCount = 1;
+            }
+        }
+
+        @Override
+        public @Nullable ICompressorRecipe register() {
+            if (!validate()) return null;
+            CompressorRecipe recipe = new CompressorRecipe(this.output.get(0), this.inputCount, true, Collections.singletonList(this.input.get(0).toMcIngredient()));
+            recipe.setRegistryName(this.name);
+            add(recipe);
+            return recipe;
+        }
+    }
+}