Finish #4 (#274)

* Fixed some errors and added some luv component recipeis * LuV pump * luv convertor module * rest of luv * more recipies * Even More recipes * Supercomputer and superfabricator
ThePansmith · Jun 1, 2024 · 56d866a · 56d866a
1 parent ddf0f0d
commit 56d866a
Show file tree

Hide file tree

Showing 10 changed files with 145 additions and 31 deletions.
diff --git a/config/cyclopscore-common.toml b/config/cyclopscore-common.toml
@@ -0,0 +1,23 @@
+
+[core]
+
+	[core.general]
+		#If mod compatibility loader should crash hard if errors occur in that process.
+		crashOnModCompatCrash = false
+		#Set 'true' to enable development debug mode. This will result in a lower performance!
+		debug = false
+		#The anonymous id used by the analytics service.
+		anonymousAnalyticsID = "4f139e1d-c06b-429e-a6ea-de91153ff41a"
+		#If the recipe loader should crash when finding invalid recipes.
+		crashOnInvalidRecipe = false
+		#If an anonymous mod startup analytics request may be sent to our analytics service.
+		analytics = true
+		#If the version checker should be enabled.
+		versionChecker = true
+
+[general]
+
+	[general.general]
+		#If a button should be added to the main menu to open a dev world (shift-click creates a new world).
+		devWorldButton = false
+
diff --git a/config/darkmodeeverywhereshaders.json b/config/darkmodeeverywhereshaders.json
@@ -48,5 +48,5 @@
     }
   ],
   "version": 2,
-  "selectedShaderIndex": 0
+  "selectedShaderIndex": 3
 }
diff --git a/config/iconexporter-common.toml b/config/iconexporter-common.toml
@@ -0,0 +1,17 @@
+
+[core]
+
+	[core.general]
+		#If mod compatibility loader should crash hard if errors occur in that process.
+		crashOnModCompatCrash = false
+		#The default image width in px to render at.
+		defaultScale = 32
+		#If the NBT tag should be hashed with MD5 when constructing the file name, and if an auxiliary txt file should be created with the full tag contents.
+		fileNameHashTag = false
+		#If the recipe loader should crash when finding invalid recipes.
+		crashOnInvalidRecipe = false
+		#If an anonymous mod startup analytics request may be sent to our analytics service.
+		analytics = true
+		#If the version checker should be enabled.
+		versionChecker = true
+
diff --git a/kubejs/server_scripts/gregtech/Post_UV_Components.js b/kubejs/server_scripts/gregtech/Post_UV_Components.js
@@ -60,31 +60,25 @@ ServerEvents.recipes(event => {
             })
 
 
