Migration from ForgeGradle to RetroFuturaGradle

examples/thaumcraft.groovy

@@ -1,5 +1,3 @@
-import net.minecraft.util.ResourceLocation
-
 mods.thaumcraft.Crucible.removeByOutput(item('minecraft:gunpowder'))
 
 mods.thaumcraft.Crucible.recipeBuilder()
@@ -52,7 +50,7 @@ mods.thaumcraft.ArcaneWorkbench.shapedBuilder()
 //        .chatColor(14013676)
 //        .component(aspect('cognito'))
 //        .component(aspect('perditio'))
-//        .image(new ResourceLocation('thaumcraft', 'textures/aspects/humor.png'))
+//        .image(resource('thaumcraft:textures/aspects/humor.png'))
 //        .register()
 
 mods.thaumcraft.AspectHelper.aspectBuilder()
@@ -122,12 +120,12 @@ mods.thaumcraft.SmeltingBonus.removeByOutput(item('minecraft:gold_nugget'))
 //    .formulaAspect(aspect('ignis') * 5)
 //    .formulaAspect(aspect('terra') * 5)
 //    .formulaAspect(aspect('aqua') * 5)
-//    .icon(new ResourceLocation('thaumcraft', 'textures/aspects/humor.png'))
-//    .background(new ResourceLocation('thaumcraft', 'textures/gui/gui_research_back_1.jpg'))
-//    .background2(new ResourceLocation('thaumcraft', 'textures/gui/gui_research_back_over.png'))
+//    .icon(resource('thaumcraft:textures/aspects/humor.png'))
+//    .background(resource('thaumcraft:textures/gui/gui_research_back_1.jpg'))
+//    .background2(resource('thaumcraft:textures/gui/gui_research_back_over.png'))
 //    .register()
 //
-//mods.thaumcraft.Research.addResearchLocation(new ResourceLocation('thaumcraft', 'research/new.json'))
+//mods.thaumcraft.Research.addResearchLocation(resource('thaumcraft:research/new.json'))
 
 mods.thaumcraft.Research.addScannable('KNOWLEDGETYPEHUMOR', item('minecraft:pumpkin'))
 

gradle.properties

@@ -9,17 +9,10 @@ maven_group = com.cleanroommc
 archives_base_name = groovyscript
 
 groovy_version = 4.0.8
-
 mod_ref_path=com.cleanroommc.groovyscript.GroovyScript
-
-# Boilerplate Options
-use_mixins = true
-use_coremod = true
-
 debug_load_all_mods = true
 
 # Coremod Arguments
-include_mod = true
 coremod_plugin_class_name = com.cleanroommc.groovyscript.core.GroovyScriptCore
 
 # Debug mod compat
@@ -31,6 +24,8 @@ debug_de = false
 debug_ie = false
 debug_enderio = false
 debug_astral = false
+debug_roots = false
 debug_blood_magic = false
 debug_tinkers = false
 debug_extended_crafting = false
+debug_botania = false

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip

settings.gradle

