diff --git a/manifest.json b/manifest.json index 04d26ab..9e69669 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,7 @@ "required":true }, { - "fileID":4498424, + "fileID":4957984, "projectID":433862, "required":true }, @@ -57,7 +57,7 @@ "required":true }, { - "fileID":4531967, + "fileID":5216875, "projectID":267193, "required":true }, @@ -117,8 +117,8 @@ "required":true }, { - "fileID":4445746, - "projectID":240630, + "fileID":3929204, + "projectID":325625, "required":true }, { @@ -132,7 +132,7 @@ "required":true }, { - "fileID":4509007, + "fileID":5134546, "projectID":74924, "required":true }, @@ -182,12 +182,12 @@ "required":true }, { - "fileID":4732252, + "fileID":4837418, "projectID":521393, "required":true }, { - "fileID":4774383, + "fileID":5301367, "projectID":310111, "required":true }, @@ -217,7 +217,7 @@ "required":true }, { - "fileID":4509008, + "fileID":5148042, "projectID":74072, "required":true }, @@ -302,7 +302,7 @@ "required":true }, { - "fileID":4521465, + "fileID":5137931, "projectID":419699, "required":true }, @@ -327,7 +327,7 @@ "required":true }, { - "fileID":4633387, + "fileID":4973439, "projectID":348521, "required":true }, @@ -337,7 +337,7 @@ "required":true }, { - "fileID":4759875, + "fileID":4801048, "projectID":69162, "required":true }, @@ -387,12 +387,12 @@ "required":true }, { - "fileID":4590652, + "fileID":4985315, "projectID":309927, "required":true }, { - "fileID":4800666, + "fileID":5322305, "projectID":908741, "required":true }, @@ -457,7 +457,7 @@ "required":true }, { - "fileID":4771446, + "fileID":5129277, "projectID":854949, "required":true }, @@ -482,7 +482,7 @@ "required":true }, { - "fileID":4585765, + "fileID":4842875, "projectID":429371, "required":true }, @@ -492,7 +492,7 @@ "required":true }, { - "fileID":4216196, + "fileID":4843021, "projectID":421694, "required":true }, @@ -522,7 +522,7 @@ "required":true }, { - "fileID":4767129, + "fileID":5399365, "projectID":790626, "required":true }, @@ -552,12 +552,12 @@ "required":true }, { - "fileID":4783586, + "fileID":5286275, "projectID":558998, "required":true }, { - "fileID":4789545, + "fileID":5093207, "projectID":888624, "required":true }, @@ -592,12 +592,12 @@ "required":true }, { - "fileID":4736645, + "fileID":5194758, "projectID":422301, "required":true }, { - "fileID":4736642, + "fileID":5296312, "projectID":618298, "required":true }, @@ -617,7 +617,7 @@ "required":true }, { - "fileID":4788136, + "fileID":5102251, "projectID":454372, "required":true }, @@ -627,7 +627,7 @@ "required":true }, { - "fileID":4800837, + "fileID":5079263, "projectID":324717, "required":true }, @@ -687,7 +687,7 @@ "required":true }, { - "fileID":3694403, + "fileID":3713957, "projectID":238551, "required":true }, @@ -707,7 +707,7 @@ "required":true }, { - "fileID":4808763, + "fileID":5268448, "projectID":628539, "required":true }, @@ -717,7 +717,7 @@ "required":true }, { - "fileID":4513973, + "fileID":4939214, "projectID":233071, "required":true }, @@ -777,7 +777,7 @@ "required":true }, { - "fileID":4838717, + "fileID":4970407, "projectID":820977, "required":true }, @@ -790,6 +790,16 @@ "fileID":4318732, "projectID":666198, "required":true + }, + { + "fileID":3712896, + "projectID":523013, + "required":true + }, + { + "fileID":3694844, + "projectID":558746, + "required":true } ], "manifestType":"minecraftModpack", @@ -797,7 +807,7 @@ "minecraft":{ "modLoaders":[ { - "id":"forge-40.2.8", + "id":"forge-40.2.21", "primary":true } ], @@ -805,5 +815,5 @@ }, "name":"CABIN", "overrides":"overrides", - "version":"1.2.3" + "version":"1.3.0" } diff --git a/modlist.html b/modlist.html index 2359d9d..4ec1a04 100644 --- a/modlist.html +++ b/modlist.html @@ -19,11 +19,11 @@
  • Dungeon Crawl (by xiroc)
  • Ender Storage 1.8.+ (by ChickenBones, covers1624)
  • Exchangers (by Jackyy, TurkeyDev)
    • +
  • Expanded Caves (by Rover656)
  • Explorer's Compass (by ChaosTheDude)
  • Farmer's Delight (by vectorwing)
  • GunpowderLib (by Jackyy)
  • Iceberg [Forge] (by Grend)
    • -
  • Just Enough Resources (JER)
  • Leaves Be Gone [Forge & Fabric] (by Fuzs)
  • Legendary Tooltips [Forge] (by Grend)
  • Mantle (by Slime Knights)
    • @@ -36,8 +36,10 @@
  • Project Red - Integration (by MrTJP, Chicken Bones, covers1624)
  • Project Red - Transmission (by MrTJP, Chicken Bones, covers1624)
  • Puzzles Lib [Forge & Fabric] (by Fuzs)
    • +
  • Randomium Ore (by MehVahdJukaar)
  • REI Plugin Compatibilities (REIPC) (by shedaniel)
  • Roughly Enough Items Fabric/Forge (REI) (by shedaniel)
    • +
  • Roughly Enough Resources (RER) (By theorbagain)
  • Rubber Duck (by Salvadormg15)
  • SmartBrainLib (Forge/Fabric/Quilt) (by Tslat)
  • Create: Steam 'n' Rails (by The Railways Team)
    • diff --git a/overrides/config/custom-micromaterials.cfg b/overrides/config/custom-micromaterials.cfg index 529eb90..38c18cd 100644 --- a/overrides/config/custom-micromaterials.cfg +++ b/overrides/config/custom-micromaterials.cfg @@ -793,6 +793,18 @@ everycomp:q/forbidden_arcanus/vertical_cherrywood_planks everycomp:q/forbidden_arcanus/vertical_mysterywood_planks everycomp:q/forbidden_arcanus/vertical_edelwood_planks +# Expanded Caves +#expcaves:broken_stone +#expcaves:broken_deepslate +expcaves:sediment_stone +expcaves:lavastone +expcaves:dirtstone +#expcaves:dirtstone_cobble #normally I enable as many blocks as I can. But this is just brown endstone +expcaves:marlstone +expcaves:marlstone_powder +expcaves:bricks_ice +expcaves:bricks_snow + # Farmer's Delight farmersdelight:carrot_crate farmersdelight:potato_crate @@ -909,7 +921,7 @@ quark:yellow_blossom_leaves quark:red_blossom_leaves quark:midori_block quark:midori_pillar -quark:dirty_glass +#quark:dirty_glass quark:azalea_log quark:azalea_wood quark:azalea_planks @@ -940,18 +952,18 @@ quark:dripstone_pillar quark:tuff_bricks quark:chiseled_tuff_bricks quark:tuff_pillar -#quark:limestone_bricks -#quark:chiseled_limestone_bricks -#quark:limestone_pillar -#quark:jasper_bricks -#quark:chiseled_jasper_bricks -#quark:jasper_pillar -#quark:shale_bricks -#quark:chiseled_shale_bricks -#quark:shale_pillar -#quark:myalite_bricks -#quark:chiseled_myalite_bricks -#quark:myalite_pillar +quark:limestone_bricks +quark:chiseled_limestone_bricks +quark:limestone_pillar +quark:jasper_bricks +quark:chiseled_jasper_bricks +quark:jasper_pillar +quark:shale_bricks +quark:chiseled_shale_bricks +quark:shale_pillar +quark:myalite_bricks +quark:chiseled_myalite_bricks +quark:myalite_pillar #quark:gravisand quark:duskbound_block quark:duskbound_lantern @@ -1010,14 +1022,14 @@ quark:glowberry_sack quark:blaze_lantern quark:bonded_leather quark:bonded_rabbit_hide -#quark:limestone -#quark:polished_limestone -#quark:jasper -#quark:polished_jasper -#quark:shale -#quark:polished_shale -#quark:myalite -#quark:polished_myalite +quark:limestone +quark:polished_limestone +quark:jasper +quark:polished_jasper +quark:shale +quark:polished_shale +quark:myalite +quark:polished_myalite #quark:red_corundum #quark:waxed_red_corundum ##quark:red_corundum_cluster @@ -1085,7 +1097,10 @@ quark:green_shingles quark:red_shingles quark:black_shingles - +# Randomium +randomium:randomium_ore +randomium:randomium_ore_deepslate +randomium:randomium_ore_end # Rechiseled rechiseled:amethyst_block_beams diff --git a/overrides/config/expcaves_common.toml b/overrides/config/expcaves_common.toml new file mode 100644 index 0000000..101a36b --- /dev/null +++ b/overrides/config/expcaves_common.toml @@ -0,0 +1,165 @@ + +[oreFeatures] + + [oreFeatures.brokenStone] + #Whether this feature generates + enabled = true + #The maximum size of each vein. (default = 24) + #Range: 0 ~ 64 + veinSize = 24 + #The maximum number of this feature per chunk. (default = 12) + #Range: 0 ~ 64 + count = 12 + + [oreFeatures.brokenDeepslate] + #Whether this feature generates + enabled = true + #The maximum size of each vein. (default = 24) + #Range: 0 ~ 64 + veinSize = 24 + #The maximum number of this feature per chunk. (default = 12) + #Range: 0 ~ 64 + count = 12 + + [oreFeatures.sedimentStone] + #Whether this feature generates + enabled = true + #The maximum size of each vein. (default = 54) + #Range: 0 ~ 64 + veinSize = 54 + #The maximum number of this feature per chunk. (default = 8) + #Range: 0 ~ 64 + count = 8 + + [oreFeatures.lavastone] + #Whether this feature generates + enabled = true + #The maximum size of each vein. (default = 48) + #Range: 0 ~ 64 + veinSize = 48 + #The maximum number of this feature per chunk. (default = 12) + #Range: 0 ~ 64 + count = 12 + + [oreFeatures.dirtstone] + #Whether this feature generates + enabled = true + #The maximum size of each vein. (default = 64) + #Range: 0 ~ 64 + veinSize = 64 + #The maximum number of this feature per chunk. (default = 5) + #Range: 0 ~ 64 + count = 5 + + [oreFeatures.marlstone] + #Whether this feature generates + enabled = true + #The maximum size of each vein. (default = 48) + #Range: 0 ~ 64 + veinSize = 48 + #The maximum number of this feature per chunk. (default = 5) + #Range: 0 ~ 64 + count = 5 + + [oreFeatures.packedIce] + #Whether this feature generates + enabled = true + #The maximum size of each vein. (default = 64) + #Range: 0 ~ 64 + veinSize = 64 + #The maximum number of this feature per chunk. (default = 5) + #Range: 0 ~ 64 + count = 5 + +[rockFeatures] + + [rockFeatures.flintPebbles] + #Whether this feature generates + enabled = true + #The spawnrate of this feature. (default = 12) + #Range: 1 ~ 50 + count = 12 + + [rockFeatures.pebbles] + #Whether this feature generates + enabled = true + #The spawnrate of this feature. (default = 12) + #Range: 1 ~ 50 + count = 12 + + [rockFeatures.surface_pebbles] + #Whether this feature generates + enabled = true + #The spawnrate of this feature. (default = 4) + #Range: 1 ~ 50 + count = 4 + + [rockFeatures.rockpiles] + #Whether this feature generates + enabled = true + #The spawnrate of this feature. (default = 12) + #Range: 1 ~ 50 + count = 12 + + [rockFeatures.stalagmites] + #Whether this feature generates + enabled = true + #The spawnrate of this feature. (default = 16) + #Range: 1 ~ 50 + count = 16 + + [rockFeatures.stalactites] + #Whether this feature generates + enabled = true + #The spawnrate of this feature. (default = 16) + #Range: 1 ~ 50 + count = 16 + +[mushrooms] + #Whether mushrooms can generate. + enabled = true + #The number of sweetshroom generated. (default = 32) + #Range: 0 ~ 64 + sweetshroomCount = 32 + #The number of goldishroom generated. (default = 16) + #Range: 0 ~ 64 + goldishroomCount = 16 + #The number of shinyshroom generated. (default = 24) + #Range: 0 ~ 64 + shinyshroomCount = 24 + #The number of lumishroom generated. (default = 32) + #Range: 0 ~ 64 + lumishroomCount = 32 + #The number of fluoshroom generated. (default = 32) + #Range: 0 ~ 64 + fluoshroomCount = 32 + #The number of rockshroom generated. (default = 12) + #Range: 0 ~ 64 + rockshroomCount = 12 + +[mosses] + #Whether moss can generate. + enabled = true + #The number of dry moss generated. (default = 54) + #Range: 0 ~ 64 + dryMossCount = 54 + #The number of fire moss generated. (default = 24) + #Range: 0 ~ 64 + fireMossCount = 24 + #The number of frozen moss generated. (default = 32) + #Range: 0 ~ 64 + frozenMossCount = 32 + #The number of hanging roots generated. (default = 32) + #Range: 0 ~ 64 + hangingRootsCount = 32 + #The number of humid moss generated. (default = 32) + #Range: 0 ~ 64 + humidMossCount = 32 + +[vines] + #Whether vines can generate. + enabled = true + #The number of cave vines generated. (default = 54) + #Range: 0 ~ 64 + caveVineCount = 54 + diff --git a/overrides/config/ftbquests/quests/chapters/market.snbt b/overrides/config/ftbquests/quests/chapters/market.snbt index 2c405dd..8d501ed 100644 --- a/overrides/config/ftbquests/quests/chapters/market.snbt +++ b/overrides/config/ftbquests/quests/chapters/market.snbt @@ -500,7 +500,7 @@ Count: 1b tag: { BlockEntityTag: { - LootTable: "custom:chests/patience_1" + LootTable: "cabin:chests/the_market/patience/1" } display: { Lore: ["{\"italic\":true,\"color\":\"gray\",\"text\":\"The fabled prize awaits at the bottom...\"}"] @@ -609,7 +609,7 @@ Count: 1b tag: { BlockEntityTag: { - LootTable: "custom:chests/tinker" + LootTable: "cabin:chests/the_market/tinkerbox" id: "minecraft:chest" } display: { diff --git a/overrides/config/lootr-common.toml b/overrides/config/lootr-common.toml index af11196..71931b4 100644 --- a/overrides/config/lootr-common.toml +++ b/overrides/config/lootr-common.toml @@ -29,7 +29,7 @@ decay_structures = [] #lootr will automatically log all unresolved tables (i.e., for containers that have a loot table associated with them but, for whatever reason, the lookup for this table returns empty). setting this option to true additionally informs players when they open containers. report_unresolved_tables = false #list of loot tables which shouldn't be converted (in the format of ["modid:loot_table", "othermodid:other_loot_table"]) -loot_table_blacklist = ["custom:chests/patience_1", "custom:chests/patience_2", "custom:chests/tinker"] +loot_table_blacklist = ["custom:chests/patience_1", "custom:chests/patience_2", "custom:chests/tinker", "cabin:chests/the_market/patience/1", "cabin:chests/the_market/patience/2", "cabin:chests/the_market/tinkerbox"] #list of dimensions where loot chests should automatically refresh (default: blank, e.g., ["minecraft:overworld", "othermod:otherdimension"]) refresh_dimensions = [] #list of mod IDs whose loot tables will refresh (default blank, meaning no chests refresh, in the format of ["modid", "othermodid"]) diff --git a/overrides/config/openloader/resources/CABIN/assets/expcaves/models/item/blackstone_pebble.json b/overrides/config/openloader/resources/CABIN/assets/expcaves/models/item/blackstone_pebble.json new file mode 100644 index 0000000..025c0ae --- /dev/null +++ b/overrides/config/openloader/resources/CABIN/assets/expcaves/models/item/blackstone_pebble.json @@ -0,0 +1,7 @@ +{ + "parent": "expcaves:item/rock_flint", + "textures": { + "0": "minecraft:block/blackstone", + "particle": "minecraft:block/blackstone" + } +} \ No newline at end of file diff --git a/overrides/config/openloader/resources/CABIN/assets/expcaves/models/item/netherrack_pebble.json b/overrides/config/openloader/resources/CABIN/assets/expcaves/models/item/netherrack_pebble.json new file mode 100644 index 0000000..3905eb6 --- /dev/null +++ b/overrides/config/openloader/resources/CABIN/assets/expcaves/models/item/netherrack_pebble.json @@ -0,0 +1,7 @@ +{ + "parent": "expcaves:item/rock_flint", + "textures": { + "0": "minecraft:block/netherrack", + "particle": "minecraft:block/netherrack" + } +} \ No newline at end of file diff --git a/overrides/config/quark-common.toml b/overrides/config/quark-common.toml index 0eb5c1d..f582eb8 100644 --- a/overrides/config/quark-common.toml +++ b/overrides/config/quark-common.toml @@ -96,7 +96,7 @@ Rope = true "Oriental Palette" = true "Nether Brick Fence Gate" = true - "More Stone Variants" = false + "More Stone Variants" = true "More Potted Plants" = true "More Brick Types" = true Midori = true @@ -213,11 +213,11 @@ "Enable Cactus Block" = true "Enable Chorus Fruit Block" = true "Enable Stick Block" = true - "Enable Apple Crate" = false + "Enable Apple Crate" = true "Enable Golden Apple Crate" = true - "Enable Potato Crate" = false - "Enable Carrot Crate" = false - "Enable Beetroot Crate" = false + "Enable Potato Crate" = true + "Enable Carrot Crate" = true + "Enable Beetroot Crate" = true "Enable Cocoa Bean Sack" = true "Enable Nether Wart Sack" = true "Enable Gunpowder Sack" = true @@ -262,7 +262,7 @@ [tools] Trowel = true - "Slime In A Bucket" = false + "Slime In A Bucket" = true "Seed Pouch" = false Pickarang = false "Pathfinder Maps" = false @@ -401,7 +401,7 @@ Emotes = false "Dragon Scales" = true "Double Door Opening" = true - "Compasses Work Everywhere" = false + "Compasses Work Everywhere" = true "Campfires Boost Elytra" = true "Better Elytra Rocket" = true "Automatic Recipe Unlock" = true @@ -543,7 +543,7 @@ "Spiral Spires" = false Permafrost = true "No More Lava Pockets" = true - "New Stone Types" = false + "New Stone Types" = true "Nether Obsidian Spikes" = false "Monster Box" = false "Glimmering Weald" = true @@ -564,7 +564,7 @@ [world.spiral_spires.dimensions] "Is Blacklist" = false - Dimensions = ["minecraft:the_end"] + Dimensions = [] [world.spiral_spires.biomes] @@ -628,7 +628,7 @@ [world.new_stone_types.limestone.dimensions] "Is Blacklist" = false - Dimensions = ["minecraft:overworld"] + Dimensions = [] [world.new_stone_types.limestone.oregen_lower] #Allowed values: [-64,320] @@ -656,7 +656,7 @@ [world.new_stone_types.jasper.dimensions] "Is Blacklist" = false - Dimensions = ["minecraft:overworld"] + Dimensions = [] [world.new_stone_types.jasper.oregen_lower] #Allowed values: [-64,320] @@ -684,7 +684,7 @@ [world.new_stone_types.shale.dimensions] "Is Blacklist" = false - Dimensions = ["minecraft:overworld"] + Dimensions = [] [world.new_stone_types.shale.oregen_lower] #Allowed values: [-64,320] diff --git a/overrides/config/randomium-common.toml b/overrides/config/randomium-common.toml new file mode 100644 index 0000000..611d270 --- /dev/null +++ b/overrides/config/randomium-common.toml @@ -0,0 +1,47 @@ + +[spawns] + #Spawn attempts per chunk + #Range: 0 ~ 200 + spawn_attempts_per_chunk = 10 + +[interactions] + #Chance for the block to try to move when it's attacked, picking one of the following actions + #Range: 0 ~ 100 + excite_chance_on_attack = 70 + #Chance for the block to try to move when it receives a block update, picking one of the following actions. You might want to disable this as it could break flying machines that run into it since it might teleport into them when they touch it + #Range: 0 ~ 100 + excite_chance_on_block_update = 25 + #Chance for fall action to be picked + #Range: 0 ~ 100 + fall_chance = 30 + #Chance for horizontal move action to be picked + #Range: 0 ~ 100 + move_chance = 40 + #Chance for fly up action to be picked + #Range: 0 ~ 100 + fly_chance = 2 + #Chance for teleport action to be picked + #Range: 0 ~ 100 + teleport_chance = 8 + #Excitement multiplier if silk touch is used on the block. The lower the value the less likely it will move + #Range: 0.0 ~ 1.0 + silk_touch_multiplier = 0.5 + +[drops] + #A way to blacklist entire mods from the loot pool. Enter a list of mod ids + mod_blacklist = ["chiselsandbits"] + #Loot mode: decides if it can drop everything except blacklist or only stuff on the whitelist + #Allowed Values: BLACKLIST, WHITELIST + loot_mode = "BLACKLIST" + #Base randomium drop chance (in percentage, so out of 100). Final chance will be [base_chance + luck*luck_multiplier + fortune*fortune_multiplier] + #Range: 0.0 ~ 100.0 + base_drop_chance = 0.0 + #Multiplier applied to each luck level the player has + #Range: 0.0 ~ 20.0 + luck_multiplier = 1.0 + #Multiplier applied to each fortune level the player has + #Range: 0.0 ~ 20.0 + fortune_multiplier = 0.2 + #Allow the block to be silk touched + allow_silk_touch = true + diff --git a/overrides/kubejs/client_scripts/JEI.js b/overrides/kubejs/client_scripts/JEI.js index e534f43..4585ed8 100644 --- a/overrides/kubejs/client_scripts/JEI.js +++ b/overrides/kubejs/client_scripts/JEI.js @@ -1,27 +1,3 @@ -onEvent('rei.hide.items', event => { - let coinhide = (name) => { - event.hide('thermal:' + name + '_coin') - event.hide('createdeco:' + name + '_coin') - event.hide('createdeco:' + name + '_coinstack') - } - coinhide('iron') - coinhide('copper') - coinhide('netherite') - coinhide('tin') - coinhide('lead') - coinhide('nickel') - coinhide('electrum') - coinhide('invar') - coinhide('constantan') - coinhide('signalum') - coinhide('lumium') - coinhide('enderium') - coinhide('brass') - coinhide('bronze') - coinhide('cast_iron') - coinhide('zinc') -}) - onEvent('rei.group', event => { event.groupItemsByTag('supplementaries:rei_groups/hanging_signs', 'Sign Posts', 'supplementaries:hanging_signs') @@ -29,7 +5,7 @@ onEvent('rei.group', event => { event.groupItemsByTag('tconstruct:rei_groups/modifiable', 'Tinkers Tools', 'tconstruct:modifiable') event.groupItemsByTag('tconstruct:rei_groups/parts', 'Tinkers Parts', 'tconstruct:parts') - const useNbt = ['potion', 'enchanted_book', 'splash_potion', 'tipped_arrow', 'lingering_potion', 'reliquary:potion', 'reliquary:potion_essence', 'reliquary:splash_potion', 'reliquary:lingering_potion', 'reliquary:tipped_arrow', 'tconstruct:potion_bucket', 'tconstruct:crafting_station', 'tconstruct:tinker_station', 'tconstruct:part_builder', 'tconstruct:modifier_worktable', 'tconstruct:tinkers_anvil', 'tconstruct:scorched_anvil', 'tconstruct:repair_kit', 'chiselandbits:block_bit'] + const useNbt = ['reliquary:potion', 'reliquary:potion_essence', 'reliquary:splash_potion', 'reliquary:lingering_potion', 'reliquary:tipped_arrow', 'tconstruct:crafting_station', 'tconstruct:tinker_station', 'tconstruct:part_builder', 'tconstruct:modifier_worktable', 'tconstruct:tinkers_anvil', 'tconstruct:scorched_anvil', 'tconstruct:repair_kit', 'chiselandbits:block_bit'] useNbt.forEach(id => { const item = Item.of(id) @@ -40,7 +16,7 @@ onEvent('rei.group', event => { event.groupItems('kubejs:rei_groups/microblocks', 'Microblocks', [ - /microblock/ + /cb_microblock:microblock/ ]) event.groupItems('kubejs:rei_groups/fluidbuckets', 'Buckets of Fluids', [ diff --git a/overrides/kubejs/client_scripts/bulkhide.js b/overrides/kubejs/client_scripts/bulkhide.js index cf907b5..4e6a54f 100644 --- a/overrides/kubejs/client_scripts/bulkhide.js +++ b/overrides/kubejs/client_scripts/bulkhide.js @@ -1,360 +1,17 @@ onEvent('rei.hide.items', event => { - event.hide('itemfilters:always_true') - event.hide('itemfilters:mod') - event.hide('itemfilters:tag') - event.hide('itemfilters:xor') - event.hide('itemfilters:not') - event.hide('itemfilters:and') - event.hide('itemfilters:or') - event.hide('itemfilters:always_false') - event.hide('itemfilters:item_group') - event.hide('itemfilters:id_regex') - event.hide('itemfilters:damage') - event.hide('itemfilters:block') - event.hide('itemfilters:max_count') - event.hide('itemfilters:strong_nbt') - event.hide('itemfilters:weak_nbt') - event.hide('itemfilters:custom') - event.hide('thermal:press_coin_die') - event.hide('thermal:press_gear_die') - event.hide('thermal:press_packing_2x2_die') - event.hide('thermal:press_packing_3x3_die') - event.hide('thermal:press_unpacking_die') - event.hide('ae2:debug_part_placer') - event.hide('projectred_core:silver_ingot') - event.hide('projectred_core:tin_ingot') - event.hide('projectred_core:ruby') - event.hide('projectred_core:sapphire') - event.hide('projectred_core:peridot') - event.hide('projectred_core:electrotine_ingot') - event.hide('projectred_core:electrotine_dust') - event.hide('projectred_core:electrotine_iron_comp') - event.hide(/reliquary:magazines/) - event.hide(/reliquary:bullets/) - event.hide('waterstrainer:string_mesh') - event.hide('waterstrainer:iron_mesh') - event.hide('waterstrainer:obsidian_mesh') - event.hide('waterstrainer:strainer_survivalist_solid') - event.hide('waterstrainer:strainer_fisherman_solid') - event.hide('ftbquests:missing_item') - event.hide('ftbquests:custom_icon') - event.hide('ftbquests:barrier') - event.hide('ftbquests:stage_barrier') - event.hide('ftbquests:detector') - event.hide('thermal:gold_plate') - event.hide('thermal:iron_plate') - event.hide('thermal:copper_plate') - event.hide('thermal:netherite_plate') - event.hide('thermal:silver_ore') - event.hide('thermal:deepslate_silver_ore') - event.hide('thermal:tin_ore') - event.hide('thermal:deepslate_tin_ore') - event.hide('thermal:tin_nugget') - event.hide('thermal:tin_ingot') - event.hide('thermal:tin_block') - event.hide('thermal:tin_dust') - event.hide('thermal:tin_plate') - event.hide('thermal:tin_gear') - event.hide('thermal:raw_tin') - event.hide('thermal:raw_tin_block') - event.hide('create:crushed_raw_tin') - event.hide('tconstruct:molten_tin_bucket') - event.hide('ftblibrary:fluid_container') - event.hide('forbidden_arcanus:pixie_spawn_egg') - event.hide('forbidden_arcanus:arcane_dark_stone') - event.hide('projectred_core:conductive_plate') - event.hide('projectred_core:wired_plate') - event.hide('projectred_core:bundled_plate') - event.hide('projectred_core:anode') - event.hide('projectred_core:cathode') - event.hide('projectred_core:pointer') - event.hide('projectred_core:silicon_chip') - event.hide('projectred_core:energized_silicon_chip') - event.hide('projectred_core:red_iron_comp') - event.hide('kubejs:failed_alchemy_1') - event.hide('kubejs:failed_alchemy_2') - event.hide('kubejs:failed_alchemy_3') - event.hide('kubejs:failed_alchemy_4') - event.hide('kubejs:failed_alchemy_5') - event.hide('kubejs:failed_alchemy_12') - event.hide('kubejs:failed_alchemy_11') - event.hide('kubejs:failed_alchemy_9') - event.hide('kubejs:failed_alchemy_7') - event.hide('kubejs:failed_alchemy_6') - event.hide('kubejs:failed_alchemy_13') - event.hide('kubejs:failed_alchemy_14') - event.hide('kubejs:failed_alchemy_8') - event.hide('kubejs:failed_alchemy_10') - event.hide('ae2:inscriber') - event.hide('ae2:vibration_chamber') - event.hide('ae2:grindstone') - event.hide('ae2:crank') - event.hide('ae2:white_smart_cable') - event.hide('ae2:orange_smart_cable') - event.hide('ae2:magenta_smart_cable') - event.hide('ae2:light_blue_smart_cable') - event.hide('ae2:yellow_smart_cable') - event.hide('ae2:lime_smart_cable') - event.hide('ae2:pink_smart_cable') - event.hide('ae2:green_smart_cable') - event.hide('ae2:brown_smart_cable') - event.hide('ae2:blue_smart_cable') - event.hide('ae2:purple_smart_cable') - event.hide('ae2:cyan_smart_cable') - event.hide('ae2:light_gray_smart_cable') - event.hide('ae2:gray_smart_cable') - event.hide('ae2:red_smart_cable') - event.hide('ae2:black_smart_cable') - event.hide('ae2:white_covered_cable') - event.hide('ae2:orange_covered_cable') - event.hide('ae2:magenta_covered_cable') - event.hide('ae2:light_blue_covered_cable') - event.hide('ae2:purple_covered_cable') - event.hide('ae2:light_gray_covered_cable') - event.hide('ae2:gray_covered_cable') - event.hide('ae2:cyan_covered_cable') - event.hide('ae2:pink_covered_cable') - event.hide('ae2:lime_covered_cable') - event.hide('ae2:yellow_covered_cable') - event.hide('ae2:blue_covered_cable') - event.hide('ae2:brown_covered_cable') - event.hide('ae2:green_covered_cable') - event.hide('ae2:red_covered_cable') - event.hide('ae2:black_covered_cable') - event.hide('ae2:white_glass_cable') - event.hide('ae2:gray_glass_cable') - event.hide('ae2:pink_glass_cable') - event.hide('ae2:lime_glass_cable') - event.hide('ae2:yellow_glass_cable') - event.hide('ae2:light_blue_glass_cable') - event.hide('ae2:magenta_glass_cable') - event.hide('ae2:orange_glass_cable') - event.hide('ae2:cyan_glass_cable') - event.hide('ae2:light_gray_glass_cable') - event.hide('ae2:black_glass_cable') - event.hide('ae2:purple_glass_cable') - event.hide('ae2:blue_glass_cable') - event.hide('ae2:brown_glass_cable') - event.hide('ae2:green_glass_cable') - event.hide('ae2:red_glass_cable') - event.hide('ae2:white_covered_dense_cable') - event.hide('ae2:gray_covered_dense_cable') - event.hide('ae2:pink_covered_dense_cable') - event.hide('ae2:lime_covered_dense_cable') - event.hide('ae2:brown_covered_dense_cable') - event.hide('ae2:green_covered_dense_cable') - event.hide('ae2:red_covered_dense_cable') - event.hide('ae2:black_covered_dense_cable') - event.hide('ae2:light_gray_covered_dense_cable') - event.hide('ae2:orange_covered_dense_cable') - event.hide('ae2:magenta_covered_dense_cable') - event.hide('ae2:cyan_covered_dense_cable') - event.hide('ae2:purple_covered_dense_cable') - event.hide('ae2:light_blue_covered_dense_cable') - event.hide('ae2:yellow_covered_dense_cable') - event.hide('ae2:blue_covered_dense_cable') - event.hide('ae2:orange_smart_dense_cable') - event.hide('ae2:white_smart_dense_cable') - event.hide('ae2:gray_smart_dense_cable') - event.hide('ae2:light_gray_smart_dense_cable') - event.hide('ae2:pink_smart_dense_cable') - event.hide('ae2:lime_smart_dense_cable') - event.hide('ae2:yellow_smart_dense_cable') - event.hide('ae2:light_blue_smart_dense_cable') - event.hide('ae2:cyan_smart_dense_cable') - event.hide('ae2:magenta_smart_dense_cable') - event.hide('ae2:purple_smart_dense_cable') - event.hide('ae2:brown_smart_dense_cable') - event.hide('ae2:blue_smart_dense_cable') - event.hide('ae2:green_smart_dense_cable') - event.hide('ae2:red_smart_dense_cable') - event.hide('ae2:black_smart_dense_cable') - event.hide('thermal:ender_pearl_dust') - event.hide('ae2:iron_dust') - event.hide('ae2:gold_dust') - event.hide('occultism:obsidian_dust') - event.hide('occultism:raw_silver') - event.hide('occultism:silver_ingot') - event.hide('occultism:silver_nugget') - event.hide('occultism:silver_ore') - event.hide('occultism:silver_ore_deepslate') - event.hide('thermal:invar_plate') - event.hide('thermal:bronze_nugget') - event.hide('thermal:bronze_ingot') - event.hide('thermal:bronze_plate') - event.hide('thermal:netherite_nugget') - event.hide('tconstruct:netherite_nugget') - event.hide('thermal:copper_nugget') - event.hide('tconstruct:copper_nugget') - event.hide('waterstrainer:strainer_survivalist_reinforced') - event.hide('ae2:white_paint_ball') - event.hide('ae2:light_blue_paint_ball') - event.hide('ae2:lime_paint_ball') - event.hide('ae2:pink_paint_ball') - event.hide('ae2:gray_paint_ball') - event.hide('ae2:light_gray_paint_ball') - event.hide('ae2:cyan_paint_ball') - event.hide('ae2:purple_paint_ball') - event.hide('ae2:brown_paint_ball') - event.hide('ae2:black_paint_ball') - event.hide('ae2:white_lumen_paint_ball') - event.hide('ae2:orange_lumen_paint_ball') - event.hide('ae2:magenta_lumen_paint_ball') - event.hide('ae2:light_blue_lumen_paint_ball') - event.hide('ae2:purple_lumen_paint_ball') - event.hide('ae2:cyan_lumen_paint_ball') - event.hide('ae2:gray_lumen_paint_ball') - event.hide('ae2:pink_lumen_paint_ball') - event.hide('ae2:lime_lumen_paint_ball') - event.hide('ae2:yellow_lumen_paint_ball') - event.hide('ae2:light_gray_lumen_paint_ball') - event.hide('ae2:orange_paint_ball') - event.hide('ae2:blue_lumen_paint_ball') - event.hide('ae2:brown_lumen_paint_ball') - event.hide('ae2:red_lumen_paint_ball') - event.hide('ae2:green_lumen_paint_ball') - event.hide('ae2:black_lumen_paint_ball') - event.hide('ae2:wooden_gear') - event.hide('ae2:flour') - event.hide('prettypipes:blank_module') - event.hide('occultism:iron_dust') - event.hide('occultism:gold_dust') - event.hide('occultism:copper_dust') - event.hide('occultism:silver_dust') - event.hide('metalbarrels:wood_to_diamond') - event.hide('metalbarrels:wood_to_obsidian') - event.hide('metalbarrels:wood_to_netherite') - event.hide('metalbarrels:copper_to_iron') - event.hide('metalbarrels:copper_to_silver') - event.hide('metalbarrels:copper_to_gold') - event.hide('metalbarrels:copper_to_diamond') - event.hide('metalbarrels:copper_to_obsidian') - event.hide('metalbarrels:iron_to_silver') - event.hide('metalbarrels:iron_to_gold') - event.hide('metalbarrels:iron_to_diamond') - event.hide('metalbarrels:iron_to_obsidian') - event.hide('metalbarrels:wood_to_crystal') - event.hide('metalbarrels:diamond_to_obsidian') - event.hide('metalbarrels:gold_to_obsidian') - event.hide('metalbarrels:gold_to_diamond') - event.hide('metalbarrels:silver_to_obsidian') - event.hide('metalbarrels:silver_to_diamond') - event.hide('metalbarrels:silver_to_gold') - event.hide('metalbarrels:copper_to_crystal') - event.hide('metalbarrels:iron_to_crystal') - event.hide('metalbarrels:silver_to_crystal') - event.hide('metalbarrels:gold_to_crystal') - event.hide('metalbarrels:diamond_to_crystal') - event.hide('metalbarrels:crystal_barrel') - event.hide('metalbarrels:diamond_barrel') - event.hide('metalbarrels:obsidian_barrel') - event.hide('metalbarrels:netherite_barrel') - event.hide('kubejs:ponder_laser_lamp') - event.hide('kubejs:ponder_laser_lamp_on') - event.hide('projectred_core:sand_coal_comp') - event.hide('projectred_core:boule') - event.hide('projectred_core:silicon') - event.hide('projectred_core:red_silicon_comp') - event.hide('projectred_core:glow_silicon_comp') - event.hide('projectred_core:electrotine_silicon_comp') - event.hide('projectred_core:infused_silicon') - event.hide('projectred_core:energized_silicon') - event.hide('projectred_core:electrotine_silicon') - event.hide('projectred_core:copper_coil') - event.hide('projectred_core:iron_coil') - event.hide('projectred_core:gold_coil') - event.hide('projectred_core:motor') - event.hide('projectred_core:woven_cloth') - event.hide('projectred_core:sail') - event.hide('projectred_core:draw_plate') - event.hide('projectred_core:multimeter') - event.hide('projectred_core:null_routing_chip') - event.hide('projectred-transmission:low_load_power_wire') - event.hide('projectred-transmission:low_load_framed_power_wire') - event.hide('occultism:debug_foliot_lumberjack') - event.hide('occultism:debug_foliot_transport_items') - event.hide('occultism:debug_foliot_cleaner') - event.hide('occultism:debug_foliot_trader') - event.hide('occultism:debug_djinni_manage_machine') - event.hide('occultism:debug_djinni_test') - event.hide('occultism:lighted_air') - event.hide('forbidden_arcanus:edelwood_bucket') - event.hide('forbidden_arcanus:edelwood_tropical_fish_bucket') - event.hide('forbidden_arcanus:edelwood_magma_cube_bucket') - event.hide('forbidden_arcanus:edelwood_slime_bucket') - event.hide('forbidden_arcanus:edelwood_lava_bucket') - event.hide('forbidden_arcanus:edelwood_suspicious_stew_bucket') - event.hide('forbidden_arcanus:edelwood_chicken_bucket') - event.hide('forbidden_arcanus:edelwood_mushroom_stew_bucket') - event.hide('forbidden_arcanus:edelwood_water_bucket') - event.hide('forbidden_arcanus:edelwood_milk_bucket') - event.hide('forbidden_arcanus:edelwood_beetroot_soup_bucket') - event.hide('forbidden_arcanus:edelwood_bat_soup_bucket') - event.hide('forbidden_arcanus:edelwood_pufferfish_bucket') - event.hide('forbidden_arcanus:edelwood_salmon_bucket') - event.hide('forbidden_arcanus:edelwood_bat_bucket') - event.hide('forbidden_arcanus:edelwood_squid_bucket') - event.hide('forbidden_arcanus:edelwood_cod_bucket') - event.hide('architects_palette:withered_bone') - event.hide('grapplemod:rocketupgradeitem') - event.hide('grapplemod:forcefieldupgradeitem') - event.hide('grapplemod:repeller') - event.hide('createdeco:gold_coinstack') - event.hide('createdeco:gold_coin') - event.hide(/mars/) - event.hide(/venus/) - event.hide(/mercury/) - event.hide(/glacio/) - event.hide("beyond_earth:steel_ingot") - event.hide("beyond_earth:steel_nugget") - event.hide("beyond_earth:steel_tank") - event.hide("beyond_earth:steel_engine") - event.hide(/ostrum/) - event.hide(/calorite/) - event.hide(/beyond_earth:compressed_/) - event.hide(/beyond_earth:engine_/) - event.hide('beyond_earth:infernal_spire_block') - event.hide('beyond_earth:sky_stone') - event.hide('beyond_earth:permafrost') - event.hide('beyond_earth:wheel') - event.hide('beyond_earth:rocket_fin') - event.hide('beyond_earth:rocket_nose_cone') - event.hide('beyond_earth:oxygen_tank') - event.hide('beyond_earth:oxygen_gear') - event.hide('beyond_earth:desh_tank') - event.hide('beyond_earth:desh_engine') - event.hide('beyond_earth:hammer') - event.hide('beyond_earth:iron_plate') - event.hide('beyond_earth:coal_generator') - event.hide('beyond_earth:compressor') - event.hide('beyond_earth:fuel_refinery') - event.hide('beyond_earth:solar_panel') - event.hide('beyond_earth:water_pump') - event.hide('beyond_earth:nasa_workbench') - event.hide('beyond_earth:rover') - event.hide('beyond_earth:rocket_t2') - event.hide('beyond_earth:rocket_t3') - event.hide('beyond_earth:rocket_t4') - event.hide('titanium:machine_test') - event.hide('metalbarrels:obsidian_to_netherite') - event.hide('everycomp:q/forbidden_arcanus/mysterywood_chest') - event.hide('everycomp:q/forbidden_arcanus/mysterywood_trapped_chest') - event.hide(/extendedgears/) - event.hide('create:crushed_raw_osmium') - event.hide('create:crushed_raw_platinum') - event.hide('create:crushed_raw_silver') - event.hide('create:crushed_raw_quicksilver') - event.hide('create:crushed_raw_aluminum') - event.hide('create:crushed_raw_uranium') - event.hide('kubejs:silver_coin') - event.hide('kubejs:gold_coin') - event.hide('thermal:servo_attachment') - event.hide('create:sturdy_sheet') - event.hide('create:unprocessed_obsidian_sheet') + global.itemBlacklist.forEach(item=>{ + event.hide(item); + }) + global.jeiItemBlacklist.forEach(item=>{ + event.hide(item); + }) }) onEvent('rei.hide.fluids', event => { - event.hide('tconstruct:molten_tin'); - event.hide('beyond_earth:molten_ostrum'); - event.hide('beyond_earth:molten_calorite'); + global.fluidBlacklist.forEach(fluid=>{ + event.hide(fluid); + }) + global.jeiFluidBlacklist.forEach(fluid=>{ + event.hide(fluid); + }) }) \ No newline at end of file diff --git a/overrides/kubejs/client_scripts/client_compatibility.js b/overrides/kubejs/client_scripts/client_compatibility.js index 31fad6d..6a18cdd 100644 --- a/overrides/kubejs/client_scripts/client_compatibility.js +++ b/overrides/kubejs/client_scripts/client_compatibility.js @@ -1,19 +1 @@ -// Client scripts for addon mods - -onEvent('rei.hide.items', event => { - //Crafts and Additions - if (Platform.isLoaded("createaddition")) { - event.hide("thermal:electrum_ingot") - event.hide("thermal:electrum_nugget") - event.hide("thermal:electrum_plate") - event.hide("beyond_earth:iron_stick") - event.hide("createaddition:zinc_sheet") - //Unfortunately we have stick to thermal diamond dust due to the strainer recipe - event.hide("createaddition:diamond_grit") - event.hide("createaddition:accumulator") - } - //The buddycard malum cards are a strange case where we only want to hide items when a mod is not present - if (!Platform.isLoaded("malum")) { - event.hide("#buddycardsexp:buddycards_malum") - } -}) \ No newline at end of file +// Client scripts for addon mods \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/chiseling_recipes/apple_block.json b/overrides/kubejs/data/cabin/chiseling_recipes/apple_block.json new file mode 100644 index 0000000..58bb8b5 --- /dev/null +++ b/overrides/kubejs/data/cabin/chiseling_recipes/apple_block.json @@ -0,0 +1,12 @@ +{ + "type": "rechiseled:chiseling", + "entries": [ + { + "item": "thermal:apple_block" + }, + { + "item": "quark:apple_crate" + } + ], + "overwrite": false +} diff --git a/overrides/kubejs/data/cabin/chiseling_recipes/beetroot_block.json b/overrides/kubejs/data/cabin/chiseling_recipes/beetroot_block.json index 8b3bbf3..e577b25 100644 --- a/overrides/kubejs/data/cabin/chiseling_recipes/beetroot_block.json +++ b/overrides/kubejs/data/cabin/chiseling_recipes/beetroot_block.json @@ -6,6 +6,9 @@ }, { "item": "thermal:beetroot_block" + }, + { + "item": "quark:beetroot_crate" } ], "overwrite": false diff --git a/overrides/kubejs/data/cabin/chiseling_recipes/carrot_block.json b/overrides/kubejs/data/cabin/chiseling_recipes/carrot_block.json index ee5a263..f1f0586 100644 --- a/overrides/kubejs/data/cabin/chiseling_recipes/carrot_block.json +++ b/overrides/kubejs/data/cabin/chiseling_recipes/carrot_block.json @@ -6,6 +6,9 @@ }, { "item": "thermal:carrot_block" + }, + { + "item": "quark:carrot_crate" } ], "overwrite": false diff --git a/overrides/kubejs/data/cabin/chiseling_recipes/potato_block.json b/overrides/kubejs/data/cabin/chiseling_recipes/potato_block.json index 3d31065..82cafda 100644 --- a/overrides/kubejs/data/cabin/chiseling_recipes/potato_block.json +++ b/overrides/kubejs/data/cabin/chiseling_recipes/potato_block.json @@ -6,6 +6,9 @@ }, { "item": "thermal:potato_block" + }, + { + "item": "quark:potato_crate" } ], "overwrite": false diff --git a/overrides/kubejs/data/cabin/loot_tables/chests/the_market/patience/1.json b/overrides/kubejs/data/cabin/loot_tables/chests/the_market/patience/1.json new file mode 100644 index 0000000..4401db9 --- /dev/null +++ b/overrides/kubejs/data/cabin/loot_tables/chests/the_market/patience/1.json @@ -0,0 +1,505 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "weight": 5, + "name": "minecraft:apple", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Motivational Apple", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 5, + "name": "minecraft:cookie", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Motivational Cookie", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:pufferfish", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Motivational Pufferfish", + "italic": false + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.075 + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Keep going.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Let's do this.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Don't stop until you're proud.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Dream big.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "You get what you give.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Be you.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Take the risk or lose the chance.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "You are stronger than you think", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Never ever give up.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Anything is possible.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "It always seems impossible until it's done.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Believe in yourself.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Getting there...", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "You've got this.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Prove them wrong.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Failure is success in progress.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Don't let go.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Be brave.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Just keep trying.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Be stronger than your excuses", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Any minute now...", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "I'm sorry.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Persistence is key.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Today is a good day.", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "The next crate could be the one!", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "So close yet so far...", + "italic": false + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:paper", + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "This took forever to package.", + "italic": false + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.09 + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "weight": 2500000, + "name": "minecraft:barrel", + "functions": [ + { + "function": "minecraft:set_loot_table", + "type": "minecraft:chest", + "name": "cabin:chests/the_market/patience/1" + }, + { + "function": "minecraft:set_lore", + "lore": [ + { + "text": "The fabled prize awaits at the bottom...", + "color": "gray", + "italic": true + } + ] + } + ] + }, + { + "type": "minecraft:item", + "weight": 1, + "name": "minecraft:barrel", + "functions": [ + { + "function": "minecraft:set_loot_table", + "type": "minecraft:chest", + "name": "cabin:chests/the_market/patience/2" + }, + { + "function": "minecraft:set_name", + "name": { + "text": "The Reward of Patience", + "color": "dark_green", + "italic": false + } + }, + { + "function": "minecraft:set_lore", + "lore": [ + { + "text": "The fabled prize...", + "color": "gray", + "italic": true + } + ] + } + ] + } + ] + } + ] + } + \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/loot_tables/chests/the_market/patience/2.json b/overrides/kubejs/data/cabin/loot_tables/chests/the_market/patience/2.json new file mode 100644 index 0000000..d1b679f --- /dev/null +++ b/overrides/kubejs/data/cabin/loot_tables/chests/the_market/patience/2.json @@ -0,0 +1,130 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:paper", + "weight": 1, + "functions": [ + { + "function": "minecraft:set_name", + "name": { + "text": "Unbelievable.", + "italic": false + } + }, + { + "function": "minecraft:set_lore", + "lore": [ + { + "text": "You have no idea how lucky you are.", + "color": "gray", + "italic": false + } + ] + } + ] + } + ] + }, + { + "rolls": { + "min": 15.0, + "max": 25.0, + "type": "minecraft:uniform" + }, + "entries": [ + { + "type": "minecraft:item", + "weight": 5, + "name": "thermal:gold_coin" + }, + { + "type": "minecraft:item", + "weight": 8, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1.0, + "max": 56.0, + "type": "minecraft:uniform" + } + } + ], + "name": "thermal:gold_coin" + }, + { + "type": "minecraft:item", + "weight": 4, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 12.0, + "max": 57.0, + "type": "minecraft:uniform" + } + } + ], + "name": "thermal:silver_coin" + }, + { + "type": "minecraft:item", + "weight": 3, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 11.0, + "max": 53.0, + "type": "minecraft:uniform" + } + } + ], + "name": "minecraft:gold_ingot" + }, + { + "type": "minecraft:item", + "weight": 2, + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1.0, + "max": 13.0, + "type": "minecraft:uniform" + } + } + ], + "name": "thermal:silver_ingot" + }, + { + "type": "minecraft:item", + "weight": 5, + "functions": [ + { + "function": "minecraft:enchant_randomly" + } + ], + "name": "minecraft:book" + }, + { + "type": "minecraft:item", + "weight": 5, + "functions": [ + { + "function": "minecraft:enchant_with_levels", + "levels": 35, + "treasure": true + } + ], + "name": "minecraft:book" + } + ] + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/loot_tables/chests/the_market/tinkerbox.json b/overrides/kubejs/data/cabin/loot_tables/chests/the_market/tinkerbox.json new file mode 100644 index 0000000..b31d8fc --- /dev/null +++ b/overrides/kubejs/data/cabin/loot_tables/chests/the_market/tinkerbox.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:loot_table", + "name": "cabin:chests/tinkerbox" + } + ] + } + ] +} diff --git a/overrides/kubejs/data/cabin/loot_tables/chests/tinkerbox.json b/overrides/kubejs/data/cabin/loot_tables/chests/tinkerbox.json new file mode 100644 index 0000000..f7f5699 --- /dev/null +++ b/overrides/kubejs/data/cabin/loot_tables/chests/tinkerbox.json @@ -0,0 +1,1068 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "rolls": { + "min": 1.0, + "max": 3.0, + "type": "minecraft:uniform" + }, + "entries": [ + { + "type": "minecraft:tag", + "name": "tconstruct:tables", + "expand": true, + "weight": 1 + } + ] + }, + { + "rolls": { + "min": 2.0, + "max": 4.0, + "type": "minecraft:uniform" + }, + "entries": [ + { + "type": "minecraft:tag", + "name": "tconstruct:seared_blocks", + "expand": true, + "weight": 1 + } + ] + }, + { + "rolls": { + "min": 12.0, + "max": 18.0, + "type": "minecraft:uniform" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:pick_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:hammer_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_axe_head", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:small_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:broad_blade", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_binding", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:large_plate", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tool_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:copper\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:cobalt\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:iron\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bronze\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:rose_gold\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:silver\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:bone\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:lead\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:wood\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "tconstruct:tough_handle", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": "{\"Material\": \"tconstruct:flint\"}" + } + ] + } + ] + }, + { + "rolls": { + "min": 2.0, + "max": 8.0, + "type": "minecraft:uniform" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "tconstruct:pattern", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1.0, + "max": 3.0, + "type": "minecraft:uniform" + } + } + ], + "weight": 1 + } + ] + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/structures/aridcabin.nbt b/overrides/kubejs/data/cabin/structures/aridcabin.nbt index 2e3c10e..b9f015a 100644 Binary files a/overrides/kubejs/data/cabin/structures/aridcabin.nbt and b/overrides/kubejs/data/cabin/structures/aridcabin.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/blacksmith_shop.nbt b/overrides/kubejs/data/cabin/structures/blacksmith_shop.nbt index 7b91876..9453bf6 100644 Binary files a/overrides/kubejs/data/cabin/structures/blacksmith_shop.nbt and b/overrides/kubejs/data/cabin/structures/blacksmith_shop.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/broken_windmill.nbt b/overrides/kubejs/data/cabin/structures/broken_windmill.nbt index b4212cf..e848afd 100644 Binary files a/overrides/kubejs/data/cabin/structures/broken_windmill.nbt and b/overrides/kubejs/data/cabin/structures/broken_windmill.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/broken_windmill_bottom.nbt b/overrides/kubejs/data/cabin/structures/broken_windmill_bottom.nbt index 453cfc2..adf436c 100644 Binary files a/overrides/kubejs/data/cabin/structures/broken_windmill_bottom.nbt and b/overrides/kubejs/data/cabin/structures/broken_windmill_bottom.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/campsite.nbt b/overrides/kubejs/data/cabin/structures/campsite.nbt index 0359d0e..48ee44c 100644 Binary files a/overrides/kubejs/data/cabin/structures/campsite.nbt and b/overrides/kubejs/data/cabin/structures/campsite.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/crystal_harvester/base.nbt b/overrides/kubejs/data/cabin/structures/crystal_harvester/base.nbt index 230882d..3807744 100644 Binary files a/overrides/kubejs/data/cabin/structures/crystal_harvester/base.nbt and b/overrides/kubejs/data/cabin/structures/crystal_harvester/base.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/forestcabin.nbt b/overrides/kubejs/data/cabin/structures/forestcabin.nbt index c65a53a..f1c0d69 100644 Binary files a/overrides/kubejs/data/cabin/structures/forestcabin.nbt and b/overrides/kubejs/data/cabin/structures/forestcabin.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/log_cabin.nbt b/overrides/kubejs/data/cabin/structures/log_cabin.nbt index eb28ce9..978aad0 100644 Binary files a/overrides/kubejs/data/cabin/structures/log_cabin.nbt and b/overrides/kubejs/data/cabin/structures/log_cabin.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/mountaincabin.nbt b/overrides/kubejs/data/cabin/structures/mountaincabin.nbt index 819feb6..6da217b 100644 Binary files a/overrides/kubejs/data/cabin/structures/mountaincabin.nbt and b/overrides/kubejs/data/cabin/structures/mountaincabin.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/oak_station.nbt b/overrides/kubejs/data/cabin/structures/oak_station.nbt index 13e65c8..d3dd4f9 100644 Binary files a/overrides/kubejs/data/cabin/structures/oak_station.nbt and b/overrides/kubejs/data/cabin/structures/oak_station.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/oak_station_ruin.nbt b/overrides/kubejs/data/cabin/structures/oak_station_ruin.nbt index 2587798..878daf1 100644 Binary files a/overrides/kubejs/data/cabin/structures/oak_station_ruin.nbt and b/overrides/kubejs/data/cabin/structures/oak_station_ruin.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/plainscabin.nbt b/overrides/kubejs/data/cabin/structures/plainscabin.nbt index 2b251d4..9498062 100644 Binary files a/overrides/kubejs/data/cabin/structures/plainscabin.nbt and b/overrides/kubejs/data/cabin/structures/plainscabin.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/bad_ending.nbt b/overrides/kubejs/data/cabin/structures/railshaft/bad_ending.nbt new file mode 100644 index 0000000..c56d289 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/bad_ending.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/good_ending.nbt b/overrides/kubejs/data/cabin/structures/railshaft/good_ending.nbt new file mode 100644 index 0000000..d9d60d3 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/good_ending.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/house.nbt b/overrides/kubejs/data/cabin/structures/railshaft/house.nbt new file mode 100644 index 0000000..f53fec1 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/house.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/house_basement.nbt b/overrides/kubejs/data/cabin/structures/railshaft/house_basement.nbt new file mode 100644 index 0000000..e39437c Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/house_basement.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/slope_both.nbt b/overrides/kubejs/data/cabin/structures/railshaft/slope_both.nbt new file mode 100644 index 0000000..133c884 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/slope_both.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/slope_left.nbt b/overrides/kubejs/data/cabin/structures/railshaft/slope_left.nbt new file mode 100644 index 0000000..8e16fba Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/slope_left.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/slope_right.nbt b/overrides/kubejs/data/cabin/structures/railshaft/slope_right.nbt new file mode 100644 index 0000000..b29bc87 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/slope_right.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/slope_straight.nbt b/overrides/kubejs/data/cabin/structures/railshaft/slope_straight.nbt new file mode 100644 index 0000000..42e5a8b Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/slope_straight.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/watery.nbt b/overrides/kubejs/data/cabin/structures/railshaft/watery.nbt new file mode 100644 index 0000000..f25cad2 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/watery.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/railshaft/weak_slope.nbt b/overrides/kubejs/data/cabin/structures/railshaft/weak_slope.nbt new file mode 100644 index 0000000..402ca44 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/railshaft/weak_slope.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/arch.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/arch.nbt new file mode 100644 index 0000000..d9f28b3 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/arch.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/bridge.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/bridge.nbt new file mode 100644 index 0000000..7fc33d4 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/bridge.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/crossing.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/crossing.nbt new file mode 100644 index 0000000..acfb661 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/crossing.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/end.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/end.nbt new file mode 100644 index 0000000..861b58c Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/end.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/foundation.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/foundation.nbt new file mode 100644 index 0000000..b7030e1 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/foundation.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/house.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/house.nbt new file mode 100644 index 0000000..d9935ee Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/house.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/spires.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/spires.nbt new file mode 100644 index 0000000..ebb7fcd Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/spires.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/straight.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/straight.nbt new file mode 100644 index 0000000..a732b20 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/straight.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/tower.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/tower.nbt new file mode 100644 index 0000000..4247f23 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/tower.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/ruins/dripstone/turn.nbt b/overrides/kubejs/data/cabin/structures/ruins/dripstone/turn.nbt new file mode 100644 index 0000000..4b692e2 Binary files /dev/null and b/overrides/kubejs/data/cabin/structures/ruins/dripstone/turn.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/tropicalcabin.nbt b/overrides/kubejs/data/cabin/structures/tropicalcabin.nbt index 8770d9b..69bf700 100644 Binary files a/overrides/kubejs/data/cabin/structures/tropicalcabin.nbt and b/overrides/kubejs/data/cabin/structures/tropicalcabin.nbt differ diff --git a/overrides/kubejs/data/cabin/structures/underground_lab.nbt b/overrides/kubejs/data/cabin/structures/underground_lab.nbt index efa55fd..eeee815 100644 Binary files a/overrides/kubejs/data/cabin/structures/underground_lab.nbt and b/overrides/kubejs/data/cabin/structures/underground_lab.nbt differ diff --git a/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/abandoned_engineer_house.json b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/abandoned_engineer_house.json index a81e1ea..f9df619 100644 --- a/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/abandoned_engineer_house.json +++ b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/abandoned_engineer_house.json @@ -3,6 +3,7 @@ "minecraft:dark_forest", "biomesoplenty:ominous_woods", "biomesoplenty:dead_forest", - "biomesoplenty:old_growth_dead_forest" + "biomesoplenty:old_growth_dead_forest", + "biomesoplenty:redwood_forest" ] } \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/broken_windmill.json b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/broken_windmill.json new file mode 100644 index 0000000..3f5c0c8 --- /dev/null +++ b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/broken_windmill.json @@ -0,0 +1,12 @@ +{ + "values": [ + "#minecraft:is_taiga", + "#minecraft:is_hill", + "#minecraft:is_jungle", + "#minecraft:has_structure/village_plains", + "minecraft:savanna", + "#minecraft:is_forest", + "#minecraft:has_structure/swamp_hut" + ] + } + \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/campsite.json b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/campsite.json index c87afe5..087bd32 100644 --- a/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/campsite.json +++ b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/campsite.json @@ -1,7 +1,12 @@ { - "values": [ - "#minecraft:has_structure/village_plains", - "#minecraft:has_structure/jungle_temple" - ] - } - \ No newline at end of file + "values": [ + "#minecraft:is_taiga", + "#minecraft:is_hill", + "#minecraft:is_jungle", + "#minecraft:has_structure/village_plains", + "minecraft:savanna", + "#minecraft:is_forest", + "#minecraft:has_structure/swamp_hut", + "#minecraft:has_structure/village_snowy" + ] +} diff --git a/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/railshaft.json b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/railshaft.json new file mode 100644 index 0000000..a7d46e9 --- /dev/null +++ b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/railshaft.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#minecraft:is_taiga", + "#minecraft:is_jungle", + "#minecraft:has_structure/village_plains", + "minecraft:savanna", + "#minecraft:is_forest" + ] + } + \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/ruins.json b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/ruins.json new file mode 100644 index 0000000..3f5c0c8 --- /dev/null +++ b/overrides/kubejs/data/cabin/tags/worldgen/biome/has_structure/ruins.json @@ -0,0 +1,12 @@ +{ + "values": [ + "#minecraft:is_taiga", + "#minecraft:is_hill", + "#minecraft:is_jungle", + "#minecraft:has_structure/village_plains", + "minecraft:savanna", + "#minecraft:is_forest", + "#minecraft:has_structure/swamp_hut" + ] + } + \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/broken_windmill.json b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/broken_windmill.json index 614408e..f56075a 100644 --- a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/broken_windmill.json +++ b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/broken_windmill.json @@ -4,7 +4,7 @@ "start_pool": "cabin:broken_windmill", "size": 2 }, - "biomes": "#cabin:has_structure/campsite", + "biomes": "#cabin:has_structure/broken_windmill", "adapt_noise": false, "spawn_overrides": {} } diff --git a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/crystal_harvester.json b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/crystal_harvester.json index 37ee9b9..f3c47d5 100644 --- a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/crystal_harvester.json +++ b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/crystal_harvester.json @@ -1,8 +1,11 @@ { - "type": "minecraft:bastion_remnant", + "type": "repurposed_structures:mineshaft_generic", "config": { + "probability": 1, "start_pool": "cabin:crystal_harvester", - "size": 4 + "size": 4, + "max_y": 48, + "min_y": 16 }, "biomes": "#minecraft:has_structure/mineshaft", "spawn_overrides": {} diff --git a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/forestcabin.json b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/forestcabin.json index 92a919c..0107b45 100644 --- a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/forestcabin.json +++ b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/forestcabin.json @@ -4,7 +4,7 @@ "start_pool": "cabin:forestcabin", "size": 1 }, - "biomes": "minecraft:forest", + "biomes": "#minecraft:is_forest", "adapt_noise": true, "spawn_overrides": {} } diff --git a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/log_cabin.json b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/log_cabin.json index db7dcd3..2bf1a77 100644 --- a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/log_cabin.json +++ b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/log_cabin.json @@ -4,7 +4,7 @@ "start_pool": "cabin:log_cabin", "size": 1 }, - "biomes": "#minecraft:has_structure/village_plains", + "biomes": "#cabin:has_structure/campsite", "adapt_noise": true, "spawn_overrides": {} } \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/plainscabin.json b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/plainscabin.json index 0d62296..0b3aff2 100644 --- a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/plainscabin.json +++ b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/plainscabin.json @@ -4,7 +4,7 @@ "start_pool": "cabin:plainscabin", "size": 1 }, - "biomes": "minecraft:plains", + "biomes": "#minecraft:has_structure/village_plains", "adapt_noise": true, "spawn_overrides": {} } diff --git a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/railshaft.json b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/railshaft.json new file mode 100644 index 0000000..439d2ea --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/railshaft.json @@ -0,0 +1,10 @@ +{ + "type": "repurposed_structures:generic_jigsaw_structure", + "config": { + "start_pool": "cabin:railshaft/house", + "size": 13 + }, + "biomes": "#cabin:has_structure/railshaft", + "adapt_noise": false, + "spawn_overrides": {} +} diff --git a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/ruins/dripstone.json b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/ruins/dripstone.json new file mode 100644 index 0000000..f7a77e6 --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/ruins/dripstone.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:village", + "config": { + "start_pool": "cabin:ruins/dripstone_start", + "size": 7 + }, + "biomes": "#cabin:has_structure/ruins", + "adapt_noise": true, + "spawn_overrides": {} +} diff --git a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/underground_lab.json b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/underground_lab.json index 9d972a4..f0b2c39 100644 --- a/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/underground_lab.json +++ b/overrides/kubejs/data/cabin/worldgen/configured_structure_feature/underground_lab.json @@ -1,8 +1,11 @@ { - "type": "minecraft:bastion_remnant", + "type": "repurposed_structures:mineshaft_generic", "config": { + "probability": 1, "start_pool": "cabin:underground_lab", - "size": 1 + "size": 1, + "max_y": 48, + "min_y": 8 }, "biomes": "#minecraft:has_structure/mineshaft", "spawn_overrides": {} diff --git a/overrides/kubejs/data/cabin/worldgen/structure_set/abandoned_engineer_house.json b/overrides/kubejs/data/cabin/worldgen/structure_set/abandoned_engineer_house.json deleted file mode 100644 index dab1533..0000000 --- a/overrides/kubejs/data/cabin/worldgen/structure_set/abandoned_engineer_house.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "structures": [ - { - "structure": "cabin:abandoned_engineer_house", - "weight": 1 - } - ], - "placement": { - "type": "minecraft:random_spread", - "spacing": 25, - "separation": 20, - "salt": 95336364 - } -} diff --git a/overrides/kubejs/data/cabin/worldgen/structure_set/above_and_beyond.json b/overrides/kubejs/data/cabin/worldgen/structure_set/above_and_beyond.json deleted file mode 100644 index fecff6c..0000000 --- a/overrides/kubejs/data/cabin/worldgen/structure_set/above_and_beyond.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "structures": [ - { - "structure": "cabin:campsite", - "weight": 1 - }, - { - "structure": "cabin:log_cabin", - "weight": 1 - } - ], - "placement": { - "type": "minecraft:random_spread", - "spacing": 20, - "separation": 16, - "salt": 1143757710 - } -} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/structure_set/broken_windmill.json b/overrides/kubejs/data/cabin/worldgen/structure_set/broken_windmill.json deleted file mode 100644 index 5615304..0000000 --- a/overrides/kubejs/data/cabin/worldgen/structure_set/broken_windmill.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "structures": [ - { - "structure": "cabin:broken_windmill", - "weight": 1 - } - ], - "placement": { - "type": "minecraft:random_spread", - "spacing": 25, - "separation": 20, - "salt": 1014532926 - } -} diff --git a/overrides/kubejs/data/cabin/worldgen/structure_set/cabins.json b/overrides/kubejs/data/cabin/worldgen/structure_set/cabins.json deleted file mode 100644 index f2e6d90..0000000 --- a/overrides/kubejs/data/cabin/worldgen/structure_set/cabins.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "structures": [ - { - "structure": "cabin:aridcabin", - "weight": 1 - }, - { - "structure": "cabin:forestcabin", - "weight": 1 - }, - { - "structure": "cabin:mountaincabin", - "weight": 1 - }, - { - "structure": "cabin:plainscabin", - "weight": 1 - }, - { - "structure": "cabin:tropicalcabin", - "weight": 1 - } - ], - "placement": { - "type": "minecraft:random_spread", - "spacing": 25, - "separation": 20, - "salt": 1243757710 - } -} diff --git a/overrides/kubejs/data/cabin/worldgen/structure_set/oak_station_ruin.json b/overrides/kubejs/data/cabin/worldgen/structure_set/oak_station_ruin.json deleted file mode 100644 index a1656e9..0000000 --- a/overrides/kubejs/data/cabin/worldgen/structure_set/oak_station_ruin.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "structures": [ - { - "structure": "cabin:oak_station_ruin", - "weight": 1 - } - ], - "placement": { - "type": "minecraft:random_spread", - "spacing": 30, - "separation": 20, - "salt": 241292441 - } -} diff --git a/overrides/kubejs/data/cabin/worldgen/structure_set/plains.json b/overrides/kubejs/data/cabin/worldgen/structure_set/plains.json deleted file mode 100644 index 6ab7a53..0000000 --- a/overrides/kubejs/data/cabin/worldgen/structure_set/plains.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "structures": [ - { - "structure": "cabin:blacksmith_shop", - "weight": 1 - }, - { - "structure": "cabin:oak_station", - "weight": 1 - } - ], - "placement": { - "type": "minecraft:random_spread", - "spacing": 30, - "separation": 20, - "salt": 241292441 - } -} diff --git a/overrides/kubejs/data/cabin/worldgen/structure_set/surface_structures.json b/overrides/kubejs/data/cabin/worldgen/structure_set/surface_structures.json new file mode 100644 index 0000000..a954e8e --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/structure_set/surface_structures.json @@ -0,0 +1,66 @@ +{ + "structures": [ + { + "structure": "cabin:broken_windmill", + "weight": 10 + }, + { + "structure": "cabin:railshaft", + "weight": 8 + }, + { + "structure": "cabin:log_cabin", + "weight": 8 + }, + { + "structure": "cabin:campsite", + "weight": 8 + }, + { + "structure": "cabin:ruins/dripstone", + "weight": 5 + }, + { + "structure": "cabin:blacksmith_shop", + "weight": 5 + }, + { + "structure": "cabin:oak_station", + "weight": 5 + }, + { + "structure": "cabin:oak_station_ruin", + "weight": 5 + }, + { + "structure": "cabin:abandoned_engineer_house", + "weight": 8 + }, + { + "structure": "cabin:aridcabin", + "weight": 4 + }, + { + "structure": "cabin:forestcabin", + "weight": 4 + }, + { + "structure": "cabin:mountaincabin", + "weight": 4 + }, + { + "structure": "cabin:plainscabin", + "weight": 4 + }, + { + "structure": "cabin:tropicalcabin", + "weight": 4 + } + ], + "placement": { + "type": "minecraft:random_spread", + "spacing": 12, + "separation": 6, + "salt": 1143757710 + } +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/structure_set/underground_lab.json b/overrides/kubejs/data/cabin/worldgen/structure_set/underground_lab.json index 257e06a..c85b9c6 100644 --- a/overrides/kubejs/data/cabin/worldgen/structure_set/underground_lab.json +++ b/overrides/kubejs/data/cabin/worldgen/structure_set/underground_lab.json @@ -8,7 +8,7 @@ "placement": { "type": "minecraft:random_spread", "spacing": 20, - "separation": 15, + "separation": 8, "salt": 1543536663 } } diff --git a/overrides/kubejs/data/cabin/worldgen/template_pool/oak_station.json b/overrides/kubejs/data/cabin/worldgen/template_pool/oak_station.json index 1f6f9d9..049c9a3 100644 --- a/overrides/kubejs/data/cabin/worldgen/template_pool/oak_station.json +++ b/overrides/kubejs/data/cabin/worldgen/template_pool/oak_station.json @@ -3,7 +3,7 @@ "fallback": "minecraft:empty", "elements": [ { - "weight": 95, + "weight": 40, "element": { "element_type": "minecraft:single_pool_element", "location": "cabin:oak_station", @@ -12,7 +12,7 @@ } }, { - "weight": 5, + "weight": 60, "element": { "element_type": "minecraft:single_pool_element", "location": "cabin:oak_station_ruin", diff --git a/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/after_horizontal.json b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/after_horizontal.json new file mode 100644 index 0000000..bc11a7e --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/after_horizontal.json @@ -0,0 +1,60 @@ +{ + "name": "cabin:railshaft/after_horizontal", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 3, + "element": { + "location": "cabin:railshaft/slope_straight", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 3, + "element": { + "location": "cabin:railshaft/good_ending", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 2, + "element": { + "location": "cabin:railshaft/bad_ending", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:railshaft/slope_right", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:railshaft/slope_left", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:railshaft/slope_both", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/after_slope.json b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/after_slope.json new file mode 100644 index 0000000..a341496 --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/after_slope.json @@ -0,0 +1,69 @@ +{ + "name": "cabin:railshaft/after_slope", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 4, + "element": { + "location": "cabin:railshaft/slope_straight", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:railshaft/good_ending", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:railshaft/bad_ending", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 3, + "element": { + "location": "cabin:railshaft/watery", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 4, + "element": { + "location": "cabin:railshaft/weak_slope", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:railshaft/slope_right", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:railshaft/slope_left", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/first.json b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/first.json new file mode 100644 index 0000000..324e866 --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/first.json @@ -0,0 +1,24 @@ +{ + "name": "cabin:railshaft/first", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 3, + "element": { + "location": "cabin:railshaft/slope_straight", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 3, + "element": { + "location": "cabin:railshaft/slope_both", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/house.json b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/house.json new file mode 100644 index 0000000..5b7deba --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/house.json @@ -0,0 +1,15 @@ +{ + "name": "cabin:railshaft/house", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "location": "cabin:railshaft/house", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/house_basement.json b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/house_basement.json new file mode 100644 index 0000000..1bc8f64 --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/template_pool/railshaft/house_basement.json @@ -0,0 +1,15 @@ +{ + "name": "cabin:railshaft/house_basement", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "location": "cabin:railshaft/house_basement", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/template_pool/ruins/dripstone.json b/overrides/kubejs/data/cabin/worldgen/template_pool/ruins/dripstone.json new file mode 100644 index 0000000..570f01e --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/template_pool/ruins/dripstone.json @@ -0,0 +1,96 @@ +{ + "name": "cabin:ruins/dripstone", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 2, + "element": { + "location": "cabin:ruins/dripstone/crossing", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 4, + "element": { + "location": "cabin:ruins/dripstone/straight", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 3, + "element": { + "location": "cabin:ruins/dripstone/turn", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/arch", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/bridge", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/end", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/foundation", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/house", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/spires", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/tower", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/cabin/worldgen/template_pool/ruins/dripstone_start.json b/overrides/kubejs/data/cabin/worldgen/template_pool/ruins/dripstone_start.json new file mode 100644 index 0000000..fdac61b --- /dev/null +++ b/overrides/kubejs/data/cabin/worldgen/template_pool/ruins/dripstone_start.json @@ -0,0 +1,33 @@ +{ + "name": "cabin:ruins/dripstone_start", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/crossing", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/straight", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "cabin:ruins/dripstone/turn", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/custom/loot_tables/chests/patience_1.json b/overrides/kubejs/data/custom/loot_tables/chests/patience_1.json index c3eb428..f2a1c4b 100644 --- a/overrides/kubejs/data/custom/loot_tables/chests/patience_1.json +++ b/overrides/kubejs/data/custom/loot_tables/chests/patience_1.json @@ -1,505 +1,14 @@ { - "type": "minecraft:chest", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:apple", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Motivational Apple", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:cookie", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Motivational Cookie", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:pufferfish", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Motivational Pufferfish", - "italic": false - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.075 - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Keep going.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Let's do this.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Don't stop until you're proud.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Dream big.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "You get what you give.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Be you.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Take the risk or lose the chance.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "You are stronger than you think", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Never ever give up.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Anything is possible.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "It always seems impossible until it's done.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Believe in yourself.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Getting there...", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "You've got this.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Prove them wrong.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Failure is success in progress.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Don't let go.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Be brave.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Just keep trying.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Be stronger than your excuses", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Any minute now...", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "I'm sorry.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Persistence is key.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Today is a good day.", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "The next crate could be the one!", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "So close yet so far...", - "italic": false - } - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "This took forever to package.", - "italic": false - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.09 - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 2500000, - "name": "minecraft:barrel", - "functions": [ - { - "function": "minecraft:set_loot_table", - "type": "minecraft:chest", - "name": "custom:chests/patience_1" - }, - { - "function": "minecraft:set_lore", - "lore": [ - { - "text": "The fabled prize awaits at the bottom...", - "color": "gray", - "italic": true - } - ] - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:barrel", - "functions": [ - { - "function": "minecraft:set_loot_table", - "type": "minecraft:chest", - "name": "custom:chests/patience_2" - }, - { - "function": "minecraft:set_name", - "name": { - "text": "The Reward of Patience", - "color": "dark_green", - "italic": false - } - }, - { - "function": "minecraft:set_lore", - "lore": [ - { - "text": "The fabled prize...", - "color": "gray", - "italic": true - } - ] - } - ] - } - ] - } - ] - } - \ No newline at end of file + "type": "minecraft:chest", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:loot_table", + "name": "cabin:chests/the_market/patience/1" + } + ] + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/custom/loot_tables/chests/patience_2.json b/overrides/kubejs/data/custom/loot_tables/chests/patience_2.json index d1b679f..d0dbac0 100644 --- a/overrides/kubejs/data/custom/loot_tables/chests/patience_2.json +++ b/overrides/kubejs/data/custom/loot_tables/chests/patience_2.json @@ -5,124 +5,8 @@ "rolls": 1, "entries": [ { - "type": "minecraft:item", - "name": "minecraft:paper", - "weight": 1, - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "text": "Unbelievable.", - "italic": false - } - }, - { - "function": "minecraft:set_lore", - "lore": [ - { - "text": "You have no idea how lucky you are.", - "color": "gray", - "italic": false - } - ] - } - ] - } - ] - }, - { - "rolls": { - "min": 15.0, - "max": 25.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "weight": 5, - "name": "thermal:gold_coin" - }, - { - "type": "minecraft:item", - "weight": 8, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 56.0, - "type": "minecraft:uniform" - } - } - ], - "name": "thermal:gold_coin" - }, - { - "type": "minecraft:item", - "weight": 4, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 12.0, - "max": 57.0, - "type": "minecraft:uniform" - } - } - ], - "name": "thermal:silver_coin" - }, - { - "type": "minecraft:item", - "weight": 3, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 11.0, - "max": 53.0, - "type": "minecraft:uniform" - } - } - ], - "name": "minecraft:gold_ingot" - }, - { - "type": "minecraft:item", - "weight": 2, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 13.0, - "type": "minecraft:uniform" - } - } - ], - "name": "thermal:silver_ingot" - }, - { - "type": "minecraft:item", - "weight": 5, - "functions": [ - { - "function": "minecraft:enchant_randomly" - } - ], - "name": "minecraft:book" - }, - { - "type": "minecraft:item", - "weight": 5, - "functions": [ - { - "function": "minecraft:enchant_with_levels", - "levels": 35, - "treasure": true - } - ], - "name": "minecraft:book" + "type": "minecraft:loot_table", + "name": "cabin:chests/the_market/patience/2" } ] } diff --git a/overrides/kubejs/data/custom/loot_tables/chests/tinker.json b/overrides/kubejs/data/custom/loot_tables/chests/tinker.json index f7f5699..ee86254 100644 --- a/overrides/kubejs/data/custom/loot_tables/chests/tinker.json +++ b/overrides/kubejs/data/custom/loot_tables/chests/tinker.json @@ -2,1067 +2,13 @@ "type": "minecraft:chest", "pools": [ { - "rolls": { - "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - }, + "rolls": 1, "entries": [ { - "type": "minecraft:tag", - "name": "tconstruct:tables", - "expand": true, - "weight": 1 - } - ] - }, - { - "rolls": { - "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:tag", - "name": "tconstruct:seared_blocks", - "expand": true, - "weight": 1 - } - ] - }, - { - "rolls": { - "min": 12.0, - "max": 18.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:pick_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:hammer_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_axe_head", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:small_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:broad_blade", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_binding", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:large_plate", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tool_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:copper\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:cobalt\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:iron\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bronze\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:rose_gold\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:silver\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:bone\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:lead\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:wood\"}" - } - ] - }, - { - "type": "minecraft:item", - "name": "tconstruct:tough_handle", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{\"Material\": \"tconstruct:flint\"}" - } - ] - } - ] - }, - { - "rolls": { - "min": 2.0, - "max": 8.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "name": "tconstruct:pattern", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } - } - ], - "weight": 1 + "type": "minecraft:loot_table", + "name": "cabin:chests/the_market/tinkerbox" } ] } ] -} \ No newline at end of file +} diff --git a/overrides/kubejs/data/expcaves/loot_tables/blocks/quartz_treasure_amphora.json b/overrides/kubejs/data/expcaves/loot_tables/blocks/quartz_treasure_amphora.json new file mode 100644 index 0000000..2865207 --- /dev/null +++ b/overrides/kubejs/data/expcaves/loot_tables/blocks/quartz_treasure_amphora.json @@ -0,0 +1,68 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "thermal:gold_coin", + "weight": 1 + }, + { + "type": "tag", + "name": "forge:treasure3", + "expand": true, + "weight": 1 + }, + { + "type": "tag", + "name": "minecraft:arrows", + "expand": true, + "weight": 1 + }, + { + "type": "item", + "name": "thermal:silver_coin", + "weight": 30, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 8 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:arrow", + "weight": 20, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:torch", + "weight": 20, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/expcaves/loot_tables/blocks/small_quartz_treasure_pot.json b/overrides/kubejs/data/expcaves/loot_tables/blocks/small_quartz_treasure_pot.json new file mode 100644 index 0000000..7868865 --- /dev/null +++ b/overrides/kubejs/data/expcaves/loot_tables/blocks/small_quartz_treasure_pot.json @@ -0,0 +1,92 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "thermal:gold_coin", + "weight": 1 + }, + { + "type": "tag", + "name": "forge:treasure3", + "expand": true, + "weight": 1 + }, + { + "type": "item", + "name": "thermal:silver_coin", + "weight": 20, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 5 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:emerald", + "weight": 4, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + } + ] + }, + { + "conditions": [ + { + "condition": "random_chance", + "chance": 0.1 + } + ], + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "minecraft:golden_carrot", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": 1 + } + ] + } + ] + }, + { + "conditions": [ + { + "condition": "random_chance", + "chance": 0.1 + } + ], + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "minecraft:golden_apple", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": 1 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/expcaves/loot_tables/blocks/small_treasure_pot.json b/overrides/kubejs/data/expcaves/loot_tables/blocks/small_treasure_pot.json new file mode 100644 index 0000000..3db3a67 --- /dev/null +++ b/overrides/kubejs/data/expcaves/loot_tables/blocks/small_treasure_pot.json @@ -0,0 +1,81 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "thermal:silver_coin", + "weight": 13 + }, + { + "type": "tag", + "name": "forge:treasure1", + "expand": true, + "weight": 1 + }, + { + "type": "item", + "name": "minecraft:dead_bush", + "weight": 1 + }, + { + "type": "item", + "name": "minecraft:string", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:feather", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:gunpowder", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:leather", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/expcaves/loot_tables/blocks/treasure_amphora.json b/overrides/kubejs/data/expcaves/loot_tables/blocks/treasure_amphora.json new file mode 100644 index 0000000..c11f42a --- /dev/null +++ b/overrides/kubejs/data/expcaves/loot_tables/blocks/treasure_amphora.json @@ -0,0 +1,68 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "minecraft:dead_bush", + "weight": 1 + }, + { + "type": "tag", + "name": "forge:treasure2", + "expand": true, + "weight": 1 + }, + { + "type": "tag", + "name": "minecraft:saplings", + "expand": true, + "weight": 1 + }, + { + "type": "item", + "name": "thermal:silver_coin", + "weight": 40, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 2 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:bone", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:stick", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/data/expcaves/loot_tables/blocks/treasure_pot.json b/overrides/kubejs/data/expcaves/loot_tables/blocks/treasure_pot.json new file mode 100644 index 0000000..63b0288 --- /dev/null +++ b/overrides/kubejs/data/expcaves/loot_tables/blocks/treasure_pot.json @@ -0,0 +1,82 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "thermal:silver_coin", + "weight": 30, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 2 + } + } + ] + }, + { + "type": "tag", + "name": "forge:treasure1", + "expand": true, + "weight": 1 + }, + { + "type": "tag", + "name": "forge:treasure2", + "expand": true, + "weight": 1 + }, + { + "type": "item", + "name": "minecraft:dead_bush", + "weight": 1 + }, + { + "type": "item", + "name": "minecraft:carrot", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:potato", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + }, + { + "type": "item", + "name": "minecraft:apple", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/loot.js b/overrides/kubejs/server_scripts/loot.js index 335227f..f2300a6 100644 --- a/overrides/kubejs/server_scripts/loot.js +++ b/overrides/kubejs/server_scripts/loot.js @@ -163,4 +163,119 @@ onEvent('block.loot_tables', event => { event.addJson(TE('lead_ore'), metal_ores_drop_dust(TE('lead_ore'), CR('crushed_raw_lead'))) event.addJson(TE('deepslate_lead_ore'), metal_ores_drop_dust(TE('deepslate_lead_ore'), CR('crushed_raw_lead'))) + // --- Fixing Expanded Caves' buggy loot tables --- + //remove plant fibre from expanded caves drops since it has no uses + let shears_drops_self = { + type: "minecraft:block", + pools: [ + { + rolls: 1, + bonus_rolls: 0, + entries: [ + { + type: "minecraft:item", + name: "expcaves:dry_moss", + conditions: [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + } + ] + } + ] + } + ] + } + + event.addJson("expcaves:dry_moss", shears_drops_self) + shears_drops_self.pools[0].entries[0].name = "expcaves:cave_vine_end" + event.addJson("expcaves:cave_vine", shears_drops_self) + event.addJson("expcaves:cave_vine_end", shears_drops_self) + + //stalactites with broken drops + let stalagmite = { + type: "minecraft:block", + pools: [ + { + rolls: 1, + bonus_rolls: 0, + entries: [ + { + type: "minecraft:alternatives", + children: [ + { + type: "minecraft:item", + name: "expcaves:packed_ice_stalagmite", + conditions: [ + { + condition: "minecraft:match_tool", + predicate: { + enchantments: [ + { + enchantment: "minecraft:silk_touch", + levels: { + min: 1 + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } + + event.addJson("expcaves:packed_ice_stalagmite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:packed_ice_stalactite" + event.addJson("expcaves:packed_ice_stalactite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:packed_ice_tall_stalagmite" + event.addJson("expcaves:packed_ice_tall_stalagmite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:packed_ice_tall_stalactite" + event.addJson("expcaves:packed_ice_tall_stalactite", stalagmite) + + stalagmite.pools[0].entries[0].children.push({ + type: "minecraft:item", + name: "expcaves:netherrack_pebble", + functions: [ + { + function: "minecraft:set_count", + count: 3 + } + ], + conditions: [ + { + condition: "minecraft:survives_explosion" + } + ] + }) + + stalagmite.pools[0].entries[0].children[0].name = "expcaves:netherrack_stalagmite" + event.addJson("expcaves:netherrack_stalagmite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:netherrack_stalactite" + event.addJson("expcaves:netherrack_stalactite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:netherrack_tall_stalagmite" + stalagmite.pools[0].entries[0].children[1].functions[0].count = 5 + event.addJson("expcaves:netherrack_tall_stalagmite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:netherrack_tall_stalactite" + event.addJson("expcaves:netherrack_tall_stalactite", stalagmite) + + stalagmite.pools[0].entries[0].children[1].name = "expcaves:blackstone_pebble" + stalagmite.pools[0].entries[0].children[1].functions[0].count = 3 + stalagmite.pools[0].entries[0].children[0].name = "expcaves:blackstone_stalagmite" + event.addJson("expcaves:blackstone_stalagmite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:blackstone_stalactite" + event.addJson("expcaves:blackstone_stalactite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:blackstone_tall_stalagmite" + stalagmite.pools[0].entries[0].children[1].functions[0].count = 5 + event.addJson("expcaves:blackstone_tall_stalagmite", stalagmite) + stalagmite.pools[0].entries[0].children[0].name = "expcaves:blackstone_tall_stalactite" + event.addJson("expcaves:blackstone_tall_stalactite", stalagmite) }) \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/recipes.js b/overrides/kubejs/server_scripts/recipes.js index de79591..bea38e7 100644 --- a/overrides/kubejs/server_scripts/recipes.js +++ b/overrides/kubejs/server_scripts/recipes.js @@ -96,6 +96,7 @@ onEvent('recipes', event => { trading(event) glitch(event) stripping(event) + expandCaves(event) log.push('Recipes Updated') }) @@ -327,7 +328,7 @@ function beforeNuke(event) { } function unwantedRecipes(event) { - event.remove({ output: AE2('grindstone') }) + event.remove({ id:'ftbquests:loot_crate_opener'}) event.remove({ output: TE('tin_block') }) event.remove({ output: AE2('vibration_chamber') }) event.remove({ output: AE2('inscriber') }) @@ -340,7 +341,6 @@ function unwantedRecipes(event) { event.remove({ input: '#forge:ores/silver' }) event.remove({ output: '#forge:plates/tin' }) event.remove({ output: '#forge:gears/tin' }) - event.remove({ type: AE2('grinder') }) event.remove({ type: TE('press') }) event.remove({ id: /thermal:earth_charge\/.*/ }) event.remove({ id: /thermal:machines\/smelter\/.*dust/ }) @@ -376,8 +376,12 @@ function unwantedRecipes(event) { event.remove({ id: CR('cutting/andesite_alloy') }) event.remove({ id: QU('building/crafting/compressed/charcoal_block')}) event.remove({ id: QU('building/crafting/compressed/sugar_cane_block')}) - event.remove({ id: TE('building/crafting/compressed/bamboo_block')}) event.remove({ id: QU('building/crafting/compressed/gunpowder_sack')}) + event.remove({ id: QU('building/crafting/compressed/apple_crate')}) + event.remove({ id: QU('building/crafting/compressed/potato_crate')}) + event.remove({ id: QU('building/crafting/compressed/carrot_crate')}) + event.remove({ id: QU('building/crafting/compressed/beetroot_crate')}) + event.remove({ id: TE('building/crafting/compressed/bamboo_block')}) event.remove({ id: TE('storage/silver_block')}) event.remove({ id: TE('storage/silver_ingot_from_block')}) event.remove({ id: TE('storage/silver_ingot_from_nuggets')}) @@ -436,6 +440,10 @@ function unwantedRecipes(event) { }) event.remove({ id: TE('smelting/silver_ingot_from_dust_smelting')}) event.remove({ id: TE('smelting/silver_ingot_from_dust_blasting')}) + //Remove Tconstruct cheese since it only costs milk to craft and cheese already exists on the moon. + event.remove({ id: TC('smeltery/casting/cheese_block')}) + event.remove({ id: TC('smeltery/casting/cheese_ingot_gold_cast')}) + event.remove({ id: TC('smeltery/casting/cheese_ingot_sand_cast')}) } function tweaks(event) { @@ -668,13 +676,57 @@ function tweaks(event) { bedrock_cobblegen(MC("packed_ice"), MC("andesite")) bedrock_cobblegen(AP("polished_packed_ice"), MC("granite")) bedrock_cobblegen(AP("chiseled_packed_ice"), MC("diorite")) - bedrock_cobblegen(AP("packed_ice_pillar"), CR("scoria")) + + event.custom({ + "type": "thermal:rock_gen", + "adjacent": "create:chocolate", + "result": { "item": "create:scoria"} + }) + event.custom({ + "type": "thermal:rock_gen", + "adjacent": "create:honey", + "result": { "item": "create:limestone"} + }) + event.custom({ + "type": "thermal:rock_gen", + "adjacent": "biomesoplenty:blood", + "result": { "item": "biomesoplenty:flesh"} + }) + + event.custom({ + "type": "thermal:rock_gen", + "adjacent": "kubejs:chromatic_waste", + "below": "minecraft:end_stone", + "result": { "item": "quark:myalite"} + }) + event.custom({ + "type": "thermal:rock_gen", + "adjacent": "kubejs:chromatic_waste", + "below": "minecraft:clay", + "result": { "item": "quark:shale"} + }) + event.custom({ + "type": "thermal:rock_gen", + "adjacent": "kubejs:chromatic_waste", + "below": "minecraft:quartz_block", + "result": { "item": "quark:jasper"} + }) + event.custom({ + "type": "architects_palette:warping", + "ingredient": [ + { + "item": "create:limestone" + } + ], + "result": { + "item": "quark:limestone" + }, + "dimension": "minecraft:the_nether" + }) event.recipes.createPressing([TE('nickel_plate')], TE('nickel_ingot')) -// event.remove({ id: "chisel:charcoal/raw" }) event.remove({ id: AP("charcoal_block") }) -// event.stonecutting("chisel:charcoal/raw", MC('charcoal')) event.stonecutting(AP("charcoal_block"), MC('charcoal')) event.remove({ id: CR('splashing/gravel') }) @@ -739,59 +791,16 @@ function tweaks(event) { "energy": 6000 }) - - let cast_block = (fluid, item) => { - event.custom({ - "type": "tconstruct:casting_basin", - "fluid": { "name": fluid, "amount": 810 }, - "result": { "item": item }, - "cooling_time": 150 - }) - } - - let cast = (type, fluid, amount, item, time) => { - event.custom({ - "type": "tconstruct:casting_table", - "cast": { "tag": "tconstruct:casts/single_use/" + type }, - "cast_consumed": true, - "fluid": { "name": fluid, "amount": amount }, - "result": { "item": item }, - "cooling_time": time - }) - event.custom({ - "type": "tconstruct:casting_table", - "cast": { "tag": "tconstruct:casts/multi_use/" + type }, - "fluid": { "name": fluid, "amount": amount }, - "result": { "item": item }, - "cooling_time": time - }) - } - - let remove_cast = (name) => { - event.remove({ id: `${TC(name)}_sand_cast`}) - event.remove({ id:`${TC(name)}_gold_cast`}) - } - event.remove({ id: TE("storage/copper_nugget_from_ingot")}) event.remove({ id: TC("common/materials/copper_nugget_from_ingot")}) event.remove({ id: TE("storage/copper_ingot_from_nuggets")}) event.remove({ id: TC("common/materials/copper_ingot_from_nuggets")}) - remove_cast("smeltery/casting/metal/copper/nugget") - - cast("nugget", TC("molten_copper"), 10, CR("copper_nugget"), 17) - event.remove({ id: TE("storage/netherite_nugget_from_ingot")}) event.remove({ id: TC("common/materials/netherite_nugget_from_ingot")}) event.remove({ id: TE("storage/netherite_ingot_from_nuggets")}) event.remove({ id: TC("common/materials/netherite_ingot_from_nuggets")}) - remove_cast("smeltery/casting/metal/netherite/nugget") - remove_cast("smeltery/casting/metal/netherite/plate") - - cast("nugget", TC("molten_netherite"), 10, CD("netherite_nugget"), 17) - cast("plate", TC("molten_netherite"), 90, CD("netherite_sheet"), 75) - event.remove({id: "alloyed:mixing/bronze_ingot"}) event.remove({id: "alloyed:mixing/bronze_ingot_x3"}) @@ -800,16 +809,6 @@ function tweaks(event) { event.remove({ id: TE('storage/bronze_ingot_from_block')}) event.remove({ id: TE('storage/bronze_block')}) - remove_cast("smeltery/casting/metal/bronze/nugget") - remove_cast("smeltery/casting/metal/bronze/ingot") - remove_cast("smeltery/casting/metal/bronze/plate") - event.remove({ id: TC("smeltery/casting/metal/bronze/block")}) - - cast("nugget", TC("molten_bronze"), 10, "alloyed:bronze_nugget", 17) - cast("ingot", TC("molten_bronze"), 90, "alloyed:bronze_ingot", 50) - cast("plate", TC("molten_bronze"), 90, "alloyed:bronze_sheet", 50) - cast_block(TC("molten_bronze"), "alloyed:bronze_block") - event.custom({ "type": "tconstruct:melting", "ingredient": { @@ -1460,19 +1459,19 @@ function algalAndesite(event) { 'SS', 'AA' ], { - A: ['minecraft:andesite', CR('andesite_cobblestone')], + A: 'minecraft:andesite', S: AP('algal_brick') }) event.shaped(Item.of(CR('andesite_alloy'), 2), [ 'AA', 'SS' ], { - A: ['minecraft:andesite', CR('andesite_cobblestone')], + A: 'minecraft:andesite', S: AP('algal_brick') }) event.recipes.createMixing(Item.of(AP('algal_blend'), 2), ['minecraft:clay_ball', ['minecraft:kelp', 'minecraft:seagrass']]) - event.recipes.createMixing(Item.of(CR('andesite_alloy'), 2), [AP('algal_brick'), ['minecraft:andesite', CR('andesite_cobblestone')]]) + event.recipes.createMixing(Item.of(CR('andesite_alloy'), 2), [AP('algal_brick'), 'minecraft:andesite']) } function oreProcessing(event) { @@ -1660,10 +1659,15 @@ function alloys(event) { event.remove({ type: MC("crafting_shapeless"), output: TE('bronze_dust') }) event.remove({ type: MC("crafting_shapeless"), output: TE('invar_dust') }) - event.recipes.createMixing(Fluid.of(TC('molten_brass'), 3), [Fluid.of(TC('molten_copper'), 3), Fluid.of(TC('molten_zinc'), 3)]).processingTime(1) - event.recipes.createMixing(Fluid.of(TC('molten_constantan'), 3), [Fluid.of(TC('molten_copper'), 3), Fluid.of(TC('molten_nickel'), 3)]).processingTime(1) - event.recipes.createMixing(Fluid.of(TC('molten_rose_gold'), 3), [Fluid.of(TC('molten_copper'), 3), Fluid.of(TC('molten_gold'), 3)]).processingTime(1) - event.recipes.createMixing(Fluid.of(TC('molten_electrum'), 3), [Fluid.of(TC('molten_silver'), 3), Fluid.of(TC('molten_gold'), 3)]).processingTime(1) + let moltenAlloy = function (fluidAlloy, fluid1, fluid2) { + //Recipe ids are actually important here since the id that comes later in alphabetical order is the one that is prioritized + event.recipes.createMixing(Fluid.of(TC(fluidAlloy), 3), [Fluid.of(fluid1, 3), Fluid.of(fluid2, 3)]).processingTime(1).id(`kubejs:mixing/${fluidAlloy}_3`) + event.recipes.createMixing(Fluid.of(TC(fluidAlloy), 1), [Fluid.of(fluid1, 1), Fluid.of(fluid2, 1)]).processingTime(1).id(`kubejs:mixing/${fluidAlloy}_1`) + } + moltenAlloy('molten_brass', TC('molten_copper'), TC('molten_zinc')) + moltenAlloy('molten_constantan', TC('molten_copper'), TC('molten_nickel')) + moltenAlloy('molten_rose_gold', TC('molten_copper'), TC('molten_gold')) + moltenAlloy('molten_electrum', TC('molten_silver'), TC('molten_gold')) event.recipes.thermal.smelter([KJ("invar_compound"), KJ("invar_compound")], [TE("nickel_ingot"), MC("iron_ingot")]) event.recipes.thermal.smelter(CR("brass_ingot", 2), [MC("copper_ingot"), CR("zinc_ingot")]) @@ -3082,6 +3086,64 @@ function stripping(event) { }) } +function expandCaves(event) { + // Expanded Caves --- This mod is alpha and it really shows in some places + //Dev forgot to add pressure plate recipes to the mod so we add them ourselves. + let pressurePlateMaterials = ["sediment_stone", "lavastone", "polished_lavastone", "dirtstone", "dirtstone_cobble", "marlstone", "bricks_ice", "bricks_snow"] + pressurePlateMaterials.forEach(str=>{ + event.shaped(`expcaves:${str}_pressure_plate`, [ + 'SS' + ], { + S: `expcaves:${str}` + }).id(`kubejs:expcaves/${str}_pressure_plate`) + }) + + //snow and ice brick --- these are probably intended for the structures that never got ported. But we'll give them recipes + event.shaped(Item.of('expcaves:bricks_snow',4), [ + 'SS', + 'SS' + ], { + S: `minecraft:snow_block` + }).id(`kubejs:expcaves/bricks_snow`) + + event.shaped(Item.of('expcaves:bricks_ice',4), [ + 'SS', + 'SS' + ], { + S: `architects_palette:polished_packed_ice` + }).id(`kubejs:expcaves/bricks_ice`) + + //broken stone + event.recipes.createPressing(['expcaves:broken_stone'], 'minecraft:stone').id('kubejs:pressing/broken_stone') + event.recipes.createPressing(['expcaves:broken_deepslate'], 'minecraft:deepslate').id('kubejs:pressing/broken_deepslate') + + //flint rock + event.custom({ "type": "create:haunting", + "ingredients": [{"item": "minecraft:flint"}], + "results": [ + { + "item": "expcaves:rock_flint" + } + ] + }).id('kubejs:haunting/rock_flint') + + //stalagmites + let stalagmites = ["stone", "andesite", "diorite", "granite", "tuff", "deepslate", "packed_ice", "netherrack", "blackstone"] + stalagmites.forEach(str=>{ + event.stonecutting(Item.of(`expcaves:${str}_stalagmite`, 2), `minecraft:${str}`).id(`kubejs:stonecutting/${str}_stalagmite`) + event.stonecutting(Item.of(`expcaves:${str}_stalactite`, 2), `minecraft:${str}`).id(`kubejs:stonecutting/${str}_stalactite`) + event.stonecutting(`expcaves:${str}_tall_stalagmite`, `minecraft:${str}`).id(`kubejs:stonecutting/${str}_tall_stalagmite`) + event.stonecutting(`expcaves:${str}_tall_stalactite`, `minecraft:${str}`).id(`kubejs:stonecutting/${str}_tall_stalactite`) + }) + stalagmites = ["sediment_stone", "lavastone"] + stalagmites.forEach(str=>{ + event.stonecutting(Item.of(`expcaves:${str}_stalagmite`, 2), `expcaves:${str}`).id(`kubejs:stonecutting/${str}_stalagmite`) + event.stonecutting(Item.of(`expcaves:${str}_stalactite`, 2), `expcaves:${str}`).id(`kubejs:stonecutting/${str}_stalactite`) + event.stonecutting(`expcaves:${str}_tall_stalagmite`, `expcaves:${str}`).id(`kubejs:stonecutting/${str}_tall_stalagmite`) + event.stonecutting(`expcaves:${str}_tall_stalactite`, `expcaves:${str}`).id(`kubejs:stonecutting/${str}_tall_stalactite`) + }) +} + // Program //event.listen('player.chat', function (event) { diff --git a/overrides/kubejs/server_scripts/tags.js b/overrides/kubejs/server_scripts/tags.js index b8cae92..946019b 100644 --- a/overrides/kubejs/server_scripts/tags.js +++ b/overrides/kubejs/server_scripts/tags.js @@ -6,12 +6,39 @@ onEvent('item.tags', event => { event.add('forge:dusts/obsidian', 'create:powdered_obsidian') event.add('forge:dusts', 'create:powdered_obsidian') + + //Fixes copper dupe. + event.remove('forge:storage_blocks/copper', 'minecraft:cut_copper'); +}) + +//for some inexplicable reason these need to be kept in seperate onEvent triggers. +//I've been told that this is some Rino (compiler) jank +onEvent('item.tags', event => { + global.itemBlacklist.forEach(item=>{ + if (Item.exists(item)) { + event.add('randomium:blacklist', item) + } else { + console.warn(`Failed to add \"randomium:blacklist\" tag to ${item} from randomium blacklist`) + } + }) +}) +onEvent('item.tags', event => { + global.randomiumBlacklist.forEach(item=>{ + if (Item.exists(item)) { + event.add('randomium:blacklist', item) + } else { + console.warn(`Failed to add \"randomium:blacklist\" tag to ${item} from randomium blacklist`) + } + }) }) onEvent('block.tags', event => { event.add('minecraft:beacon_base_blocks', 'alloyed:steel_block') event.remove('minecraft:beacon_base_blocks', 'thermal:bronze_block') + //Not sure if anything checks for this block tag but don't want to risk it. + event.remove('forge:storage_blocks/copper', 'minecraft:cut_copper'); + //I don't know why this isn't wrenchable by default event.add("create:wrench_pickup", "minecraft:note_block") diff --git a/overrides/kubejs/startup_scripts/blacklist.js b/overrides/kubejs/startup_scripts/blacklist.js new file mode 100644 index 0000000..0f8cd24 --- /dev/null +++ b/overrides/kubejs/startup_scripts/blacklist.js @@ -0,0 +1,1007 @@ +// priority: 100 + +//Global blacklist for items that will be hidden from jei and removed from randomium ore +global.itemBlacklist = [ + + //ftbquests + 'ftbquests:missing_item', + 'ftbquests:custom_icon', + 'ftbquests:barrier', + 'ftbquests:stage_barrier', + 'ftbquests:detector', + 'ftbquests:lootcrate', + 'ftbquests:loot_crate_opener', + + //itemfilters + 'itemfilters:always_true', + 'itemfilters:mod', + 'itemfilters:tag', + 'itemfilters:xor', + 'itemfilters:not', + 'itemfilters:and', + 'itemfilters:or', + 'itemfilters:always_false', + 'itemfilters:item_group', + 'itemfilters:id_regex', + 'itemfilters:damage', + 'itemfilters:block', + 'itemfilters:max_count', + 'itemfilters:strong_nbt', + 'itemfilters:weak_nbt', + 'itemfilters:custom', + + //ae2 + 'ae2:inscriber', + 'ae2:vibration_chamber', + 'ae2:white_paint_ball', + 'ae2:light_blue_paint_ball', + 'ae2:lime_paint_ball', + 'ae2:pink_paint_ball', + 'ae2:gray_paint_ball', + 'ae2:light_gray_paint_ball', + 'ae2:cyan_paint_ball', + 'ae2:purple_paint_ball', + 'ae2:brown_paint_ball', + 'ae2:black_paint_ball', + 'ae2:white_lumen_paint_ball', + 'ae2:orange_lumen_paint_ball', + 'ae2:magenta_lumen_paint_ball', + 'ae2:light_blue_lumen_paint_ball', + 'ae2:purple_lumen_paint_ball', + 'ae2:cyan_lumen_paint_ball', + 'ae2:gray_lumen_paint_ball', + 'ae2:pink_lumen_paint_ball', + 'ae2:lime_lumen_paint_ball', + 'ae2:yellow_lumen_paint_ball', + 'ae2:light_gray_lumen_paint_ball', + 'ae2:orange_paint_ball', + 'ae2:blue_lumen_paint_ball', + 'ae2:brown_lumen_paint_ball', + 'ae2:red_lumen_paint_ball', + 'ae2:green_lumen_paint_ball', + 'ae2:black_lumen_paint_ball', + + //Architect's palette + 'architects_palette:withered_bone', + + //Beyond Earth + 'beyond_earth:mars_globe', + 'beyond_earth:mars_stone', + 'beyond_earth:mars_stone_bricks', + 'beyond_earth:cracked_mars_stone_bricks', + 'beyond_earth:mars_stone_brick_slab', + 'beyond_earth:mars_stone_brick_stairs', + 'beyond_earth:mars_sand', + 'beyond_earth:mars_iron_ore', + 'beyond_earth:mars_diamond_ore', + 'beyond_earth:mars_ostrum_ore', + 'beyond_earth:mars_ice_shard_ore', + 'beyond_earth:venus_globe', + 'beyond_earth:venus_stone', + 'beyond_earth:venus_stone_bricks', + 'beyond_earth:cracked_venus_stone_bricks', + 'beyond_earth:venus_stone_brick_slab', + 'beyond_earth:venus_stone_brick_stairs', + 'beyond_earth:venus_sandstone', + 'beyond_earth:venus_sandstone_bricks', + 'beyond_earth:cracked_venus_sandstone_bricks', + 'beyond_earth:venus_sandstone_brick_slab', + 'beyond_earth:venus_sandstone_brick_stairs', + 'beyond_earth:venus_sand', + 'beyond_earth:venus_coal_ore', + 'beyond_earth:venus_gold_ore', + 'beyond_earth:venus_diamond_ore', + 'beyond_earth:venus_calorite_ore', + 'beyond_earth:mercury_globe', + 'beyond_earth:mercury_stone', + 'beyond_earth:mercury_stone_bricks', + 'beyond_earth:cracked_mercury_stone_bricks', + 'beyond_earth:mercury_stone_brick_slab', + 'beyond_earth:mercury_stone_brick_stairs', + 'beyond_earth:mercury_iron_ore', + 'beyond_earth:glacio_globe', + 'beyond_earth:glacio_stone', + 'beyond_earth:glacio_stone_bricks', + 'beyond_earth:cracked_glacio_stone_bricks', + 'beyond_earth:glacio_stone_brick_slab', + 'beyond_earth:glacio_stone_brick_stairs', + 'beyond_earth:glacio_ice_shard_ore', + 'beyond_earth:glacio_coal_ore', + 'beyond_earth:glacio_copper_ore', + 'beyond_earth:glacio_iron_ore', + 'beyond_earth:glacio_lapis_ore', + "beyond_earth:steel_ingot", + "beyond_earth:steel_nugget", + "beyond_earth:steel_tank", + "beyond_earth:steel_engine", + 'beyond_earth:ostrum_ingot', + 'beyond_earth:ostrum_nugget', + 'beyond_earth:raw_ostrum', + 'beyond_earth:ostrum_block', + 'beyond_earth:raw_ostrum_block', + 'beyond_earth:molten_ostrum_bucket', + 'beyond_earth:calorite_ingot', + 'beyond_earth:calorite_nugget', + 'beyond_earth:raw_calorite', + 'beyond_earth:calorite_block', + 'beyond_earth:raw_calorite_block', + 'beyond_earth:molten_calorite_bucket', + 'beyond_earth:compressed_steel', + 'beyond_earth:compressed_desh', + 'beyond_earth:compressed_ostrum', + 'beyond_earth:compressed_calorite', + 'beyond_earth:engine_frame', + 'beyond_earth:engine_fan', + 'beyond_earth:desh_engine', + 'beyond_earth:ostrum_engine', + 'beyond_earth:calorite_engine', + 'beyond_earth:desh_tank', + 'beyond_earth:ostrum_tank', + 'beyond_earth:calorite_tank', + 'beyond_earth:infernal_spire_block', + 'beyond_earth:sky_stone', + 'beyond_earth:permafrost', + 'beyond_earth:wheel', + 'beyond_earth:rocket_fin', + 'beyond_earth:rocket_nose_cone', + 'beyond_earth:oxygen_tank', + 'beyond_earth:oxygen_gear', + 'beyond_earth:hammer', + 'beyond_earth:iron_plate', + 'beyond_earth:coal_generator', + 'beyond_earth:compressor', + 'beyond_earth:fuel_refinery', + 'beyond_earth:solar_panel', + 'beyond_earth:water_pump', + 'beyond_earth:nasa_workbench', + 'beyond_earth:rover', + 'beyond_earth:rocket_t2', + 'beyond_earth:rocket_t3', + 'beyond_earth:rocket_t4', + + //Biomes O' Plenty + 'biomesoplenty:blood', /* Not the fluid but the item. Use buckets to place this instead */ + + //Create + 'create:crushed_raw_tin', + 'create:crushed_raw_osmium', + 'create:crushed_raw_platinum', + 'create:crushed_raw_silver', + 'create:crushed_raw_quicksilver', + 'create:crushed_raw_aluminum', + 'create:crushed_raw_uranium', + 'create:sturdy_sheet', + 'create:unprocessed_obsidian_sheet', + + //Create Deco + 'createdeco:copper_coin', + 'createdeco:copper_coinstack', + 'createdeco:zinc_coin', + 'createdeco:zinc_coinstack', + 'createdeco:brass_coin', + 'createdeco:brass_coinstack', + 'createdeco:iron_coin', + 'createdeco:iron_coinstack', + 'createdeco:cast_iron_coin', + 'createdeco:cast_iron_coinstack', + 'createdeco:gold_coin', + 'createdeco:gold_coinstack', + 'createdeco:netherite_coin', + 'createdeco:netherite_coinstack', + + //Incomplete assemblies + 'railways:white_incomplete_conductor_cap', + 'railways:orange_incomplete_conductor_cap', + 'railways:magenta_incomplete_conductor_cap', + 'railways:light_blue_incomplete_conductor_cap', + 'railways:yellow_incomplete_conductor_cap', + 'railways:lime_incomplete_conductor_cap', + 'railways:pink_incomplete_conductor_cap', + 'railways:gray_incomplete_conductor_cap', + 'railways:light_gray_incomplete_conductor_cap', + 'railways:cyan_incomplete_conductor_cap', + 'railways:purple_incomplete_conductor_cap', + 'railways:blue_incomplete_conductor_cap', + 'railways:brown_incomplete_conductor_cap', + 'railways:green_incomplete_conductor_cap', + 'railways:red_incomplete_conductor_cap', + 'railways:black_incomplete_conductor_cap', + 'railways:track_incomplete_acacia', + 'railways:track_incomplete_jungle', + 'railways:track_incomplete_oak', + 'railways:track_incomplete_crimson', + 'railways:track_incomplete_monorail', + 'railways:track_incomplete_blackstone', + 'railways:track_incomplete_phantom', + 'railways:track_incomplete_birch', + 'railways:track_incomplete_warped', + 'railways:track_incomplete_ender', + 'railways:track_incomplete_dark_oak', + 'railways:track_incomplete_spruce', + 'railways:track_incomplete_tieless', + 'railways:track_incomplete_biomesoplenty_cherry', + 'railways:track_incomplete_biomesoplenty_dead', + 'railways:track_incomplete_biomesoplenty_fir', + 'railways:track_incomplete_biomesoplenty_hellbark', + 'railways:track_incomplete_biomesoplenty_jacaranda', + 'railways:track_incomplete_biomesoplenty_magic', + 'railways:track_incomplete_biomesoplenty_mahogany', + 'railways:track_incomplete_biomesoplenty_palm', + 'railways:track_incomplete_biomesoplenty_redwood', + 'railways:track_incomplete_biomesoplenty_umbran', + 'railways:track_incomplete_biomesoplenty_willow', + 'kubejs:incomplete_calculation_processor', + 'kubejs:incomplete_logic_processor', + 'kubejs:incomplete_engineering_processor', + 'kubejs:incomplete_kinetic_mechanism', + 'kubejs:incomplete_sealed_mechanism', + 'kubejs:incomplete_reinforced_mechanism', + 'kubejs:incomplete_infernal_mechanism', + 'kubejs:incomplete_inductive_mechanism', + 'kubejs:incomplete_abstruse_mechanism', + 'kubejs:incomplete_calculation_mechanism', + 'kubejs:incomplete_coke_chunk', + 'create:incomplete_precision_mechanism', + 'create:incomplete_track', + 'create_central_kitchen:incomplete_egg_sandwich', + 'create_central_kitchen:incomplete_chicken_sandwich', + 'create_central_kitchen:incomplete_hamburger', + 'create_central_kitchen:incomplete_bacon_sandwich', + 'create_central_kitchen:incomplete_mutton_wrap', + 'create_central_kitchen:incomplete_apple_pie', + 'create_central_kitchen:incomplete_sweet_berry_cheesecake', + 'create_central_kitchen:incomplete_pumpkin_pie', + 'create_central_kitchen:incomplete_cherry_pie', + 'create_central_kitchen:incomplete_truffle_pie', + 'create_central_kitchen:incomplete_mulberry_pie', + + //Decorative Blocks + 'decorative_blocks:blockstate_copy_item', + + //everycomp + 'everycomp:q/forbidden_arcanus/mysterywood_chest', + 'everycomp:q/forbidden_arcanus/mysterywood_trapped_chest', + + //Expanded Caves + 'expcaves:plant_fiber', //useless inventory bloat + /* There next few items don't seem to generate for whatever reason. + Let the CABIN discord know if you somehow find these in your world */ + 'expcaves:sweetshroom', + 'expcaves:goldishroom', + 'expcaves:shinyshroom', + 'expcaves:lumishroom', + 'expcaves:fluoshroom', + 'expcaves:rockshroom', + 'expcaves:cooked_sweetshroom', + 'expcaves:sticky_stew', + 'expcaves:fluorescent_stew', + 'expcaves:hard_stew', + /* unobtainable, probably meant to come from structures that aren't in this version */ + 'expcaves:butcher_knife', + 'expcaves:chef_knife', + 'expcaves:gourmet_fork', + 'expcaves:gourmet_spoon', + 'expcaves:iron_dagger', + 'expcaves:rusty_sword', + 'expcaves:rusty_pickaxe', + 'expcaves:wooden_cane', + /* unobtainable brown endstone */ + 'expcaves:dirtstone_cobble', + 'expcaves:dirtstone_cobble_stairs', + 'expcaves:dirtstone_cobble_slab', + 'expcaves:dirtstone_cobble_button', + 'expcaves:dirtstone_cobble_pressure_plate', + 'expcaves:dirtstone_cobble_wall', + + //Extended Gears + 'extendedgears:half_shaft_cogwheel', + 'extendedgears:shaftless_cogwheel', + 'extendedgears:large_half_shaft_cogwheel', + 'extendedgears:large_shaftless_cogwheel', + + //Forbidden Arcanus + 'forbidden_arcanus:edelwood_bucket', + 'forbidden_arcanus:edelwood_tropical_fish_bucket', + 'forbidden_arcanus:edelwood_magma_cube_bucket', + 'forbidden_arcanus:edelwood_slime_bucket', + 'forbidden_arcanus:edelwood_lava_bucket', + 'forbidden_arcanus:edelwood_suspicious_stew_bucket', + 'forbidden_arcanus:edelwood_chicken_bucket', + 'forbidden_arcanus:edelwood_mushroom_stew_bucket', + 'forbidden_arcanus:edelwood_water_bucket', + 'forbidden_arcanus:edelwood_milk_bucket', + 'forbidden_arcanus:edelwood_beetroot_soup_bucket', + 'forbidden_arcanus:edelwood_bat_soup_bucket', + 'forbidden_arcanus:edelwood_pufferfish_bucket', + 'forbidden_arcanus:edelwood_salmon_bucket', + 'forbidden_arcanus:edelwood_bat_bucket', + 'forbidden_arcanus:edelwood_squid_bucket', + 'forbidden_arcanus:edelwood_cod_bucket', + + //Grapple Mod + 'grapplemod:rocketupgradeitem', + 'grapplemod:forcefieldupgradeitem', + 'grapplemod:repeller', + + //kubejs + 'kubejs:failed_alchemy_1', + 'kubejs:failed_alchemy_2', + 'kubejs:failed_alchemy_3', + 'kubejs:failed_alchemy_4', + 'kubejs:failed_alchemy_5', + 'kubejs:failed_alchemy_6', + 'kubejs:failed_alchemy_7', + 'kubejs:failed_alchemy_8', + 'kubejs:failed_alchemy_9', + 'kubejs:failed_alchemy_10', + 'kubejs:failed_alchemy_11', + 'kubejs:failed_alchemy_12', + 'kubejs:failed_alchemy_13', + 'kubejs:failed_alchemy_14', + 'kubejs:ponder_laser_lamp', + 'kubejs:ponder_laser_lamp_on', + 'kubejs:silver_coin', + 'kubejs:gold_coin', + + //metal barrels + 'metalbarrels:wood_to_diamond', + 'metalbarrels:wood_to_obsidian', + 'metalbarrels:wood_to_netherite', + 'metalbarrels:copper_to_iron', + 'metalbarrels:copper_to_silver', + 'metalbarrels:copper_to_gold', + 'metalbarrels:copper_to_diamond', + 'metalbarrels:copper_to_obsidian', + 'metalbarrels:iron_to_silver', + 'metalbarrels:iron_to_gold', + 'metalbarrels:iron_to_diamond', + 'metalbarrels:iron_to_obsidian', + 'metalbarrels:wood_to_crystal', + 'metalbarrels:diamond_to_obsidian', + 'metalbarrels:gold_to_obsidian', + 'metalbarrels:gold_to_diamond', + 'metalbarrels:silver_to_obsidian', + 'metalbarrels:silver_to_diamond', + 'metalbarrels:silver_to_gold', + 'metalbarrels:copper_to_crystal', + 'metalbarrels:iron_to_crystal', + 'metalbarrels:silver_to_crystal', + 'metalbarrels:gold_to_crystal', + 'metalbarrels:diamond_to_crystal', + 'metalbarrels:crystal_barrel', + 'metalbarrels:diamond_barrel', + 'metalbarrels:obsidian_barrel', + 'metalbarrels:netherite_barrel', + 'metalbarrels:obsidian_to_netherite', + + //Occultism + 'occultism:obsidian_dust', + 'occultism:raw_silver', + 'occultism:silver_ingot', + 'occultism:silver_nugget', + 'occultism:silver_ore', + 'occultism:silver_ore_deepslate', + 'occultism:iron_dust', + 'occultism:gold_dust', + 'occultism:copper_dust', + 'occultism:silver_dust', + 'occultism:debug_foliot_lumberjack', + 'occultism:debug_foliot_transport_items', + 'occultism:debug_foliot_cleaner', + 'occultism:debug_foliot_trader', + 'occultism:debug_djinni_manage_machine', + 'occultism:debug_djinni_test', + 'occultism:lighted_air', + 'occultism:jei_dummy/none', + 'occultism:jei_dummy/require_sacrifice', + 'occultism:jei_dummy/require_item_use', + + //Pretty Pipes + 'prettypipes:blank_module', + + //projectred core + 'projectred_core:ruby', + 'projectred_core:sapphire', + 'projectred_core:peridot', + 'projectred_core:electrotine_ingot', + 'projectred_core:electrotine_dust', + 'projectred_core:electrotine_iron_comp', + 'projectred_core:conductive_plate', + 'projectred_core:wired_plate', + 'projectred_core:bundled_plate', + 'projectred_core:anode', + 'projectred_core:cathode', + 'projectred_core:pointer', + 'projectred_core:silicon_chip', + 'projectred_core:energized_silicon_chip', + 'projectred_core:red_iron_comp', + 'projectred_core:sand_coal_comp', + 'projectred_core:boule', + 'projectred_core:silicon', + 'projectred_core:red_silicon_comp', + 'projectred_core:glow_silicon_comp', + 'projectred_core:electrotine_silicon_comp', + 'projectred_core:infused_silicon', + 'projectred_core:energized_silicon', + 'projectred_core:electrotine_silicon', + 'projectred_core:copper_coil', + 'projectred_core:iron_coil', + 'projectred_core:gold_coil', + 'projectred_core:motor', + 'projectred_core:woven_cloth', + 'projectred_core:sail', + 'projectred_core:draw_plate', + 'projectred_core:multimeter', + + //Project red Transmission + 'projectred_transmission:low_load_power_wire', + 'projectred_transmission:low_load_framed_power_wire', + + //Quark + 'quark:backpack', + 'quark:chute', + 'quark:clear_shard', + 'quark:red_shard', + 'quark:orange_shard', + 'quark:yellow_shard', + 'quark:green_shard', + 'quark:blue_shard', + 'quark:purple_shard', + 'quark:white_shard', + 'quark:black_shard', + 'quark:brown_shard', + 'quark:lime_shard', + 'quark:cyan_shard', + 'quark:light_blue_shard', + 'quark:magenta_shard', + 'quark:pink_shard', + 'quark:gray_shard', + 'quark:light_gray_shard', + 'quark:dirty_shard', + 'quark:cloud', + 'quark:gravisand', + 'quark:iron_rod', + 'quark:monster_box', + 'quark:pickarang', + 'quark:redstone_randomizer', + 'quark:seed_pouch', + 'quark:bonded_ravager_hide', + 'quark:crate', + 'quark:magnet', + 'quark:magnetized_block', + 'quark:matrix_enchanter', + 'quark:pipe', + 'quark:ravager_hide', + 'quark:tiny_potato', + 'quark:forgotten_hat', + 'quark:diamond_heart', + + 'quark:red_stool', + 'quark:orange_stool', + 'quark:yellow_stool', + 'quark:green_stool', + 'quark:blue_stool', + 'quark:purple_stool', + 'quark:white_stool', + 'quark:black_stool', + 'quark:brown_stool', + 'quark:gray_stool', + 'quark:light_gray_stool', + 'quark:lime_stool', + 'quark:cyan_stool', + 'quark:light_blue_stool', + 'quark:pink_stool', + 'quark:magenta_stool', + + 'quark:dirty_glass', + 'quark:dirty_glass_pane', + 'quark:dusky_myalite', + 'quark:myalite_crystal', + + 'quark:red_corundum', + 'quark:red_corundum_pane', + 'quark:waxed_red_corundum', + 'quark:red_corundum_cluster', + 'quark:orange_corundum', + 'quark:orange_corundum_pane', + 'quark:waxed_orange_corundum', + 'quark:orange_corundum_cluster', + 'quark:yellow_corundum', + 'quark:yellow_corundum_pane', + 'quark:waxed_yellow_corundum', + 'quark:yellow_corundum_cluster', + 'quark:green_corundum', + 'quark:green_corundum_pane', + 'quark:waxed_green_corundum', + 'quark:green_corundum_cluster', + 'quark:blue_corundum', + 'quark:blue_corundum_pane', + 'quark:waxed_blue_corundum', + 'quark:blue_corundum_cluster', + 'quark:indigo_corundum', + 'quark:indigo_corundum_pane', + 'quark:waxed_indigo_corundum', + 'quark:indigo_corundum_cluster', + 'quark:violet_corundum', + 'quark:violet_corundum_pane', + 'quark:waxed_violet_corundum', + 'quark:violet_corundum_cluster', + 'quark:white_corundum', + 'quark:white_corundum_pane', + 'quark:waxed_white_corundum', + 'quark:white_corundum_cluster', + 'quark:black_corundum', + 'quark:black_corundum_pane', + 'quark:waxed_black_corundum', + 'quark:black_corundum_cluster', + + //randomium + 'randomium:randomium', + + //strainers + 'waterstrainer:string_mesh', + 'waterstrainer:iron_mesh', + 'waterstrainer:obsidian_mesh', + 'waterstrainer:strainer_survivalist_solid', + 'waterstrainer:strainer_fisherman_solid', + 'waterstrainer:strainer_survivalist_reinforced', + + //Tconstruct + 'tconstruct:netherite_nugget', + 'tconstruct:copper_nugget', + 'tconstruct:molten_tin_bucket', + 'tconstruct:cheese_ingot', + 'tconstruct:cheese_block', + + //thermal + 'thermal:laser_diode', //I don't even know what this thing it + 'thermal:press_coin_die', + 'thermal:press_gear_die', + 'thermal:press_packing_2x2_die', + 'thermal:press_packing_3x3_die', + 'thermal:press_unpacking_die', + 'thermal:iron_coin', + 'thermal:copper_coin', + 'thermal:tin_coin', + 'thermal:lead_coin', + 'thermal:nickel_coin', + 'thermal:netherite_coin', + 'thermal:bronze_coin', + 'thermal:constantan_coin', + 'thermal:invar_coin', + 'thermal:electrum_coin', + 'thermal:signalum_coin', + 'thermal:lumium_coin', + 'thermal:enderium_coin', + 'thermal:gold_plate', + 'thermal:iron_plate', + 'thermal:copper_plate', + 'thermal:netherite_plate', + 'thermal:silver_ore', + 'thermal:deepslate_silver_ore', + 'thermal:tin_ore', + 'thermal:deepslate_tin_ore', + 'thermal:tin_nugget', + 'thermal:tin_ingot', + 'thermal:tin_block', + 'thermal:tin_dust', + 'thermal:tin_plate', + 'thermal:tin_gear', + 'thermal:raw_tin', + 'thermal:raw_tin_block', + 'thermal:invar_plate', + 'thermal:bronze_nugget', + 'thermal:bronze_ingot', + 'thermal:bronze_plate', + 'thermal:netherite_nugget', + 'thermal:copper_nugget', + 'thermal:ender_pearl_dust', + 'thermal:servo_attachment', + 'thermal:device_hive_extractor', + + //Titanium + 'titanium:machine_test', + 'titanium:block_test', + 'titanium:block_twenty_four_test', + 'titanium:block_asset_test', + 'titanium:creative_generator' +] + +global.jeiItemBlacklist = [ + //Beyond earth adds 2 sets of these which means we have to blacklist them twice + 'beyond_earth:rover', + 'beyond_earth:rocket_t2', + 'beyond_earth:rocket_t3', + 'beyond_earth:rocket_t4' +] + +//Items blacklisted from randomium for balance reasons or otherwise +global.randomiumBlacklist = [ + //Stuff that bugs out without nbt + 'chiselsandbits:pattern_single_use', + 'chiselsandbits:pattern_multi_use', + 'ae2:facade', + 'cb_microblock:microblock', + 'culinaryconstruct:sandwich', + 'culinaryconstruct:food_bowl', + + //not supposed to have in survival items + 'occultism:spirit_fire', + 'thermal:nuke_grenade', + 'thermal:nuke_tnt', + 'thermal:nuke_tnt_minecart', + 'tconstruct:modifier_crystal', + 'tconstruct:creative_slot', + 'minecraft:budding_amethyst', + 'tconstruct:budding_earth_slime_crystal', + 'tconstruct:budding_sky_slime_crystal', + 'tconstruct:budding_ichor_slime_crystal', + 'tconstruct:budding_ender_slime_crystal', + 'beyond_earth:earth_globe', //might be added to the pack later but unobtainable at the moment + 'expcaves:treasure_pot', + 'expcaves:small_treasure_pot', + 'expcaves:treasure_amphora', + 'expcaves:small_quartz_treasure_pot', + 'expcaves:quartz_treasure_amphora', + + + //Tconstruct molten fluid buckets + 'tconstruct:molten_aluminum_bucket', + 'tconstruct:molten_osmium_bucket', + 'tconstruct:molten_pewter_bucket', + 'tconstruct:molten_porcelain_bucket', + 'tconstruct:molten_refined_glowstone_bucket', + 'tconstruct:molten_refined_obsidian_bucket', + 'tconstruct:molten_tungsten_bucket', + 'tconstruct:molten_uranium_bucket', + + //ritual dummys + 'occultism:ritual_dummy/custom_ritual', + 'occultism:ritual_dummy/craft_dimensional_matrix', + 'occultism:ritual_dummy/craft_dimensional_mineshaft', + 'occultism:ritual_dummy/craft_infused_lenses', + 'occultism:ritual_dummy/craft_infused_pickaxe', + 'occultism:ritual_dummy/craft_miner_afrit_deeps', + 'occultism:ritual_dummy/craft_miner_djinni_ores', + 'occultism:ritual_dummy/craft_miner_foliot_unspecialized', + 'occultism:ritual_dummy/craft_miner_marid_master', + 'occultism:ritual_dummy/craft_satchel', + 'occultism:ritual_dummy/craft_soul_gem', + 'occultism:ritual_dummy/craft_familiar_ring', + 'occultism:ritual_dummy/craft_stabilizer_tier1', + 'occultism:ritual_dummy/craft_stabilizer_tier2', + 'occultism:ritual_dummy/craft_stabilizer_tier3', + 'occultism:ritual_dummy/craft_stabilizer_tier4', + 'occultism:ritual_dummy/craft_stable_wormhole', + 'occultism:ritual_dummy/craft_storage_controller_base', + 'occultism:ritual_dummy/craft_storage_remote', + 'occultism:ritual_dummy/familiar_otherworld_bird', + 'occultism:ritual_dummy/familiar_parrot', + 'occultism:ritual_dummy/familiar_greedy', + 'occultism:ritual_dummy/familiar_bat', + 'occultism:ritual_dummy/familiar_deer', + 'occultism:ritual_dummy/familiar_cthulhu', + 'occultism:ritual_dummy/familiar_devil', + 'occultism:ritual_dummy/familiar_dragon', + 'occultism:ritual_dummy/familiar_blacksmith', + 'occultism:ritual_dummy/familiar_guardian', + 'occultism:ritual_dummy/familiar_headless', + 'occultism:ritual_dummy/familiar_chimera', + 'occultism:ritual_dummy/familiar_beholder', + 'occultism:ritual_dummy/familiar_fairy', + 'occultism:ritual_dummy/familiar_mummy', + 'occultism:ritual_dummy/familiar_beaver', + 'occultism:ritual_dummy/possess_enderman', + 'occultism:ritual_dummy/possess_endermite', + 'occultism:ritual_dummy/possess_skeleton', + 'occultism:ritual_dummy/possess_ghast', + 'occultism:ritual_dummy/summon_afrit_rain_weather', + 'occultism:ritual_dummy/summon_afrit_thunder_weather', + 'occultism:ritual_dummy/summon_djinni_clear_weather', + 'occultism:ritual_dummy/summon_djinni_day_time', + 'occultism:ritual_dummy/summon_djinni_manage_machine', + 'occultism:ritual_dummy/summon_djinni_night_time', + 'occultism:ritual_dummy/summon_foliot_lumberjack', + 'occultism:ritual_dummy/summon_foliot_otherstone_trader', + 'occultism:ritual_dummy/summon_foliot_sapling_trader', + 'occultism:ritual_dummy/summon_foliot_transport_items', + 'occultism:ritual_dummy/summon_foliot_cleaner', + 'occultism:ritual_dummy/summon_wild_afrit', + 'occultism:ritual_dummy/summon_wild_hunt', + 'occultism:ritual_dummy/summon_wild_otherworld_bird', + 'occultism:ritual_dummy/summon_wild_parrot', + 'occultism:ritual_dummy/summon_foliot_crusher', + 'occultism:ritual_dummy/summon_djinni_crusher', + 'occultism:ritual_dummy/summon_afrit_crusher', + 'occultism:ritual_dummy/summon_marid_crusher', + + // Chapter 3 + 'kubejs:inductive_mechanism', + 'thermal:dynamo_compression', + 'kubejs:pipe_module_tier_2', + 'prettypipes:medium_crafting_module', + 'prettypipes:medium_filter_module', + 'prettypipes:medium_retrieval_module', + 'prettypipes:medium_extraction_module', + 'prettypipes:medium_speed_module', + 'thermal:machine_frame', + 'thermal:machine_smelter', + 'thermal:machine_sawmill', + 'thermal:machine_refinery', + 'thermal:machine_pyrolyzer', + 'thermal:machine_pulverizer', + 'thermal:machine_insolator', + 'thermal:machine_furnace', + 'thermal:machine_crystallizer', + 'thermal:machine_crucible', + 'thermal:machine_crafter', + 'thermal:machine_chiller', + 'thermal:machine_centrifuge', + 'thermal:machine_brewer', + 'thermal:machine_bottler', + // Chapter 3A + 'thermal:enderium_ingot', + 'thermal:enderium_nugget', + 'thermal:enderium_block', + 'thermal:enderium_dust', + 'thermal:enderium_plate', + 'thermal:enderium_gear', + 'thermal:enderium_glass', + 'tconstruct:molten_enderium_bucket', + 'exchangers:resonant_exchanger', + 'kubejs:abstruse_mechanism', + 'kubejs:enderium_machine', + 'ae2:quantum_ring', + 'enderstorage:ender_tank', + 'ae2:quantum_link', + 'portality:controller', + 'thermal:fluid_duct', + 'thermal:fluid_duct_windowed', + 'thermal:fluid_cell_frame', + 'thermal:fluid_cell', + 'enderstorage:ender_chest', + 'thermal:upgrade_augment_3', + 'kubejs:pipe_module_tier_3', + 'prettypipes:high_crafting_module', + 'prettypipes:high_filter_module', + 'prettypipes:high_retrieval_module', + 'prettypipes:high_extraction_module', + 'prettypipes:high_speed_module', + // Chapter 4 + 'ae2:silicon', + 'ae2:printed_silicon', + 'ae2:logic_processor', + 'ae2:calculation_processor', + 'ae2:engineering_processor', + 'kubejs:flash_drive', + 'kubejs:calculation_mechanism', + + //AE2 items + 'ae2:controller', + 'ae2:blank_pattern', + 'ae2:crafting_pattern', + 'ae2:processing_pattern', + 'ae2:smithing_table_pattern', + 'ae2:stonecutting_pattern', + 'ae2:spatial_cell_component_2', + 'ae2:spatial_cell_component_16', + 'ae2:spatial_cell_component_128', + 'ae2:annihilation_core', + 'ae2:formation_core', + 'ae2:condenser', + 'ae2:chest', + 'ae2:drive', + 'ae2:io_port', + 'ae2:spatial_io_port', + 'ae2:terminal', + 'ae2:crafting_terminal', + 'ae2:pattern_encoding_terminal', + 'ae2:pattern_access_terminal', + 'ae2:import_bus', + 'ae2:annihilation_plane', + 'ae2:export_bus', + 'ae2:formation_plane', + 'ae2:molecular_assembler', + 'ae2:pattern_provider', + 'ae2:cable_pattern_provider', + 'ae2:interface', + 'ae2:cable_interface', + 'ae2:storage_bus', + 'ae2:wireless_access_point', + 'ae2:level_emitter', + 'ae2:energy_level_emitter', + 'ae2:storage_monitor', + 'ae2:conversion_monitor', + 'ae2:dense_energy_cell', + 'ae2:cell_workbench', + 'ae2:me_p2p_tunnel', + 'ae2:redstone_p2p_tunnel', + 'ae2:item_p2p_tunnel', + 'ae2:fluid_p2p_tunnel', + 'ae2:fe_p2p_tunnel', + 'ae2:light_p2p_tunnel', + 'ae2:spatial_anchor', + 'ae2:security_station', + 'ae2:crafting_unit', + 'ae2:crafting_accelerator', + 'ae2:crafting_monitor', + 'ae2:1k_crafting_storage', + 'ae2:4k_crafting_storage', + 'ae2:16k_crafting_storage', + 'ae2:64k_crafting_storage', + 'ae2:256k_crafting_storage', + 'ae2:cell_component_1k', + 'ae2:cell_component_4k', + 'ae2:cell_component_16k', + 'ae2:cell_component_64k', + 'ae2:cell_component_256k', + 'ae2:basic_card', + 'ae2:redstone_card', + 'ae2:capacity_card', + 'ae2:void_card', + 'ae2:advanced_card', + 'ae2:fuzzy_card', + 'ae2:speed_card', + 'ae2:inverter_card', + 'ae2:crafting_card', + 'ae2:energy_card', + 'ae2:equal_distribution_card', + 'ae2:item_storage_cell_1k', + 'ae2:item_storage_cell_4k', + 'ae2:item_storage_cell_16k', + 'ae2:item_storage_cell_64k', + 'ae2:item_storage_cell_256k', + 'ae2:fluid_storage_cell_1k', + 'ae2:fluid_storage_cell_4k', + 'ae2:fluid_storage_cell_16k', + 'ae2:fluid_storage_cell_64k', + 'ae2:fluid_storage_cell_256k', + 'ae2:portable_item_cell_1k', + 'ae2:portable_item_cell_4k', + 'ae2:portable_item_cell_16k', + 'ae2:portable_item_cell_64k', + 'ae2:portable_fluid_cell_256k', + 'ae2:portable_fluid_cell_1k', + 'ae2:portable_fluid_cell_4k', + 'ae2:portable_fluid_cell_16k', + 'ae2:portable_fluid_cell_64k', + 'ae2:portable_fluid_cell_256k', + 'ae2:spatial_storage_cell_2', + 'ae2:spatial_storage_cell_16', + 'ae2:spatial_storage_cell_128', + 'ae2:wireless_terminal', + 'ae2:wireless_crafting_terminal', + 'ae2:color_applicator', + 'ae2:matter_cannon', + 'ae2:network_tool', + 'ae2:memory_card', + 'ae2:memory_card_black', + 'ae2:memory_card_blue', + 'ae2:memory_card_brown', + 'ae2:memory_card_cyan', + 'ae2:memory_card_gray', + 'ae2:memory_card_green', + 'ae2:memory_card_light_blue', + 'ae2:memory_card_light_gray', + 'ae2:memory_card_lime', + 'ae2:memory_card_magenta', + 'ae2:memory_card_orange', + 'ae2:memory_card_pink', + 'ae2:memory_card_purple', + 'ae2:memory_card_red', + 'ae2:memory_card_white', + 'ae2:memory_card_yellow', + 'ae2:biometric_card', + + // Chapter 4A + 'kubejs:substrate_igneous', + 'kubejs:substrate_herbal', + 'kubejs:substrate_volatile', + 'kubejs:substrate_crystal', + 'kubejs:substrate_metal', + 'kubejs:substrate_gem', + 'kubejs:substrate_chaos', + 'kubejs:substrate_silicon', + 'kubejs:substrate_silver', + // Chapter 5 + 'kubejs:raw_logic_bucket', + 'kubejs:number_0_bucket', + 'kubejs:number_1_bucket', + 'kubejs:number_2_bucket', + 'kubejs:number_3_bucket', + 'kubejs:number_4_bucket', + 'kubejs:number_5_bucket', + 'kubejs:number_6_bucket', + 'kubejs:number_7_bucket', + 'kubejs:number_8_bucket', + 'kubejs:number_9_bucket', + 'kubejs:matrix_bucket', + 'kubejs:plus', + 'kubejs:minus', + 'kubejs:multiply', + 'kubejs:divide', + 'kubejs:one', + 'kubejs:two', + 'kubejs:three', + 'kubejs:four', + 'kubejs:five', + 'kubejs:six', + 'kubejs:seven', + 'kubejs:eight', + 'kubejs:nine', + 'kubejs:zero', + 'ae2:matter_ball', + 'kubejs:matter_plastics', + 'kubejs:lander_deployer', + 'kubejs:computation_matrix', + 'kubejs:navigation_computer', + 'beyond_earth:rocket_t1', + 'beyond_earth:rocket_launch_pad', + 'beyond_earth:oxygen_mask', + 'beyond_earth:space_suit', + 'beyond_earth:space_pants', + 'beyond_earth:space_boots', + 'beyond_earth:netherite_oxygen_mask', + 'beyond_earth:netherite_space_suit', + 'beyond_earth:netherite_space_pants', + 'beyond_earth:netherite_space_boots', + 'beyond_earth:oxygen_loader', + 'beyond_earth:oxygen_bubble_distributor', + 'beyond_earth:fuel_bucket', + + // Moon Items + 'beyond_earth:moon_globe', + 'beyond_earth:cheese', + 'beyond_earth:desh_ingot', + 'beyond_earth:ice_shard', + 'beyond_earth:desh_plate', + 'beyond_earth:desh_nugget', + 'beyond_earth:raw_desh', + 'beyond_earth:desh_block', + 'beyond_earth:raw_desh_block', + 'beyond_earth:moon_stone', + 'beyond_earth:moon_stone_bricks', + 'beyond_earth:cracked_moon_stone_bricks', + 'beyond_earth:moon_stone_brick_slab', + 'beyond_earth:moon_stone_brick_stairs', + 'beyond_earth:moon_sand', + 'beyond_earth:moon_cheese_ore', + 'beyond_earth:moon_desh_ore', + 'beyond_earth:moon_iron_ore', + 'beyond_earth:moon_ice_shard_ore', + 'beyond_earth:molten_desh_bucket', + + //Creative items + 'waterstrainer:super_worm', + 'buddycards:creative_grading_sleeve', + 'thermal:rf_coil_creative_augment', + 'thermal:fluid_tank_creative_augment', + 'thermal:machine_efficiency_creative_augment', + 'thermal:machine_catalyst_creative_augment', + 'ae2:creative_energy_cell', + 'ae2:creative_item_cell', + 'ae2:creative_fluid_cell', + 'exchangers:creative_exchanger', + 'create:creative_motor', + 'create:creative_fluid_tank', + 'create:creative_crate', + 'create:creative_blaze_cake', + 'create:handheld_worldshaper', + 'storagedrawers:creative_storage_upgrade', + 'storagedrawers:creative_vending_upgrade', + 'computercraft:computer_command', + 'modonomicon:modonomicon' +] + +//Global blacklist for fluids that will be hidden from jei +global.fluidBlacklist = [ + //Beyond Earth + 'beyond_earth:molten_ostrum', + 'beyond_earth:molten_calorite', + //Tconstruct + 'tconstruct:molten_tin' +] + +global.jeiFluidBlacklist = [ + +] \ No newline at end of file diff --git a/overrides/kubejs/startup_scripts/generate.js b/overrides/kubejs/startup_scripts/generate.js index dd7e94c..0d8b588 100644 --- a/overrides/kubejs/startup_scripts/generate.js +++ b/overrides/kubejs/startup_scripts/generate.js @@ -78,15 +78,15 @@ onEvent('item.registry', event => { event.create('pipe_module_tier_3').texture("kubejs:item/pipe_module_tier_3").displayName('Enderium Pipe Module') event.create('circuit_scrap').texture("kubejs:item/circuit_scrap").displayName('Circuit Scrap') - event.create('charged_calculator').texture("kubejs:item/charged_calculator").displayName('Calculator').maxDamage(64) + //event.create('charged_calculator').texture("kubejs:item/charged_calculator").displayName('Calculator').maxDamage(64) event.create('missingno').texture("kubejs:item/missingno").displayName('∄') event.create('zinc_dust').texture("kubejs:item/zinc_dust").displayName('Zinc Dust').tag("forge:dusts/zinc").tag("forge:dusts") - event.create('creosote_pellet').texture("kubejs:item/creosote_pellet").displayName('Creosote Pellet') + //event.create('creosote_pellet').texture("kubejs:item/creosote_pellet").displayName('Creosote Pellet') event.create('sand_ball').texture("kubejs:item/sand_ball").displayName('Ball of Sand').unstackable() event.create('rough_sand').texture("kubejs:item/rough_sand").displayName('Sand Chunks') event.create('purified_sand').texture("kubejs:item/purified_sand").displayName('Purified Sand') event.create('silicon_compound').texture("kubejs:item/silicon_compound").displayName('Silicon Compound') - event.create('smoke_mote').texture("kubejs:item/smoke_mote").displayName('Tiny Smoke Cloud') + //event.create('smoke_mote').texture("kubejs:item/smoke_mote").displayName('Tiny Smoke Cloud') event.create('incomplete_coke_chunk','create:sequenced_assembly').texture("kubejs:item/incomplete_coke_chunk").displayName('Cut Coke') event.create('coke_chunk').texture("kubejs:item/coke_chunk").displayName('Coke Chunks') diff --git a/overrides/kubejs/startup_scripts/startup_compatability.js b/overrides/kubejs/startup_scripts/startup_compatability.js index 014125b..3b3ef41 100644 --- a/overrides/kubejs/startup_scripts/startup_compatability.js +++ b/overrides/kubejs/startup_scripts/startup_compatability.js @@ -1,3 +1,36 @@ +//Crafts and Additions +if (Platform.isLoaded("createaddition")) { + global.itemBlacklist.push("thermal:electrum_ingot") + global.itemBlacklist.push("thermal:electrum_nugget") + global.itemBlacklist.push("thermal:electrum_plate") + global.itemBlacklist.push("beyond_earth:iron_stick") + global.itemBlacklist.push("createaddition:zinc_sheet") + //Unfortunately we have stick to thermal diamond dust due to the strainer recipe + global.itemBlacklist.push("createaddition:diamond_grit") + global.itemBlacklist.push("createaddition:accumulator") +} +//The buddycard malum cards are a strange case where we only want to hide items when a mod is not present +if (!Platform.isLoaded("malum")) { + global.itemBlacklist.push("buddycardsexp:buddycard_malum1") + global.itemBlacklist.push("buddycardsexp:buddycard_malum2") + global.itemBlacklist.push("buddycardsexp:buddycard_malum3") + global.itemBlacklist.push("buddycardsexp:buddycard_malum4") + global.itemBlacklist.push("buddycardsexp:buddycard_malum5") + global.itemBlacklist.push("buddycardsexp:buddycard_malum6") + global.itemBlacklist.push("buddycardsexp:buddycard_malum7") + global.itemBlacklist.push("buddycardsexp:buddycard_malum8") + global.itemBlacklist.push("buddycardsexp:buddycard_malum9") + global.itemBlacklist.push("buddycardsexp:buddycard_malum10") + global.itemBlacklist.push("buddycardsexp:buddycard_malum11") + global.itemBlacklist.push("buddycardsexp:buddycard_malum12") + global.itemBlacklist.push("buddycardsexp:buddycard_malum13") + global.itemBlacklist.push("buddycardsexp:buddycard_malum14") + global.itemBlacklist.push("buddycardsexp:buddycard_malum15") + global.itemBlacklist.push("buddycardsexp:buddycard_malum16") + global.itemBlacklist.push("buddycardsexp:buddycard_malum17") + global.itemBlacklist.push("buddycardsexp:buddycard_malum18") +} + onEvent('item.registry', event => { if (Platform.isLoaded('createaddition')) { event.create('incomplete_connector','create:sequenced_assembly').texture("createaddition:item/connector").displayName('Incomplete Small Connector') diff --git a/server_manifest.json b/server_manifest.json index 8099566..c80fbd1 100644 --- a/server_manifest.json +++ b/server_manifest.json @@ -12,7 +12,7 @@ "required":true }, { - "fileID":4498424, + "fileID":4957984, "projectID":433862, "required":true }, @@ -52,7 +52,7 @@ "required":true }, { - "fileID":4531967, + "fileID":5216875, "projectID":267193, "required":true }, @@ -107,9 +107,9 @@ "required":true }, { - "fileID":4445746, - "projectID":240630, - "required":true + "fileID":3929204, + "projectID":325625, + "required":true }, { "fileID":4698195, @@ -117,7 +117,7 @@ "required":true }, { - "fileID":4509007, + "fileID":5134546, "projectID":74924, "required":true }, @@ -167,12 +167,12 @@ "required":true }, { - "fileID":4732252, + "fileID":4837418, "projectID":521393, "required":true }, { - "fileID":4774383, + "fileID":5301367, "projectID":310111, "required":true }, @@ -202,7 +202,7 @@ "required":true }, { - "fileID":4509008, + "fileID":5148042, "projectID":74072, "required":true }, @@ -287,7 +287,7 @@ "required":true }, { - "fileID":4521465, + "fileID":5137931, "projectID":419699, "required":true }, @@ -307,7 +307,7 @@ "required":true }, { - "fileID":4633387, + "fileID":4973439, "projectID":348521, "required":true }, @@ -317,7 +317,7 @@ "required":true }, { - "fileID":4759875, + "fileID":4801048, "projectID":69162, "required":true }, @@ -367,7 +367,7 @@ "required":true }, { - "fileID":4590652, + "fileID":4985315, "projectID":309927, "required":true }, @@ -422,7 +422,7 @@ "required":true }, { - "fileID":4771446, + "fileID":5129277, "projectID":854949, "required":true }, @@ -447,7 +447,7 @@ "required":true }, { - "fileID":4585765, + "fileID":4842875, "projectID":429371, "required":true }, @@ -457,7 +457,7 @@ "required":true }, { - "fileID":4216196, + "fileID":4843021, "projectID":421694, "required":true }, @@ -487,7 +487,7 @@ "required":true }, { - "fileID":4767129, + "fileID":5399365, "projectID":790626, "required":true }, @@ -517,12 +517,12 @@ "required":true }, { - "fileID":4783586, + "fileID":5286275, "projectID":558998, "required":true }, { - "fileID":4789545, + "fileID":5093207, "projectID":888624, "required":true }, @@ -557,12 +557,12 @@ "required":true }, { - "fileID":4736645, + "fileID":5194758, "projectID":422301, "required":true }, { - "fileID":4736642, + "fileID":5296312, "projectID":618298, "required":true }, @@ -577,7 +577,7 @@ "required":true }, { - "fileID":4788136, + "fileID":5102251, "projectID":454372, "required":true }, @@ -587,7 +587,7 @@ "required":true }, { - "fileID":4800837, + "fileID":5079263, "projectID":324717, "required":true }, @@ -642,7 +642,7 @@ "required":true }, { - "fileID":3694403, + "fileID":3713957, "projectID":238551, "required":true }, @@ -657,7 +657,7 @@ "required":true }, { - "fileID":4808763, + "fileID":5268448, "projectID":628539, "required":true }, @@ -667,7 +667,7 @@ "required":true }, { - "fileID":4513973, + "fileID":4939214, "projectID":233071, "required":true }, @@ -712,19 +712,29 @@ "required":true }, { - "fileID":4838717, - "projectID":820977, - "required":true + "fileID":4970407, + "projectID":820977, + "required":true }, { - "fileID":4953122, - "projectID":568127, - "required":true + "fileID":4953122, + "projectID":568127, + "required":true }, { "fileID":4318732, "projectID":666198, "required":true + }, + { + "fileID":3712896, + "projectID":523013, + "required":true + }, + { + "fileID":3694844, + "projectID":558746, + "required":true } ], "manifestType":"minecraftModpack", @@ -732,7 +742,7 @@ "minecraft":{ "modLoaders":[ { - "id":"forge-40.2.8", + "id":"forge-40.2.21", "primary":true } ], @@ -740,5 +750,5 @@ }, "name":"CABIN", "overrides":"overrides", - "version":"1.2.3" + "version":"1.3.0" } \ No newline at end of file