Move GrS

.editorconfig

@@ -15,6 +15,10 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
+# Matches multiple files with brace expansion notation
+[*.{groovy}]
+indent_size = 4
+
 # Override default charset for XML and CFG files
 [*.{json,cfg,xml}]
 insert_final_newline = false

CHANGELOG_v2.md

@@ -2,6 +2,7 @@
 ## Move mods
 - Baubles-LTS (1.0.6.0) -> BubblesEX (1.6.5)
 - Bring Me The Rings! (0.4) -> BubblesEX (1.6.5)
+- CraftTweaker (4.1.20.700) -> GroovyScript (1.4.3)
 
 ## Delete mods
 - AE2 Wireless Terminal-LTS
@@ -10,6 +11,8 @@
 - AE2 Wireless Interface Terminal
 - AE2 Wireless Pattern Terminal
 - p455w0rd's AE2 Wireless Terminals Patch
+- MTLib
+- ModTweaker
 
 ## Update mods
 - AE2FluidCraft-Rework-Unofficial (2.7.9 -> 2.7.10)
@@ -22,7 +25,7 @@
 - Forgelin-Continuous (2.3.10.1 -> 2.3.20.0)
 - GTConsolidate (1.1.3.5 -> 1.1.4.2)
 - GTExpertCore (2.7.4 -> 2.7.8)
-- GTMoreTools (1.1.2 -> 1.3.3)
+- GTMoreTools (1.1.2 -> 1.4.0)
 - HadEnoughItems (4.27.1 -> 4.30.3)
 - Hot or Not GTCEu (1.3.0 -> 1.4.0)
 - Inventory Bogo Sorter (1.6.2 -> 1.6.4)

manifest.json

@@ -210,8 +210,8 @@
       "required": true
     },
     {
-      "projectID": 239197,
-      "fileID": 5486112,
+      "projectID": 687577,
+      "fileID": 7925117,
       "required": true
     },
     {
@@ -294,11 +294,6 @@
       "fileID": 2745545,
       "required": true
     },
-    {
-      "projectID": 253211,
-      "fileID": 3308160,
-      "required": true
-    },
     {
       "projectID": 245425,
       "fileID": 2530747,
@@ -329,11 +324,6 @@
       "fileID": 3157548,
       "required": true
     },
