diff --git a/config/ftbquests/quests/chapters/end_game.snbt b/config/ftbquests/quests/chapters/end_game.snbt index 40108f844..846f168cb 100644 --- a/config/ftbquests/quests/chapters/end_game.snbt +++ b/config/ftbquests/quests/chapters/end_game.snbt @@ -12,31 +12,31 @@ id: "54018A95BECC356C" linked_quest: "5A8D2BFAF02E6325" x: 46.5d - y: -23.25d + y: -24.25d } { id: "2A5A7CD2C9EDD767" linked_quest: "7979D07FBDC6D170" x: 44.75d - y: -23.25d + y: -24.25d } { id: "6FD00239A5CD9D2F" linked_quest: "3D7924B550A1BBA0" x: 48.25d - y: -23.25d + y: -24.25d } { id: "3F1F20A84F3FDE97" linked_quest: "0C9A9F33EEA3AB5E" x: 48.25d - y: -21.5d + y: -22.5d } { id: "2C514C36E06DC5FA" linked_quest: "5601A05D8361551D" x: 48.25d - y: -19.0d + y: -20.0d } ] quests: [ @@ -2090,13 +2090,10 @@ type: "item" }] x: 32.5d - y: -15.25d + y: -13.5d } { - dependencies: [ - "45B17E923E03264B" - "5A256CEC02CC747D" - ] + dependencies: ["45B17E923E03264B"] description: [ "Reinforcing &6Heart of a Universe&r with &6Chaotic Cores&r, many &6Piles of Neutrons&r, and a bunch of &6Eternal Catalysts&r produces an &cInfinity Catalyst&r." "" @@ -2110,7 +2107,7 @@ item: "kubejs:infinity_catalyst" type: "item" }] - x: 38.25d + x: 32.5d y: -15.25d } { @@ -2130,7 +2127,7 @@ y: -11.75d } { - dependencies: ["6F9041F256F517A3"] + dependencies: ["4261BDA34D716EC8"] description: [ "The &9Creative Tank&r is a major milestone. Great work!" "" @@ -2180,8 +2177,8 @@ item: "gtceu:infinity_ingot" type: "item" }] - x: 38.25d - y: -17.0d + x: 32.5d + y: -18.0d } { dependencies: ["27EBB5AAF8A40F3D"] @@ -2237,7 +2234,7 @@ }] title: "&9&lCreative Chest&r" x: 48.25d - y: -17.0d + y: -18.0d } { dependencies: [ @@ -2258,7 +2255,7 @@ }] title: "Creative RF Source" x: 27.75d - y: -21.75d + y: -22.75d } { dependencies: ["3171F83E24C8F740"] @@ -2338,7 +2335,7 @@ } ] title: "&2Simulation Supercomputer" - x: 40.5d + x: 40.25d y: -10.25d } { @@ -2356,7 +2353,7 @@ }] title: "The Final Solar Panel" x: 27.75d - y: -17.0d + y: -18.0d } { dependencies: ["113E9543ADB1666B"] @@ -2372,7 +2369,7 @@ type: "item" }] title: "&9Creative Storage Upgrade" - x: 40.5d + x: 40.25d y: -6.75d } { @@ -2387,7 +2384,7 @@ }] title: "&2Creative Power, Gregtech Edition" x: 27.75d - y: -23.25d + y: -24.25d } { description: ["This element is not in Gregtech."] @@ -3047,7 +3044,7 @@ type: "item" }] title: "&9Creative Data Access Hatch" - x: 40.5d + x: 30.25d y: -15.25d } { @@ -3113,7 +3110,7 @@ } ] title: "&9Loot Superfabricator" - x: 40.5d + x: 40.25d y: -8.25d } { @@ -3191,7 +3188,7 @@ y: -6.75d } { - dependencies: ["2D9A95AC50CCB988"] + dependencies: ["6F9041F256F517A3"] description: ["The &bSubatomic Digital Assembler &fcan be used to produce some creative items from the required data and computational power, the first of which is the &dCreative Quantum Tank."] id: "4261BDA34D716EC8" size: 1.0d @@ -3205,22 +3202,6 @@ x: 35.5d y: -9.25d } - { - dependencies: ["456D0255B6ECFA51"] - description: [ - "Placeholder for any number of chains or mechanics or whatnot " - "" - "Likely new MM missions" - ] - id: "5A256CEC02CC747D" - tasks: [{ - id: "41381A01B531235B" - item: "ftbquests:barrier" - type: "item" - }] - x: 38.25d - y: -13.5d - } { dependencies: ["456D0255B6ECFA51"] id: "3F2FC421B1CC2D0A" @@ -3229,19 +3210,22 @@ item: "gtceu:uev_machine_hull" type: "item" }] - x: 40.5d + x: 40.25d y: -11.75d } { - dependencies: ["1BABC1CF44534AE0"] + dependencies: [ + "1BABC1CF44534AE0" + "0DE1BF1648CAF6D6" + ] id: "1B32B86C8AF41947" tasks: [{ id: "5510ABA29D84165F" item: "kubejs:dimensional_processor" type: "item" }] - x: 36.75d - y: -19.0d + x: 35.5d + y: -20.0d } { dependencies: ["1B32B86C8AF41947"] @@ -3251,8 +3235,8 @@ item: "kubejs:dimensional_processor_assembly" type: "item" }] - x: 34.75d - y: -19.0d + x: 34.0d + y: -20.0d } { dependencies: ["768A28309AF076F0"] @@ -3263,7 +3247,7 @@ type: "item" }] x: 32.5d - y: -19.0d + y: -20.0d } { dependencies: ["5D0252A2E07BB99D"] @@ -3274,7 +3258,7 @@ type: "item" }] x: 32.5d - y: -21.75d + y: -22.75d } { dependencies: ["113E9543ADB1666B"] @@ -3295,8 +3279,8 @@ item: "kubejs:dimensional_processing_unit" type: "item" }] - x: 38.25d - y: -19.0d + x: 35.5d + y: -18.0d } { dependencies: ["0DE33F0066D49759"] @@ -3307,18 +3291,18 @@ type: "item" }] x: 34.75d - y: -21.75d + y: -22.75d } { - dependencies: ["0DE33F0066D49759"] + dependencies: ["456D0255B6ECFA51"] id: "63CC578C3558E0AF" tasks: [{ id: "1E6F38616AA5D63C" item: "gtceu:advanced_microverse_projector_iii" type: "item" }] - x: 32.5d - y: -23.25d + x: 40.25d + y: -13.5d } { dependencies: ["0DE33F0066D49759"] @@ -3330,7 +3314,7 @@ type: "item" }] x: 30.25d - y: -23.25d + y: -24.25d } { dependencies: ["0DE33F0066D49759"] @@ -3348,7 +3332,7 @@ type: "item" }] x: 34.75d - y: -23.25d + y: -24.25d } { dependencies: ["0DE33F0066D49759"] @@ -3359,23 +3343,7 @@ type: "item" }] x: 34.75d - y: -20.5d - } - { - dependencies: ["4EA1E0D437528747"] - description: [ - "infinity coils? who knows" - "" - "just part of the process to get monium" - ] - id: "4EEE5A7A199CFDC1" - tasks: [{ - id: "7EFCB8E19449DA2A" - item: "ftbquests:barrier" - type: "item" - }] - x: 40.5d - y: -17.0d + y: -21.5d } { dependencies: ["13578427FD9CC2CE"] @@ -3386,10 +3354,9 @@ type: "item" }] x: 43.25d - y: -23.25d + y: -24.25d } { - dependencies: ["4EEE5A7A199CFDC1"] description: ["The final step of monium chain will be a MM."] id: "5EE558EA203778BE" tasks: [{ @@ -3398,7 +3365,7 @@ type: "item" }] x: 40.5d - y: -23.25d + y: -24.25d } { dependencies: ["060A5766B021FC77"] @@ -3410,7 +3377,7 @@ type: "item" }] x: 43.25d - y: -17.0d + y: -18.0d } { dependencies: ["77FFBCDD22BA1029"] @@ -3421,7 +3388,7 @@ type: "item" }] x: 45.5d - y: -19.0d + y: -20.0d } { dependencies: ["060A5766B021FC77"] @@ -3432,7 +3399,7 @@ type: "item" }] x: 45.5d - y: -21.5d + y: -22.5d } { dependencies: ["0DE33F0066D49759"] @@ -3443,7 +3410,7 @@ type: "item" }] x: 30.25d - y: -20.25d + y: -21.25d } { dependencies: ["456D0255B6ECFA51"] @@ -3454,7 +3421,7 @@ item: "gtceu:draconic_reactor" type: "item" }] - x: 40.5d + x: 36.75d y: -13.5d } { @@ -3478,6 +3445,57 @@ x: 32.5d y: -6.75d } + { + dependencies: [ + "456D0255B6ECFA51" + "63CC578C3558E0AF" + ] + id: "33F610CF136278AE" + tasks: [{ + id: "38C0D22CABA00813" + item: "kubejs:microminer_t11" + type: "item" + }] + x: 38.25d + y: -13.5d + } + { + dependencies: [ + "1D00150456DEF379" + "33F610CF136278AE" + "61BE0215F377C510" + ] + id: "0FD9B533BB402B17" + tasks: [{ + id: "53F611C7F1F12321" + item: "kubejs:alien_scrap" + type: "item" + }] + x: 38.25d + y: -15.25d + } + { + dependencies: ["0FD9B533BB402B17"] + id: "0DE1BF1648CAF6D6" + tasks: [{ + id: "1BBD650C59C35C52" + item: "gtceu:holmium_ingot" + type: "item" + }] + x: 38.25d + y: -20.0d + } + { + dependencies: ["4261BDA34D716EC8"] + id: "61BE0215F377C510" + tasks: [{ + id: "3F79F8E984CF6A2A" + item: "kubejs:corrupted_universe_data" + type: "item" + }] + x: 35.5d + y: -15.25d + } ] subtitle: [ "Getting overhauled!" diff --git a/config/ftbquests/quests/chapters/genesis.snbt b/config/ftbquests/quests/chapters/genesis.snbt index b7eb6defe..059899cbf 100644 --- a/config/ftbquests/quests/chapters/genesis.snbt +++ b/config/ftbquests/quests/chapters/genesis.snbt @@ -328,70 +328,6 @@ x: 0.5d y: 2.5d } - { - dependencies: ["2E8BFA2E719B1C47"] - description: [ - "There are lots of ways to upgrade and improve your Grappling Hook, so play around with it." - "" - "&9Since there is no Curios slot for the Hook, you'll have to keep it in your hotbar to use it.&r" - ] - id: "5B31AB11CC640279" - rewards: [{ - id: "5C2F124669C65506" - item: "kubejs:moni_nickel" - type: "item" - }] - subtitle: "A &aGrappling Hook&f is very useful in an urban environment." - tasks: [{ - id: "3C1E57C56F5B5B92" - item: { - Count: 1b - id: "grapplemod:grapplinghook" - tag: { - Damage: 0 - custom: { - angle: 20.0d - attract: 0b - attractradius: 3.0d - crc32: 2252267022L - detachonkeyrelease: 0b - doublehook: 0b - enderstaff: 0b - hookgravity: 1.0d - maxlen: 30.0d - motor: 0b - motoracceleration: 0.2d - motordampener: 0b - motormaxspeed: 4.0d - motorwhencrouching: 0b - motorwhennotcrouching: 1b - oneropepull: 0b - phaserope: 0b - playermovementmult: 1.0d - pullbackwards: 1b - reelin: 1b - repel: 0b - repelforce: 1.0d - rocket: 0b - rocket_active_time: 0.5d - rocket_force: 1.0d - rocket_refuel_ratio: 15.0d - rocket_vertical_angle: 0.0d - smartdoublemotor: 1b - smartmotor: 0b - sneakingangle: 10.0d - sneakingverticalthrowangle: 0.0d - sticky: 0b - throwspeed: 2.0d - verticalthrowangle: 0.0d - } - } - } - type: "item" - }] - x: -2.5d - y: 2.5d - } { dependencies: ["58566C7BF4C22D86"] description: [ diff --git a/kubejs/server_scripts/gregtech/greenhouse.js b/kubejs/server_scripts/gregtech/greenhouse.js index 62a3d6530..9db0ab2b5 100644 --- a/kubejs/server_scripts/gregtech/greenhouse.js +++ b/kubejs/server_scripts/gregtech/greenhouse.js @@ -77,9 +77,17 @@ ServerEvents.recipes(event => { Greenhouse('flowering_azalea', 'minecraft:flowering_azalea', 1000, ['64x minecraft:oak_log', '4x minecraft:flowering_azalea'], false) Greenhouse('flowering_azalea_boosted', 'minecraft:flowering_azalea', 1000, ['64x minecraft:oak_log', '64x minecraft:oak_log', '4x minecraft:flowering_azalea'], true) + // Cherry + Greenhouse('cherry_sapling', 'minecraft:cherry_sapling', 1000, ['64x minecraft:cherry_log', '4x minecraft:cherry_sapling'], false) + Greenhouse('cherry_sapling_boosted', 'minecraft:cherry_sapling', 1000, ['64x minecraft:cherry_log', '64x minecraft:cherry_log', '4x minecraft:cherry_sapling'], true) + // Mangrove Greenhouse('mangrove_propagule', 'minecraft:mangrove_propagule', 1000, ['64x minecraft:mangrove_log', '4x minecraft:mangrove_propagule'], false) Greenhouse('mangrove_propagule_boosted', 'minecraft:mangrove_propagule', 1000, ['64x minecraft:mangrove_log', '64x minecraft:mangrove_log', '4x minecraft:mangrove_propagule'], true) + + // Chorus + Greenhouse('chorus', 'minecraft:chorus_flower', 1000, ['32x minecraft:chorus_fruit', '4x minecraft:chorus_flower'], false) + Greenhouse('chorus_boosted', 'minecraft:chorus_flower', 1000, ['64x minecraft:chorus_fruit', '4x minecraft:chorus_flower'], true) ////// Crops ////// @@ -134,6 +142,9 @@ ServerEvents.recipes(event => { // Brown Mushroom Greenhouse('brown_mushroom', 'minecraft:brown_mushroom', 1000, '12x minecraft:brown_mushroom', false) Greenhouse('brown_mushroom_boosted', 'minecraft:brown_mushroom', 1000, '24x minecraft:brown_mushroom', true) + + + // Flowers }) ServerEvents.recipes(event => { @@ -176,4 +187,19 @@ ServerEvents.recipes(event => { "energy_mod": 3.0, "water_mod": 3.0 }).id('kubejs:thermal/insolator/rubber_sapling') + + event.custom({ + type: 'thermal:insolator', + "ingredient": { + "item": "minecraft:pink_petals", + }, + "result": [ + { + "item": "minecraft:pink_petals", + "chance": 2.0 + } + ], + "energy_mod": 1.0, + "water_mod": 1.0 + }).id('kubejs:thermal/insolator/pink_petals') }) \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/microverse_recipes.js b/kubejs/server_scripts/gregtech/microverse_recipes.js index 56c246bb0..161e8ddea 100644 --- a/kubejs/server_scripts/gregtech/microverse_recipes.js +++ b/kubejs/server_scripts/gregtech/microverse_recipes.js @@ -165,11 +165,11 @@ ServerEvents.recipes(event => { // Advanced Microverse iii ServerEvents.recipes(event => { - event.recipes.gtceu.advanced_microverse_iii('kubejs:t_test') - .itemInputs('minecraft:bedrock') - .itemOutputs('minecraft:bedrock') - .duration(1500) - .EUt(31250) + event.recipes.gtceu.advanced_microverse_iii('kubejs:t_eleven_first') + .itemInputs('kubejs:microminer_t11', 'kubejs:corrupted_universe_data', 'kubejs:infinity_catalyst') // could be increased + .itemOutputs('64x kubejs:alien_scrap', '64x kubejs:alien_scrap', '64x kubejs:alien_scrap', '64x kubejs:alien_scrap') + .duration(400) + .EUt(2000000) }) // Microversium @@ -203,6 +203,7 @@ ServerEvents.recipes(event => { ['basic_microverse_projector', '#gtceu:circuits/hv'], ['advanced_microverse_projector', '#gtceu:circuits/ev'], ['advanced_microverse_projector_ii', '#gtceu:circuits/iv'], + ['advanced_microverse_projector_iii', '#gtceu:circuits/uev'] ] projector.forEach(projector => { diff --git a/kubejs/server_scripts/gregtech/tank_fabricator.js b/kubejs/server_scripts/gregtech/tank_fabricator.js index b7bbc3ef1..44b18238b 100644 --- a/kubejs/server_scripts/gregtech/tank_fabricator.js +++ b/kubejs/server_scripts/gregtech/tank_fabricator.js @@ -24,4 +24,11 @@ ServerEvents.recipes(event => { .CWUt(64) .duration(500) .EUt(100000) + + event.recipes.gtceu.subatomic_digital_assembly('kubejs:corrupted_data') + .itemInputs('kubejs:universe_creation_data') + .itemOutputs('kubejs:corrupted_universe_data') + .CWUt(64) + .duration(200) + .EUt(16000) }) \ No newline at end of file diff --git a/kubejs/server_scripts/microverse.js b/kubejs/server_scripts/microverse.js index 2753dbc50..165e1b762 100644 --- a/kubejs/server_scripts/microverse.js +++ b/kubejs/server_scripts/microverse.js @@ -234,6 +234,29 @@ ServerEvents.recipes(event => { } ) + // T11 Microminer + event.recipes.extendedcrafting.shaped_table( + 'kubejs:microminer_t11', [ + ' O M O ', + ' O M O ', + ' OO M OO ', + ' POOMMMOOP ', + ' OOOMMMOOO ', + 'POOMMMMMOOP', + 'OODMMMMMDOO', + 'ODSMOOOMSDO', + 'OSOOW WOOSO', + ' OOW WOO ', + ' W W ' + ], { + O: 'gtceu:double_omnium_plate', + M: 'gtceu:double_crystal_matrix_plate', + P: 'solarflux:sp_custom_neutronium', + W: 'kubejs:warp_engine', + D: 'draconicevolution:reactor_core', + S: 'draconicevolution:reactor_stabilizer' + } + ) // // Miner Components // diff --git a/kubejs/server_scripts/scrap.js b/kubejs/server_scripts/scrap.js new file mode 100644 index 000000000..d0f412698 --- /dev/null +++ b/kubejs/server_scripts/scrap.js @@ -0,0 +1,80 @@ +ServerEvents.recipes(event => { + + + + + // Scrap + event.recipes.gtceu.sifter('scrap_sifting') + .itemInputs('kubejs:alien_scrap') + .chancedOutput('gtceu:stone_dust', 3300, 0) + .chancedOutput('gtceu:concrete_dust', 3300, 0) + .chancedOutput('gtceu:carbon_dust', 3300, 0) + .chancedOutput('kubejs:alien_scrap_emitter', 1000, 0) + .chancedOutput('kubejs:alien_scrap_supercap', 1000, 0) + .chancedOutput('kubejs:alien_scrap_sensor', 1000, 0) + .chancedOutput('kubejs:alien_scrap_emitter', 1000, 0) + .duration(400) + .EUt(16380) + +// Supercap +// A simple "crush the thing and get the good stuff" +event.recipes.gtceu.macerator('alien_scrap_supercap_crushing') +.itemInputs('kubejs:alien_scrap_supercap') +.itemOutputs('kubejs:crushed_supercap') +.chancedOutput('gtceu:enriched_naquadah_trinium_europium_duranide_dust', 3300, 0) +.duration(100) +.EUt(16380) + +event.recipes.gtceu.electromagnetic_separator('alien_scrap_supercap_electro') +.itemInputs('kubejs:crushed_supercap') +.itemOutputs('kubejs:magnetic_supercap_dust') +.chancedOutput('gtceu:carbon_dust', 3300, 850) // Finally, an easy way to get carbon! +.duration(100) +.EUt(16380) + +event.recipes.gtceu.centrifuge('alien_scrap_supercap_dust_centrifuge') +.itemInputs('5x kubejs:magnetic_supercap_dust') +.itemOutputs('gtceu:holmium_dust') +.chancedOutput('gtceu:iron_dust', 3300, 850) +.duration(100) +.EUt(16380) + +// Sensor +// Ion exchange +event.recipes.gtceu.macerator('alien_scrap_sensor_crushing') +.itemInputs('kubejs:alien_scrap_sensor') +.itemOutputs('kubejs:crushed_alien_sensor') +.chancedOutput('gtceu:neutronium_dust', 3300, 850) +.duration(600) +.EUt(16380) + +event.recipes.gtceu.thermal_centrifuge('alien_scrap_sensor_centrifuge') +.itemInputs('kubejs:crushed_alien_sensor') +.itemOutputs('kubejs:holmium_compound') +.chancedOutput('gtceu:silver_dust', 3300, 850) +.duration(600) +.EUt(16380) + +event.recipes.gtceu.autoclave('holmium_compound_autoclave') +.itemInputs('3x kubejs:holmium_compound') +.inputFluids('gtceu:polytetrafluoroethylene 100') // Maybe Polystyrene instead? +.itemOutputs('gtceu:holmium_dust') +.duration(600) +.EUt(16380) + + +// Emitter +// Has Glass containing holmium oxide +event.recipes.gtceu.macerator('alien_scrap_emitter_crushing') +.itemInputs('kubejs:alien_scrap_emitter') +.itemOutputs('kubejs:holmium_oxide_glass_dust') +.chancedOutput('gtceu:trinium_dust', 3300, 850) +.duration(400) +.EUt(16380) + +event.recipes.gtceu.centrifuge('holmium_oxide_glass_centro') +.itemInputs('kubejs:holmium_oxide_glass_dust') +.itemOutputs('gtceu:holmium_oxide_dust', 'gtceu:glass_dust') +.duration(400) +.EUt(16380) +}) \ No newline at end of file diff --git a/kubejs/startup_scripts/Item_Registry.js b/kubejs/startup_scripts/Item_Registry.js index fde3bfcab..a67060522 100644 --- a/kubejs/startup_scripts/Item_Registry.js +++ b/kubejs/startup_scripts/Item_Registry.js @@ -295,6 +295,18 @@ StartupEvents.registry('item', event => { .textureJson({ layer0: `gtceu:item/computer_monitor_cover` }) .color(0, color) } + + // Alien scrap + event.create('corrupted_universe_data') + event.create('alien_scrap') + event.create('alien_scrap_supercap') + event.create('alien_scrap_sensor') + event.create('alien_scrap_emitter') + event.create('crushed_supercap') + event.create('magnetic_supercap_dust') + event.create('crushed_alien_sensor') + event.create('holmium_compound') + event.create('kubejs:holmium_oxide_glass_dust') }) ItemEvents.modification(event => { diff --git a/kubejs/startup_scripts/Missing_Materials.js b/kubejs/startup_scripts/Missing_Materials.js index 021bf6ee4..caceb7050 100644 --- a/kubejs/startup_scripts/Missing_Materials.js +++ b/kubejs/startup_scripts/Missing_Materials.js @@ -9,6 +9,7 @@ const $FluidStorageKeys = Java.loadClass('com.gregtechceu.gtceu.api.fluids.store GTCEuStartupEvents.registry('gtceu:material', event => { GTMaterials.Lutetium.setProperty($PropertyKey.INGOT, new $IngotProperty()) + GTMaterials.Holmium.setProperty($PropertyKey.INGOT, new $IngotProperty()) GTMaterials.Einsteinium.setProperty($PropertyKey.FLUID, new $FluidProperty()) GTMaterials.Einsteinium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder()) diff --git a/kubejs/startup_scripts/material_registry/misc.js b/kubejs/startup_scripts/material_registry/misc.js index 2e053e620..cc0ea59d6 100644 --- a/kubejs/startup_scripts/material_registry/misc.js +++ b/kubejs/startup_scripts/material_registry/misc.js @@ -144,4 +144,9 @@ GTCEuStartupEvents.registry('gtceu:material', event => { .fluid() .color(0xbbddbd) .iconSet('elemental_reduction_fluid') + + event.create('holmium_oxide') + .dust() + .color(0xD29092) + .components('2x holmium', '3x oxygen') })