From fae9848cac31a0a903e4730cccf1d1c2076ec89f Mon Sep 17 00:00:00 2001 From: SparkedTheorem <162088357+SparkedTheorem@users.noreply.github.com> Date: Fri, 7 Feb 2025 19:52:40 -0800 Subject: [PATCH] modifications to new changes, removal of ultimate tools and gem --- .../quests/chapters/the_factory.snbt | 48 ------------------- kubejs/server_scripts/End_Game.js | 15 ------ .../gregtech/Post_UV_Components.js | 2 +- kubejs/server_scripts/gregtech/circuits.js | 2 +- kubejs/server_scripts/gregtech/omnic_forge.js | 6 +++ .../missing_material_forms.js | 2 - .../missing_material_forms_hm.js | 1 - .../startup_scripts/registry/item_registry.js | 17 ------- 8 files changed, 8 insertions(+), 85 deletions(-) diff --git a/config/ftbquests/quests/chapters/the_factory.snbt b/config/ftbquests/quests/chapters/the_factory.snbt index 1da091ce4..b294c48b9 100644 --- a/config/ftbquests/quests/chapters/the_factory.snbt +++ b/config/ftbquests/quests/chapters/the_factory.snbt @@ -2540,54 +2540,6 @@ x: 1.0d y: 7.5d } - { - dependencies: ["7A12743F5ECCED90"] - description: ["{moni.quest.6BA0B1B3AB853F9A.description1}"] - icon: "kubejs:lv_exoskeleton_legs" - id: "6BA0B1B3AB853F9A" - rewards: [{ - id: "4493B1DEE6BCC5A4" - item: "kubejs:moni_nickel" - type: "item" - }] - subtitle: "{moni.quest.6BA0B1B3AB853F9A.subtitle}" - tasks: [{ - id: "53DCEF454DF9FFFD" - item: { - Count: 1 - id: "itemfilters:or" - tag: { - items: [ - { - Count: 1b - id: "kubejs:lv_exoskeleton_legs" - } - { - Count: 1b - id: "kubejs:mv_exoskeleton_legs" - } - { - Count: 1b - id: "kubejs:hv_exoskeleton_legs" - } - { - Count: 1b - id: "kubejs:ev_exoskeleton_legs" - } - { - Count: 1b - id: "kubejs:iv_exoskeleton_legs" - } - ] - } - } - title: "Any Exoskeleton" - type: "item" - }] - title: "{moni.quest.6BA0B1B3AB853F9A.title}" - x: -2.0d - y: -2.0d - } ] title: "{moni.chapter.2763DAD954E0EED8.title}" } diff --git a/kubejs/server_scripts/End_Game.js b/kubejs/server_scripts/End_Game.js index 4d0746037..7fe931844 100644 --- a/kubejs/server_scripts/End_Game.js +++ b/kubejs/server_scripts/End_Game.js @@ -133,21 +133,6 @@ ServerEvents.recipes(event => { .EUt(491520) ) - // Monic Star of the End - - event.recipes.gtceu.assembly_line('monic_star_of_the_end') - .itemInputs('gtceu:monium_frame', '12x kubejs:the_ultimate_material', 'kubejs:quasi_stable_neutron_star', '4x gtceu:gravi_star', '4x kubejs:eternal_catalyst', '6x gtceu:dense_cryococcus_plate', '6x gtceu:dense_cryolobus_plate','6x gtceu:dense_manyullyn_plate', '6x gtceu:dense_obsidian_plate') - .inputFluids('gtceu:nether_star 11520', 'gtceu:omnium 5760', 'enderio:xp_juice 20000', 'gtceu:americium_plasma 5000') - .itemOutputs('kubejs:monic_star_of_the_end') - .duration(2400) - .EUt(GTValues.VHA[GTValues.MAX]) - - .stationResearch(b => b - .researchStack('kubejs:quasi_stable_neutron_star') - .CWUt(144, 576000) - .EUt(1048576) - ) - // Flux Plating event.shaped('4x redstone_arsenal:flux_plating', [ ' P ', diff --git a/kubejs/server_scripts/gregtech/Post_UV_Components.js b/kubejs/server_scripts/gregtech/Post_UV_Components.js index 7b19f2d7d..930e6a370 100644 --- a/kubejs/server_scripts/gregtech/Post_UV_Components.js +++ b/kubejs/server_scripts/gregtech/Post_UV_Components.js @@ -233,7 +233,7 @@ ServerEvents.recipes(event => { ) event.recipes.gtceu.assembly_line('max_motor') - .itemInputs('4x gtceu:long_magnetic_terbium_rod', '12x gtceu:long_monium_rod', '12x gtceu:monium_ring', '24x gtceu:monium_round', '64x gtceu:fine_monium_wire', '64x gtceu:fine_monium_wire', '64x gtceu:fine_holmium_wire', '64x gtceu:fine_holmium_wire', '64x gtceu:fine_activated_netherite_wire', '4x gtceu:monium_single_wire') + .itemInputs('4x gtceu:long_magnetic_terbium_rod', '12x gtceu:long_monium_rod', '12x gtceu:monium_ring', '24x gtceu:monium_round', '64x gtceu:fine_monium_wire', '64x gtceu:fine_monium_wire', '64x gtceu:fine_holmium_wire', '64x gtceu:fine_holmium_wire', '4x gtceu:monium_single_wire') .inputFluids('gtceu:soldering_alloy 11520', 'gtceu:lubricant 4000', 'gtceu:crystal_matrix 5760', 'gtceu:omnium 2304') .itemOutputs('kubejs:max_electric_motor') .duration(1800) diff --git a/kubejs/server_scripts/gregtech/circuits.js b/kubejs/server_scripts/gregtech/circuits.js index 70a3b0d01..12e46421c 100644 --- a/kubejs/server_scripts/gregtech/circuits.js +++ b/kubejs/server_scripts/gregtech/circuits.js @@ -288,7 +288,7 @@ ServerEvents.recipes(event => { '#gtceu:circuits/uv', 'gtceu:zpm_field_generator', '1x kubejs:quasi_stable_neutron_star', - '2x kubejs:ultimate_gem' + '2x kubejs:hadal_energy_core' ) .inputFluids('gtceu:omnium 576') .itemOutputs('32x kubejs:monic_circuit_board') diff --git a/kubejs/server_scripts/gregtech/omnic_forge.js b/kubejs/server_scripts/gregtech/omnic_forge.js index bdccfad4b..f512776a7 100644 --- a/kubejs/server_scripts/gregtech/omnic_forge.js +++ b/kubejs/server_scripts/gregtech/omnic_forge.js @@ -60,6 +60,12 @@ ServerEvents.recipes(event => { .duration(800) .EUt(134217728) + event.recipes.gtceu.omnic_forge('kubejs:monic_star_of_the_end') + .itemInputs('gtceu:monium_frame', '6x kubejs:contained_singularity', '12x kubejs:the_ultimate_material', 'kubejs:quasi_stable_neutron_star', '4x gtceu:gravi_star', '4x kubejs:eternal_catalyst') + .itemOutputs('kubejs:monic_star_of_the_end') + .duration(1200) + .EUt(134217728) + // Buffed Catalyst Recycling event.recipes.gtceu.omnic_forge('kubejs:furious_infinity_catalyst_recycling') .itemInputs('kubejs:dormant_furious_infinity_catalyst', 'kubejs:heart_of_a_universe') diff --git a/kubejs/startup_scripts/gregtech_material_registry/missing_material_forms.js b/kubejs/startup_scripts/gregtech_material_registry/missing_material_forms.js index 8438e610d..f1b32f260 100644 --- a/kubejs/startup_scripts/gregtech_material_registry/missing_material_forms.js +++ b/kubejs/startup_scripts/gregtech_material_registry/missing_material_forms.js @@ -45,8 +45,6 @@ GTCEuStartupEvents.registry('gtceu:material', event => { GTMaterials.Graphite.addFlags(GTMaterialFlags.GENERATE_PLATE) GTMaterials.MagnesiumDiboride.addFlags(GTMaterialFlags.GENERATE_FINE_WIRE) GTMaterials.RutheniumTriniumAmericiumNeutronate.addFlags(GTMaterialFlags.GENERATE_FINE_WIRE) - GTMaterials.Zeron100.addFlags(GTMaterialFlags.GENERATE_DENSE) - GTMaterials.BlueAlloy.addFlags(GTMaterialFlags.GENERATE_DENSE) GTMaterials.Neutronium.addFlags(GTMaterialFlags.GENERATE_LONG_ROD, GTMaterialFlags.GENERATE_RING, GTMaterialFlags.GENERATE_ROUND, GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_SMALL_GEAR, GTMaterialFlags.GENERATE_BOLT_SCREW, GTMaterialFlags.GENERATE_DENSE) // Gears for Thermal Expansion diff --git a/kubejs/startup_scripts/hardmode/material_registry/missing_material_forms_hm.js b/kubejs/startup_scripts/hardmode/material_registry/missing_material_forms_hm.js index 5fa076682..563e153f4 100644 --- a/kubejs/startup_scripts/hardmode/material_registry/missing_material_forms_hm.js +++ b/kubejs/startup_scripts/hardmode/material_registry/missing_material_forms_hm.js @@ -14,5 +14,4 @@ GTCEuStartupEvents.registry('gtceu:material', event => { GTMaterials.Berkelium.addFlags(GTMaterialFlags.GENERATE_FRAME) addFluid(GTMaterials.Oganesson, $FluidStorageKeys.GAS, 7777); GTMaterials.Oganesson.setMaterialARGB(0x443936) - addFluid(GTMaterials.Monium, $FluidStorageKeys.LIQUID, 9999); }) diff --git a/kubejs/startup_scripts/registry/item_registry.js b/kubejs/startup_scripts/registry/item_registry.js index 810b47650..de3e31dbd 100644 --- a/kubejs/startup_scripts/registry/item_registry.js +++ b/kubejs/startup_scripts/registry/item_registry.js @@ -146,7 +146,6 @@ StartupEvents.registry('item', event => { // Endgame Items event.create('diamond_lattice') event.create('neutron_emitter') - event.create('ultimate_gem').displayName("§dUltimate Gem").glow(true) event.create('mote_of_omnium').displayName("Mote of Omnium") .glow(true).rarity("epic") event.create('heart_of_a_universe').displayName("§dHeart Of A Universe") @@ -166,25 +165,10 @@ StartupEvents.registry('item', event => { event.create('field_stabilised_omnic_pulsar_compound') event.create('quasi_stable_neutron_star').displayName('Quasi-Stable Neutron Star') - // Singularities event.create('singularity_containment_unit') event.create('contained_singularity') - - // Ultimate Tools - event.create('ultimate_file').texture('kubejs:item/ultimate/file') - .rarity("epic").maxStackSize(1) - event.create('ultimate_hammer').texture('kubejs:item/ultimate/hammer') - .rarity("epic").maxStackSize(1) - event.create('ultimate_screwdriver').texture('kubejs:item/ultimate/screwdriver') - .rarity("epic").maxStackSize(1) - event.create('ultimate_wrench').texture('kubejs:item/ultimate/wrench') - .rarity("epic").maxStackSize(1) - event.create('ultimate_wire_cutter').texture('kubejs:item/ultimate/wire_cutter') - .rarity("epic").maxStackSize(1) - - // Infinity Tools event.create('infinity_power_unit').rarity("epic").maxStackSize(1) event.create('infinity_file').rarity("epic").maxStackSize(1) @@ -193,7 +177,6 @@ StartupEvents.registry('item', event => { event.create('infinity_wrench').rarity("epic").maxStackSize(1) event.create('infinity_wire_cutter').rarity("epic").maxStackSize(1) - // Solidified Elements const solidified_elements = [ ['argon', '#12bc12'],