-    {
-      "projectID": 220954,
-      "fileID": 3840577,
-      "required": true
-    },
     {
       "projectID": 322344,
       "fileID": 6790812,
@@ -691,7 +681,7 @@
     },
     {
       "projectID": 1458022,
-      "fileID": 8091637,
+      "fileID": 8247574,
       "required": true
     },
     {

modlist.html

@@ -38,7 +38,7 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/gregtech-food-option">GregTech Food Option (by bruberu)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/gregtech-ce-unofficial">GregTech CE: Unofficial (by dandannoodlesman)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ctm">ConnectedTexturesMod (by tterrag1098)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/crafttweaker">CraftTweaker (by Jaredlll08)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/groovyscript">GroovyScript (by CleanroomMC)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/dans-crafting-tweaks">dan's Crafting Tweaks (by cleanroommc)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/architecturecraft-tridev">ArchitectureCraft - TridentMC Version (by darkevilmac)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/custom-main-menu">Custom Main Menu (by Lumien231)</a></li>
@@ -55,14 +55,12 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ender-io-oc-conduits">Ender IO OC Conduits (by HenryLoenwind)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/better-questing-unofficial"></a>Better Questing Unofficial (by CleanroomMC)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/project-red-core">Project Red - Core (by MrTJP)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/mtlib">MTLib (by Jaredlll08)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ezstorage-2">EZStorage 2 (by zer0fall)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/packagedauto">PackagedAuto (by TheLMiffy1111)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/topalldependents">TopAllDependents (by xuanyu)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/lemonskin">LemonSkin (by myxazaur)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/framed-compacting-drawers">Framed Compacting Drawers (by Eutropium)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-utilities-forge">FTB Utilities (Forge) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/modtweaker">ModTweaker (by Jaredlll08)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/libnine">LibNine (by phantamanta44)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/lazy-ae2">Lazy AE2 (by phantamanta44)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/dynamistics">Dynamistics (by Eutropium)</a></li>

overrides/config/gtmt/modules.cfg

@@ -17,6 +17,11 @@ modules {
     # Mod Dependencies: [ chisel ]
     B:"gtmt:chisel_integration"=true
 
+    # JEI Integration Module
+    # Module Dependencies: [ gtmt:integration ]
+    # Mod Dependencies: [ jei ]
+    B:"gtmt:jei_integration"=true
+
     # Core of GTMTMod
     B:"gtmt:core"=true
 
@@ -28,6 +33,10 @@ modules {
     # Module Dependencies: [ gtmt:integration ]
     # Mod Dependencies: [ storagedrawers ]
     B:"gtmt:storage_drawers_integration"=true
+
+    # GTMoreTools Tools Module
+    # Module Dependencies: [ gtmt:core ]
+    B:"gtmt:tools"=true
 }
 
 

overrides/config/gtmt/tools.cfg

@@ -0,0 +1,48 @@
+# Configuration file
+
+general {
+    # Enable tool restrictions and JEI item hiding.
+    # default: false
+    B:enable=true
+
+    # Items to apply restrictions to.
+    # Format: modid:item_name@meta, maxDamage, hideFromJEI
+    #   maxDamage   0 = no restriction; positive = set max durability to this value
+    #   hideFromJEI true = hide from JEI and remove crafting recipes
+    # Example: minecraft:wooden_sword, 0, false
+    # Example: appliedenergistics2:certus_quartz_sword, 0, false
+    S:items <
+        minecraft:wooden_sword, 0, false
+        minecraft:wooden_shovel, 1, false
+        minecraft:wooden_pickaxe, 1, false
+        minecraft:wooden_axe, 1, false
+        minecraft:stone_sword, 0, false
+        minecraft:stone_shovel, 1, false
+        minecraft:stone_pickaxe, 1, false
+        minecraft:stone_axe, 1, false
+        minecraft:iron_sword, 0, false
+        minecraft:iron_shovel, 1, false
+        minecraft:iron_pickaxe, 1, false
+        minecraft:iron_axe, 1, false
+        minecraft:golden_sword, 0, false
+        minecraft:golden_shovel, 1, false
+        minecraft:golden_pickaxe, 1, false
+        minecraft:golden_axe, 1, false
+        minecraft:diamond_sword, 0, false
+        minecraft:diamond_shovel, 1, false
+        minecraft:diamond_pickaxe, 1, false
+        minecraft:diamond_axe, 1, false
+        appliedenergistics2:certus_quartz_sword, 0, true
+        appliedenergistics2:certus_quartz_spade, 0, true
+        appliedenergistics2:certus_quartz_pickaxe, 0, true
+        appliedenergistics2:certus_quartz_axe, 0, true
+        appliedenergistics2:nether_quartz_sword, 0, true
+        appliedenergistics2:nether_quartz_spade, 0, true
+        appliedenergistics2:nether_quartz_pickaxe, 0, true
+        appliedenergistics2:nether_quartz_axe, 0, true
+        architecturecraft:sawblade, 0, true
+        architecturecraft:largepulley, 0, true
+     >
+}
+
+

overrides/groovy/.groovylintrc.json

@@ -0,0 +1,35 @@
+{
+    "extends": "all",
+    "rules": {
+        "braces.ElseBlockBraces": "off",
+        "braces.IfStatementBraces": "off",
+        "convention.CompileStatic": "off",
+        "convention.NoDef": "off",
+        "convention.ImplicitReturnStatement": "warn",
+        "convention.VariableTypeRequired": "off",
+        "design.BuilderMethodWithSideEffects": "off",
+        "design.Instanceof": "off",
+        "design.NestedForLoop": "off",
+        "dry.DuplicateListLiteral": "off",
+        "dry.DuplicateNumberLiteral": "off",
+        "dry.DuplicateStringLiteral": "off",
+        "formatting.BlankLineBeforePackage": "off",
+        "formatting.Indentation": {
+            "spacesPerIndentLevel": 4,
+            "severity": "error"
+        },
+        "formatting.SpaceAroundMapEntryColon": {
+            "characterBeforeColonRegex": "\\s",
+            "characterAfterColonRegex": "\\s"
+        },
+        "groovyism.UseCollectMany": "off",
+        "imports.NoWildcardImports": "off",
+        "logging.Println": "warning",
+        "naming.ClassNameSameAsFilename": "off",
+        "naming.FactoryMethodName": "off",
+        "naming.PackageNameMatchesFilePath": {
+            "groupId": "post"
+        },
+        "unnecessary.UnnecessaryReturnKeyword": "off"
+    }
+}

overrides/groovy/postInit/globals.groovy

@@ -0,0 +1,74 @@
+import gregtech.integration.groovy.GroovyScriptModule
+import net.minecraftforge.fml.common.Loader
+
+mi = { String name, int count = 1 ->
+    def stack = GroovyScriptModule.getMetaItem(name)
+    if (stack == null) {
+        log.warn("MetaItem not found: ${name}")
+        return null
+    }
+    stack.setCount(count)
+    return stack
+}
+
+////////////////////////////////////////
+// Applied Energistics 2
+////////////////////////////////////////
+// Extended Crafting Terminal
+mods.minecraft.ore_dict.add('craftExtendedTerminal', item('appliedenergistics2:part', 341))
+mods.minecraft.ore_dict.add('craftExtendedTerminal', item('ae2fc:part_fluid_pattern_ex_terminal'))
+
+// Fluid Assembler
+mods.minecraft.ore_dict.add('craftAssemblerFluid', item('ae2fc:fluid_assembler'))
+mods.minecraft.ore_dict.add('craftAssemblerFluid', item('aeadditions:fluidcrafter'))
+
+
+////////////////////////////////////////
+// Minecraft
+////////////////////////////////////////
+// Grass
+mods.minecraft.ore_dict.add('grass', item('minecraft:double_plant', 2))
+mods.minecraft.ore_dict.add('grass', item('minecraft:double_plant', 3))
+mods.minecraft.ore_dict.add('grass', item('minecraft:tallgrass', 32767))
+
+// Colors
+colors = [
+    'white', 'orange', 'magenta', 'light_blue', 'yellow', 'lime',
+    'pink', 'gray', 'silver', 'cyan', 'purple', 'blue',
+    'brown', 'green', 'red', 'black'
+]
+colorLiquid = [
+    fluid('dye_white'), fluid('dye_orange'), fluid('dye_magenta'),
+    fluid('dye_light_blue'), fluid('dye_yellow'), fluid('dye_lime'),
+    fluid('dye_pink'), fluid('dye_gray'), fluid('dye_light_gray'),
+    fluid('dye_cyan'), fluid('dye_purple'), fluid('dye_blue'),
+    fluid('dye_brown'), fluid('dye_green'), fluid('dye_red'),
+    fluid('dye_black')
+]
+
+
+////////////////////////////////////////
+// Other
+////////////////////////////////////////
+// Wrench
+mods.minecraft.ore_dict.add('wrench', item('appliedenergistics2:certus_quartz_wrench'))
+mods.minecraft.ore_dict.add('wrench', item('appliedenergistics2:nether_quartz_wrench'))
+mods.minecraft.ore_dict.add('wrench', item('enderio:item_yeta_wrench'))
+
+// Wools
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_black', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_red', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_green', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_brown', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_blue', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_purple', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_cyan', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_lightgray', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_gray', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_pink', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_lime', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_yellow', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_lightblue', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_magenta', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_orange', 32767))
+mods.minecraft.ore_dict.add('wool', item('chisel:wool_white', 32767))