Some cleanup (#126)

* Removed duplicate solar flux recipes * JEI stuff * FIxed ultra dense hydrogen mcmeta * Added tooltip to AE2 facades * Hydrogen compacting recipes * Fixed some recipes - Removed obsolete comments Fixed recipes for: - Reactor Stabilizer - Draconic Energy Core - Neutronium Solar Panel - T4 Microminer - T7 Microminer - T10 Microminer - Warp Engine (also fixed inconsistency in amount of thrusters) - Basic Microminer Guidance System - Plate Basic [sic, from NuclearCraft] - Creative Tank Fabricator (also fixed the multiblock to use the right casing)
ThePansmith · Apr 29, 2024 · f1eb722 · f1eb722
1 parent a4306bf
commit f1eb722
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 41 deletions.
diff --git a/config/solarflux/recipes.cfg b/config/solarflux/recipes.cfg
@@ -83,13 +83,13 @@ C "recipes"={
 	B "solarflux:solar_panels/avaritia/neutronium"=false
 
 	/* Enable this recipe? */
-	B "solarflux:solar_panels/draconicevolution/chaotic"=true
+	B "solarflux:solar_panels/draconicevolution/chaotic"=false
 
 	/* Enable this recipe? */
-	B "solarflux:solar_panels/draconicevolution/draconic"=true
+	B "solarflux:solar_panels/draconicevolution/draconic"=false
 
 	/* Enable this recipe? */
-	B "solarflux:solar_panels/draconicevolution/wyvern"=true
+	B "solarflux:solar_panels/draconicevolution/wyvern"=false
 
 	/* Enable this recipe? */
 	B "solarflux:transfer_rate_upgrade"=false

diff --git a/...textures/item/ultra_dense_hydrogen.mcmeta → ...ures/item/ultra_dense_hydrogen.png.mcmeta b/...textures/item/ultra_dense_hydrogen.mcmeta → ...ures/item/ultra_dense_hydrogen.png.mcmeta
@@ -3,7 +3,7 @@
     "interpolate": true,
     "frametime": 2,
     "frames": [
-      0, 0,0,1, 1, 1,
+      0, 0, 0, 1, 1, 1
     ]
   }
 } 
