Merge pull request #2178 from loving2/Jeb-naq-ore

Fix naq ore, add AAE-GT compat, add new universal presses
AllTheMods · Dec 30, 2024 · 7861e5d · 7861e5d
2 parents fdc9839 + b785127
commit 7861e5d
Show file tree

Hide file tree

Showing 21 changed files with 390 additions and 112 deletions.
diff --git a/config/gtceu.yaml b/config/gtceu.yaml
@@ -466,7 +466,7 @@ tools:
 gameplay:
   # Enable hazardous materials
   # Default: true
-  hazardsEnabled: true
+  hazardsEnabled: false
 
   # Whether hazards are applied to all valid items, or just GT's.
   # true = all, false = GT only.

diff --git a/kubejs/data/ae2/recipes/inscriber/ultimate_universal_accumulation_processor_print.json b/kubejs/data/ae2/recipes/inscriber/ultimate_universal_accumulation_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "tag": "forge:ingots/sky_steel"
+      },
+      "top": {
+        "item": "kubejs:ultimate_universal_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "megacells:printed_accumulation_processor"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/ultimate_universal_calculation_processor_print.json b/kubejs/data/ae2/recipes/inscriber/ultimate_universal_calculation_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "item": "ae2:certus_quartz_crystal"
+      },
+      "top": {
+        "item": "kubejs:ultimate_universal_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "ae2:printed_calculation_processor"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/ultimate_universal_energy_processor_print.json b/kubejs/data/ae2/recipes/inscriber/ultimate_universal_energy_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "item": "appflux:charged_redstone"
+      },
+      "top": {
+        "item": "kubejs:ultimate_universal_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "appflux:printed_energy_processor"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/ultimate_universal_engineering_processor_print.json b/kubejs/data/ae2/recipes/inscriber/ultimate_universal_engineering_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "tag": "forge:gems/diamond"
+      },
+      "top": {
+        "item": "kubejs:ultimate_universal_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "ae2:printed_engineering_processor"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/ultimate_universal_logic_processor_print.json b/kubejs/data/ae2/recipes/inscriber/ultimate_universal_logic_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "tag": "forge:ingots/gold"
+      },
+      "top": {
+        "item": "kubejs:ultimate_universal_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "ae2:printed_logic_processor"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/ultimate_universal_press.json b/kubejs/data/ae2/recipes/inscriber/ultimate_universal_press.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "item": "allthemodium:vibranium_allthemodium_alloy_block"
+      },
+      "top": {
+        "item": "kubejs:ultimate_universal_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "kubejs:ultimate_universal_press"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/ultimate_universal_quantum_processor_print.json b/kubejs/data/ae2/recipes/inscriber/ultimate_universal_quantum_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "item": "advanced_ae:quantum_alloy"
+      },
+      "top": {
+        "item": "kubejs:ultimate_universal_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "advanced_ae:printed_quantum_processor"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/ultimate_universal_silicon_print.json b/kubejs/data/ae2/recipes/inscriber/ultimate_universal_silicon_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "tag": "forge:silicon"
+      },
+      "top": {
+        "item": "kubejs:ultimate_universal_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "ae2:printed_silicon"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/universal_addon_accumulation_processor_print.json b/kubejs/data/ae2/recipes/inscriber/universal_addon_accumulation_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "tag": "forge:ingots/sky_steel"
+      },
+      "top": {
+        "item": "kubejs:universal_addon_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "megacells:printed_accumulation_processor"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/universal_addon_energy_processor_print.json b/kubejs/data/ae2/recipes/inscriber/universal_addon_energy_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "item": "appflux:charged_redstone"
+      },
+      "top": {
+        "item": "kubejs:universal_addon_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "appflux:printed_energy_processor"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/universal_addon_press.json b/kubejs/data/ae2/recipes/inscriber/universal_addon_press.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "item": "minecraft:iron_block"
+      },
+      "top": {
+        "item": "kubejs:universal_addon_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "kubejs:universal_addon_press"
+    }
+  }
diff --git a/kubejs/data/ae2/recipes/inscriber/universal_addon_quantum_processor_print.json b/kubejs/data/ae2/recipes/inscriber/universal_addon_quantum_processor_print.json
@@ -0,0 +1,15 @@
+{
+    "type": "ae2:inscriber",
+    "ingredients": {
+      "middle": {
+        "item": "advanced_ae:quantum_alloy"
+      },
+      "top": {
+        "item": "kubejs:universal_addon_press"
+      }
+    },
+    "mode": "inscribe",
+    "result": {
+      "item": "advanced_ae:printed_quantum_processor"
+    }
+  }
diff --git a/kubejs/server_scripts/mods/ae/recipes.js b/kubejs/server_scripts/mods/ae/recipes.js
@@ -18,10 +18,29 @@ ServerEvents.recipes(allthemods => {
     L: 'ae2:logic_processor_press',
     E: 'ae2:engineering_processor_press'
   }).id('allthemods:universal_press')
