diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json index e8cc3b028..c253b278e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json @@ -13,6 +13,10 @@ { "feature": "tfg:mars/surface/skulls/charger", "placement": [] + }, + { + "feature": "tfg:mars/surface/skulls/raider", + "placement": [] } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/raider.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/raider.json new file mode 100644 index 000000000..cd2c87829 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/raider.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:raider_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/snatcher.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/snatcher.json new file mode 100644 index 000000000..3258f648c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/snatcher.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:snatcher_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json index f413a15cf..ebdcabc62 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json @@ -18,6 +18,10 @@ "feature": "tfg:mars/surface/skulls/surfer", "placement": [] }, + { + "feature": "tfg:mars/surface/skulls/snatcher", + "placement": [] + }, { "feature": "tfg:mars/surface/skulls/tiny", "placement": [] diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json index 41865f871..945dd7230 100644 --- a/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json @@ -1,65 +1,79 @@ { - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_crusher_meat", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 2, - "max": 5 - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "wan_ancient_beasts:crusher_spike", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 0, - "max": 2, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - ] + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_crusher_meat", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 5 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:crusher_spike", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:crusher_egg", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.1 + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json index 90570f5b2..408ea0512 100644 --- a/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json @@ -1,66 +1,79 @@ { - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_glider_wings", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 2, - "max": 6 - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 2, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - , - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "wan_ancient_beasts:glider_feather", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 0, - "max": 2, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - ] + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_glider_wings", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 6 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_egg", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.1 + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json index 2499bd85b..e4c12b080 100644 --- a/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json @@ -1,66 +1,64 @@ { - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_whole_soarer", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4 - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - , - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "wan_ancient_beasts:glider_feather", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 0, - "max": 4, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - ] + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_whole_soarer", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json index 9808e1bba..bd339296f 100644 --- a/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json @@ -1,45 +1,59 @@ { - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_walker_steak", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 10, - "max": 25 - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 4, - "max": 10, - "type": "minecraft:uniform" - } - } - ] - } - ] - } - ] + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_walker_steak", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 10, + "max": 25 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4, + "max": 10, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:walker_egg", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.1 + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/data.js b/kubejs/server_scripts/wan_ancient_beasts/data.js new file mode 100644 index 000000000..209bea8fb --- /dev/null +++ b/kubejs/server_scripts/wan_ancient_beasts/data.js @@ -0,0 +1,35 @@ +// priority: 0 +"use strict"; + +const registerWABData = (event) => { + + event.foodItem('wan_ancient_beasts:toxlacanth', food => { + food.hunger(2) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('wan_ancient_beasts:cooked_toxlacanth', food => { + food.hunger(4) + food.saturation(2) + food.protein(2.5) + food.decayModifier(2.25) + }) + + // Eater meat + event.foodItem('wan_ancient_beasts:raw_ancient_meat', food => { + food.hunger(2) + food.protein(2) + food.decayModifier(3) + }) + + event.foodItem('wan_ancient_beasts:cooked_ancient_meat', food => { + food.hunger(4) + food.saturation(3) + food.protein(5) + food.decayModifier(2.25) + }) + + + event.itemSize('wan_ancient_beasts:reinforced_shield', 'very_large', 'very_heavy') +} \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/recipes.js b/kubejs/server_scripts/wan_ancient_beasts/recipes.js index 9f083ead7..c6b2fbbb6 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/recipes.js +++ b/kubejs/server_scripts/wan_ancient_beasts/recipes.js @@ -1,4 +1,3 @@ - // priority: 0 "use strict"; @@ -48,37 +47,35 @@ const registerWABRecipes = (event) => { C: '#tfc:shields', D: '#forge:plates/titanium' }).id('tfg:shaped/reinforced_shield_from_shield') + + event.shapeless('wan_ancient_beasts:fearsome_horn', [ + 'wan_ancient_beasts:raider_horn', + 'wan_ancient_beasts:eater_tooth', + 'wan_ancient_beasts:crusher_spike', + 'endermanoverhaul:enderman_tooth' + ]).id('tfg:shapeless/fearsome_horn') + + event.shaped('wan_ancient_beasts:white_charger_armor', [ + 'ABA', + 'CCC' + ], { + A: 'firmaciv:rope_coil', + B: 'minecraft:leather_horse_armor', + C: '#forge:double_plates/steel' + }).id('tfg:shaped/white_charger_armor') + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.recipes.tfc.barrel_sealed(1000) + .inputs('#wan_ancient_beasts:charger_armors', Fluid.of(`tfc:${dye}_dye`, 288)) + .outputItem(`wan_ancient_beasts:${dye}_charger_armor`) + .id(`tfg:barrel/dyeing/charger_armor_${dye}`) + + event.recipes.gtceu.chemical_bath(`tfg:wan_ancient_beasts/${dye}_charger_armor`) + .itemInputs('#wan_ancient_beasts:charger_armors') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 288)) + .itemOutputs(`wan_ancient_beasts:${dye}_charger_armor`) + .duration(200) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + }) } - -const registerWABData = (event) => { - - event.foodItem('wan_ancient_beasts:toxlacanth', food => { - food.hunger(2) - food.protein(1.5) - food.decayModifier(3) - }) - - event.foodItem('wan_ancient_beasts:cooked_toxlacanth', food => { - food.hunger(4) - food.saturation(2) - food.protein(2.5) - food.decayModifier(2.25) - }) - - // Eater meat - event.foodItem('wan_ancient_beasts:raw_ancient_meat', food => { - food.hunger(2) - food.protein(2) - food.decayModifier(3) - }) - - event.foodItem('wan_ancient_beasts:cooked_ancient_meat', food => { - food.hunger(4) - food.saturation(3) - food.protein(5) - food.decayModifier(2.25) - }) - - - event.itemSize('wan_ancient_beasts:reinforced_shield', 'very_large', 'very_heavy') -} \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/tags.js b/kubejs/server_scripts/wan_ancient_beasts/tags.js index 3dd151ff7..bf36190a3 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/tags.js +++ b/kubejs/server_scripts/wan_ancient_beasts/tags.js @@ -73,6 +73,7 @@ const registerWansAncientBeastsBiomeTags = (event) => { event.removeAll('wan_ancient_beasts:has_structure/ancient_nest'); event.removeAll('wan_ancient_beasts:has_structure/dead_coral'); event.removeAll('wan_ancient_beasts:has_structure/desert_ruins'); + event.removeAll('wan_ancient_beasts:has_structure/desert_ruins_small'); event.removeAll('wan_ancient_beasts:has_structure/digsite_badlands'); event.removeAll('wan_ancient_beasts:has_structure/digsite_desert'); event.removeAll('wan_ancient_beasts:has_structure/digsite_icespikes'); @@ -84,4 +85,7 @@ const registerWansAncientBeastsBiomeTags = (event) => { event.removeAll('wan_ancient_beasts:has_structure/digsite_taiga'); event.removeAll('wan_ancient_beasts:has_structure/ice_spike_castle'); event.removeAll('wan_ancient_beasts:has_structure/mesa_temple'); + event.removeAll('wan_ancient_beasts:has_structure/primal_log'); + event.removeAll('wan_ancient_beasts:has_structure/ruined_castle'); + event.removeAll('wan_ancient_beasts:has_structure/training_outpost'); } \ No newline at end of file diff --git a/kubejs/startup_scripts/wan_ancient_beasts/constants.js b/kubejs/startup_scripts/wan_ancient_beasts/constants.js index 6e5c22a5a..a255a4abc 100644 --- a/kubejs/startup_scripts/wan_ancient_beasts/constants.js +++ b/kubejs/startup_scripts/wan_ancient_beasts/constants.js @@ -49,5 +49,46 @@ global.WAB_DISABLED_ITEMS = [ 'wan_ancient_beasts:blue_hang_glider', 'wan_ancient_beasts:purple_hang_glider', 'wan_ancient_beasts:magenta_hang_glider', - 'wan_ancient_beasts:pink_hang_glider' + 'wan_ancient_beasts:pink_hang_glider', + 'wan_ancient_beasts:paleo_table', + 'wan_ancient_beasts:shrieking_horn', + 'wan_ancient_beasts:spectral_horn', + 'wan_ancient_beasts:nasty_stew', + 'wan_ancient_beasts:rafflesia_seeds', + 'wan_ancient_beasts:sundew_seeds', + 'wan_ancient_beasts:bellflower_seeds', + 'wan_ancient_beasts:moonflower', + 'wan_ancient_beasts:equisetum_seeds', + 'wan_ancient_beasts:olden_moss_carpet', + 'wan_ancient_beasts:olden_moss', + 'wan_ancient_beasts:amber_ginkgo_seeds', + 'wan_ancient_beasts:verdant_ginkgo_seeds', + 'wan_ancient_beasts:amber_ginkgo_sapling', + 'wan_ancient_beasts:verdant_ginkgo_sapling', + 'wan_ancient_beasts:amber_ginkgo_leaves', + 'wan_ancient_beasts:verdant_ginkgo_leaves', + 'wan_ancient_beasts:ginkgo_log', + 'wan_ancient_beasts:stripped_ginkgo_log', + 'wan_ancient_beasts:ginkgo_wood', + 'wan_ancient_beasts:stripped_ginkgo_wood', + 'wan_ancient_beasts:ginkgo_planks', + 'wan_ancient_beasts:ginkgo_stairs', + 'wan_ancient_beasts:ginkgo_slab', + 'wan_ancient_beasts:ginkgo_fence', + 'wan_ancient_beasts:ginkgo_fence_gate', + 'wan_ancient_beasts:ginkgo_door', + 'wan_ancient_beasts:ginkgo_trapdoor', + 'wan_ancient_beasts:ginkgo_pressure_plate', + 'wan_ancient_beasts:ginkgo_button', + 'wan_ancient_beasts:ginkgo_sign', + 'wan_ancient_beasts:ginkgo_hanging_sign', + 'wan_ancient_beasts:ginkgo_boat', + 'wan_ancient_beasts:ginkgo_chest_boat', + 'wan_ancient_beasts:petrified_log', + 'wan_ancient_beasts:stripped_petrified_log', + 'wan_ancient_beasts:petrified_wood', + 'wan_ancient_beasts:stripped_petrified_wood', + 'wan_ancient_beasts:horns_pottery_sherd', + 'wan_ancient_beasts:loot_pottery_sherd', + 'wan_ancient_beasts:steal_pottery_sherd' ] \ No newline at end of file