diff --git a/kubejs/client_scripts/JEI.js b/kubejs/client_scripts/JEI.js
@@ -43,6 +43,8 @@ JEIEvents.hideItems(event => {
     event.hide([Item.of('ironjetpacks:cell', '{Id:"ironjetpacks:dark_soularium"}').strongNBT(), Item.of('ironjetpacks:cell', '{Id:"ironjetpacks:fluxed"}').strongNBT(), 'ironjetpacks:capacitor', Item.of('ironjetpacks:thruster', '{Id:"ironjetpacks:creative"}').strongNBT()])
     event.hide(['ironjetpacks:basic_coil', 'ironjetpacks:advanced_coil', 'ironjetpacks:elite_coil', 'ironjetpacks:ultimate_coil'])
 
+    // Chisels&Bits
+    event.hide('chiselsandbits:block_bit')
 
     // antiblocks (is this even needed?)
     // event.hide([/^antiblocksrechiseled:pressure_plate_.+$/, /^antiblocksrechiseled:button_.+$/, /^antiblocksrechiseled:stair_.+$/, /^antiblocksrechiseled:slab_.+$/, /^antiblocksrechiseled:border_.+$/, /^antiblocksrechiseled:wool_.+$/])
@@ -119,7 +121,6 @@ JEIEvents.addItems(event => {
     event.add(['sophisticatedstorage:gold_shulker_box', 'sophisticatedstorage:diamond_shulker_box', 'sophisticatedstorage:netherite_shulker_box'])
     event.add('sophisticatedbackpacks:backpack')
     event.add(['sophisticatedstorage:basic_to_gold_tier_upgrade', 'sophisticatedstorage:gold_to_diamond_tier_upgrade', 'sophisticatedstorage:diamond_to_netherite_tier_upgrade'])
-
-
+    event.add(Item.of('ae2:facade', {item: "gtceu:infinity_block"}))
 
 })
diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js
@@ -87,6 +87,9 @@ ItemEvents.tooltip(tooltip => {
     tooltip.add(['sophisticatedstorage:diamond_barrel', 'sophisticatedstorage:diamond_chest', 'sophisticatedstorage:diamond_shulker_box'], 'Use an Iron to Aluminium Tier Upgrade on the previous tier to obtain')
     tooltip.add(['sophisticatedstorage:netherite_barrel', 'sophisticatedstorage:netherite_chest', 'sophisticatedstorage:netherite_shulker_box'], 'Use an Aluminium to Stainless Steel Tier Upgrade on the previous tier to obtain')
 
+    // AE2
+    tooltip.add('ae2:facade', Text.gray('Crafted with Cable Anchors'))
+
     // Misc
     tooltip.add('kubejs:eternal_catalyst', Text.darkGray('Gaze into the Abyss...'))
     tooltip.add('kubejs:infinity_catalyst', Text.darkGray('One is all, and all is one.'))

diff --git a/kubejs/server_scripts/gregtech/draconic_reactor.js b/kubejs/server_scripts/gregtech/draconic_reactor.js
@@ -24,15 +24,15 @@ ServerEvents.recipes(event => {
     Reactor('wyvern_crafting_injector', 'draconicevolution:wyvern_crafting_injector', ['draconicevolution:basic_crafting_injector', 'draconicevolution:wyvern_core', '2x draconicevolution:draconium_core', 'gtceu:draconium_block', '4x minecraft:nether_star'], 'basic', 20480000)
     Reactor('wyvern_core', 'draconicevolution:wyvern_core', ['gtceu:emeradic_empowered_block', '4x draconicevolution:draconium_core', '2x gtceu:nether_star_block', '2x armorplus:compressed_infused_lava_crystal'], 'basic', 175544000)
     Reactor('chaotic_solar', '2x solarflux:sp_de.chaotic', ['draconicevolution:chaotic_core', '2x solarflux:sp_de.draconic', '2x draconicevolution:draconic_energy_core'], 'chaotic', 13421760000)
-    Reactor('nt_solar', 'solarflux:sp_custom_neutronium', ['solarflux:sp_de.chaotic', '4x gtceu:draconic_superconductor_single_wire', '2x gtceu:omnium_block'], 'chaotic', 134217600000)
+    Reactor('nt_solar', 'solarflux:sp_custom_neutronium', ['solarflux:sp_de.chaotic', '4x draconicevolution:chaotic_core', '4x gtceu:draconic_superconductor_single_wire', '2x gtceu:omnium_block'], 'chaotic', 134217600000)
     Reactor('draconic_solar', '2x solarflux:sp_de.draconic', ['draconicevolution:draconic_energy_core', '4x solarflux:sp_de.wyvern', '4x enderio:draconic_superconductor_conduit', '2x draconicevolution:wyvern_energy_core'], 'awakened', 16777200000)
     Reactor('wyvern_solar', '2x solarflux:sp_de.wyvern', ['draconicevolution:wyvern_energy_core', '4x solarflux:sp_8', '4x enderio:draconium_conduit', '2x gtceu:draconium_block'], 'wyvern', 8388600000)
     Reactor('reactor_core', 'draconicevolution:reactor_core', ['extendedcrafting:the_ultimate_catalyst', '4x gtceu:draconium_awakened_block', '4x draconicevolution:chaos_shard', '2x kubejs:stabilized_einsteinium'], 'awakened', 26000000000)
     Reactor('chaotic_crafting_injector', 'draconicevolution:chaotic_crafting_injector', ['draconicevolution:awakened_crafting_injector', '4x gtceu:neutronium_ingot', '4x draconicevolution:chaos_shard', '2x gtceu:crystal_matrix_block'], 'awakened', 30000000000)
     Reactor('draconic_crafting_injector', 'draconicevolution:awakened_crafting_injector', ['draconicevolution:wyvern_crafting_injector', '2x minecraft:nether_star', '2x draconicevolution:wyvern_core', '2x minecraft:dragon_egg'], 'wyvern', 6000000000)
     Reactor('energy_core_stabilizer', 'draconicevolution:energy_core_stabilizer', ['draconicevolution:particle_generator', '8x gtceu:diamatine_empowered_block'], 'wyvern', 320000000)
-    Reactor('reactor_stabilizer', 'draconicevolution:reactor_stabilizer', ['draconicevolution:reactor_prt_stab_frame', 'draconicevolution:reactor_prt_stab_frame', 'draconicevolution:reactor_prt_focus_ring', '2x draconicevolution:draconic_energy_core', '4x draconicevolution:awakened_core'], 'awakened', 56320000000)
-    Reactor('draconic_energy_core', 'draconicevolution:draconic_energy_core', ['draconicevolution:wyvern_energy_core', '4x gtceu:draconium_awakened_ingot', '2x draconicevolution:awakened_core', '2x gtceu:energy_module', 'gtceu:energy_module', '4x gtceu:restonia_empowered_block'], 'awakened', 419430000)
+    Reactor('reactor_stabilizer', 'draconicevolution:reactor_stabilizer', ['draconicevolution:reactor_prt_stab_frame', 'draconicevolution:reactor_prt_rotor_full', 'draconicevolution:reactor_prt_focus_ring', '2x draconicevolution:draconic_energy_core', '4x draconicevolution:awakened_core'], 'awakened', 56320000000)
+    Reactor('draconic_energy_core', 'draconicevolution:draconic_energy_core', ['draconicevolution:wyvern_energy_core', '4x gtceu:draconium_awakened_ingot', '2x draconicevolution:awakened_core', '2x gtceu:energy_module', '2x gtceu:restonia_empowered_block'], 'awakened', 419430000)
     Reactor('draconium_awakened_block', '5x gtceu:draconium_awakened_block', ['5x gtceu:draconium_block', '4x draconicevolution:wyvern_core', '2x draconicevolution:dragon_heart'], 'wyvern', 24000000000)
     Reactor('awakened_core', 'draconicevolution:awakened_core', ['minecraft:nether_star', '4x draconicevolution:wyvern_core', '2x gtceu:draconium_awakened_block'], 'wyvern', 3000000000)
     Reactor('chaotic_core', 'draconicevolution:chaotic_core', ['minecraft:nether_star', '4x draconicevolution:chaos_shard', '2x gtceu:neutronium_ingot', '2x gtceu:omnium_ingot'], 'chaotic', 30000000000)

diff --git a/kubejs/server_scripts/gregtech/tank_fabricator.js b/kubejs/server_scripts/gregtech/tank_fabricator.js
@@ -2,13 +2,14 @@ ServerEvents.recipes(event => {
     event.shaped(
         'gtceu:creative_tank_fabricator', [
             'EFE',
-            'FCF',
+            'GCG',
             'LUL'
         ], {
         E: 'gtceu:zpm_emitter',
-        F: 'gtceu:zpm_field_generator',
-        L: 'gtceu:luv_emitter',
-        C: 'kubejs:microverse_casing',
+        F: 'gtceu:luv_field_generator',
+        G: 'gtceu:zpm_field_generator',
+        L: '#gtceu:circuits/luv',
+        C: 'gtceu:atomic_casing',
         U: 'gtceu:uv_field_generator'
     }
     ).id('kubejs:shaped/creative_tank_fabricator')

diff --git a/kubejs/server_scripts/microverse.js b/kubejs/server_scripts/microverse.js
@@ -86,7 +86,7 @@ ServerEvents.recipes(event => {
             B: 'gtceu:hv_field_generator',
             F: 'kubejs:signalum_micro_miner_core',
             T: Item.of('ironjetpacks:thruster', '{Id:"ironjetpacks:energetic"}').weakNBT(),
-            D: 'thermal:dynamo_magmatic' // TODO: replace with reactant dynamo when possible
+            D: 'thermal:dynamo_compression'
         }, 3
     )
 
@@ -153,7 +153,7 @@ ServerEvents.recipes(event => {
             L: 'kubejs:supercharged_laser_array',
             D: 'gtceu:double_draconium_plate',
             G: 'kubejs:advanced_micro_miner_guidance_system',
-            P: 'draconicevolution:particle_generator',
+            P: 'draconicevolution:energy_core_stabilizer',
             A: 'gtceu:luv_field_generator',
             E: 'kubejs:ender_energy_manipulator', // TODO: REPLACE WITH REAL DE COMPONENT
             W: 'kubejs:warp_engine'
@@ -204,8 +204,8 @@ ServerEvents.recipes(event => {
             U: 'kubejs:universal_navigator',
             A: 'gtceu:uv_field_generator',
             B: 'gtceu:ev_super_chest',
-            R: 'draconicevolution:reactor_stabilizer', // TODO: REPLACE WITH THE REAL DE COMPONENT
-            C: 'draconicevolution:reactor_core', // TODO: REPLACE WITH THE REAL DE COMPONENT
+            R: 'draconicevolution:reactor_stabilizer',
+            C: 'draconicevolution:reactor_core',
             W: 'kubejs:warp_engine'
         }
     )
@@ -226,9 +226,9 @@ ServerEvents.recipes(event => {
         ], {
             N: 'gtceu:double_neutronium_plate',
             U: 'kubejs:universal_navigator',
-            C: 'draconicevolution:reactor_core', // TODO: REPLACE WITH THE REAL DE COMPONENT
+            C: 'draconicevolution:reactor_core',
             P: 'solarflux:sp_custom_neutronium',
-            R: 'draconicevolution:energy_core_stabilizer', // TODO: REPLACE WITH THE REAL DE COMPONENT
+            R: 'draconicevolution:reactor_stabilizer',
             A: 'gtceu:iv_quantum_chest',
             W: 'kubejs:warp_engine'
         }
@@ -246,7 +246,7 @@ ServerEvents.recipes(event => {
             'PCP',
             'CCC'
         ], {
-            G: 'minecraft:glass',
+            G: 'gtceu:lv_sensor',
             P: 'gtceu:double_steel_plate',
             C: '#gtceu:circuits/mv'
         }
@@ -333,8 +333,8 @@ ServerEvents.recipes(event => {
             'draconicevolution:advanced_magnet', /* DE Magnet */
             '2x #forge:plates/crystal_matrix',
             '2x gtceu:iv_field_generator',
-            Item.of('2x ironjetpacks:thruster', '{Id:"ironjetpacks:fluxed"}').weakNBT(),
-            Item.of('ironjetpacks:thruster', '{Id:"ironjetpacks:dark_soularium"}').weakNBT())
+            Item.of('ironjetpacks:thruster', 2, '{Id:"ironjetpacks:fluxed"}').weakNBT(),
+            Item.of('ironjetpacks:thruster', 2, '{Id:"ironjetpacks:dark_soularium"}').weakNBT())
         .itemOutputs('kubejs:warp_engine')
         .inputFluids('gtceu:soldering_alloy 1152')
         .duration(1800)

diff --git a/kubejs/server_scripts/mods/NuclearCraft.js b/kubejs/server_scripts/mods/NuclearCraft.js
@@ -160,7 +160,7 @@ ServerEvents.recipes(event => {
             "TST"
         ], {
             T: 'nuclearcraft:tough_alloy_ingot',
-            S: 'gtceu:tungsten_ingot',
+            S: 'gtceu:tungsten_plate',
             D: 'gtceu:double_steel_plate'
         }
     )

diff --git a/kubejs/server_scripts/random_recipes.js b/kubejs/server_scripts/random_recipes.js
@@ -575,6 +575,10 @@ ServerEvents.recipes(event => {
     //Avaritia Replacement recipes
     comapcting(event, 'gtceu:neutronium_ingot', 'gtceu:neutronium_nugget')
 
+    //Dense Hydrogen converion
+    comapcting(event, 'kubejs:dense_hydrogen', 'kubejs:solidified_hydrogen');
+    comapcting(event, 'kubejs:ultra_dense_hydrogen', 'kubejs:dense_hydrogen');
+
     //Recipie from Radium salt to Radium and Rock Salt
     event.recipes.gtceu.electrolyzer("radium_salt_to_radium_and_salt")
         .itemInputs("kubejs:radium_salt")
@@ -639,6 +643,6 @@ ServerEvents.recipes(event => {
     // Stonecut p2p tunnels, attunement sucks
     const p2p = ["redstone", "item", "fluid", "fe", "light"]
     p2p.forEach(type => {
-    event.stonecutting('ae2:'+type+'_p2p_tunnel', 'ae2:me_p2p_tunnel')
-})
+        event.stonecutting('ae2:'+type+'_p2p_tunnel', 'ae2:me_p2p_tunnel')
+    })
 })
diff --git a/kubejs/startup_scripts/Multiblock_Registry.js b/kubejs/startup_scripts/Multiblock_Registry.js
@@ -302,22 +302,22 @@ event.create('draconic_reactor', 'multiblock')
 
 // Creative Tank Fabricator
 // TODO: Cooler Design, thinking about some kind of computer that fabricates the tanks from the data
-    event.create('creative_tank_fabricator', 'multiblock')
-        .rotationState(RotationState.NON_Y_AXIS)
-        .recipeTypes('creative_tank_fabricator')
-        .appearanceBlock(GTBlocks.CASING_STAINLESS_CLEAN)
-        .pattern(definition => FactoryBlockPattern.start()
-            .aisle("CCC", "GGG", "CCC")
-            .aisle("CCC", "G#G", "CCC")
-            .aisle("CSC", "GGG", "CCC")
-            .where('S', Predicates.controller(Predicates.blocks(definition.get())))
-            .where('G', Predicates.blocks(GTBlocks.CASING_TEMPERED_GLASS.get()))
-            .where('C', Predicates.blocks("kubejs:microverse_casing")
-                .or(Predicates.autoAbilities(definition.getRecipeTypes())))
-                .where('#', Predicates.any())
-            .build())
-        .workableCasingRenderer("kubejs:block/microverse_casing",
-            "gtceu:block/multiblock/implosion_compressor", false)
+event.create('creative_tank_fabricator', 'multiblock')
+    .rotationState(RotationState.NON_Y_AXIS)
+    .recipeTypes('creative_tank_fabricator')
+    .appearanceBlock(GTBlocks.CASING_STAINLESS_CLEAN)
+    .pattern(definition => FactoryBlockPattern.start()
+        .aisle("CCC", "GGG", "CCC")
+        .aisle("CCC", "G#G", "CCC")
+        .aisle("CSC", "GGG", "CCC")
+        .where('S', Predicates.controller(Predicates.blocks(definition.get())))
+        .where('G', Predicates.blocks(GTBlocks.CASING_TEMPERED_GLASS.get()))
+        .where('C', Predicates.blocks("gtceu:atomic_casing")
+            .or(Predicates.autoAbilities(definition.getRecipeTypes())))
+        .where('#', Predicates.any())
+         .build())
+     .workableCasingRenderer("gtceu:block/casings/gcym/atomic_casing",
+        "gtceu:block/multiblock/implosion_compressor", false)
 
 // Super Computer
 event.create('simulation_supercomputer', 'multiblock')