-
-  allthemods.shapeless(` 4x ae2:fluix_covered_cable`,[`ae2:fluix_covered_dense_cable`]).id(`allthemods:ae2/dense_to_normal`)
-  allthemods.shapeless(` 4x ae2:fluix_smart_cable`,[`ae2:fluix_smart_dense_cable`]).id(`allthemods:ae2/smart_dense_to_smart_normal`)
-  allthemods.shaped('16x ae2:sky_dust', ['DDD','   ','   '] ,{D: 'mysticalagriculture:sky_stone_essence',}).id('allthemods:ae2/skystone_dust')
+
+  allthemods.shaped('kubejs:universal_addon_press', ['FPF', 'CSL', 'FEF'], {
+    F: '#forge:storage_blocks/sky_steel',
+    P: 'megacells:accumulation_processor_press',
+    C: 'appflux:energy_processor_press',
+    S: 'appflux:charged_redstone',
+    L: 'advanced_ae:quantum_processor_press',
+    E: 'advanced_ae:quantum_alloy'
+  }).id('allthemods:universal_addon_press')
+
+  allthemods.shaped('kubejs:ultimate_universal_press', ['FPG', 'CSL', 'GEF'], {
+    F: '#forge:storage_blocks/vibranium_allthemodium_alloy',
+    G: '#forge:storage_blocks/unobtainium_vibranium_alloy',
+    P: 'kubejs:universal_press',
+    C: 'appflux:core_256k',
+    S: 'advanced_ae:quantum_core',
+    L: 'megacells:bulk_cell_component',
+    E: 'kubejs:universal_addon_press'
+  }).id('allthemods:ultimate_universal_press')
+
+  allthemods.shapeless(` 4x ae2:fluix_covered_cable`, [`ae2:fluix_covered_dense_cable`]).id(`allthemods:ae2/dense_to_normal`)
+  allthemods.shapeless(` 4x ae2:fluix_smart_cable`, [`ae2:fluix_smart_dense_cable`]).id(`allthemods:ae2/smart_dense_to_smart_normal`)
+  allthemods.shaped('16x ae2:sky_dust', ['DDD', '   ', '   '], { D: 'mysticalagriculture:sky_stone_essence', }).id('allthemods:ae2/skystone_dust')
 
 })
 

