Yet Another Assorted Fix PR (#1080)

* Make PECA faster & lower energy cost. Also eliminate recipe conflict with Ethylene * Add links to old-style resource packs on FAQ * Change multiblock definitions to use predicates.frame instead of block definitions * Fix broken ingredient in Elite (LuV) world accelerator * Increase Omnic matrix coil recipe energy tier to UHV * Cryococcal Reverberator buff * Turn HM naqline petrotheum into a closed loop, and reduce Electrolyzer duration * Change Bathyal energy core recipe so Hadal cores use all 6 empowered gem types, but fewer Nether Stars * Slight nerf to Zombie model rotten flesh output so flesh -> iron ingot recipe is less OP * Change Reinforced Mining Laser recipe's capacitor to prevent NBT interfering * Buff Assembler Diamond Lattice recipe * Buff TE machine frame recipe * Add Max battery to T10 since solars don't have any energy storage on their own * Quick post-tank circuit buff * Move solar conversion recipes to Atomic Reconstructor * Revert "Buff Assembler Diamond Lattice recipe"
ThePansmith · Nov 10, 2024 · f0da1e8 · f0da1e8
1 parent a99829e
commit f0da1e8
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 62 deletions.
diff --git a/FAQ.md b/FAQ.md
@@ -87,6 +87,12 @@ If it doesn't:
 
 [Instructions can be found here](https://github.com/ThePansmith/Monifactory?tab=readme-ov-file#dedicated-server-installation)
 
+**Q. How do I get old Gregtech textures?**
+
+For the old Gregtech: Modern textures, look into [Zedtech](https://www.curseforge.com/minecraft/texture-packs/zedtech).
+
+For the older 1.12 Gregtech textures, look into [Threefold's Modern GregTech](https://modrinth.com/resourcepack/threefolds-modern-gregtech).
+
 <hr>
 
 ## Tech Support

diff --git a/config/ftbquests/quests/chapters/end_game.snbt b/config/ftbquests/quests/chapters/end_game.snbt
@@ -1190,7 +1190,7 @@
 				""
 				"It only works with a handful of highly energy-dense items and consumes a wealth of &6Cryococcus,&r so you'll need to find a way to produce these consistently and in bulk."
 				""
-				"If you manage to accomplish this, you'll be awarded with up to &a64A UIV&r while avoiding the explosive risk of &elarge spheres of superheated dragon metal.&r"
+				"If you manage to supply it with &6Contained Singularities&r, you'll be awarded with enough energy to saturate a &6UIV 4,096A Laser Source Hatch&r while avoiding the explosive risk of &elarge spheres of superheated dragon metal.&r"
 			]
 			icon: "gtceu:cryococcal_reverberator"
 			id: "25A7BC39C30139DA"

diff --git a/kubejs/data/hostilenetworks/data_models/zombie.json b/kubejs/data/hostilenetworks/data_models/zombie.json
@@ -21,7 +21,7 @@
     "trivia": "hostilenetworks.trivia.zombie",
     "fabricator_drops": [{
             "item": "minecraft:rotten_flesh",
-            "count": 64
+            "count": 40
         },
         {
             "item": "minecraft:iron_ingot",

diff --git a/kubejs/server_scripts/End_Game.js b/kubejs/server_scripts/End_Game.js
@@ -354,7 +354,7 @@ ServerEvents.recipes(event => {
     )
 
     event.recipes.gtceu.assembly_line('luv_world_accelerator')
-    .itemInputs('gtceu:uhv_machine_hull', '64x gtceu:uhv_field_generator', '16x gtceu:uhv_field_generator', '20x gtceu:uhv_sensor', '20x gtceu:uhv_emitter', '16x #gtceu:circuits/uhv', '4x gtceu:double_netherite_plate', '2x gtceu:dense_neutronium_plate')
+    .itemInputs('gtceu:uhv_machine_hull', '64x gtceu:uhv_field_generator', '16x gtceu:uhv_field_generator', '20x gtceu:uhv_sensor', '20x gtceu:uhv_emitter', '16x #gtceu:circuits/uhv', '4x gtceu:double_activated_netherite_plate', '2x gtceu:dense_neutronium_plate')
     .inputFluids('gtceu:omnium 1152', 'gtceu:soldering_alloy 1152')
     .itemOutputs('gtceu:luv_world_accelerator')
     .duration(6000)

diff --git a/kubejs/server_scripts/_hardmode/hardmode_processing.js b/kubejs/server_scripts/_hardmode/hardmode_processing.js
@@ -329,7 +329,7 @@ ServerEvents.recipes(event => {
     event.recipes.gtceu.chemical_reactor('naquadah_oxide_aero_solution')
         .itemInputs('4x kubejs:aerotheum_dust')
         .inputFluids('gtceu:naquadah_oxide_petro_solution 1000')
-        .itemOutputs('4x thermal:basalz_powder')
+        .itemOutputs('4x kubejs:petrotheum_dust')
         .outputFluids('gtceu:naquadah_oxide_aero_solution 1000')
         .duration(300).EUt(240)
 
@@ -352,7 +352,7 @@ ServerEvents.recipes(event => {
         .notConsumable('2x gtceu:ruthenium_rod')
         .itemOutputs('2x gtceu:naquadah_dust')
         .outputFluids('gtceu:neocryolite 3750', 'gtceu:oxygen 3000')
-        .duration(750).EUt(7680)
+        .duration(250).EUt(7680)
 
     event.recipes.gtceu.chemical_bath('bathe_molten_aerotheum_to_aerotheum_dust')
         .inputFluids('kubejs:molten_aerotheum 250')

diff --git a/kubejs/server_scripts/gregtech/PECA.js b/kubejs/server_scripts/gregtech/PECA.js
@@ -4,85 +4,85 @@ ServerEvents.recipes(event => {
         .itemInputs('gtceu:sodium_hydroxide_dust')
         .outputFluids('minecraft:water 500')
         .itemOutputs('gtceu:sodium_cyanide_dust')
-        .duration(500)
-        .EUt(56000)
+        .duration(50)
+        .EUt(GTValues.VHA[GTValues.IV])
 
     event.recipes.gtceu.chemical_reactor("chloroacetatic_mixture")
         .notConsumableFluid('gtceu:acetic_anhydride 500')
         .inputFluids('gtceu:acetic_acid 1000', 'gtceu:chlorine 2000')
         .outputFluids('gtceu:chloroacetic_mixture 3000')
         .duration(20)
-        .EUt(700000)
+        .EUt(GTValues.VA[GTValues.UV])
 
     event.recipes.gtceu.distillation_tower("chloroacetate_distillation")
         .inputFluids('gtceu:chloroacetic_mixture 1000')
         .itemOutputs('gtceu:small_chloroacetate_dust')
         .outputFluids('gtceu:dichloroacetate 200', 'gtceu:trichloroacetate 100', 'gtceu:hydrochloric_acid 450')
-        .duration(6000)
-        .EUt(192)
+        .duration(200)
+        .EUt(GTValues.VHA[GTValues.HV])
 
     event.recipes.gtceu.chemical_reactor("cyanoacetic_acid")
         .itemInputs('2x gtceu:chloroacetate_dust', '2x gtceu:sodium_cyanide_dust', '1x gtceu:soda_ash_dust')
         .inputFluids('gtceu:hydrochloric_acid 700', 'minecraft:water 700')
         .itemOutputs('2x gtceu:cyanoacetic_acid_dust')
-        .duration(6000)
-        .EUt(30720)
+        .duration(600)
+        .EUt(GTValues.VA[GTValues.LuV])
 
     event.recipes.gtceu.chemical_reactor("ethyl_cyanoacetate")
-        .notConsumableFluid('gtceu:sulfuric_acid 2000')
+        .notConsumableFluid('gtceu:fluoroantimonic_acid 2000')
         .inputFluids('gtceu:ethanol 1000')
         .itemInputs('gtceu:cyanoacetic_acid_dust')
         .outputFluids('gtceu:ethyl_cyanoacetate 500')
-        .duration(36000)
-        .EUt(480)
+        .duration(360)
+        .EUt(GTValues.VA[GTValues.HV])
 
     event.recipes.gtceu.chemical_reactor("uncracked_ethyl_cyanoacrylate")
         .inputFluids('gtceu:ethyl_cyanoacetate 1000', 'gtceu:formaldehyde 1000')
         .outputFluids('gtceu:uncracked_ethyl_cyanoacrylate 1000', 'minecraft:water 1000')
         .duration(320)
-        .EUt(36000)
+        .EUt(GTValues.VA[GTValues.LuV])
 
     event.recipes.gtceu.chemical_reactor('ethyl_cyanoacrylate_hydro')
         .inputFluids('gtceu:uncracked_ethyl_cyanoacrylate 500', 'gtceu:hydrogen 3000')
         .outputFluids('gtceu:ethyl_cyanoacrylate 250')
         .duration(160)
-        .EUt(30)
+        .EUt(GTValues.VA[GTValues.LV])
 
     event.recipes.gtceu.chemical_reactor('ethyl_cyanoacrylate_steam')
         .inputFluids('gtceu:uncracked_ethyl_cyanoacrylate 1000', 'gtceu:steam 1000')
         .outputFluids('gtceu:ethyl_cyanoacrylate 500')
         .duration(240)
-        .EUt(30)
+        .EUt(GTValues.VA[GTValues.LV])
 
     // Needs to be LCR to fit all the fluids
     event.recipes.gtceu.large_chemical_reactor('polyethyl_cyanoacrylate')
-        .notConsumableFluid('gtceu:dimethyl_sulfoxide 50')
+        .notConsumableFluid('gtceu:dimethyl_sulfoxide 500')
         .inputFluids('gtceu:ethyl_cyanoacrylate 1000', 'gtceu:acetone 3000', 'gtceu:air 750')
         .itemOutputs('gtceu:polyethyl_cyanoacrylate_dust')
         .outputFluids('gtceu:acetone 1600')
         .duration(3000)
-        .EUt(30720)
+        .EUt(GTValues.VA[GTValues.LuV])
 
     //Dimethyl sulfoxide (catalyst) chain below
     event.recipes.gtceu.chemical_reactor('dimethyl_sulfoxide')
         .inputFluids('gtceu:dimethyl_sulfide 1000', 'gtceu:nitrogen_dioxide 1000')
         .outputFluids('gtceu:dimethyl_sulfoxide 1000', 'gtceu:nitric_oxide 1000')
         .duration(10000)
-        .EUt(30720)
+        .EUt(GTValues.VA[GTValues.LuV])
 
     event.recipes.gtceu.chemical_reactor('dimethyl_sulfide')
         .notConsumable('gtceu:aluminium_dust')
         .inputFluids('gtceu:hydrogen_sulfide 1000', 'gtceu:methanol 2000')
         .outputFluids('gtceu:dimethyl_sulfide 1000', 'minecraft:water 2000')
         .duration(500)
-        .EUt(15640)
+        .EUt(GTValues.VHA[GTValues.LuV])
 
     //Uses for PECA with higher efficiency than PBI
     event.recipes.gtceu.bender('fluid_cell_peca')
         .itemInputs('gtceu:polyethyl_cyanoacrylate_plate')
         .itemOutputs('32x gtceu:fluid_cell')
         .duration(100)
-        .EUt(7)
+        .EUt(GTValues.VA[GTValues.ULV])
         .circuit(12)
 
     event.recipes.gtceu.chemical_reactor('plastic_board_peca')
@@ -97,5 +97,5 @@ ServerEvents.recipes(event => {
         .inputFluids('gtceu:polyethylene 36')
         .itemOutputs('32x gtceu:duct_tape')
         .duration(100)
-        .EUt(30)
+        .EUt(GTValues.VA[GTValues.LV])
 })
diff --git a/kubejs/server_scripts/gregtech/circuits.js b/kubejs/server_scripts/gregtech/circuits.js
@@ -38,7 +38,7 @@ ServerEvents.recipes(event => {
         event.recipes.gtceu.assembler(`complex_smd_${item}`)
         //PECA foil is used since other electronic component recipes use fluid polymers
         .itemInputs(primary, secondary, Item.of('gtceu:polyethyl_cyanoacrylate_foil', foil_amount))
-        .itemOutputs(`32x kubejs:complex_smd_${item}`)
+        .itemOutputs(`64x kubejs:complex_smd_${item}`)
         .duration(160)
         .EUt(245760)
     }
@@ -66,7 +66,7 @@ ServerEvents.recipes(event => {
             '3x gtceu:exquisite_monazite_gem'
         )
         .inputFluids('gtceu:distilled_water 500')
-        .itemOutputs('16x kubejs:matter_circuit_board')
+        .itemOutputs('32x kubejs:matter_circuit_board')
         .cleanroom(CleanroomType.CLEANROOM)
         .duration(1200)
         .EUt(250000)
@@ -145,15 +145,15 @@ ServerEvents.recipes(event => {
     // WIP: Dimensional Circuits
     event.recipes.gtceu.circuit_assembler('dimensional_circuit_board')
         .itemInputs(
-            '16x kubejs:matter_circuit_board',
+            '32x kubejs:matter_circuit_board',
             '4x gtceu:infinity_plate',
             '#gtceu:circuits/zpm',
             'gtceu:luv_sensor',
             '3x kubejs:the_ultimate_material',
             '2x gtceu:nether_star_lens'
         )
         .inputFluids('gtceu:omnium 288')
-        .itemOutputs('16x kubejs:dimensional_circuit_board')
+        .itemOutputs('32x kubejs:dimensional_circuit_board')
         .cleanroom(CleanroomType.CLEANROOM)
         .duration(1200)
         .EUt(500000)
@@ -236,15 +236,15 @@ ServerEvents.recipes(event => {
 
     // Monic Circuits
     event.recipes.gtceu.circuit_assembler('monic_circuit_board')
-        .itemInputs('16x kubejs:dimensional_circuit_board',
+        .itemInputs('32x kubejs:dimensional_circuit_board',
             '2x gtceu:monium_plate',
             '#gtceu:circuits/uv',
             'gtceu:zpm_field_generator',
             '1x kubejs:quasi_stable_neutron_star',
             '2x kubejs:ultimate_gem'
         )
         .inputFluids('gtceu:omnium 576')
-        .itemOutputs('16x kubejs:monic_circuit_board')
+        .itemOutputs('32x kubejs:monic_circuit_board')
         .cleanroom(CleanroomType.CLEANROOM)
         .duration(1200)
         .EUt(2000000)
@@ -302,7 +302,7 @@ ServerEvents.recipes(event => {
             '4x gtceu:infinity_plate'
         )
         .inputFluids('gtceu:soldering_alloy 1152')
-        .itemOutputs('2x kubejs:monic_processor_computer')
+        .itemOutputs('1x kubejs:monic_processor_computer')
         .duration(20*20)
         .EUt(3932160)
 

diff --git a/kubejs/server_scripts/gregtech/cryococcal_reverberator.js b/kubejs/server_scripts/gregtech/cryococcal_reverberator.js
@@ -30,8 +30,8 @@ ServerEvents.recipes(event => {
             .duration(duration)
     }
 
-    Reverberate('omnic_acid_resonating', ['1x gtceu:cryococcus_block', '5x gtceu:omnic_acid_dust'], 33554432, 15*60*20)
-    Reverberate('infinity_resonating', ['2x gtceu:cryococcus_block', '1x gtceu:infinity_ingot'], 134217728, 30*60*20)
-    Reverberate('fsopc_resonating', ['4x gtceu:cryococcus_block', '1x kubejs:field_stabilised_omnic_pulsar_compound'], 536870912, 1*60*60*20)
-    Reverberate('singularity_resonating', ['8x gtceu:cryococcus_block', '16x kubejs:contained_singularity'], 2147483647, 2*60*60*20)
+    Reverberate('omnic_acid_resonating', ['1x gtceu:cryococcus_block', '20x gtceu:omnic_acid_dust'], 0.5*GTValues.V[GTValues.UIV], 15*60*20)
+    Reverberate('infinity_resonating', ['2x gtceu:cryococcus_block', '1x gtceu:infinity_ingot'], 8*GTValues.V[GTValues.UIV], 30*60*20)
+    Reverberate('fsopc_resonating', ['4x gtceu:cryococcus_block', '1x kubejs:field_stabilised_omnic_pulsar_compound'], 128*GTValues.V[GTValues.UIV], 1*60*60*20)
+    Reverberate('singularity_resonating', ['8x gtceu:cryococcus_block', '8x kubejs:contained_singularity'], 2048*GTValues.V[GTValues.UIV], 2*60*60*20)
 })
diff --git a/kubejs/server_scripts/gregtech/energy_cores.js b/kubejs/server_scripts/gregtech/energy_cores.js
@@ -59,7 +59,7 @@ ServerEvents.recipes(event => {
         .EUt(32)
 
         event.recipes.gtceu.assembler("kubejs:bathyal_energy_core")
-        .itemInputs("3x kubejs:mesol_energy_core", "8x gtceu:emeradic_empowered_gem", "2x gtceu:nether_star_block")
+        .itemInputs("3x kubejs:mesol_energy_core", "8x gtceu:emeradic_empowered_gem", "1x gtceu:nether_star_block", "6x gtceu:diamatine_empowered_gem")
         .inputFluids('enderio:xp_juice 1000')
         .itemOutputs("2x kubejs:bathyal_energy_core")
         .duration(100)

diff --git a/kubejs/server_scripts/gregtech/omnic_forge.js b/kubejs/server_scripts/gregtech/omnic_forge.js
@@ -32,7 +32,7 @@ ServerEvents.recipes(event => {
         .itemInputs('8x gtceu:omnium_double_wire', '8x gtceu:crystal_matrix_foil')
         .itemOutputs('kubejs:omnic_matrix_coil_block')
         .duration(1000)
-        .EUt(65520)
+        .EUt(GTValues.VA[GTValues.UHV])
 
     event.recipes.gtceu.omnic_forge('kubejs:netherite_casing')
         .itemInputs('8x gtceu:neutronium_plate', '8x gtceu:large_scale_assembler_casing', '2x gtceu:dense_activated_netherite_plate', '6x gtceu:tungsten_steel_rod')
@@ -43,14 +43,14 @@ ServerEvents.recipes(event => {
     event.recipes.gtceu.omnic_forge('kubejs:cryococcus_fusion_coil')
         .itemInputs('2x gtceu:fusion_coil', '8x gtceu:dense_cryococcus_plate', '2x gtceu:activated_netherite_frame', '2x #gtceu:circuits/uhv', 'gtceu:uhv_field_generator')
         .itemOutputs('2x kubejs:cryococcus_fusion_coil')
-        .duration(2000)
-        .EUt(65520)
+        .duration(200)
+        .EUt(GTValues.VA[GTValues.UV])
 
     event.recipes.gtceu.omnic_forge('kubejs:cryococcus_fusion_casing')
         .itemInputs('gtceu:uhv_machine_hull', '2x kubejs:cryococcus_fusion_coil', '12x gtceu:cryococcus_plate', '4x gtceu:fusion_casing_mk3', 'gtceu:uhv_field_generator')
         .itemOutputs('4x kubejs:cryococcus_fusion_casing')
-        .duration(2000)
-        .EUt(65520)
+        .duration(200)
+        .EUt(GTValues.VA[GTValues.UHV])
 
     event.recipes.gtceu.omnic_forge('kubejs:timeless_monic_heavy_plating')
         .itemInputs('10x gtceu:monium_plate', '8x kubejs:quantum_fluxed_eternium_heavy_plating', '4x kubejs:universe_resistant_neutronium_heavy_plating', '4x kubejs:elementally_infused_omnic_matrix_heavy_plating', '2x kubejs:dimensionally_stabilized_infinity_heavy_plating', '16x kubejs:contained_singularity')

diff --git a/kubejs/server_scripts/gregtech/superfabricator.js b/kubejs/server_scripts/gregtech/superfabricator.js
@@ -75,7 +75,7 @@ ServerEvents.recipes(event => {
     fabricator('wither', 2, 'kubejs:wither_bone')
     fabricator('wither_skeleton', 1, 'minecraft:wither_skeleton_skull')
     fabricator('wither_skeleton', 2, '12x gtceu:lead_ingot')
-    fabricator('zombie', 1, '64x minecraft:rotten_flesh')
+    fabricator('zombie', 1, '40x minecraft:rotten_flesh')
     fabricator('zombie', 2, '12x minecraft:iron_ingot')
     fabricator('zombie', 3, '32x minecraft:carrot')
     fabricator('zombie', 4, '32x minecraft:potato')

diff --git a/kubejs/server_scripts/microverse.js b/kubejs/server_scripts/microverse.js
@@ -219,7 +219,7 @@ ServerEvents.recipes(event => {
             '  NN NN  ',
             '  NN NN  ',
             ' NUNNNUN ',
-            'PNCN NCNP',
+            'PNCNBNCNP',
             'NNRNANRNN',
             ' NNNNNNN ',
             'NW W W WN'
@@ -230,7 +230,8 @@ ServerEvents.recipes(event => {
             C: 'kubejs:universal_warp_controller',
             P: 'solarflux:sp_custom_neutronium',
             A: 'gtceu:iv_quantum_chest',
-            W: 'kubejs:hadal_warp_engine'
+            W: 'kubejs:hadal_warp_engine',
+            B: 'gtceu:max_battery'
         }
     )
 
@@ -335,7 +336,7 @@ ServerEvents.recipes(event => {
             B: 'minecraft:quartz_block',
             Q: 'minecraft:quartz',
             C: '#gtceu:circuits/hv',
-            E: 'enderio:advanced_capacitor_bank'
+            E: 'enderio:octadic_capacitor'
         }
     )
 

diff --git a/kubejs/server_scripts/mods/Solar_Flux.js b/kubejs/server_scripts/mods/Solar_Flux.js
@@ -252,7 +252,15 @@ ServerEvents.recipes(event => {
                     break;
             }
         }
-        event.shapeless(`gtceu:${tiername}_solar_panel`, solarFluxPanel).id(`gtceu:solar_panel_${tiername}_conversion`)
-        event.shapeless(solarFluxPanel, `gtceu:${tiername}_solar_panel`).id(`gtceu:solar_panel_${tiername}_reversion`)
+        event.recipes.gtceu.atomic_reconstruction(`gtceu:solar_panel_${tiername}_conversion`)
+            .itemInputs(solarFluxPanel)
+            .itemOutputs(`gtceu:${tiername}_solar_panel`)
+            .duration(5)
+            .EUt(32)
+        event.recipes.gtceu.atomic_reconstruction(`gtceu:solar_panel_${tiername}_reversion`)
+            .itemInputs(`gtceu:${tiername}_solar_panel`)
+            .itemOutputs(solarFluxPanel)
+            .duration(5)
+            .EUt(32)
     }
 })
diff --git a/kubejs/server_scripts/mods/Thermal_Series.js b/kubejs/server_scripts/mods/Thermal_Series.js
@@ -334,10 +334,11 @@ ServerEvents.recipes(event => {
         'thermal:machine_frame', [
             'SSS',
             'SMS',
-            'SSS'
+            'III'
         ], {
-            M: 'gtceu:mythril_block',
-            S: 'gtceu:stainless_steel_plate'
+            M: '#forge:gears/mythril',
+            S: '#forge:plates/stainless_steel',
+            I: '#forge:ingots/invar'
         }
     )