From 84dd7394799e3f9ac13ad8e7dcc8b845c0f2ee80 Mon Sep 17 00:00:00 2001 From: roidrole <83431927+roidrole@users.noreply.github.com> Date: Tue, 24 Dec 2024 23:20:20 -0500 Subject: [PATCH 1/8] Use tags for most Trade Station Export Recipes --- overrides/kubejs/server_scripts/tags.js | 327 ++++++++++++++++++++ overrides/kubejs/startup_scripts/trading.js | 237 ++++---------- 2 files changed, 383 insertions(+), 181 deletions(-) diff --git a/overrides/kubejs/server_scripts/tags.js b/overrides/kubejs/server_scripts/tags.js index a3f5cc9e..c6e82575 100644 --- a/overrides/kubejs/server_scripts/tags.js +++ b/overrides/kubejs/server_scripts/tags.js @@ -87,6 +87,333 @@ onEvent('item.tags', event => { event.get('thermal:crafting/dies').add('#kubejs:transaction_cards') event.get('thermal:crafting/dies').add('kubejs:missingno') + //Tags for use in market recipes + event.get('kubejs:food_crate') + .add('quark:golden_apple_crate') + .add('quark:potato_crate') + .add('quark:carrot_crate') + .add('quark:beetroot_crate') + .add('farmersdelight:carrot_crate') + .add('farmersdelight:potato_crate') + .add('farmersdelight:beetroot_crate') + .add('farmersdelight:cabbage_crate') + .add('farmersdelight:tomato_crate') + .add('farmersdelight:onion_crate') + .add('farmersdelight:rice_bag') + .add('thermal:apple_block') + .add('thermal:carrot_block') + .add('thermal:potato_block') + .add('thermal:beetroot_block') + .add('quark:apple_crate') + .add('buddycardsexp:buddybean_crate') + .add('quark:glowberry_sack') + .add('quark:berry_sack') + .add('quark:chorus_fruit_block') + event.get('market:export/farming') + .add(KJ('#food_crate')) + .add(FD('canvas')) + .add(F('#berries')) + .add(MC('cocoa_beans')) + .add(MC('honey_bottle')) + .add(MC('honeycomb')) + .add(MC('#small_flowers')) + .add(MC('bread')) + .add(F('#mushrooms')) + .add(MC('kelp')) + .add(MC('pumpkin')) + .add(MC('#wool')) + .add(MC('melon')) + .add('kubejs:profession_card_farming') + + event.get('market:export/wood/1') + .add(MC('oak_log')) + .add(MC('spruce_log')) + .add(MC('jungle_log')) + .add(MC('dark_oak_log')) + .add(BOP('redwood_log')) + .add(BOP('fir_log')) + .add(BOP('umbran_log')) + .add(BOP('dead_log')) + event.get('market:export/wood/2') + .add(MC('acacia_log')) + .add(MC('birch_log')) + .add(BOP('cherry_log')) + .add(TC('skyroot_log')) + .add(TC('greenheart_log')) + .add('architects_palette:twisted_log') + .add('biomesoplenty:jacaranda_log') + event.get('market:export/wood/3') + .add(BOP('willow_log')) + .add(BOP('palm_log')) + .add(BOP('mahogany_log')) + .add(BOP('magic_log')) + .add('quark:azalea_log') + .add('quark:blossom_log') + event.get('market:export/wood/4') + .add(MC('crimson_stem')) + .add(MC('warped_stem')) + .add(TC('bloodshroom_log')) + event.get('market:export/carpentry') + .add('#market:export/wood/1') + .add('#market:export/wood/2') + .add('#market:export/wood/3') + .add('#market:export/wood/4') + .add(BOP('hellbark_log')) + .add('kubejs:profession_card_carpentry') + + event.get('market:export/stone/1') + .add('minecraft:andesite') + .add('minecraft:granite') + .add('minecraft:diorite') + .add('minecraft:sandstone') + .add('create:limestone') + .add('create:scoria') + event.get('market:export/crushed_raw_ores/8') + .add(CR('crushed_raw_iron')) + .add(CR('crushed_raw_copper')) + .add(CR('crushed_raw_zinc')) + event.get('market:export/crushed_raw_ores/12') + .add(CR('crushed_raw_nickel')) + .add(CR('crushed_raw_lead')) + event.get('market:export/stone/6') + .add(TE('cinnabar')) + .add(TE('sulfur')) + .add(TE('niter')) + .add(MC('lapis_lazuli')) + event.get('market:export/gem/10') + .add(TE('sapphire')) + .add(TE('ruby')) + event.get('market:export/mining') + .add('#market:export/crushed_raw_ores/8') + .add('#market:export/crushed_raw_ores/12') + .add('create:crushed_raw_gold') + .add('#market:export/stone/1') + .add('#market:export/stone/6') + .add('#market:export/gem/10') + .add(MC('coal')) + .add(TE('apatite')) + .add(MC('diamond')) + .add('kubejs:profession_card_mining') + + event.get('market:export/brick/4') + .add(SP('checker_block')) + .add(AP('olivestone_bricks')) + .add(AP('flint_tiles')) + event.get('market:export/brick/6') + .add(AP('basalt_tiles')) + .add(MC('bricks')) + .add(TC('mud_bricks')) + .add(AP('algal_bricks')) + .add(AP('osseous_bricks')) + .add(TC('lavawood')) + .add(MC('mossy_cobblestone')) + .add(F('#glazed_terracotta')) + event.get('market:export/brick/8') + .add(AP('packed_ice_pillar')) + .add(AP('sunmetal_block')) + .add(SP('daub_brace')) + event.get('market:export/brick/10') + .add(AP('gilded_sandstone')) + .add(TC('seared_bricks')) + .add(CR('ornate_iron_window')) + event.get('market:export/masonry') + .add('#market:export/brick/4') + .add('#market:export/brick/6') + .add('#market:export/brick/8') + .add('#market:export/brick/10') + .add(AP('abyssaline')) + .add(MC('quartz_bricks')) + .add('kubejs:profession_card_masonry') + + event.get('market:export/drop/5') + .add(RQ('rib_bone')) + .add(RQ('zombie_heart')) + .add(RQ('chelicerae')) + .add(RQ('nebulous_heart')) + .add(RQ('molten_core')) + event.get('market:export/drop/6') + .add(RQ('slime_pearl')) + .add(RQ('guardian_spike')) + event.get('market:export/drop/8') + .add(MC('phantom_membrane')) + .add(MC('rabbit_foot')) + event.get('market:export/drop/10') + .add(RQ('bat_wing')) + .add(MC('ghast_tear')) + .add(RQ('catalyzing_gland')) + event.get('market:export/drop/15') + .add(RQ('witch_hat')) + .add(RQ('withered_rib')) + event.get('market:export/hunting') + .add('#market:export/drop/5') + .add('#market:export/drop/6') + .add('#market:export/drop/8') + .add('#market:export/drop/10') + .add('#market:export/drop/15') + .add(MC('dragon_breath')) + .add(RQ('squid_beak')) + .add(RQ('frozen_core')) + .add(RQ('eye_of_the_storm')) + .add(MC('nether_star')) + .add(MC('dragon_egg')) + .add('kubejs:profession_card_hunting') + + event.get('kubejs:cookies') + .add(MC('cookie')) + .add('farmersdelight:sweet_berry_cookie') + .add(FD('honey_cookie')) + .add('buddycardsexp:buddycookie') + event.get('market:export/food/3') + .add(AC('sushi')) + .add(FD('apple_pie_slice')) + event.get('market:export/food/4') + .add(CR('bar_of_chocolate')) + .add(CR('honeyed_apple')) + .add(CR('builders_tea')) + .add(FD('chocolate_pie_slice')) + .add(CR('sweet_roll')) + event.get('market:export/food/5') + .add(FD('nether_salad')) + .add(FD('cabbage_rolls')) + .add(FD('hot_cocoa')) + .add(FD('egg_sandwich')) + event.get('market:export/food/6') + .add(FD('barbecue_stick')) + .add(FD('stuffed_potato')) + .add(MC('pumpkin_pie')) + event.get('market:export/food/7') + .add(FD('melon_popsicle')) + .add(FD('dumplings')) + .add(FD('fruit_salad')) + .add(MC('beetroot_soup')) + .add(FD('roast_chicken')) + .add(FD('honey_glazed_ham')) + .add(FD('shepherds_pie')) + event.get('market:export/food/8') + .add(FD('beef_stew')) + .add(FD('fried_rice')) + event.get('market:export/food/9') + .add(FD('chicken_soup')) + .add(FD('mixed_salad')) + .add(FD('baked_cod_stew')) + .add(FD('chicken_sandwich')) + .add(FD('bacon_sandwich')) + .add(FD('vegetable_soup')) + .add(FD('fish_stew')) + .add(FD('noodle_soup')) + .add(FD('roasted_mutton_chops')) + .add(FD('steak_and_potatoes')) + .add(FD('stuffed_pumpkin')) + .add(FD('ratatouille')) + event.get('market:export/food/10') + .add(FD('vegetable_noodles')) + .add(FD('pasta_with_meatballs')) + .add(FD('mutton_wrap')) + .add(MC('rabbit_stew')) + .add(FD('pasta_with_mutton_chop')) + event.get('market:export/food/11') + .add(FD('hamburger')) + .add(FD('squid_ink_pasta')) + event.get('market:export/cooking') + .add('#market:export/food/3') + .add('#market:export/food/4') + .add('#market:export/food/5') + .add('#market:export/food/6') + .add('#market:export/food/7') + .add('#market:export/food/8') + .add('#market:export/food/9') + .add('#market:export/food/10') + .add('#market:export/food/11') + .add('#kubejs:cookies') + .add(FD('tomato_sauce')) + .add(FD('cake_slice')) + .add(SP('pancake')) + .add(FD('sweet_berry_cheesecake_slice')) + .add(FD('pumpkin_soup')) + .add('kubejs:profession_card_cooking') + + event.get('market:export/fish/1') + .add(MC('cod')) + .add(MC('salmon')) + .add(MC('tropical_fish')) + .add(MC('pufferfish')) + event.get('market:export/fish/3') + .add(AC('atlantic_herring')) + .add(AC('synodontis')) + .add(AC('bluegill')) + .add(AC('perch')) + .add(AC('tambaqui')) + .add(AC('minnow')) + .add(AC('blackfish')) + event.get('market:export/fish/5') + .add(AC('pink_salmon')) + .add(AC('brown_trout')) + .add(AC('carp')) + .add(AC('pollock')) + .add(AC('smallmouth_bass')) + .add(AC('boulti')) + .add(AC('red_shrooma')) + .add(AC('brown_shrooma')) + event.get('market:export/fish/7') + .add(AC('gar')) + .add(AC('rainbow_trout')) + .add(AC('bayad')) + .add(AC('piranha')) + .add(AC('jellyfish')) + .add(AC('red_grouper')) + .add(AC('atlantic_cod')) + event.get('market:export/fish/8') + .add(AC('muskellunge')) + .add(AC('pacific_halibut')) + .add(AC('atlantic_halibut')) + event.get('market:export/fish/10') + .add(AC('catfish')) + .add(AC('capitaine')) + .add(AC('tuna')) + .add(AC('arapaima')) + .add(AC('#turtle')) + .add(AC('goldfish')) + event.get('market:export/fishing') + .add('#market:export/fish/1') + .add('#market:export/fish/3') + .add('#market:export/fish/5') + .add('#market:export/fish/7') + .add('#market:export/fish/8') + .add('#market:export/fish/10') + .add('kubejs:profession_card_fishing') + + event.get('market:export/smithing') + .add(MC('iron_sword')) + .add(MC('iron_helmet')) + .add(MC('iron_chestplate')) + .add(MC('iron_leggings')) + .add(MC('iron_boots')) + .add(MC('golden_sword')) + .add(MC('golden_chestplate')) + .add(MC('golden_helmet')) + .add(MC('golden_leggings')) + .add(MC('golden_boots')) + .add(MC('golden_apple')) + .add(TC('ingot_cast')) + .add(TC('pick_head_cast')) + .add(TC('gem_cast')) + .add(MC('#arrows')) + .add('kubejs:profession_card_smithing') + + event.get('market:export') + .add('#market:export/farming') + .add('#market:export/carpentry') + .add('#market:export/mining') + .add('#market:export/masonry') + .add('#market:export/hunting') + .add('#market:export/cooking') + .add('#market:export/fishing') + .add('#market:export/smithing') + .add('thermal:machine_press') + .add('thermal:silver_coin') + .add('thermal:gold_coin') + //Dome! + event.get('thermal:crafting/casts').add(KJ("three_cast")).add(KJ("eight_cast")).add(KJ("plus_cast")).add(KJ("minus_cast")).add(KJ("multiply_cast")).add(KJ("divide_cast")).add(KJ("#circuit_press")) event.get('create:upright_on_belt') diff --git a/overrides/kubejs/startup_scripts/trading.js b/overrides/kubejs/startup_scripts/trading.js index daacad7d..839f4f23 100644 --- a/overrides/kubejs/startup_scripts/trading.js +++ b/overrides/kubejs/startup_scripts/trading.js @@ -59,26 +59,15 @@ onEvent('item.registry', event => { let G = (x) => TE('gold_coin', x) profession("Farming", 0xFFCC29, 0x81B214, [ - { in: FD('carrot_crate'), out: S(1) }, - { in: FD('potato_crate'), out: S(1) }, - { in: FD('beetroot_crate'), out: S(1) }, - { in: FD('cabbage_crate'), out: S(1) }, - { in: FD('tomato_crate'), out: S(1) }, - { in: FD('onion_crate'), out: S(1) }, - { in: FD('rice_bag'), out: S(1) }, + { in: KJ('#food_crate', 1), out: S(1) }, { in: FD('canvas', 32), out: S(1) }, - { in: TE('apple_block'), out: S(1) }, - { in: MC('sweet_berries', 8), out: S(1) }, + { in: F('#berries', 8), out: S(1) }, { in: MC('cocoa_beans', 16), out: S(1) }, { in: MC('honey_bottle', 8), out: S(1) }, { in: MC('honeycomb', 4), out: S(1) }, - { in: MC('dandelion', 16), out: S(1) }, - { in: MC('poppy', 16), out: S(1) }, - { in: MC('oxeye_daisy', 16), out: S(1) }, + { in: MC('#small_flowers', 16), out: S(1) }, { in: MC('bread', 8), out: S(1) }, - { in: MC('brown_mushroom', 8), out: S(1) }, - { in: MC('red_mushroom', 8), out: S(1) }, - { in: BOP('toadstool', 8), out: S(1) }, + { in: F('#mushrooms', 8), out: S(1) }, { in: MC('kelp', 64), out: S(1) }, { in: MC('pumpkin', 9), out: S(1) }, { in: MC('#wool', 16), out: S(1) }, @@ -86,208 +75,94 @@ onEvent('item.registry', event => { ]) profession("Carpentry", 0xD0AF84, 0x966C3B, [ - { in: MC('oak_log', 64), out: S(1) }, - { in: MC('spruce_log', 64), out: S(1) }, - { in: MC('jungle_log', 64), out: S(1) }, - { in: MC('dark_oak_log', 64), out: S(1) }, - { in: BOP('redwood_log', 64), out: S(1) }, - { in: BOP('fir_log', 64), out: S(1) }, - { in: BOP('umbran_log', 64), out: S(1) }, - { in: BOP('dead_log', 64), out: S(1) }, - { in: MC('acacia_log', 64), out: S(2) }, - { in: MC('birch_log', 64), out: S(2) }, - { in: BOP('cherry_log', 64), out: S(2) }, - { in: BOP('willow_log', 64), out: S(3) }, - { in: BOP('palm_log', 64), out: S(3) }, - { in: BOP('mahogany_log', 64), out: S(3) }, - { in: BOP('magic_log', 64), out: S(3) }, - { in: QR('azalea_log', 64), out: S(3) }, - { in: QR('blossom_log', 64), out: S(3) }, - { in: MC('crimson_stem', 64), out: S(4) }, - { in: MC('warped_stem', 64), out: S(4) }, + { in: '64x #market:export/wood/1', out: S(1) }, + { in: '64x #market:export/wood/2', out: S(2) }, + { in: '64x #market:export/wood/3', out: S(3) }, + { in: '64x #market:export/wood/3', out: S(3) }, + { in: '64x #market:export/wood/4', out: S(4) }, { in: BOP('hellbark_log', 64), out: S(8) } ]) profession("Mining", 0x1C1124, 0x88FFF7, [ - { in: CR('crushed_raw_iron', 16), out: S(8) }, - { in: CR('crushed_raw_copper', 16), out: S(8) }, - { in: CR('crushed_raw_zinc', 16), out: S(8) }, + { in: '64x #market:export/stone/1', out: S(1) }, + { in: '16x #market:export/crushed_raw_ores/8', out: S(8) }, { in: CR('crushed_raw_gold', 16), out: S(10) }, - { in: CR('crushed_raw_nickel', 16), out: S(12) }, - { in: CR('crushed_raw_lead', 16), out: S(12) }, - { in: MC('andesite', 64), out: S(1) }, - { in: MC('granite', 64), out: S(1) }, - { in: MC('diorite', 64), out: S(1) }, - { in: MC('sandstone', 64), out: S(1) }, - { in: CR('limestone', 64), out: S(1) }, - { in: CR('scoria', 64), out: S(1) }, - { in: TE('cinnabar', 8), out: S(6) }, - { in: TE('sulfur', 16), out: S(6) }, - { in: TE('niter', 16), out: S(6) }, - { in: MC('lapis_lazuli', 16), out: S(6) }, + { in: '16x #market:export/crushed_raw_ores/12', out: S(12) }, + { in: MC('coal', 16), out: S(2) }, { in: TE('apatite', 16), out: S(4) }, - { in: TE('sapphire', 1), out: S(10) }, - { in: TE('ruby', 1), out: S(10) }, + { in: '8x #market:export/stone/6', out: S(6) }, + { in: '1x #market:export/gem/10', out: S(10) }, { in: MC('diamond', 1), out: S(14) }, - { in: MC('coal', 16), out: S(2) }, ]) profession("Masonry", 0x5E6F64, 0xBA7967, [ - { in: SP('checker_block', 64), out: S(4) }, - { in: AP('basalt_tiles', 64), out: S(6) }, - { in: TC('seared_bricks', 64), out: S(10) }, - { in: AP('sunmetal_block', 64), out: S(8) }, - { in: AP('osseous_bricks', 64), out: S(6) }, - { in: AP('packed_ice_pillar', 64), out: S(8) }, - { in: AP('flint_tiles', 64), out: S(4) }, + { in: '64x #market:export/brick/4', out: S(4) }, + { in: '64x #market:export/brick/6', out: S(6) }, + { in: '64x #market:export/brick/8', out: S(8) }, + { in: '64x #market:export/brick/10', out: S(10) }, { in: AP('abyssaline', 64), out: S(12) }, - { in: AP('gilded_sandstone', 64), out: S(10) }, - { in: MC('bricks', 64), out: S(6) }, - { in: TC('mud_bricks', 64), out: S(6) }, - { in: AP('olivestone_bricks', 64), out: S(4) }, - { in: MC('quartz_bricks', 64), out: S(18) }, - { in: AP('algal_bricks', 64), out: S(6) }, - { in: TC('lavawood', 64), out: S(6) }, - { in: CR('ornate_iron_window', 64), out: S(10) }, - { in: MC('mossy_cobblestone', 64), out: S(6) }, - { in: F('#glazed_terracotta', 64), out: S(6) }, - { in: SP('daub_brace', 64), out: S(8) } + { in: MC('quartz_bricks', 64), out: S(18) } ]) profession("Hunting", 0x393E46, 0xCF0000, [ - { in: RQ('slime_pearl'), out: S(6) }, - { in: RQ('catalyzing_gland'), out: S(10) }, - { in: RQ('witch_hat'), out: S(15) }, + { in: MC('dragon_breath'), out: S(1) }, { in: RQ('squid_beak'), out: S(3) }, - { in: RQ('withered_rib'), out: S(15) }, - { in: RQ('rib_bone'), out: S(5) }, - { in: RQ('zombie_heart'), out: S(5) }, - { in: RQ('chelicerae'), out: S(5) }, - { in: RQ('bat_wing'), out: S(10) }, { in: RQ('frozen_core'), out: S(4) }, - { in: RQ('nebulous_heart'), out: S(5) }, - { in: RQ('molten_core'), out: S(5) }, + { in: '#market:export/drop/5', out: S(5) }, + { in: '#market:export/drop/6', out: S(6) }, + { in: '#market:export/drop/8', out: S(8) }, + { in: '#market:export/drop/10', out: S(10) }, { in: RQ('eye_of_the_storm'), out: S(12) }, - { in: MC('phantom_membrane'), out: S(8) }, - { in: MC('rabbit_foot'), out: S(8) }, + { in: '#market:export/drop/15', out: S(15) }, { in: MC('nether_star'), out: G(1) }, - { in: MC('dragon_breath'), out: S(1) }, - { in: MC('ghast_tear'), out: S(10) }, { in: MC('dragon_egg'), out: G(2) }, - { in: RQ('guardian_spike'), out: S(6) } ]) profession("Cooking", 0xD8B384, 0xF7DAD9, [ - { in: CR('bar_of_chocolate', 16), out: S(4) }, - { in: CR('honeyed_apple', 16), out: S(4) }, - { in: CR('builders_tea', 16), out: S(4) }, - { in: FD('hot_cocoa', 16), out: S(5) }, + { in: '64x #kubejs:cookies', out: S(2) }, { in: FD('tomato_sauce', 8), out: S(3) }, - { in: FD('apple_pie_slice', 16), out: S(3) }, - { in: FD('chocolate_pie_slice', 16), out: S(4) }, - { in: FD('sweet_berry_cheesecake_slice', 17), out: S(3) }, { in: FD('cake_slice', 14), out: S(3) }, - { in: FD('sweet_berry_cookie', 64), out: S(2) }, - { in: FD('honey_cookie', 64), out: S(2) }, - { in: MC('cookie', 64), out: S(2) }, - { in: FD('melon_popsicle', 16), out: S(7) }, - { in: FD('fruit_salad', 16), out: S(7) }, - { in: FD('mixed_salad', 16), out: S(9) }, - { in: FD('nether_salad', 16), out: S(5) }, - { in: FD('barbecue_stick', 16), out: S(6) }, - { in: FD('egg_sandwich', 16), out: S(5) }, - { in: FD('chicken_sandwich', 16), out: S(9) }, - { in: FD('bacon_sandwich', 16), out: S(9) }, - { in: FD('hamburger', 16), out: S(11) }, - { in: FD('mutton_wrap', 16), out: S(10) }, - { in: FD('dumplings', 16), out: S(7) }, - { in: FD('stuffed_potato', 16), out: S(6) }, - { in: FD('cabbage_rolls', 16), out: S(5) }, - { in: FD('beef_stew', 16), out: S(8) }, - { in: FD('chicken_soup', 16), out: S(9) }, - { in: MC('rabbit_stew', 16), out: S(10) }, - { in: MC('beetroot_soup', 16), out: S(7) }, - { in: MC('pumpkin_pie', 16), out: S(6) }, - { in: FD('vegetable_soup', 16), out: S(9) }, + { in: FD('sweet_berry_cheesecake_slice', 17), out: S(3) }, { in: SP('pancake', 32), out: S(4) }, - { in: FD('fish_stew', 16), out: S(9) }, - { in: FD('fried_rice', 16), out: S(8) }, - { in: FD('pumpkin_soup', 16), out: S(12) }, - { in: FD('baked_cod_stew', 16), out: S(9) }, - { in: FD('noodle_soup', 16), out: S(9) }, - { in: FD('pasta_with_meatballs', 16), out: S(10) }, - { in: FD('pasta_with_mutton_chop', 16), out: S(10) }, - { in: FD('roasted_mutton_chops', 16), out: S(9) }, - { in: FD('vegetable_noodles', 16), out: S(10) }, - { in: FD('steak_and_potatoes', 16), out: S(9) }, - { in: FD('ratatouille', 16), out: S(9) }, - { in: FD('squid_ink_pasta', 16), out: S(11) }, - { in: FD('roast_chicken', 16), out: S(7) }, - { in: FD('stuffed_pumpkin', 16), out: S(9) }, - { in: FD('honey_glazed_ham', 16), out: S(7) }, - { in: FD('shepherds_pie', 16), out: S(7) }, - { in: AC('sushi', 16), out: S(3) }, - { in: CR('sweet_roll', 16), out: S(4) } + { in: '16x #market:export/food/3', out: S(3) }, + { in: '16x #market:export/food/4', out: S(4) }, + { in: '16x #market:export/food/5', out: S(5) }, + { in: '16x #market:export/food/6', out: S(6) }, + { in: '16x #market:export/food/7', out: S(7) }, + { in: '16x #market:export/food/8', out: S(8) }, + { in: '16x #market:export/food/9', out: S(9) }, + { in: '16x #market:export/food/10', out: S(10) }, + { in: '16x #market:export/food/11', out: S(11) }, + { in: FD('pumpkin_soup', 16), out: S(12) } ]) - let quota = 8 profession("Fishing", 0x9DDFD3, 0xDBF6E9, [ - { in: MC('cod', quota), out: S(1) }, - { in: MC('salmon', quota), out: S(1) }, - { in: MC('pufferfish', quota), out: S(1) }, - { in: MC('tropical_fish', quota), out: S(1) }, - { in: AC('atlantic_herring', quota), out: S(3) }, - { in: AC('synodontis', quota), out: S(3) }, - { in: AC('bluegill', quota), out: S(3) }, - { in: AC('perch', quota), out: S(3) }, - { in: AC('tambaqui', quota), out: S(3) }, - { in: AC('minnow', quota), out: S(4) }, - { in: AC('blackfish', quota), out: S(4) }, - { in: AC('pink_salmon', quota), out: S(5) }, - { in: AC('brown_trout', quota), out: S(5) }, - { in: AC('carp', quota), out: S(5) }, - { in: AC('pollock', quota), out: S(5) }, - { in: AC('smallmouth_bass', quota), out: S(5) }, - { in: AC('boulti', quota), out: S(5) }, - { in: AC('red_shrooma', quota), out: S(5) }, - { in: AC('brown_shrooma', quota), out: S(5) }, - { in: AC('gar', quota), out: S(7) }, - { in: AC('rainbow_trout', quota), out: S(7) }, - { in: AC('bayad', quota), out: S(7) }, - { in: AC('piranha', quota), out: S(7) }, - { in: AC('jellyfish', quota), out: S(7) }, - { in: AC('red_grouper', quota), out: S(7) }, - { in: AC('atlantic_cod', quota), out: S(7) }, - { in: AC('muskellunge', quota), out: S(8) }, - { in: AC('pacific_halibut', quota), out: S(8) }, - { in: AC('atlantic_halibut', quota), out: S(8) }, - { in: AC('catfish', quota), out: S(10) }, - { in: AC('capitaine', quota), out: S(10) }, - { in: AC('tuna', quota), out: S(10) }, - { in: AC('arapaima', quota), out: S(10) }, - { in: AC('arrau_turtle', quota), out: S(10) }, - { in: AC('box_turtle', quota), out: S(10) }, - { in: AC('starshell_turtle', quota), out: S(10) }, - { in: AC('goldfish', quota), out: S(10) }, + { in: '8x #market:export/fish/1', out: S(1) }, + { in: '8x #market:export/fish/3', out: S(3) }, + { in: '8x #market:export/fish/4', out: S(4) }, + { in: '8x #market:export/fish/5', out: S(5) }, + { in: '8x #market:export/fish/7', out: S(7) }, + { in: '8x #market:export/fish/8', out: S(8) }, + { in: '8x #market:export/fish/10', out: S(10) }, { in: AC('neptunium_ingot', 5), out: S(16) } ]) profession("Smithing", 0xFFC93C, 0xFF7A00, [ - { in: MC('iron_boots'), out: S(2) }, - { in: MC('iron_leggings'), out: S(4) }, - { in: MC('iron_chestplate'), out: S(4) }, - { in: TC('ingot_cast'), out: S(2) }, - { in: TC('pick_head_cast'), out: S(3) }, - { in: TC('gem_cast'), out: S(4) }, + { in: MC('iron_sword'), out: S(1) }, { in: MC('iron_helmet'), out: S(3) }, - { in: MC('golden_boots'), out: S(4) }, - { in: MC('golden_leggings'), out: S(7) }, + { in: MC('iron_chestplate'), out: S(4) }, + { in: MC('iron_leggings'), out: S(4) }, + { in: MC('iron_boots'), out: S(2) }, + { in: MC('golden_sword'), out: S(2) }, { in: MC('golden_chestplate'), out: S(8) }, { in: MC('golden_helmet'), out: S(5) }, + { in: MC('golden_leggings'), out: S(7) }, + { in: MC('golden_boots'), out: S(4) }, { in: MC('golden_apple'), out: S(10) }, - { in: MC('arrow', 32), out: S(3) }, - { in: MC('iron_sword'), out: S(1) }, - { in: MC('golden_sword'), out: S(2) } + { in: TC('ingot_cast'), out: S(2) }, + { in: TC('pick_head_cast'), out: S(3) }, + { in: TC('gem_cast'), out: S(4) }, + { in: MC('#arrows', 32), out: S(3) } ]) trade("Exchange Currencies", 0xEBA83A, 0xF4F4F4, [ From 37d56ac411081f2bfaf27f8cce66335e7f57f47d Mon Sep 17 00:00:00 2001 From: roidrole <83431927+roidrole@users.noreply.github.com> Date: Wed, 25 Dec 2024 07:19:09 -0500 Subject: [PATCH 2/8] Update market to Farmer's Delight new version Closes #82 Adds food : - All cake slices (including Create : Crafts and additions compat) - Glow Berry Custard - Grilled Salmon - Apple Cider, Melon Juice - Kelp Roll, Salmon Roll, Cod Roll - Bone Broth - Bacon and Eggs - Mushroom Rice --- .../server_compatibility/createaddition.js | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 overrides/kubejs/server_scripts/server_compatibility/createaddition.js diff --git a/overrides/kubejs/server_scripts/server_compatibility/createaddition.js b/overrides/kubejs/server_scripts/server_compatibility/createaddition.js new file mode 100644 index 00000000..c3871b50 --- /dev/null +++ b/overrides/kubejs/server_scripts/server_compatibility/createaddition.js @@ -0,0 +1,87 @@ +//Create: Crafts and Additions +if(Platform.isLoaded("createaddition")) { + onEvent('recipes', event => { + andesiteMachine(event, Item.of('createaddition:rolling_mill', 1), 'create:shaft') + brassMachine(event, Item.of('createaddition:portable_energy_interface', 2)) + brassMachine(event, Item.of('createaddition:tesla_coil', 1), 'createaddition:copper_spool') + brassMachine(event, Item.of('createaddition:modular_accumulator', 1), 'thermal:energy_cell_frame') + + event.replaceOutput({}, '#forge:nuggets/electrum','createaddition:electrum_nugget') + event.replaceOutput({}, '#forge:ingots/electrum','createaddition:electrum_ingot') + event.replaceOutput({}, '#forge:plates/electrum','createaddition:electrum_sheet') + event.replaceOutput({}, '#forge:dusts/diamond','thermal:diamond_dust') + + event.replaceOutput({id: 'kubejs:machines/smelter/electrum_ingot'}, 'thermal:electrum_ingot','createaddition:electrum_ingot') + + // Duplicate Items + //event.remove({ id: 'createaddition:electrum_ingot'}) + event.remove({ id: 'createaddition:crafting/electrum_nugget'}) + event.remove({ output: 'createaddition:zinc_sheet'}) + + // Bugged Recipe + event.replaceInput( { id:'createaddition:pressing/electrum_ingot'}, 'thermal:constantan_ingot', '#forge:ingots/electrum') + + // Motor & Alternator + // event.remove({ output: 'createaddition:electric_motor'}) + // event.remove({ output: 'createaddition:alternator'}) + invarMachine(event, Item.of('createaddition:electric_motor', 1), 'createaddition:tesla_coil') + enderiumMachine(event, Item.of('createaddition:alternator', 1), 'createaddition:electric_motor') + + // Remove + event.remove({ output: 'createaddition:capacitor'}) + + // Relay + event.remove({output: 'createaddition:redstone_relay'}) + event.smithing('createaddition:redstone_relay', 'projectred_core:platformed_plate', 'createaddition:connector') + event.recipes.createMechanicalCrafting('createaddition:redstone_relay', 'AB', { A: 'projectred_core:platformed_plate', B: 'createaddition:connector' }) + + // Remove heated basin ingot recipes + event.remove({ id: "createaddition:mixing/electrum"} ) + event.remove({ id: /createaddition:compat\/tconstruct/} ) + + // Connectors + event.remove( {id:"createaddition:crafting/small_connector_copper"}) + event.remove( {id:"createaddition:crafting/large_connector_gold"}) + event.remove( {id:"createaddition:crafting/large_connector_electrum"}) + event.recipes.createSequencedAssembly( + [Item.of('createaddition:connector', 4)], + 'create:andesite_alloy', + [ + event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:rods/copper']), + event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:plates/iron']), + event.recipes.createPressing('kubejs:incomplete_connector', 'kubejs:incomplete_connector') + ] + ).transitionalItem('kubejs:incomplete_connector').loops(1) + + event.recipes.createSequencedAssembly( + [Item.of('createaddition:large_connector', 1)], + 'create:andesite_alloy', + [ + event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:rods/electrum']), + event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:plates/iron']), + event.recipes.createPressing('kubejs:incomplete_connector', 'kubejs:incomplete_connector'), + event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:plates/iron']), + event.recipes.createPressing('kubejs:incomplete_connector', 'kubejs:incomplete_connector') + ] + ).transitionalItem('kubejs:incomplete_large_connector').loops(1) + + //Bioethanol & Seed Oil in the Compression Dynamo + event.recipes.thermal.compression_fuel(Fluid.of('createaddition:bioethanol', 1000)).energy(1000000) + event.recipes.thermal.compression_fuel(Fluid.of('createaddition:seed_oil', 1000)).energy(30000) + //Done! + + //Cake Compatibility + event.recipes.createFilling('tconstruct:earth_cake', ['createaddition:cake_base_baked',Fluid.of('tconstruct:earth_slime', 1000)]) + event.recipes.createFilling('tconstruct:sky_cake', ['createaddition:cake_base_baked',Fluid.of('tconstruct:sky_slime', 1000)]) + event.recipes.createFilling('tconstruct:ender_cake', ['createaddition:cake_base_baked',Fluid.of('tconstruct:ender_slime', 1000)]) + event.recipes.createFilling('tconstruct:blood_cake', ['create:blaze_cake_base',Fluid.of('tconstruct:blood', 1000)]) + event.recipes.createFilling('tconstruct:magma_cake', ['create:blaze_cake_base',Fluid.of('tconstruct:magma', 1000)]) + //Done! + }) + + onEvent('item.tags', event => { + event.get('kubejs:cake_slices') + .add('create_central_kitchen:chocolate_cake_slice') + .add('create_central_kitchen:honey_cake_slice') + }) +} \ No newline at end of file From e76aea6186ddf4d272348e68b0046575befa064f Mon Sep 17 00:00:00 2001 From: roidrole <83431927+roidrole@users.noreply.github.com> Date: Wed, 25 Dec 2024 07:33:52 -0500 Subject: [PATCH 3/8] Move createadditions.js to the right folder --- .../server_compatability/createaddition.js | 6 ++ .../server_compatibility/createaddition.js | 87 ------------------- 2 files changed, 6 insertions(+), 87 deletions(-) delete mode 100644 overrides/kubejs/server_scripts/server_compatibility/createaddition.js diff --git a/overrides/kubejs/server_scripts/server_compatability/createaddition.js b/overrides/kubejs/server_scripts/server_compatability/createaddition.js index 3c9dd4be..c3871b50 100644 --- a/overrides/kubejs/server_scripts/server_compatability/createaddition.js +++ b/overrides/kubejs/server_scripts/server_compatability/createaddition.js @@ -78,4 +78,10 @@ if(Platform.isLoaded("createaddition")) { event.recipes.createFilling('tconstruct:magma_cake', ['create:blaze_cake_base',Fluid.of('tconstruct:magma', 1000)]) //Done! }) + + onEvent('item.tags', event => { + event.get('kubejs:cake_slices') + .add('create_central_kitchen:chocolate_cake_slice') + .add('create_central_kitchen:honey_cake_slice') + }) } \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/server_compatibility/createaddition.js b/overrides/kubejs/server_scripts/server_compatibility/createaddition.js deleted file mode 100644 index c3871b50..00000000 --- a/overrides/kubejs/server_scripts/server_compatibility/createaddition.js +++ /dev/null @@ -1,87 +0,0 @@ -//Create: Crafts and Additions -if(Platform.isLoaded("createaddition")) { - onEvent('recipes', event => { - andesiteMachine(event, Item.of('createaddition:rolling_mill', 1), 'create:shaft') - brassMachine(event, Item.of('createaddition:portable_energy_interface', 2)) - brassMachine(event, Item.of('createaddition:tesla_coil', 1), 'createaddition:copper_spool') - brassMachine(event, Item.of('createaddition:modular_accumulator', 1), 'thermal:energy_cell_frame') - - event.replaceOutput({}, '#forge:nuggets/electrum','createaddition:electrum_nugget') - event.replaceOutput({}, '#forge:ingots/electrum','createaddition:electrum_ingot') - event.replaceOutput({}, '#forge:plates/electrum','createaddition:electrum_sheet') - event.replaceOutput({}, '#forge:dusts/diamond','thermal:diamond_dust') - - event.replaceOutput({id: 'kubejs:machines/smelter/electrum_ingot'}, 'thermal:electrum_ingot','createaddition:electrum_ingot') - - // Duplicate Items - //event.remove({ id: 'createaddition:electrum_ingot'}) - event.remove({ id: 'createaddition:crafting/electrum_nugget'}) - event.remove({ output: 'createaddition:zinc_sheet'}) - - // Bugged Recipe - event.replaceInput( { id:'createaddition:pressing/electrum_ingot'}, 'thermal:constantan_ingot', '#forge:ingots/electrum') - - // Motor & Alternator - // event.remove({ output: 'createaddition:electric_motor'}) - // event.remove({ output: 'createaddition:alternator'}) - invarMachine(event, Item.of('createaddition:electric_motor', 1), 'createaddition:tesla_coil') - enderiumMachine(event, Item.of('createaddition:alternator', 1), 'createaddition:electric_motor') - - // Remove - event.remove({ output: 'createaddition:capacitor'}) - - // Relay - event.remove({output: 'createaddition:redstone_relay'}) - event.smithing('createaddition:redstone_relay', 'projectred_core:platformed_plate', 'createaddition:connector') - event.recipes.createMechanicalCrafting('createaddition:redstone_relay', 'AB', { A: 'projectred_core:platformed_plate', B: 'createaddition:connector' }) - - // Remove heated basin ingot recipes - event.remove({ id: "createaddition:mixing/electrum"} ) - event.remove({ id: /createaddition:compat\/tconstruct/} ) - - // Connectors - event.remove( {id:"createaddition:crafting/small_connector_copper"}) - event.remove( {id:"createaddition:crafting/large_connector_gold"}) - event.remove( {id:"createaddition:crafting/large_connector_electrum"}) - event.recipes.createSequencedAssembly( - [Item.of('createaddition:connector', 4)], - 'create:andesite_alloy', - [ - event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:rods/copper']), - event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:plates/iron']), - event.recipes.createPressing('kubejs:incomplete_connector', 'kubejs:incomplete_connector') - ] - ).transitionalItem('kubejs:incomplete_connector').loops(1) - - event.recipes.createSequencedAssembly( - [Item.of('createaddition:large_connector', 1)], - 'create:andesite_alloy', - [ - event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:rods/electrum']), - event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:plates/iron']), - event.recipes.createPressing('kubejs:incomplete_connector', 'kubejs:incomplete_connector'), - event.recipes.createDeploying('kubejs:incomplete_connector', ['kubejs:incomplete_connector', '#forge:plates/iron']), - event.recipes.createPressing('kubejs:incomplete_connector', 'kubejs:incomplete_connector') - ] - ).transitionalItem('kubejs:incomplete_large_connector').loops(1) - - //Bioethanol & Seed Oil in the Compression Dynamo - event.recipes.thermal.compression_fuel(Fluid.of('createaddition:bioethanol', 1000)).energy(1000000) - event.recipes.thermal.compression_fuel(Fluid.of('createaddition:seed_oil', 1000)).energy(30000) - //Done! - - //Cake Compatibility - event.recipes.createFilling('tconstruct:earth_cake', ['createaddition:cake_base_baked',Fluid.of('tconstruct:earth_slime', 1000)]) - event.recipes.createFilling('tconstruct:sky_cake', ['createaddition:cake_base_baked',Fluid.of('tconstruct:sky_slime', 1000)]) - event.recipes.createFilling('tconstruct:ender_cake', ['createaddition:cake_base_baked',Fluid.of('tconstruct:ender_slime', 1000)]) - event.recipes.createFilling('tconstruct:blood_cake', ['create:blaze_cake_base',Fluid.of('tconstruct:blood', 1000)]) - event.recipes.createFilling('tconstruct:magma_cake', ['create:blaze_cake_base',Fluid.of('tconstruct:magma', 1000)]) - //Done! - }) - - onEvent('item.tags', event => { - event.get('kubejs:cake_slices') - .add('create_central_kitchen:chocolate_cake_slice') - .add('create_central_kitchen:honey_cake_slice') - }) -} \ No newline at end of file From e316cd56a4ea117a37bc85ff3efff9ff1b5d5e0d Mon Sep 17 00:00:00 2001 From: roidrole <83431927+roidrole@users.noreply.github.com> Date: Wed, 25 Dec 2024 07:35:57 -0500 Subject: [PATCH 4/8] Allow any cast for smithing export Price set at 2 for any cast because they can all be made cheaply (certus quartz, for example) From d7b7fddb8c188fc20fc6b6b63c8399ec1877c8e3 Mon Sep 17 00:00:00 2001 From: roidrole <83431927+roidrole@users.noreply.github.com> Date: Wed, 25 Dec 2024 07:40:35 -0500 Subject: [PATCH 5/8] Allow any cast for smithing export Set the price to 2 as they're all cheap (stone parts, certus quartz or bricks) From 538d2b719566cda667315b86fe3bd9fe8ecdfbfa Mon Sep 17 00:00:00 2001 From: roidrole <83431927+roidrole@users.noreply.github.com> Date: Wed, 25 Dec 2024 07:43:08 -0500 Subject: [PATCH 6/8] Allows any cast for Smiting Export (for real) Set the price at 2 because they're all pretty cheap (stone parts, brick, certus quartz) --- overrides/kubejs/server_scripts/tags.js | 20 +++++++++++++++----- overrides/kubejs/startup_scripts/trading.js | 9 ++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/overrides/kubejs/server_scripts/tags.js b/overrides/kubejs/server_scripts/tags.js index c6e82575..486356e5 100644 --- a/overrides/kubejs/server_scripts/tags.js +++ b/overrides/kubejs/server_scripts/tags.js @@ -263,9 +263,15 @@ onEvent('item.tags', event => { .add('farmersdelight:sweet_berry_cookie') .add(FD('honey_cookie')) .add('buddycardsexp:buddycookie') + event.get('kubejs:cake_slices') + .add(FD('cake_slice')) event.get('market:export/food/3') .add(AC('sushi')) .add(FD('apple_pie_slice')) + .add(FD('bone_broth')) + .add(FD('kelp_roll')) + .add(FD('cod_roll')) + .add(FD('salmon_roll')) event.get('market:export/food/4') .add(CR('bar_of_chocolate')) .add(CR('honeyed_apple')) @@ -277,10 +283,15 @@ onEvent('item.tags', event => { .add(FD('cabbage_rolls')) .add(FD('hot_cocoa')) .add(FD('egg_sandwich')) + .add(FD('apple_cider')) + .add(FD('melon_juice')) event.get('market:export/food/6') .add(FD('barbecue_stick')) .add(FD('stuffed_potato')) .add(MC('pumpkin_pie')) + .add(FD('glow_berry_custard')) + .add(FD('bacon_and_eggs')) + .add(FD('mushroom_rice')) event.get('market:export/food/7') .add(FD('melon_popsicle')) .add(FD('dumplings')) @@ -289,6 +300,7 @@ onEvent('item.tags', event => { .add(FD('roast_chicken')) .add(FD('honey_glazed_ham')) .add(FD('shepherds_pie')) + .add(FD('grilled_salmon')) event.get('market:export/food/8') .add(FD('beef_stew')) .add(FD('fried_rice')) @@ -314,6 +326,7 @@ onEvent('item.tags', event => { event.get('market:export/food/11') .add(FD('hamburger')) .add(FD('squid_ink_pasta')) + .add(FD('pumpkin_soup')) event.get('market:export/cooking') .add('#market:export/food/3') .add('#market:export/food/4') @@ -325,11 +338,10 @@ onEvent('item.tags', event => { .add('#market:export/food/10') .add('#market:export/food/11') .add('#kubejs:cookies') + .add('#kubejs:cake_slices') .add(FD('tomato_sauce')) - .add(FD('cake_slice')) .add(SP('pancake')) .add(FD('sweet_berry_cheesecake_slice')) - .add(FD('pumpkin_soup')) .add('kubejs:profession_card_cooking') event.get('market:export/fish/1') @@ -394,9 +406,7 @@ onEvent('item.tags', event => { .add(MC('golden_leggings')) .add(MC('golden_boots')) .add(MC('golden_apple')) - .add(TC('ingot_cast')) - .add(TC('pick_head_cast')) - .add(TC('gem_cast')) + .add(TC('#casts/gold')) .add(MC('#arrows')) .add('kubejs:profession_card_smithing') diff --git a/overrides/kubejs/startup_scripts/trading.js b/overrides/kubejs/startup_scripts/trading.js index 839f4f23..01aeeca2 100644 --- a/overrides/kubejs/startup_scripts/trading.js +++ b/overrides/kubejs/startup_scripts/trading.js @@ -121,7 +121,7 @@ onEvent('item.registry', event => { profession("Cooking", 0xD8B384, 0xF7DAD9, [ { in: '64x #kubejs:cookies', out: S(2) }, { in: FD('tomato_sauce', 8), out: S(3) }, - { in: FD('cake_slice', 14), out: S(3) }, + { in: '14x #kubejs:cake_slices', out: S(3) }, { in: FD('sweet_berry_cheesecake_slice', 17), out: S(3) }, { in: SP('pancake', 32), out: S(4) }, { in: '16x #market:export/food/3', out: S(3) }, @@ -133,7 +133,8 @@ onEvent('item.registry', event => { { in: '16x #market:export/food/9', out: S(9) }, { in: '16x #market:export/food/10', out: S(10) }, { in: '16x #market:export/food/11', out: S(11) }, - { in: FD('pumpkin_soup', 16), out: S(12) } + { in: '16x #market:export/food/12', out: S(12) }, + { in: '16x #market:export/food/15', out: S(15) } ]) profession("Fishing", 0x9DDFD3, 0xDBF6E9, [ @@ -159,9 +160,7 @@ onEvent('item.registry', event => { { in: MC('golden_leggings'), out: S(7) }, { in: MC('golden_boots'), out: S(4) }, { in: MC('golden_apple'), out: S(10) }, - { in: TC('ingot_cast'), out: S(2) }, - { in: TC('pick_head_cast'), out: S(3) }, - { in: TC('gem_cast'), out: S(4) }, + { in: TC('#casts/gold'), out: S(2) }, { in: MC('#arrows', 32), out: S(3) } ]) From ecb0b31a8385a0109fcad09f9aaa1f1cd0708973 Mon Sep 17 00:00:00 2001 From: roidrole <83431927+roidrole@users.noreply.github.com> Date: Thu, 26 Dec 2024 10:48:11 -0500 Subject: [PATCH 7/8] Fix REI Tag Tree, export #thermal:crafting/casts --- overrides/kubejs/server_scripts/tags.js | 13 +++++++++---- overrides/kubejs/startup_scripts/trading.js | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/overrides/kubejs/server_scripts/tags.js b/overrides/kubejs/server_scripts/tags.js index 486356e5..dbebd229 100644 --- a/overrides/kubejs/server_scripts/tags.js +++ b/overrides/kubejs/server_scripts/tags.js @@ -65,6 +65,7 @@ onEvent('item.tags', event => { .add(AE2("logic_processor_press")) .add(AE2("engineering_processor_press")) .add(AE2("calculation_processor_press")) + .add('kubejs:circuit_scrap') event.get("forbidden_arcanus:modifier/eternal_incompatible") .add(/exchangers:.*/) @@ -87,6 +88,12 @@ onEvent('item.tags', event => { event.get('thermal:crafting/dies').add('#kubejs:transaction_cards') event.get('thermal:crafting/dies').add('kubejs:missingno') + event.get('thermal:crafting/casts').add(KJ("three_cast")).add(KJ("eight_cast")).add(KJ("plus_cast")).add(KJ("minus_cast")).add(KJ("multiply_cast")).add(KJ("divide_cast")).add(KJ("#circuit_press")) + event.get('tconstruct:crafting/casts').add(TC('nugget_cast')).add(TC('ingot_cast')).add(TC('gem_cast')).add(TC('rod_cast')).add(TC('repair_kit_cast')).add(TC('plate_cast')).add(TC('gear_cast')).add(TC('wire_cast')).add(TC('pick_head_cast')).add(TC('small_axe_head_cast')).add(TC('small_blade_cast')).add(TC('hammer_head_cast')).add(TC('broad_blade_cast')).add(TC('broad_axe_head_cast')).add(TC('tool_binding_cast')).add(TC('round_plate_cast')).add(TC('large_plate_cast')).add(TC('tool_handle_cast')).add(TC('bow_grip_cast')).add(TC('bow_limb_cast')).add(TC('tough_handle_cast')) + event.get('kubejs:casts') + .add('#thermal:crafting/casts') + .add('#tconstruct:crafting/casts') + //Tags for use in market recipes event.get('kubejs:food_crate') .add('quark:golden_apple_crate') @@ -406,10 +413,10 @@ onEvent('item.tags', event => { .add(MC('golden_leggings')) .add(MC('golden_boots')) .add(MC('golden_apple')) - .add(TC('#casts/gold')) + .add(KJ('#casts')) .add(MC('#arrows')) .add('kubejs:profession_card_smithing') - + event.get('market:export') .add('#market:export/farming') .add('#market:export/carpentry') @@ -424,8 +431,6 @@ onEvent('item.tags', event => { .add('thermal:gold_coin') //Dome! - event.get('thermal:crafting/casts').add(KJ("three_cast")).add(KJ("eight_cast")).add(KJ("plus_cast")).add(KJ("minus_cast")).add(KJ("multiply_cast")).add(KJ("divide_cast")).add(KJ("#circuit_press")) - event.get('create:upright_on_belt') .add(AE2("red_paint_ball")) .add(AE2("yellow_paint_ball")) diff --git a/overrides/kubejs/startup_scripts/trading.js b/overrides/kubejs/startup_scripts/trading.js index 01aeeca2..c7c53296 100644 --- a/overrides/kubejs/startup_scripts/trading.js +++ b/overrides/kubejs/startup_scripts/trading.js @@ -160,7 +160,7 @@ onEvent('item.registry', event => { { in: MC('golden_leggings'), out: S(7) }, { in: MC('golden_boots'), out: S(4) }, { in: MC('golden_apple'), out: S(10) }, - { in: TC('#casts/gold'), out: S(2) }, + { in: KJ('#casts'), out: S(2) }, { in: MC('#arrows', 32), out: S(3) } ]) From 2d4dcf69cf580514a85977db2649e7991f283e4a Mon Sep 17 00:00:00 2001 From: roidrole <83431927+roidrole@users.noreply.github.com> Date: Fri, 27 Dec 2024 14:33:19 -0500 Subject: [PATCH 8/8] Add all shrooms to #forge:mushrooms --- overrides/kubejs/server_scripts/tags.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/overrides/kubejs/server_scripts/tags.js b/overrides/kubejs/server_scripts/tags.js index dbebd229..921fb2b6 100644 --- a/overrides/kubejs/server_scripts/tags.js +++ b/overrides/kubejs/server_scripts/tags.js @@ -47,6 +47,11 @@ onEvent('item.tags', event => { event.get("forge:vines").add(MC("vine")) + event.get('forge:mushrooms') + .add(EXP('sweetshroom')).add(EXP('goldishroom')).add(EXP('shinyshroom')) + .add(EXP('lumishroom')).add(EXP('fluoshroom')).add(EXP('rockshroom')) + .add('quark:glow_shroom') + //These items aren't obtainable at the moment. //This tag lets these items be melted into iron using the smeltery event.get("kubejs:recycling/iron")