Merge branch 'refs/heads/master' into fix/classes

Author: brachy84

dependencies.gradle

@@ -28,6 +28,7 @@
 // Sorted by alphabetical name of the `project.debug_[this]` value
 final def mod_dependencies = [
         'actually-additions-228404:3117927'                   : [project.debug_actually_additions],
+        'additionalenchantedminer-282837:3851282'             : [project.debug_additional_enchanted_miner],
         'advancedmortars-283777:2780626'                      : [project.debug_adv_mortars],
         'advanced-rocketry-236542:4671856'                    : [project.debug_advanced_rocketry],
         'libvulpes-236541:3801015'                            : [project.debug_advanced_rocketry],
@@ -39,15 +40,19 @@ final def mod_dependencies = [
         'arcane-archives-311357:3057332'                      : [project.debug_arcane_archives],
         'guidebook-253874:2989594'                            : [project.debug_arcane_archives],
         'mystical_lib-277064:3483816'                         : [project.debug_arcane_archives, project.debug_roots],
+        'lemonlib-306926:2639879'                             : [project.debug_arcane_world],
+        'arcane-world-302852:2972860'                         : [project.debug_arcane_world],
         'astralsorcery-sorcery-241721:3044416'                : [project.debug_astral],
-        'baubles-227083:2518667'                              : [project.debug_astral, project.debug_botania, project.debug_botania_tweaks, project.debug_botanic_additions, project.debug_essentialcraft_4, project.debug_extra_botany, project.debug_thaum],
+        'baubles-227083:2518667'                              : [project.debug_blood_arsenal, project.debug_astral, project.debug_botania, project.debug_botania_tweaks, project.debug_botanic_additions, project.debug_essentialcraft_4, project.debug_extra_botany, project.debug_thaum],
         'the-aurorian-352137:4981736'                         : [project.debug_aurorian],
         'avaritia_1_10-261348:3143349'                        : [project.debug_avaritia],
         'atum-2-59621:3116599'                                : [project.debug_atum],
-        'bwm-core-294335:2624990'                             : [project.debug_better_with_mods],
-        'bwm-suite-246760:3289033'                            : [project.debug_better_with_mods],
-        'blood-magic-224791:2822288'                          : [project.debug_blood_magic],
-        'guide-api-228832:2645992'                            : [project.debug_blood_magic, project.debug_woot],
+        'better-with-addons-268326:2899407'                   : [project.debug_better_with_addons],
+        'bwm-core-294335:2624990'                             : [project.debug_better_with_addons, project.debug_better_with_mods],
+        'bwm-suite-246760:3289033'                            : [project.debug_better_with_addons, project.debug_better_with_mods],
+        'blood-arsenal-228823:2904183'                        : [project.debug_blood_arsenal],
+        'blood-magic-224791:2822288'                          : [project.debug_blood_arsenal, project.debug_blood_magic],
+        'guide-api-228832:2645992'                            : [project.debug_blood_arsenal, project.debug_blood_magic, project.debug_woot],
         'botania-225643:3330934'                              : [project.debug_botania, project.debug_botania_tweaks, project.debug_botanic_additions, project.debug_extra_botany],
         'botania-tweaks-295114:3092102'                       : [project.debug_botania_tweaks],
         'botanic-additions-310637:2939405'                    : [project.debug_botanic_additions],
@@ -116,6 +121,22 @@ final def mod_dependencies = [
         'woot-244049:2712670'                                 : [project.debug_woot],
 ]
 
+// Maps mods from CurseMaven to the properties that enable the mod.
+// These mods will be enabled at runtime, but will not be compiled.
+// Sorted alphabetically.
+final Map<String, List<String>> runtime_dependencies = [
+        'com.cleanroommc:configanytime:3.0'                 : [project.debug_universal_tweaks],
+        'curse.maven:aainfo-573154:3627065'                 : [project.debug_actually_advanced_info],
+        'curse.maven:dropt-284973:3758733'                  : [project.debug_pyrotech],
+        'curse.maven:jei-bees-248370:2490058'               : [project.debug_forestry],
+        'curse.maven:just-enough-petroleum-291727:2549332'  : [project.debug_immersive_petroleum],
+        'curse.maven:mouse-tweaks-unofficial-461660:5876158': [project.debug_mouse_tweaks_unofficial],
+        'curse.maven:reid-629017:5502915'                   : [project.debug_roughly_enough_ids],
+        'curse.maven:thaumic_jei-285492:2705304'            : [project.debug_thaum],
+        'curse.maven:universal-tweaks-705000:5860191'       : [project.debug_universal_tweaks],
+        'curse.maven:vintagefix-871198:5536276'             : [project.debug_vintagefix],
+]
+
 dependencies {
     embed "org.apache.groovy:groovy:${project.groovy_version}"
 
@@ -145,8 +166,24 @@ dependencies {
         }
     }
 
-    if (project.debug_thaum.toBoolean()) {
-        runtimeOnly 'curse.maven:thaumic_jei-285492:2705304'
+    // enables mods for runtime
+    runtime_dependencies.each { k, v ->
+        if (v.any { it.toBoolean() }) {
+            runtimeOnly k
+        }
+    }
+
+    compileOnly rfg.deobf('curse.maven:angry-pixel-the-betweenlands-mod-243363:4479688')
+    if (project.debug_betweenlands.toBoolean()) {
+        // TODO: allow development toggling of the coremod
+        //  until this is resolved, download and install the jar from
+        //  https://www.curseforge.com/minecraft/mc-mods/angry-pixel-the-betweenlands-mod/files/4479688
+        // runtimeOnly rfg.deobf('curse.maven:angry-pixel-the-betweenlands-mod-243363:4479688')
+    }
+
+    compileOnly rfg.deobf('curse.maven:better-with-everything-896908:5202745')
+    if (!(project.debug_better_with_addons.toBoolean() || project.debug_better_with_mods.toBoolean()) && project.debug_better_with_everything.toBoolean()) {
+        runtimeOnly rfg.deobf('curse.maven:better-with-everything-896908:5202745')
     }
 
     compileOnly 'com.enderio:endercore:0.5.78'
@@ -174,24 +211,9 @@ dependencies {
         runtimeOnly rfg.deobf('curse.maven:industrialcraft_classic-242942:3093607')
     }
 
-
-    if (project.debug_forestry.toBoolean()) {
-        runtimeOnly rfg.deobf('curse.maven:jei-bees-248370:2490058')
-    }
-
-    if (project.debug_immersive_petroleum.toBoolean()) {
-        runtimeOnly rfg.deobf('curse.maven:just-enough-petroleum-291727:2549332')
-    }
-
-    if (project.debug_pyrotech.toBoolean()) {
-        runtimeOnly rfg.deobf("curse.maven:dropt-284973:3758733")
-    }
-
     compileOnly rfg.deobf('TechReborn:TechReborn-ModCompatibility-1.12.2:1.4.0.76:universal')
     if (project.debug_tech_reborn.toBoolean()) {
         runtimeOnly rfg.deobf('TechReborn:TechReborn-ModCompatibility-1.12.2:1.4.0.76:universal')
     }
 
-    runtimeOnly 'com.cleanroommc:strip-latest-forge-requirements:1.0'
-
 }

examples/postInit/arcaneworld.groovy

@@ -0,0 +1,89 @@
+
+// Auto generated groovyscript example file
+// MODS_LOADED: arcaneworld
+
+log.info 'mod \'arcaneworld\' detected, running script'
+
+// Ritual:
+// Converts up to 5 input itemstacks into a wide number of possible effects, including spawning entities, opening a portal
+// to a dungeon dimension to fight a mob, awarding an output itemstack, running commands, and even entirely customized
+// effects.
+
+mods.arcaneworld.ritual.removeByInput(item('minecraft:gold_nugget'))
+mods.arcaneworld.ritual.removeByOutput(item('arcaneworld:biome_crystal'))
+// mods.arcaneworld.ritual.removeAll()
+
+mods.arcaneworld.ritual.recipeBuilder()
+    .ritualCreateItem()
+    .input(item('minecraft:stone') * 5, item('minecraft:diamond'), item('minecraft:clay'))
+    .output(item('minecraft:clay'))
+    .translationKey('groovyscript.demo_output')
+    .name('groovyscript:custom_name')
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderArena()
+    .input(item('minecraft:stone'), item('minecraft:stone'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_arena')
+    .entity(entity('minecraft:chicken'))
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderCommand()
+    .input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_command')
+    .command('say hi',
+             'give @p minecraft:coal 5')
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderCreateItem()
+    .input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:diamond'))
+    .translationKey('groovyscript.demo_create_item')
+    .output(item('minecraft:diamond'))
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderCustom()
+    .input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:clay'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_custom')
+    .onActivate({ World world, BlockPos blockPos, EntityPlayer player, ItemStack... itemStacks -> { log.info blockPos } })
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderDragonBreath()
+    .input(item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_dragon_breath')
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderDungeon()
+    .input(item('minecraft:diamond'), item('minecraft:clay'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_dungeon')
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderSummon()
+    .input(item('minecraft:stone'), item('minecraft:clay'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_summon')
+    .entity(entity('minecraft:chicken'))
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderTime()
+    .input(item('minecraft:diamond'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_time')
+    .time(5000)
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderWeather()
+    .input(item('minecraft:diamond'), item('minecraft:gold_ingot'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_weather_clear')
+    .weatherClear()
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderWeather()
+    .input(item('minecraft:gold_ingot'), item('minecraft:diamond'), item('minecraft:clay'))
+    .translationKey('groovyscript.demo_weather_rain')
+    .weatherRain()
+    .register()
+
+mods.arcaneworld.ritual.recipeBuilderWeather()
+    .input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:gold_ingot'))
+    .translationKey('groovyscript.demo_weather_thunder')
+    .weatherThunder()
+    .register()
+
+