@@ -0,0 +1,24 @@
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name = 'GTNH Maven'
+            url = 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+            allowInsecureProtocol = true
+            mavenContent {
+                includeGroup 'com.gtnewhorizons'
+                includeGroup 'com.gtnewhorizons.retrofuturagradle'
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+plugins {
+    // Automatic toolchain provisioning
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
+}
+
+rootProject.name = archives_base_name

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

@@ -67,12 +67,12 @@
 @Mod.EventBusSubscriber(modid = GroovyScript.ID)
 public class GroovyScript {
 
-    public static final String ID = "@MODID@";
+    public static final String ID = Tags.ID;
     public static final String NAME = "GroovyScript";
-    public static final String VERSION = "@VERSION@";
+    public static final String VERSION = Tags.VERSION;
 
     public static final String MC_VERSION = "1.12.2";
-    public static final String GROOVY_VERSION = "@GROOVY_VERSION@";
+    public static final String GROOVY_VERSION = Tags.GROOVY_VERSION;
 
     public static final Logger LOGGER = LogManager.getLogger(ID);
 

src/main/java/com/cleanroommc/groovyscript/api/IScriptReloadable.java

@@ -0,0 +1,15 @@
+package com.cleanroommc.groovyscript.api;
+
+import org.jetbrains.annotations.ApiStatus;
+
+public interface IScriptReloadable {
+
+    @GroovyBlacklist
+    @ApiStatus.OverrideOnly
+    void onReload();
+
+    @GroovyBlacklist
+    @ApiStatus.OverrideOnly
+    void afterScriptLoad();
+
+}

src/main/java/com/cleanroommc/groovyscript/brackets/BracketHandlerManager.java

@@ -12,6 +12,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
@@ -56,6 +57,7 @@ public static BracketHandler<?> getBracketHandler(String key) {
     }
 
     public static void init() {
+        registerBracketHandler("resource", ResourceLocationBracketHandler.INSTANCE);
         registerBracketHandler("ore", s -> s.contains("*") ? OreDictWildcardIngredient.of(s) : new OreDictIngredient(s));
         registerBracketHandler("item", ItemBracketHandler.INSTANCE, () -> ItemStack.EMPTY);
         registerBracketHandler("liquid", BracketHandlerManager::parseFluidStack);
@@ -77,6 +79,15 @@ public static void init() {
             }
             return null;
         });
+        registerBracketHandler("textformat", s -> {
+            TextFormatting textformat = TextFormatting.getValueByName(s);
+            if (textformat == null) {
+                try {
+                    textformat = TextFormatting.fromColorIndex(Integer.parseInt(s));
+                } catch (NumberFormatException ignored) { }
+            }
+            return textformat;
+        });
     }
 
     public static FluidStack parseFluidStack(String s) {

src/main/java/com/cleanroommc/groovyscript/brackets/ResourceLocationBracketHandler.java

@@ -0,0 +1,36 @@
+package com.cleanroommc.groovyscript.brackets;
+
+import com.cleanroommc.groovyscript.api.IBracketHandler;
+import net.minecraft.util.ResourceLocation;
+
+import static com.cleanroommc.groovyscript.brackets.BracketHandlerManager.SPLITTER;
+
+public class ResourceLocationBracketHandler implements IBracketHandler<ResourceLocation> {
+
+    public static final ResourceLocationBracketHandler INSTANCE = new ResourceLocationBracketHandler();
+
+    private ResourceLocationBracketHandler() {
+    }
+
+    @Override
+    public ResourceLocation parse(String mainArg, Object[] args) {
+        String[] parts = mainArg.split(SPLITTER);
+        if (parts.length > 1) {
+            return new ResourceLocation(parts[0], parts[1]);
+        }
+
+        if (args.length > 1 || (args.length == 1 && !(args[0] instanceof String))) {
+            throw new IllegalArgumentException("Arguments not valid for bracket handler. Use 'resource(String)' or 'resource(String mod, String path)'");
+        }
+        return new ResourceLocation(mainArg, (String) args[0]);
+    }
+
+    @Override
+    public ResourceLocation parse(String arg) {
+        String[] parts = arg.split(SPLITTER);
+        if (parts.length < 2) {
+            return null;
+        }
+        return new ResourceLocation(parts[0], parts[1]);
+    }
+}

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

@@ -4,13 +4,15 @@
 import com.cleanroommc.groovyscript.api.IDynamicGroovyProperty;
 import com.cleanroommc.groovyscript.compat.mods.astralsorcery.AstralSorcery;
 import com.cleanroommc.groovyscript.compat.mods.bloodmagic.BloodMagic;
+import com.cleanroommc.groovyscript.compat.mods.botania.Botania;
 import com.cleanroommc.groovyscript.compat.mods.draconicevolution.DraconicEvolution;
 import com.cleanroommc.groovyscript.compat.mods.enderio.EnderIO;
 import com.cleanroommc.groovyscript.compat.mods.extendedcrafting.ExtendedCrafting;
 import com.cleanroommc.groovyscript.compat.mods.ic2.IC2;
 import com.cleanroommc.groovyscript.compat.mods.immersiveengineering.ImmersiveEngineering;
 import com.cleanroommc.groovyscript.compat.mods.jei.JustEnoughItems;
 import com.cleanroommc.groovyscript.compat.mods.mekanism.Mekanism;
+import com.cleanroommc.groovyscript.compat.mods.roots.Roots;
 import com.cleanroommc.groovyscript.compat.mods.tcomplement.TinkersComplement;
 import com.cleanroommc.groovyscript.compat.mods.thaumcraft.Thaumcraft;
 import com.cleanroommc.groovyscript.compat.mods.thermalexpansion.ThermalExpansion;
@@ -38,11 +40,13 @@ public class ModSupport implements IDynamicGroovyProperty {
     public static final Container<EnderIO> ENDER_IO = new Container<>("enderio", "Ender IO", EnderIO::new, "eio");
     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<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_EVO = 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<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");

src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/Apothecary.java

@@ -0,0 +1,113 @@
+package com.cleanroommc.groovyscript.compat.mods.botania;
+
+import com.cleanroommc.groovyscript.api.GroovyBlacklist;
+import com.cleanroommc.groovyscript.api.GroovyLog;
+import com.cleanroommc.groovyscript.api.IIngredient;
+import com.cleanroommc.groovyscript.helper.SimpleObjectStream;
+import com.cleanroommc.groovyscript.helper.ingredient.OreDictIngredient;
+import com.cleanroommc.groovyscript.helper.recipe.AbstractRecipeBuilder;
+import com.cleanroommc.groovyscript.registry.VirtualizedRegistry;
+import net.minecraft.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
+import vazkii.botania.api.BotaniaAPI;
+import vazkii.botania.api.recipe.RecipePetals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Apothecary extends VirtualizedRegistry<RecipePetals> {
+
+    public RecipeBuilder recipeBuilder() {
+        return new RecipeBuilder();
+    }
+
+    @Override
+    @GroovyBlacklist
+    public void onReload() {
+        removeScripted().forEach(BotaniaAPI.petalRecipes::remove);
+        BotaniaAPI.petalRecipes.addAll(restoreFromBackup());
+    }
+
+    public RecipePetals add(ItemStack output, IIngredient... inputs) {
+        RecipePetals recipe = new RecipePetals(output, Arrays.stream(inputs).map(i -> i instanceof OreDictIngredient ? ((OreDictIngredient) i).getOreDict() : i.getMatchingStacks()[0]).toArray());
+        add(recipe);
+        return recipe;
+    }
+
+    public void add(RecipePetals recipe) {
+        if (recipe == null) return;
+        addScripted(recipe);
+        BotaniaAPI.petalRecipes.add(recipe);
+    }
+
+    public boolean remove(RecipePetals recipe) {
+        if (recipe == null) return false;
+        addBackup(recipe);
+        return BotaniaAPI.petalRecipes.remove(recipe);
+    }
+
+    public boolean removeByOutput(IIngredient output) {
+        if (BotaniaAPI.petalRecipes.removeIf(recipe -> {
+            boolean found = output.test(recipe.getOutput());
+            if (found) addBackup(recipe);
+            return found;
+        })) return true;
+
+        GroovyLog.msg("Error removing Botania Apothecary recipe")
+                .add("could not find recipe with output {}", output)
+                .error()
+                .post();
+        return false;
+    }
+
+    public boolean removeByInput(IIngredient... inputs) {
+        List<Object> converted = Arrays.stream(inputs).map(i -> i instanceof OreDictIngredient ? ((OreDictIngredient) i).getOreDict() : i.getMatchingStacks()[0]).collect(Collectors.toList());
+        if (BotaniaAPI.petalRecipes.removeIf(recipe -> {
+            boolean found = converted.stream().allMatch(o -> recipe.getInputs().stream().anyMatch(i -> o instanceof String ? o.equals(i) : ItemStack.areItemStacksEqual((ItemStack) i, (ItemStack) o)));
+            if (found) addBackup(recipe);
+            return found;
+        })) return true;
+
+        GroovyLog.msg("Error removing Botania Apothecary recipe")
+                .add("could not find recipe with inputs {}", converted)
+                .error()
+                .post();
+        return false;
+    }
+
+    public boolean removeByInputs(IIngredient... inputs) {
+        return removeByInput(inputs);
+    }
+
+    public void removeAll() {
+        BotaniaAPI.petalRecipes.forEach(this::addBackup);
+        BotaniaAPI.petalRecipes.clear();
+    }
+
+    public SimpleObjectStream<RecipePetals> streamRecipes() {
+        return new SimpleObjectStream<>(BotaniaAPI.petalRecipes).setRemover(this::remove);
+    }
+
+    public class RecipeBuilder extends AbstractRecipeBuilder<RecipePetals> {
+
+        @Override
+        public String getErrorMsg() {
+            return "Error adding Botania Apothecary recipe";
+        }
+
+        @Override
+        public void validate(GroovyLog.Msg msg) {
+            validateFluids(msg, 0, 0, 0, 0);
+            validateItems(msg, 1, 20, 1, 1);
+        }
+
+        @Override
+        public @Nullable RecipePetals register() {
+            if (!validate()) return null;
+            RecipePetals recipe = new RecipePetals(output.get(0), input.stream().map(i -> i instanceof OreDictIngredient ? ((OreDictIngredient) i).getOreDict() : i.getMatchingStacks()[0]).toArray());
+            add(recipe);
+            return recipe;
+        }
+    }
+}

src/main/java/com/cleanroommc/groovyscript/compat/mods/botania/Botania.java

@@ -0,0 +1,56 @@
+package com.cleanroommc.groovyscript.compat.mods.botania;
+
+import com.cleanroommc.groovyscript.brackets.BracketHandlerManager;
+import com.cleanroommc.groovyscript.compat.mods.ModPropertyContainer;
+import vazkii.botania.api.BotaniaAPI;
+import vazkii.botania.api.lexicon.LexiconCategory;
+import vazkii.botania.api.lexicon.LexiconEntry;
+
+public class Botania extends ModPropertyContainer {
+
+    public final ElvenTrade elvenTrade = new ElvenTrade();
+    public final ManaInfusion manaInfusion = new ManaInfusion();
+    public final PureDaisy pureDaisy = new PureDaisy();
+    public final Apothecary apothecary = new Apothecary();
+    public final Orechid orechid = new Orechid();
+    public final OrechidIgnem orechidIgnem = new OrechidIgnem();
+    public final RuneAltar runeAltar = new RuneAltar();
+    public final Brew brew = new Brew();
+    public final Lexicon lexicon = new Lexicon();
+    public final Knowledge knowledge = new Knowledge();
+    public final Magnet magnet = new Magnet();
+    public final Flowers flowers = new Flowers();
+
+    public Botania() {
+        addRegistry(elvenTrade);
+        addRegistry(manaInfusion);
+        addRegistry(pureDaisy);
+        addRegistry(apothecary);
+        addRegistry(orechid);
+        addRegistry(orechidIgnem);
+        addRegistry(runeAltar);
+        addRegistry(brew);
+        addRegistry(lexicon.category);
+        addRegistry(lexicon.entry);
+        addRegistry(lexicon.page);
+        addRegistry(knowledge);
+        addRegistry(magnet);
+    }
+
+    public static LexiconCategory getCategory(String name) {
+        for (LexiconCategory category : BotaniaAPI.getAllCategories())
+            if (category.getUnlocalizedName().equals(name)) return category;
+        return null;
+    }
+
+    public static LexiconEntry getEntry(String name) {
+        for (LexiconEntry entry : BotaniaAPI.getAllEntries())
+            if (entry.getUnlocalizedName().equals(name)) return entry;
+        return null;
+    }
+
+    @Override
+    public void initialize() {
+        BracketHandlerManager.registerBracketHandler("brew", s -> BotaniaAPI.brewMap.getOrDefault(s, BotaniaAPI.fallbackBrew));
+    }
+}