-            // event.recipes.gtceu.assembly_line(`gtceu:${tier}_energy_input_hatch`)
-            //     .itemInputs(`gtceu:${tier}_machine_hull`, `4x gtceu:${mat2}_single_wire`, `2x gtceu:uhpic_chip`, `#gtceu:circuits/${tier}`, `2x gtceu:${mat1}_double_wire`)
-            //     .itemOutputs(`gtceu:${tier}_energy_input_hatch`)
-            //     .inputFluids('gtceu:crystal_matrix 11520', 'gtceu:soldering_alloy 5760')
-            //     .duration(1000)
-            //     .EUt(eut)
-
-            // event.recipes.gtceu.assembly_line(`gtceu:${tier}_energy_output_hatch`)
-            //     .itemInputs(`gtceu:${tier}_machine_hull`, `4x gtceu:${mat2}_spring`, `2x gtceu:uhpic_chip`, `#gtceu:circuits/${tier}`, `2x gtceu:${mat1}_double_wire`)
-            //     .itemOutputs(`gtceu:${tier}_energy_output_hatch`)
-            //     .inputFluids('gtceu:crystal_matrix 11520', 'gtceu:soldering_alloy 5760')
-            //     .duration(1000)
-            //     .EUt(eut)
-
-            //     event.recipes.gtceu.assembler(`gtceu:${tier}_energy_input_hatch_4a`)
-            //     .itemInputs(`gtceu:${tier}_energy_input_hatch`, `2x gtceu:${mat1}_plate`, `2x gtceu:${mat2}_quadruple_wire`)
-            //     .itemOutputs(`gtceu:${tier}_energy_input_hatch_4a`)
-            //     .duration(100)
-            //     .EUt(eut)
-
-            //     event.recipes.gtceu.assembler(`gtceu:${tier}_energy_input_hatch_16a`)
-            //     .itemInputs(`2x gtceu:${tier}_energy_input_hatch_4a`, `4x gtceu:${mat1}_plate`, `2x gtceu:${mat2}_octal_wire`, `2x gtceu:uhpic_chip`)
-            //     .itemOutputs(`gtceu:${tier}_energy_input_hatch_16a`)
-            //     .duration(100)
-            //     .EUt(eut)
+
+            event.recipes.gtceu.assembly_line(`gtceu:${tier}_energy_output_hatch`)
+                .itemInputs(`gtceu:${tier}_machine_hull`, `4x gtceu:${mat2}_spring`, `2x gtceu:uhpic_chip`, `#gtceu:circuits/${tier}`, `2x gtceu:${mat1}_double_wire`)
+                .itemOutputs(`gtceu:${tier}_energy_output_hatch`)
+                .inputFluids('gtceu:crystal_matrix 11520', 'gtceu:soldering_alloy 5760')
+                .duration(1000)
+                .EUt(eut)
+
+                //event.recipes.gtceu.assembler(`gtceu:${tier}_energy_input_hatch_4a`)
+               // .itemInputs(`gtceu:${tier}_energy_input_hatch`, `2x gtceu:${mat1}_plate`, `2x gtceu:${mat2}_quadruple_wire`)
+                //.itemOutputs(`gtceu:${tier}_energy_input_hatch_4a`)
+              //  .duration(100)
+               // .EUt(eut)
+
+              //  event.recipes.gtceu.assembler(`gtceu:${tier}_energy_input_hatch_16a`)
+              //  .itemInputs(`2x gtceu:${tier}_energy_input_hatch_4a`, `4x gtceu:${mat1}_plate`, `2x gtceu:${mat2}_octal_wire`, `2x gtceu:uhpic_chip`)
+              //  .itemOutputs(`gtceu:${tier}_energy_input_hatch_16a`)
+              //  .duration(100)
+             //   .EUt(eut)
         }
         })
 