diff --git a/kubejs/server_scripts/mods/gtceu/apiary_recipes.js b/kubejs/server_scripts/mods/gtceu/apiary_recipes.js
@@ -381,6 +381,9 @@ ServerEvents.recipes(allthemods => {
             // set chance and count if applicable
             if (output.hasOwnProperty('chance')) {
                 chance = output.chance * 100 // convert to base 10000 for GT
+                // boost chance a bit, a little reward for making the comb processor
+                // either +1.25% chance or 1.25 * chance, whichever is higher, up to 10000
+                chance = Math.min(Math.max(chance * 1.25, chance + 125), 10000)
             }
             if (output.hasOwnProperty('max')) {
                 count = output.max // max roll! woo!
@@ -436,7 +439,10 @@ ServerEvents.recipes(allthemods => {
                 if (output.item.hasOwnProperty('tag')) {
                     if (chance != 10000) {
                         combRecipeBuilder.chancedOutput(IngredientHelper.tag(output.item.tag).withCount(count), chance, 0)
-                        combBlockRecipeBuilder.chancedOutput(IngredientHelper.tag(output.item.tag).withCount(count * 4), chance, 0)
+                        combBlockRecipeBuilder.chancedOutput(IngredientHelper.tag(output.item.tag).withCount(count), chance, 0)
+                        combBlockRecipeBuilder.chancedOutput(IngredientHelper.tag(output.item.tag).withCount(count), chance, 0)
+                        combBlockRecipeBuilder.chancedOutput(IngredientHelper.tag(output.item.tag).withCount(count), chance, 0)
+                        combBlockRecipeBuilder.chancedOutput(IngredientHelper.tag(output.item.tag).withCount(count), chance, 0)
                     } else {
                         combRecipeBuilder.itemOutputs(IngredientHelper.tag(output.item.tag).withCount(count))
                         if (output.item.tag != 'forge:wax') {
@@ -448,7 +454,10 @@ ServerEvents.recipes(allthemods => {
                     // console.log("output item item is " + output.item.item)
                     if (chance != 10000) {
                         combRecipeBuilder.chancedOutput(Item.of(output.item.item, count), chance, 0)
-                        combBlockRecipeBuilder.chancedOutput(Item.of(output.item.item, count * 4), chance, 0)
+                        combBlockRecipeBuilder.chancedOutput(Item.of(output.item.item, count), chance, 0)
+                        combBlockRecipeBuilder.chancedOutput(Item.of(output.item.item, count), chance, 0)
+                        combBlockRecipeBuilder.chancedOutput(Item.of(output.item.item, count), chance, 0)
+                        combBlockRecipeBuilder.chancedOutput(Item.of(output.item.item, count), chance, 0)
                     } else {
                         combRecipeBuilder.itemOutputs(Item.of(output.item.item, count))
                         combBlockRecipeBuilder.itemOutputs(Item.of(output.item.item, count * 4))

diff --git a/kubejs/server_scripts/mods/gtceu/greenhouse_recipes.js b/kubejs/server_scripts/mods/gtceu/greenhouse_recipes.js
@@ -54,7 +54,8 @@ ServerEvents.recipes(allthemods => {
                     recipeBuilder.EUt(MV)
                         .notConsumable(InputItem.of(input))
                         .inputFluids(Fluid.of('minecraft:water', 1000))
-                        .duration(duration * 4)
+                        .duration(duration / 4)
+                        .circuit(0)
                     drops.forEach( (drop) => {
                         if (drop.hasOwnProperty('maxRolls')) {
                             recipeBuilder.chancedOutput(Item.of(drop.output.item, drop.maxRolls), drop.chance * 10000, drop.chance * 10000)
@@ -72,7 +73,8 @@ ServerEvents.recipes(allthemods => {
             recipeBuilder.EUt(MV)
                 .notConsumable(InputItem.of(input))
                 .inputFluids(Fluid.of('minecraft:water', 1000))
-                .duration(duration * 4)
+                .duration(duration / 4)
+                .circuit(0)
             drops.forEach( (drop) => {
                 if (drop.hasOwnProperty('maxRolls')) {
                     recipeBuilder.chancedOutput(Item.of(drop.output.item, drop.maxRolls), drop.chance * 10000, drop.chance * 10000)
@@ -95,7 +97,7 @@ ServerEvents.recipes(allthemods => {
         let inp = 'mysticalagriculture:' + base + '_seeds'
         let out = 'mysticalagriculture:' + base + '_essence'
         let boostOut = '4x mysticalagriculture:' + base + '_essence'
-        let duration = 9600
+        let duration = 9600 / 2
 
         grow(id, inp, out, duration, 'minecraft:air', false)
         grow(id + '_boosted', inp, boostOut, duration, '4x mysticalagriculture:inferium_essence', true)
@@ -106,7 +108,7 @@ ServerEvents.recipes(allthemods => {
         let inp = 'mysticalagriculture:' + base + '_seeds'
         let out = 'mysticalagriculture:' + base + '_essence'
         let boostOut = '4x mysticalagriculture:' + base + '_essence'
-        let duration = 9600
+        let duration = 9600 / 2
 
         grow(id, inp, out, duration, 'minecraft:air', false)
         grow(id + '_boosted', inp, boostOut, duration, '4x mysticalagriculture:prudentium_essence', true)
@@ -126,7 +128,7 @@ ServerEvents.recipes(allthemods => {
         let inp = 'mysticalagriculture:' + base + '_seeds'
         let out = 'mysticalagriculture:' + base + '_essence'
         let boostOut = '4x mysticalagriculture:' + base + '_essence'
-        let duration = 9600 * 2
+        let duration = 9600
 
         grow(id, inp, out, duration, 'minecraft:air', false)
         grow(id + '_boosted', inp, boostOut, duration, '4x mysticalagriculture:tertium_essence', true)
@@ -137,7 +139,7 @@ ServerEvents.recipes(allthemods => {
         let inp = 'mysticalagriculture:' + base + '_seeds'
         let out = 'mysticalagriculture:' + base + '_essence'
         let boostOut = '4x mysticalagriculture:' + base + '_essence'
-        let duration = 9600 * 2
+        let duration = 9600
 
         grow(id, inp, out, duration, 'minecraft:air', false)
         grow(id + '_boosted', inp, boostOut, duration, '4x mysticalagriculture:imperium_essence', true)
@@ -152,7 +154,7 @@ ServerEvents.recipes(allthemods => {
         let inp = 'mysticalagriculture:' + base + '_seeds'
         let out = 'mysticalagriculture:' + base + '_essence'
         let boostOut = '4x mysticalagriculture:' + base + '_essence'
-        let duration = 9600 * 6
+        let duration = 9600 * 3
 
         grow(id, inp, out, duration, 'minecraft:air', false)
         grow(id + '_boosted', inp, boostOut, duration, '4x mysticalagriculture:supremium_essence', true)
@@ -172,7 +174,7 @@ ServerEvents.recipes(allthemods => {
         }
         let out = 'mysticalagriculture:' + base + '_essence'
         let boostOut = '4x mysticalagriculture:' + base + '_essence'
-        let duration = 9600 * 18
+        let duration = 9600 * 9
 
         allthemods.recipes.gtceu.greenhouse(id)
             .circuit(2)
@@ -194,8 +196,8 @@ ServerEvents.recipes(allthemods => {
     })
 
     //////////////// GT Rubber trees ////////////////
-    grow('rubber_sapling', 'gtceu:rubber_sapling', ['32x gtceu:rubber_log', '8x gtceu:sticky_resin', '4x gtceu:rubber_sapling'], 9600.0, 'minecraft:air', false)
-    grow('rubber_sapling_boosted', 'gtceu:rubber_sapling', ['64x gtceu:rubber_log', '16x gtceu:sticky_resin', '4x gtceu:rubber_sapling'], 9600.0, '4x gtceu:fertilizer', true)
+    grow('rubber_sapling', 'gtceu:rubber_sapling', ['32x gtceu:rubber_log', '8x gtceu:sticky_resin', '4x gtceu:rubber_sapling'], 9600.0 / 2, 'minecraft:air', false)
+    grow('rubber_sapling_boosted', 'gtceu:rubber_sapling', ['64x gtceu:rubber_log', '16x gtceu:sticky_resin', '4x gtceu:rubber_sapling'], 9600.0 / 2, '4x gtceu:fertilizer', true)
 })
 
 // This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 9.