Merge branch 'OE100-OE100-the-building-update'

ThePansmith · Oct 2, 2024 · d8511de · d8511de
2 parents 5d22c3d + 4aaf4e8
commit d8511de
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/kubejs/server_scripts/gregtech/rock_cycle_simulator.js b/kubejs/server_scripts/gregtech/rock_cycle_simulator.js
@@ -1,5 +1,5 @@
 ServerEvents.recipes(event => {
-    
+
     // Recipe
     event.shaped(
         'gtceu:rock_cycle_simulator', [
@@ -36,5 +36,12 @@ ServerEvents.recipes(event => {
     RockCycle('marble', 'gtceu:marble', 'gtceu:marble', 240)
     RockCycle('red_granite', 'gtceu:red_granite', 'gtceu:red_granite', 960)
     RockCycle('deepslate', 'minecraft:deepslate', 'minecraft:deepslate', 960)
-
+    RockCycle('calcite', 'minecraft:calcite', 'minecraft:calcite', 60)
+    RockCycle('tuff', 'minecraft:tuff', 'minecraft:tuff', 60)
+    RockCycle('jasper', 'quark:jasper', 'quark:jasper', 60)
+    RockCycle('limestone', 'quark:limestone', 'quark:limestone', 60)
+    RockCycle('permafrost', 'quark:permafrost', 'quark:permafrost', 60)
+    RockCycle('shale', 'quark:shale', 'quark:shale', 60)
+    RockCycle('myalite', 'quark:myalite', 'quark:myalite', 60)
+
 })
diff --git a/kubejs/server_scripts/mods/gregtech.js b/kubejs/server_scripts/mods/gregtech.js
@@ -159,11 +159,21 @@ ServerEvents.recipes(event => {
     //event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_ender_pearl' })
 
     // rock breaker
-    event.recipes.gtceu.rock_breaker('kubejs:rock_breaker_calcite')
-        .notConsumable('minecraft:calcite')
-        .itemOutputs('minecraft:calcite')
-        .duration(16)
-        .EUt(60)
-        .addData('fluidA', 'minecraft:lava')
-        .addData('fluidB', 'minecraft:water')
+    const generateRockBreakerStoneRecipe = (stoneItem) => {
+        event.recipes.gtceu.rock_breaker('kubejs:rock_breaker_' + stoneItem.replace(':', '_'))
+            .notConsumable(stoneItem)
+            .itemOutputs(stoneItem)
+            .duration(16)
+            .EUt(60)
+            .addData('fluidA', 'minecraft:lava')
+            .addData('fluidB', 'minecraft:water')
+    }
+
+    generateRockBreakerStoneRecipe('minecraft:calcite')
+    generateRockBreakerStoneRecipe('minecraft:tuff')
+    generateRockBreakerStoneRecipe('quark:jasper')
+    generateRockBreakerStoneRecipe('quark:limestone')
+    generateRockBreakerStoneRecipe('quark:permafrost')
+    generateRockBreakerStoneRecipe('quark:shale')
+    generateRockBreakerStoneRecipe('quark:myalite')
 })