diff --git a/kubejs/server_scripts/gregtech/naquadah_reactor.js b/kubejs/server_scripts/gregtech/naquadah_reactor.js
@@ -6,13 +6,15 @@ ServerEvents.recipes(event => {
         .itemOutputs('gtceu:naquadah_reactor_i')
         .duration(1500)
         .EUt(122880)
+        .stationResearch(b => b.researchStack(Item.of('gtceu:naquadah_bolt')).EUt(131072).CWUt(2048))
 
     event.recipes.gtceu.assembly_line('kubejs:naquadah_reactor_ii')
         .itemInputs('gtceu:computer_monitor_cover', '3x ae2:spatial_pylon', '#gtceu:circuits/uv', '2x gtceu:fusion_glass')
         .inputFluids('gtceu:soldering_alloy 1152', 'gtceu:omnium 288')
         .itemOutputs('gtceu:naquadah_reactor_ii')
         .duration(1500)
         .EUt(122880)
+        .stationResearch(b => b.researchStack(Item.of('gtceu:naquadah_reactor_i')).EUt(131072).CWUt(2048))
 
     //Reactor usage
     //TODO: Make recipes not overclockable. I looked through the GregTech KJS integration but am too stupid to figure it out -Ciggy

diff --git a/kubejs/server_scripts/gregtech/supercomputer.js b/kubejs/server_scripts/gregtech/supercomputer.js
@@ -15,7 +15,7 @@ ServerEvents.recipes(event => {
         .itemInputs('gtceu:atomic_casing', '6x gcyr:trinaquadalloy_plate', '4x hostilenetworks:sim_chamber', '#gtceu:circuits/uev', '4x #gtceu:circuits/uhv', '2x gtceu:uv_robot_arm', '2x gtceu:uv_field_generator', 'kubejs:resonant_energy_core')
         .inputFluids('gtceu:soldering_alloy 1152')
         .itemOutputs('gtceu:simulation_supercomputer')
-        // requires research (sim chamber with data module)
+        .stationResearch(b => b.researchStack(Item.of('hostilenetworks:simulaton_chamber')).EUt(1966080).CWUt(8192))
         .duration(1200)
         .EUt(1966080)
 

diff --git a/kubejs/server_scripts/gregtech/superfabricator.js b/kubejs/server_scripts/gregtech/superfabricator.js
@@ -14,7 +14,7 @@ ServerEvents.recipes(event => {
         .itemInputs('gtceu:atomic_casing', '6x gcyr:trinaquadalloy_plate', '4x hostilenetworks:loot_fabricator', '#gtceu:circuits/uev', '4x #gtceu:circuits/uhv', '2x gtceu:uv_robot_arm', '2x gtceu:uv_emitter',  'kubejs:resonant_energy_core')
         .inputFluids('gtceu:soldering_alloy 1152')
         .itemOutputs('gtceu:loot_superfabricator')
-        // requires research (sim chamber with data module)
+        .stationResearch(b => b.researchStack(Item.of('hostilenetworks:loot_fabricator')).EUt(1966080).CWUt(8192))
         .duration(1200)
         .EUt(1966080)
 

diff --git a/kubejs/server_scripts/mods/iron_jetpacks.js b/kubejs/server_scripts/mods/iron_jetpacks.js
@@ -152,21 +152,26 @@ ServerEvents.recipes(event => {
             T: Item.of('ironjetpacks:thruster', `{Id:"ironjetpacks:${newTier}"}`).weakNBT()
         }).modifyResult(copyOldJetpackData).id(`kubejs:ironjetpacks/upgrade/${newTier}`);
     })
-
+   
     event.recipes.gtceu.assembly_line('kubejs:ironjetpacks/upgrade/dark_soularium')
         .itemInputs(Item.of('ironjetpacks:jetpack', '{Id:"ironjetpacks:vibrant"}').weakNBT(), 'gtceu:dark_soularium_block', 'better_angel_ring:angel_ring', '2x enderio:ender_crystal', 'kubejs:double_compressed_octadic_capacitor', '4x #gtceu:circuits/luv', Item.of('ironjetpacks:thruster', 2, '{Id:"ironjetpacks:dark_soularium"}').weakNBT())
         .inputFluids('gtceu:soldering_alloy 1152')
         .itemOutputs(Item.of('ironjetpacks:jetpack', '{Id:"ironjetpacks:dark_soularium"}').strongNBT())
         .duration(3000)
         .EUt(30720)
-		.modifyResult(copyOldJetpackData)
+        .stationResearch(b => b.researchStack(Item.of('ironjetpacks:jetpack', '{Id:"ironjetpacks:vibrant"}')).EUt(3686).CWUt(512))
+        .modifyResult(copyOldJetpackData)
 
     event.recipes.gtceu.assembly_line('kubejs:ironjetpacks/upgrade/fluxed')
         .itemInputs(Item.of('ironjetpacks:jetpack', '{Id:"ironjetpacks:resonant"}').weakNBT(), 'redstone_arsenal:flux_chestplate', 'kubejs:cryotheum_coolant_unit', 'better_angel_ring:angel_ring', '2x kubejs:compressed_octadic_capacitor', '4x #gtceu:circuits/luv', Item.of('ironjetpacks:thruster', 2, '{Id:"ironjetpacks:fluxed"}').weakNBT())
         .inputFluids('gtceu:soldering_alloy 1152')
         .itemOutputs(Item.of('ironjetpacks:jetpack', '{Id:"ironjetpacks:fluxed"}').strongNBT())
         .duration(3000)
         .EUt(30720)
+        .stationResearch(b => b
+            .researchStack(Item.of('ironjetpacks:jetpack', '{Id:"ironjetpacks:resonant"}'))
+            .EUt(3686)
+            .CWUt(512))
 		.modifyResult(copyOldJetpackData)
 
     //

diff --git a/kubejs/server_scripts/random_recipes.js b/kubejs/server_scripts/random_recipes.js
@@ -544,4 +544,77 @@ ServerEvents.recipes(event => {
             });
         });
     }); 
