Merge pull request #2169 from AllTheMods/GT1.6-changes

GT1.6 changes
AllTheMods · Dec 24, 2024 · f8ba05d · f8ba05d
2 parents 4780608 + 0456ea8
commit f8ba05d
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 39 deletions.
diff --git a/kubejs/startup_scripts/gtceu/alcr.js b/kubejs/startup_scripts/gtceu/alcr.js
@@ -6,7 +6,7 @@ GTCEuStartupEvents.registry('gtceu:machine', allthemods => {
         .rotationState(RotationState.NON_Y_AXIS)
         .appearanceBlock(GTBlocks.CASING_PTFE_INERT)
         .recipeTypes('large_chemical_reactor')
-        .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.PERFECT_OVERCLOCK)])
+        .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_PERFECT])
         .pattern(definition => FactoryBlockPattern.start()
             .aisle('c   c', 'ccccc', 'c   c', 'ccccc', 'c   c')
             .aisle('ccccc', 'cpppc', 'cwwwc', 'cpppc', 'ccccc')

diff --git a/kubejs/startup_scripts/gtceu/apiary.js b/kubejs/startup_scripts/gtceu/apiary.js
@@ -30,7 +30,7 @@ GTCEuStartupEvents.registry('gtceu:machine', allthemods => {
         .recipeType('apiary_i')
         .appearanceBlock(GTBlocks.CASING_STAINLESS_CLEAN)
         .tooltips(Component.translatable("kubejs.apiary_i.tooltip.bee_eater"))
-        .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.NON_PERFECT_OVERCLOCK)])
+        .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT])
         .pattern(definition => FactoryBlockPattern.start()
             .aisle('  CCC  ', '  CCC  ', '  CCC  ', '  CCC  ', '  CCC  ', '  CCC  ')
             .aisle(' CCCCC ', ' CMMMC ', ' CW#WC ', ' CW#WC ', ' CWWWC ', ' CCCCC ')
@@ -60,7 +60,7 @@ GTCEuStartupEvents.registry('gtceu:machine', allthemods => {
         .recipeType('apiary_ii')
         .appearanceBlock(GTBlocks.CASING_TITANIUM_STABLE)
         .tooltips(Component.translatable("kubejs.apiary_ii.tooltip.bee_requirements"))
-        .recipeModifier(GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.NON_PERFECT_OVERCLOCK))
+        .recipeModifier(GTRecipeModifiers.OC_NON_PERFECT)
         .pattern(definition => FactoryBlockPattern.start()
             .aisle('  CCC  ', '  CCC  ', '  CCC  ', '  CCC  ', '  CCC  ', '  CCC  ')
             .aisle(' CCCCC ', ' CMMMC ', ' CW#WC ', ' CW#WC ', ' CWWWC ', ' CCCCC ')
@@ -88,7 +88,7 @@ GTCEuStartupEvents.registry('gtceu:machine', allthemods => {
         .rotationState(RotationState.NON_Y_AXIS)
         .recipeType('comb_processor')
         .appearanceBlock(GTBlocks.CASING_STEEL_SOLID)
-        .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.NON_PERFECT_OVERCLOCK)])
+        .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT])
         .pattern(definition => FactoryBlockPattern.start()
             .aisle('   CCC   ', '         ', '    S    ', '   SSS   ', '  SSSSS  ', '  SSSSS  ', '  SSSSS  ', '         ', '         ', '         ', '         ', '         ')
             .aisle('  CFFFC  ', '   SSS   ', '  SS SS  ', ' SS   SS ', ' S     S ', ' S     S ', ' S     S ', '         ', '         ', '         ', '         ', '         ')

diff --git a/kubejs/startup_scripts/gtceu/greenhouse.js b/kubejs/startup_scripts/gtceu/greenhouse.js
@@ -17,7 +17,7 @@ GTCEuStartupEvents.registry('gtceu:machine', allthemods => {
         .rotationState(RotationState.NON_Y_AXIS)
         .recipeType('greenhouse')
         .appearanceBlock(GTBlocks.CASING_STEEL_SOLID)
-        .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.PERFECT_OVERCLOCK)])
+        .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_PERFECT])
         .pattern(definition => FactoryBlockPattern.start()
             .aisle('CCC', 'CCC', 'CGC', 'CGC', 'CCC')
             .aisle('CCC', 'FPF', 'G#G', 'GIG', 'CGC')

diff --git a/kubejs/startup_scripts/gtceu/mega_fusion_reactor.js b/kubejs/startup_scripts/gtceu/mega_fusion_reactor.js
diff --git a/kubejs/startup_scripts/gtceu/micro_universe_orb.js b/kubejs/startup_scripts/gtceu/micro_universe_orb.js
diff --git a/kubejs/startup_scripts/gtceu/miner.js b/kubejs/startup_scripts/gtceu/miner.js
@@ -1,15 +1,21 @@
-GTCEuStartupEvents.registry("gtceu:machine", event => {
+// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 9.
+// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
 
-    event.create("world_data_scanner", "simple", GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV)
-        .rotationState(RotationState.NON_Y_AXIS)
-        .recipeType("world_data_scanner", true, true)
-        .workableTieredHullRenderer("gtceu:block/machines/scanner")
-        .tankScalingFunction(tier => tier * 0 + 64000)
+GTCEuStartupEvents.registry("gtceu:machine", allthemods => {
+
+    allthemods.create("world_data_scanner", "simple")
+    .tiers(GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV)
+    .definition((tier, builder) =>
+        builder 
+            .rotationState(RotationState.NON_Y_AXIS)
+            .recipeType("world_data_scanner")
+            .workableTieredHullRenderer("gtceu:block/machines/scanner")
+        )
 
-    event.create("void_miner", "multiblock")
+    allthemods.create("void_miner", "multiblock")
         .rotationState(RotationState.NON_Y_AXIS)
         .recipeType("void_miner")
-        .recipeModifier(GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.NON_PERFECT_OVERCLOCK))
+        .recipeModifier(GTRecipeModifiers.OC_NON_PERFECT)
         .appearanceBlock(GTBlocks.CASING_TITANIUM_STABLE)
         .pattern((definition) =>
             FactoryBlockPattern.start()
@@ -29,16 +35,16 @@ GTCEuStartupEvents.registry("gtceu:machine", event => {
 
 })
 
-GTCEuStartupEvents.registry("gtceu:recipe_type", event => {
+GTCEuStartupEvents.registry("gtceu:recipe_type", allthemods => {
 
-    event.create("void_miner")
+    allthemods.create("void_miner")
         .setEUIO("in")
         .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY)
         .setMaxIOSize(2, 4, 2, 0)
         .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT)
         .setSound(GTSoundEntries.SCIENCE)
 
-    event.create("world_data_scanner")
+    allthemods.create("world_data_scanner")
         .setEUIO("in")
         .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY)
         .setMaxIOSize(2, 1, 2, 0)
@@ -47,11 +53,14 @@ GTCEuStartupEvents.registry("gtceu:recipe_type", event => {
 
 })
 
-StartupEvents.registry("item", event => {
-    event.create("overworld_data")
+StartupEvents.registry("item", allthemods => {
+    allthemods.create("overworld_data")
         .texture("gtceu:item/data_stick")
-    event.create("nether_data")
+    allthemods.create("nether_data")
         .texture("gtceu:item/data_stick")
-    event.create("end_data")
+    allthemods.create("end_data")
         .texture("gtceu:item/data_stick")
-})
+})
+
+// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 9.
+// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.
diff --git a/kubejs/startup_scripts/gtceu/starforge.js b/kubejs/startup_scripts/gtceu/starforge.js