Update GT and other mods (#119)

* Update mods: Had Enough Items 4.25.1 -> 4.25.4 Controlling 3.0.12.2 -> 3.0.12.3 Xaero's Minimap 23.9.1 -> 24.1.1 Xaero's World Map 1.37.1 -> 1.38.4 Better Questing Unofficial 4.1.0 -> 4.2.2 CensoredASM 5.18 -> 5.20 LittleTiles 1.5.85 -> 1.5.87 GregTech CE Unofficial 2.8.7-beta -> 2.8.8-beta AE2 Unofficial Extended Life v0.56.3 -> v0.56.4 AE2 Fluid Crafting Rework AE2-2.5.6-r -> AE2-2.5.13-r Sledgehammer 2.0.25 -> 2.0.26 Universal Tweaks 1.9.0 -> 1.11.0 GroovyScript 0.7.3 -> 1.0.1 ConfigAnytime 1.0 -> 3.0 VisualOres 0.2.4 -> 0.2.5 Inventory Bogo Sorter 1.4.6 -> 1.4.8 ModularUI 2.4.2 -> 2.4.3 Neeve's AE2: Extended Life Additions 1.6.1 -> 1.6.2 * Update AE2 mods: Neeve's AE2: Extended Life Additions 1.6.2 -> 1.6.4 AE2 Unofficial Extended Life v0.56.4 -> 0.56.5 * add recipes for new stuff added by NAE2 * oops (fix missing package in globals) * add NAE2 quests (#121) * Update Mods: Had Enough Items 4.25.4 -> 4.25.5 Controlling 3.0.12.3 -> 3.0.12.4 Xaero's Minimap 24.1.1 -> 24.2.0 Xaero's World Map 1.38.4 -> 1.38.8 GregTech CE Unofficial 2.8.8 -> 2.8.10 AE2 Unofficial Extended Life 0.56.5 -> 0.56.6 AE2 Fluid Crafting Rework 2.5.13-r -> 2.6.4-r Universal Tweaks 1.11.0 -> 1.12.0 Particle Culling v1.4.1 -> v1.4.3 GroovyScript 1.0.1 -> 1.1.1 Gregicality Multiblocks 1.2.8 -> 1.2.10 MixinBooter 8.8 -> 8.9 * Update GrS to 1.1.2 * Downgrade AE and addons due to blocking bugs AE2UEL: 0.56.4 AE2FCr: 2.5.13-r * NAE2 recipe rebalances * Update new quest requirements --------- Co-authored-by: mina <[email protected]>
GregTechCEu · Jul 25, 2024 · 7099f38 · 7099f38
1 parent 5d9840c
commit 7099f38
Show file tree

Hide file tree

Showing 8 changed files with 805 additions and 29 deletions.
diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json
diff --git a/groovy/classes/MetaTileEntityGreenhouse.groovy b/groovy/classes/MetaTileEntityGreenhouse.groovy
@@ -1,3 +1,5 @@
+package classes
+
 import gregtech.api.metatileentity.MetaTileEntity
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity
 import gregtech.api.metatileentity.multiblock.IMultiblockPart

diff --git a/groovy/classes/globals.groovy b/groovy/classes/globals.groovy
@@ -1,3 +1,5 @@
+package classes
+
 public class globals {
     public static final DYES = [
             'white',
@@ -17,4 +19,4 @@ public class globals {
             'red',
             'black'
     ]
-}
+}
diff --git a/groovy/postInit/ae2_fc.groovy b/groovy/postInit/ae2_fc.groovy
@@ -14,7 +14,7 @@ crafting.shapedBuilder().name('fluid_discretizer')
         .register()
 
 // Fluid Pattern Encoder
-mods.jei.hide(item('ae2fc:fluid_pattern_encoder'))
+mods.jei.ingredient.hide(item('ae2fc:fluid_pattern_encoder'))
 crafting.remove('ae2fc:fluid_pattern_encoder')
 
 // Fluid Packet Decoder
@@ -32,11 +32,11 @@ crafting.shapedBuilder().name('fluid_packet_decoder')
         .register()
 
 // Ingredient Buffer
-mods.jei.hide(item('ae2fc:ingredient_buffer'))
+mods.jei.ingredient.hide(item('ae2fc:ingredient_buffer'))
 crafting.remove('ae2fc:ingredient_buffer')
 
 // Large Ingredient Buffer
-mods.jei.hide(item('ae2fc:large_ingredient_buffer'))
+mods.jei.ingredient.hide(item('ae2fc:large_ingredient_buffer'))
 crafting.remove('ae2fc:large_ingredient_buffer')
 
 // Precision Burette
@@ -62,7 +62,7 @@ crafting.shapedBuilder().name('dual_interface')
         .register()
 
 // Fluid Level Maintainer
-mods.jei.hide(item('ae2fc:fluid_level_maintainer'))
+mods.jei.ingredient.hide(item('ae2fc:fluid_level_maintainer'))
 crafting.remove('ae2fc:fluid_level_maintainer')
 
 // Fluid Assembler

diff --git a/groovy/postInit/jei.groovy b/groovy/postInit/jei.groovy
@@ -1,3 +1,3 @@
 // Hide categories
-mods.jei.hideCategory('appliedenergistics2.grinder')
-mods.jei.hideCategory('appliedenergistics2.inscriber')
+mods.jei.category.remove('appliedenergistics2.grinder')
+mods.jei.category.remove('appliedenergistics2.inscriber')
diff --git a/groovy/postInit/nae2.groovy b/groovy/postInit/nae2.groovy
@@ -20,6 +20,23 @@ crafting.shapedBuilder().name('hyper_acceleration_card')
         .key('K', ore('circuitIv'))
         .register()
 
+// Job Auto-Complete Card
+crafting.remove('nae2:item/upgrade/auto_complete')
+crafting.shapelessBuilder().name('auto_complete_card')
+        .output(item('nae2:upgrade', 1))
+        .input(item('appliedenergistics2:material', 53))
+        .input(metaitem('emitter.mv'))
+        .register()
+
+// Programmed Circuit Card
+crafting.remove('nae2:item/upgrade/gregtech_circuit')
+crafting.shapelessBuilder().name('programmed_circuit_card')
+        .output(item('nae2:upgrade', 2))
+        .input(item('appliedenergistics2:material', 28))
+        .input(metaitem('robot.arm.ev'))
+        .input(ore('circuitLuv'))
+        .register()
+
 // Pattern Multi-Tool
 crafting.remove('nae2:item/pattern_multiplier')
 crafting.shapedBuilder().name('pattern_multitool')
@@ -33,6 +50,16 @@ crafting.shapedBuilder().name('pattern_multitool')
         .key('C', item('appliedenergistics2:material', 23))
         .register()
 
+// ME Storage Exposer
+crafting.remove('nae2:block/exposer')
+recipemap('assembler').recipeBuilder()
+        .inputs(metaitem('hull.ev'))
+        .inputs(item('appliedenergistics2:interface'))
+        .inputs(metaitem('sensor.ev'))
+        .inputs(item('appliedenergistics2:material:30') * 4)
+        .outputs(item('nae2:exposer'))
+        .duration(200).EUt(1920).buildAndRegister()
+
 // Void Storage Component
 crafting.remove('nae2:item/material/storage/cell_part_void')
 crafting.shapedBuilder().name('cell_part_void')

diff --git a/groovy/preInit/materials.groovy b/groovy/preInit/materials.groovy
@@ -10,7 +10,7 @@ event_manager.listen { MaterialEvent event ->
             .gem()
             .color(0x674FAF).iconSet('CERTUS')
             .flags('generate_plate', 'disable_decomposition', 'no_smelting', 'crystallizable')
-            .components(material('certus_quartz'), 1, material('nether_quartz'), 1, material('redstone'), 1)
+            .components(material('certus_quartz'), material('nether_quartz'), material('redstone'))
             .build()
 
     material('certus_quartz').addFlags('generate_rod', 'generate_bolt_screw')

diff --git a/manifest.json b/manifest.json
@@ -18,7 +18,7 @@
     "files": [
         {
             "projectID": 557549,
-            "fileID": 4810661,
+            "fileID": 5471944,
             "required": true
         },
         {
@@ -40,7 +40,7 @@
         {
             "clientOnly": true,
             "projectID": 250398,
-            "fileID": 4428378,
+            "fileID": 5408385,
             "required": true
         },
         {
@@ -122,12 +122,12 @@
         },
         {
             "projectID": 263420,
-            "fileID": 4911777,
+            "fileID": 5394758,
             "required": true
         },
         {
             "projectID": 317780,
-            "fileID": 4911823,
+            "fileID": 5394803,
             "required": true
         },
         {
@@ -230,7 +230,7 @@
         },
         {
             "projectID": 629629,
-            "fileID": 4010084,
+            "fileID": 5183601,
             "required": true
         },
         {
@@ -255,7 +255,7 @@
         },
         {
             "projectID": 460609,
-            "fileID": 4800875,
+            "fileID": 5257348,
             "required": true
         },
         {
@@ -276,7 +276,7 @@
         },
         {
             "projectID": 419286,
-            "fileID": 4828995,
+            "fileID": 4835295,
             "required": true
         },
         {
@@ -286,7 +286,7 @@
         },
         {
             "projectID": 257818,
-            "fileID": 4916630,
+            "fileID": 5180387,
             "required": true
         },
         {
@@ -327,7 +327,7 @@
         },
         {
             "projectID": 557242,
-            "fileID": 5121638,
+            "fileID": 5519022,
             "required": true
         },
         {
@@ -363,7 +363,7 @@
         },
         {
             "projectID": 570458,
-            "fileID": 5088803,
+            "fileID": 5147702,
             "required": true
         },
         {
@@ -383,58 +383,58 @@
         },
         {
             "projectID": 623955,
-            "fileID": 5069186,
+            "fileID": 5315135,
             "required": true
         },
         {
             "projectID": 319175,
-            "fileID": 4810570,
+            "fileID": 5264331,
             "required": true
         },
         {
             "projectID": 705000,
-            "fileID": 4929573,
+            "fileID": 5529764,
             "required": true
         },
         {
             "clientOnly": true,
             "projectID": 408853,
-            "fileID": 4439001,
+            "fileID": 5337217,
             "required": true
         },
         {
             "projectID": 687577,
-            "fileID": 4991701,
+            "fileID": 5562296,
             "required": true
         },
         {
             "projectID": 870276,
-            "fileID": 4576653,
+            "fileID": 5212709,
             "required": true
         },
         {
             "projectID": 895539,
-            "fileID": 4904325,
+            "fileID": 5121879,
             "required": true
         },
         {
             "projectID": 632327,
-            "fileID": 4951607,
+            "fileID": 5162169,
             "required": true
         },
         {
             "projectID": 624243,
-            "fileID": 4996326,
+            "fileID": 5153413,
             "required": true
         },
         {
             "projectID": 884359,
-            "fileID": 4955559,
+            "fileID": 5380800,
             "required": true
         },
         {
             "projectID": 564858,
-            "fileID": 5121714,
+            "fileID": 5508050,
             "required": true
         },
         {