+
+    //LUV Components
+    event.remove({ id: 'gtceu:assembly_line/electric_motor_luv'})
+    event.recipes.gtceu.assembly_line('gtceu:assembly_line/electric_motor_luv')
+        .itemInputs('gtceu:long_magnetic_samarium_rod',Item.of('gtceu:long_hsss_rod',2),Item.of('gtceu:hsss_ring',2),Item.of('gtceu:hsss_round',4),Item.of('gtceu:fine_ruridit_wire',64),Item.of('gtceu:niobium_titainum_single_cable',2))
+        .inputFluids(Fluid.of('gtceu:soldering_alloy',144),Fluid.of('gtceu:lubricant',250))
+        .itemOutputs('gtceu:luv_electric_motor')
+        .duration(600)
+        .EUt(6000)
+        ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack('gtceu:iv_electric_motor').EUt(480).duration(4800))
+
+    event.remove({ id: 'gtceu:assembly_line/electric_pump_luv'})
+    event.recipes.gtceu.assembly_line('gtceu:assembly_line/electric_pump_luv')
+        .itemInputs(Item.of('gtceu:luv_electric_motor',1),Item.of('gtceu:niobium_titanium_small_fluid_pipe',1),Item.of('gtceu:hsss_plate',2),Item.of('gtceu:hsss_screw',8),Item.of('gtceu:silicone_rubber_ring',4),Item.of('gtceu:hsss_rotor',1),Item.of('gtceu:niobium_titanium_single_cable',2))
+        .inputFluids(Fluid.of('gtceu:soldering_alloy',144),Fluid.of('gtceu:lubricant',250))
+        .itemOutputs('gtceu:luv_electric_pump')
+        . duration(600)
+        .EUt(6000)
+        ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack('gtceu:iv_electric_pump').EUt(480).duration(4800))
+
+    event.remove({ id: 'gtceu:assembly_line/conveyor_module_luv'})
+    event.recipes.gtceu.assembly_line('gtceu:assembly_line/conveyor_module_luv')
+        .itemInputs(Item.of('gtceu:luv_electric_motor',2),Item.of('gtceu:hsss_round',16),Item.of('gtceu:hsss_plate',2),Item.of('gtceu:hsss_screw',4),Item.of('gtceu:hsss_ring',4) , Item.of('gtceu:niobium_titanium_single_cable',2))
+        .inputFluids(Fluid.of('gtceu:soldering_alloy',144),Fluid.of('gtceu:lubricant',250), Fluid.of('gtceu:styrene_butadiene_rubber',1000))
+        .itemOutputs('gtceu:luv_conveyor_module')
+        .duration(600)
+        .EUt(6000)
+        ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack('gtceu:iv_conveyor_module').EUt(480).duration(4800))
+
+
+    event.remove({ id: 'gtceu:assembly_line/electric_piston_luv'})
+    event.recipes.gtceu.assembly_line('gtceu:assembly_line/electric_piston_luv')
+            .itemInputs(Item.of('gtceu:luv_electric_motor',1),Item.of('gtceu:hsss_plate',4),Item.of('gtceu:hsss_ring',2),Item.of('gtceu:hsss_round',16),Item.of('gtceu:hsss_rod',4),Item.of('gtceu:hsss_gear',1),Item.of('gtceu:small_hsss_gear',2),Item.of('gtceu:niobium_titanium_single_cable',2))
+            .inputFluids(Fluid.of('gtceu:soldering_alloy',144),Fluid.of('gtceu:lubricant',250))
+            .itemOutputs('gtceu:luv_electric_piston')
+            .duration(600)
+            .EUt(6000)
+            ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack('gtceu:iv_electric_piston').EUt(480).duration(4800))
+
+    event.remove({ id: 'gtceu:assembly_line/dynamo_hatch_luv'})
+    event.recipes.gtceu.assembly_line('gtceu:assembly_line/dynamo_hatch_luv')
+            .itemInputs(Item.of('gtceu:long_hsss_rod',4),Item.of('gtceu:hsss_gear',1),Item.of('gtceu:small_hsss_gear',3), Item.of('gtceu:hpic_chip',2),Item.of('#gtceu:circuits/luv',1),Item.of('gtceu:luv_voltage_coil',1))
+            .inputFluids(Fluid.of('gtceu:sodium_potassium',6000),Fluid.of('gtceu:soldering_alloy',720))
+            .itemOutputs('gtceu:luv_energy_output_hatch')
+            .duration(400)
+            .EUt(30720)
+            ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack('gtceu:iv_energy_output_hatch').EUt(480).duration(4800))
+
+            event.remove({ id: 'gtceu:assembly_line/robot_arm_luv'})
+    event.recipes.gtceu.assembly_line('gtceu:assembly_line/robot_arm_luv')
+            .itemInputs(Item.of('gtceu:luv_machine_hull',1),Item.of('gtceu:niobium_titanium_spring',4),Item.of('gtceu:small_hsss_gear',3), Item.of('gtceu:luv_electric_motor',2),Item.of('gtceu:luv_electric_piston',1),Item.of('#gtceu:circuits/luv',1),Item.of('#gtceu:circuits/iv',2),Item.of('#gtceu:circuits/ev',2),Item.of('gtceu:niobium_titanium_single_cable',4))
+            .inputFluids(Fluid.of('gtceu:soldering_alloy',576),Fluid.of('gtceu:lubricant',250))
+            .itemOutputs('gtceu:luv_robot_arm')
+            .duration(600)
+            .EUt(6000)
+            ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack('gtceu:iv_robot_arm').EUt(480).duration(4800))
+            event.remove({ id: 'gtceu:shaped/mega_blast_furnace'})
+    event.recipes.gtceu.assembly_line('kubejs:assembly_line/mega_blast_furnace')
+        .itemInputs(Item.of('gtceu:electric_blast_furnace',16),Item.of('gtceu:dense_naquadah_alloy_plate',8),Item.of('gtceu:naquadah_spring',8),Item.of('gtceu:ruthenium_trinium_americium_neutronate_octal_wire',2),Item.of('gtceu:zpm_field_generator',4),Item.of('#gtceu:circuits/zpm',4))
+        .inputFluids('gtceu:soldering_alloy 9216')
+        .itemOutputs(Item.of('gtceu:mega_blast_furnace'))
+        .duration(3000)
+        .EUt(30720)
+        .stationResearch(b => b.researchStack(Item.of('gtceu:electric_blast_furnace')).EUt(131072).CWUt(2048))
+    event.remove({ id: 'gtceu:shaped/mega_vacuum_freezer'})
+    event.recipes.gtceu.assembly_line('kubejs:assembly_line/mega_vacuum_freezer')
+        .itemInputs(Item.of('gtceu:vacuum_freezer',16),Item.of('gtceu:dense_rhodium_plated_palladium_plate',8),Item.of('gtceu:niobium_titanium_normal_fluid_pipe',8),Item.of('gtceu:ruthenium_trinium_americium_neutronate_octal_wire',2),Item.of('gtceu:zpm_field_generator',4),Item.of('#gtceu:circuits/zpm',4))
+        .inputFluids('gtceu:soldering_alloy 9216')
+        .itemOutputs(Item.of('gtceu:mega_vacuum_freezer'))
+        .duration(3000)
+        .EUt(30720)
+        .stationResearch(b => b.researchStack(Item.of('gtceu:vacuum_freezer')).EUt(131072).CWUt(2048))
+
 })
diff --git a/kubejs/startup_scripts/Singleblock_Registry.js b/kubejs/startup_scripts/Singleblock_Registry.js
@@ -14,6 +14,6 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
     // Atomic Reconstructor
     event.create('atomic_reconstructor', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV, GTValues.UEV, GTValues.UIV)
         .langValue("Atomic Reconstructor")
-        .recipeType('atomic_reconstruction', true, true)
+        .recipeType('atomic_reconstruction')
         .workableTieredHullRenderer('gtceu:block/machines/reconstructor')
 })