Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Market #152

Merged
merged 9 commits into from
Mar 2, 2025
+408 −181
Merged

Improve Market #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
84dd739
Use tags for most Trade Station Export Recipes
roidrole Dec 25, 2024
a21e05f
Merge branch 'ThePansmith:main' into market
roidrole Dec 25, 2024
37d56ac
Update market to Farmer's Delight new version
roidrole Dec 25, 2024
e76aea6
Move createadditions.js to the right folder
roidrole Dec 25, 2024
e316cd5
Allow any cast for smithing export
roidrole Dec 25, 2024
d7b7fdd
Allow any cast for smithing export
roidrole Dec 25, 2024
538d2b7
Allows any cast for Smiting Export (for real)
roidrole Dec 25, 2024
ecb0b31
Fix REI Tag Tree, export #thermal:crafting/casts
roidrole Dec 26, 2024
2d4dcf6
Add all shrooms to #forge:mushrooms
roidrole Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions overrides/kubejs/server_scripts/server_compatability/createaddition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
}
347 changes: 347 additions & 0 deletions overrides/kubejs/server_scripts/tags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -65,6 +70,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:.*/)
Expand All @@ -88,6 +94,347 @@ onEvent('item.tags', event => {
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')
.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('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'))
.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'))
.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'))
.add(FD('fruit_salad'))
.add(MC('beetroot_soup'))
.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'))
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'))
.add(FD('pumpkin_soup'))
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('#kubejs:cake_slices')
.add(FD('tomato_sauce'))
.add(SP('pancake'))
.add(FD('sweet_berry_cheesecake_slice'))
.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(KJ('#casts'))
.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('create:upright_on_belt')
.add(AE2("red_paint_ball"))
Expand Down
Loading