diff --git a/kubejs/data/ad_astra/loot_tables/entities/corrupted_lunarian.json b/kubejs/data/ad_astra/loot_tables/entities/corrupted_lunarian.json new file mode 100644 index 000000000..8f59e3ad4 --- /dev/null +++ b/kubejs/data/ad_astra/loot_tables/entities/corrupted_lunarian.json @@ -0,0 +1,45 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:rotten_flesh", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "max": 2, + "min": 1, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "max": 6, + "min": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/entities/zombie.json b/kubejs/data/minecraft/loot_tables/entities/zombie.json index 12839c18d..4c4758d92 100644 --- a/kubejs/data/minecraft/loot_tables/entities/zombie.json +++ b/kubejs/data/minecraft/loot_tables/entities/zombie.json @@ -52,8 +52,8 @@ { "function": "minecraft:set_count", "count": { - "max": 1, - "min": 0, + "max": 6, + "min": 4, "type": "minecraft:uniform" } } diff --git a/kubejs/data/species/loot_tables/entities/birt.json b/kubejs/data/species/loot_tables/entities/birt.json new file mode 100644 index 000000000..7ceabfac1 --- /dev/null +++ b/kubejs/data/species/loot_tables/entities/birt.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:bone" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "species:birt_egg", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.5 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 3ed0f617a..d2ae3193b 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -132,6 +132,7 @@ const registerAdAstraBlockTags = (event) => { event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/hardened/dacite') event.add('minecraft:rabbits_spawnable_on', '#ad_astra:moon_stone_replaceables') + event.add('species:limpet_spawnable_on', '#ad_astra:moon_stone_replaceables') event.add('tfc:can_landslide', 'ad_astra:moon_sand') event.add('tfc:can_landslide', 'ad_astra:mars_sand') diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index f623955f5..40d934bf5 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -226,6 +226,7 @@ ServerEvents.recipes(event => { registerRnrRecipes(event) registerSophisticatedBackpacksRecipes(event) registerSimplylightRecipes(event) + registerSpeciesRecipes(event) registerTFCRecipes(event) registerTFCBetterBFRecipes(event) registerTFCLunchBoxRecipes(event) diff --git a/kubejs/server_scripts/species/recipes.js b/kubejs/server_scripts/species/recipes.js new file mode 100644 index 000000000..d32cb8b86 --- /dev/null +++ b/kubejs/server_scripts/species/recipes.js @@ -0,0 +1,5 @@ +// priority: 0 + +function registerSpeciesRecipes(event) { + event.remove({ mod: 'species' }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 44ef1ddbd..57b0d9613 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -26,7 +26,6 @@ const registerSpeciesItemTags = (event) => { const DISABLED_ITEMS = [ 'species:deepfish_bucket', - 'species:birt_egg', 'species:bone_spike', 'species:ancient_pinecone', 'species:petrified_egg', @@ -44,4 +43,5 @@ const registerSpeciesItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', item) }) + event.add('forge:eggs', 'species:birt_egg') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index d7f2c995e..fae312de4 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -885,7 +885,7 @@ global.TFC_MEAT_RECIPE_COMPONENTS = [ { input: 'tfc:food/hyena', output: 'tfc:food/cooked_hyena', name: 'cooked_hyena' }, { input: 'tfc:food/duck', output: 'tfc:food/cooked_duck', name: 'cooked_duck' }, { input: 'tfc:food/chevon', output: 'tfc:food/cooked_chevon', name: 'cooked_chevon' }, - { input: 'minecraft:egg', output: 'tfc:food/cooked_egg', name: 'cooked_egg' }, + { input: '#forge:eggs', output: 'tfc:food/cooked_egg', name: 'cooked_egg' }, ]; global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [