diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json new file mode 100644 index 000000000..bfc1525e1 --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json @@ -0,0 +1,62 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:ancient_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:soul_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:summoner_pearl" + } + ], + "rolls": 1.0 + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:badlands_hood" + }, + { + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.1 + } + ] + } + ] + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:chorus_fruit" + } + ], + "rolls": 2.0 + } + ], + "random_sequence": "endermanoverhaul:entities/badlands_enderman" +} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json new file mode 100644 index 000000000..a308042c6 --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json @@ -0,0 +1,41 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:corrupted_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:soul_pearl" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:chorus_fruit" + } + ], + "rolls": 2.0 + } + ], + "random_sequence": "endermanoverhaul:entities/cave_enderman" +} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/crimson_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/crimson_enderman.json new file mode 100644 index 000000000..418bf07c7 --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/crimson_enderman.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:crimson_pearl" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:chorus_fruit" + } + ], + "rolls": 2.0 + } + ], + "random_sequence": "endermanoverhaul:entities/crimson_enderman" +} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/warped_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/warped_enderman.json new file mode 100644 index 000000000..8cdd36e2a --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/warped_enderman.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:warped_pearl" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:chorus_fruit" + } + ], + "rolls": 2.0 + } + ], + "random_sequence": "endermanoverhaul:entities/warped_enderman" +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/loot.js b/kubejs/server_scripts/ad_astra/loot.js index 92973c808..65022a4a0 100644 --- a/kubejs/server_scripts/ad_astra/loot.js +++ b/kubejs/server_scripts/ad_astra/loot.js @@ -14,4 +14,8 @@ function registerAdAstraLoots(event) { event.addEntityLootModifier('ad_astra:star_crawler') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 4], ['tfg:food/raw_crawlermari']) + + + event.addEntityLootModifier('ad_astra:martian_raptor') + .addWeightedLoot([2, 4], ['minecraft:bone']) } \ No newline at end of file diff --git a/kubejs/server_scripts/endermanoverhaul/tags.js b/kubejs/server_scripts/endermanoverhaul/tags.js index 438a2d1e1..6ba95244b 100644 --- a/kubejs/server_scripts/endermanoverhaul/tags.js +++ b/kubejs/server_scripts/endermanoverhaul/tags.js @@ -3,19 +3,15 @@ const registerEndermanOverhaulItemTags = (event) => { const DISABLED_ITEMS = [ - 'endermanoverhaul:tiny_skull', 'endermanoverhaul:enderman_tooth', 'endermanoverhaul:corrupted_blade', 'endermanoverhaul:corrupted_shield', - 'endermanoverhaul:badlands_hood', 'endermanoverhaul:savanna_hood', 'endermanoverhaul:snowy_hood', 'endermanoverhaul:bubble_pearl', - 'endermanoverhaul:icy_pearl', - 'endermanoverhaul:crimson_pearl', - 'endermanoverhaul:warped_pearl' + 'endermanoverhaul:icy_pearl' ] DISABLED_ITEMS.forEach(item => { diff --git a/kubejs/server_scripts/species/loot.js b/kubejs/server_scripts/species/loot.js index 31694db09..28b019256 100644 --- a/kubejs/server_scripts/species/loot.js +++ b/kubejs/server_scripts/species/loot.js @@ -19,12 +19,32 @@ function registerSpeciesLoots(event) { .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 4], ['tfg:food/raw_limpet']) + + event.addEntityLootModifier('species:goober') + .addWeightedLoot([4, 6], ['minecraft:bone']) + .addWeightedLoot([12, 20], ['tfg:food/raw_goober_meat']) event.addEntityLootModifier('species:goober') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([2, 4], ['tfg:food/raw_goober_meat']) + .addWeightedLoot([6, 10], ['tfg:food/raw_goober_meat']) + + + event.addEntityLootModifier('species:springling') + .addWeightedLoot([2, 4], ['minecraft:bone']) + .addWeightedLoot([6, 8], ['tfg:food/raw_springling_chops']) event.addEntityLootModifier('species:springling') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([1, 3], ['tfg:food/raw_springling_chops']) + .addWeightedLoot([3, 5], ['tfg:food/raw_springling_chops']) + + + // TODO: meat + event.addEntityLootModifier('species:cruncher') + .addWeightedLoot([10, 13], ['minecraft:bone']) + + + event.addEntityLootModifier('species:quake') + .addWeightedLoot([2, 4], ['create:copper_sheet']) + .addSequenceLoot(LootEntry.of('create:precision_mechanism').when(c => c.randomChance(0.5))) + .addSequenceLoot(LootEntry.of('species:kinetic_core').when(c => c.randomChance(0.2))) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/loot.js b/kubejs/server_scripts/tfg/loot.js index ac78e2fe8..5577c084a 100644 --- a/kubejs/server_scripts/tfg/loot.js +++ b/kubejs/server_scripts/tfg/loot.js @@ -152,17 +152,30 @@ function registerTFGLoots(event) { .addLoot(id) }) - // Extra animal drop amounts for butchery knives + // Animal drops + + event.addEntityLootModifier('tfg:glacian_ram') + .addWeightedLoot([1, 2], ['minecraft:bone']) + .addWeightedLoot([8, 12], ['tfg:food/raw_glacian_mutton']) event.addEntityLootModifier('tfg:glacian_ram') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([6, 9], ['tfg:food/raw_glacian_mutton']) + .addWeightedLoot([4, 6], ['tfg:food/raw_glacian_mutton']) + + + event.addEntityLootModifier('tfg:moon_rabbit') + .addWeightedLoot([2, 3], ['minecraft:bone']) + .addLoot('tfg:food/raw_moon_rabbit') event.addEntityLootModifier('tfg:moon_rabbit') .matchMainHand('#forge:tools/butchery_knives') - .addLoot('tfg:food/raw_moon_rabbit') + .addWeightedLoot([1, 2], ['tfg:food/raw_moon_rabbit']) + + + event.addEntityLootModifier('tfg:sniffer') + .addWeightedLoot([16, 20], ['tfg:food/raw_sniffer_beef']) event.addEntityLootModifier('tfg:sniffer') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([6, 9], ['tfg:food/raw_sniffer_beef']) + .addWeightedLoot([8, 10], ['tfg:food/raw_sniffer_beef']) }; diff --git a/kubejs/server_scripts/wan_ancient_beasts/loot.js b/kubejs/server_scripts/wan_ancient_beasts/loot.js index a1f5cfb53..b24da6119 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/loot.js +++ b/kubejs/server_scripts/wan_ancient_beasts/loot.js @@ -3,21 +3,40 @@ function registerWansAncientBeastsLoots(event) { - // Extra animal drop amounts for butchery knives + event.addEntityLootModifier('wan_ancient_beasts:crusher') + .addWeightedLoot([2, 4], ['minecraft:bone']) + .addWeightedLoot([4, 7], ['tfg:food/raw_crusher_meat']) event.addEntityLootModifier('wan_ancient_beasts:crusher') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([1, 3], ['tfg:food/raw_crusher_meat']) + .addWeightedLoot([2, 4], ['tfg:food/raw_crusher_meat']) + + + event.addEntityLootModifier('wan_ancient_beasts:glider') + .addWeightedLoot([1, 3], ['minecraft:bone']) + .addWeightedLoot([6, 8], ['tfg:food/raw_glider_wings']) event.addEntityLootModifier('wan_ancient_beasts:glider') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([1, 3], ['tfg:food/raw_glider_wings']) + .addWeightedLoot([3, 4], ['tfg:food/raw_glider_wings']) + + + event.addEntityLootModifier('wan_ancient_beasts:soarer') + .addWeightedLoot([1, 3], ['minecraft:bone']) + .addWeightedLoot([2, 4], ['tfg:food/raw_whole_soarer']) event.addEntityLootModifier('wan_ancient_beasts:soarer') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 2], ['tfg:food/raw_whole_soarer']) + + event.addEntityLootModifier('wan_ancient_beasts:walker') + .addWeightedLoot([10, 15], ['minecraft:bone']) + .addWeightedLoot([25, 35], ['tfg:food/raw_walker_steak']) + event.addEntityLootModifier('wan_ancient_beasts:walker') .matchMainHand('#forge:tools/butchery_knives') - .addWeightedLoot([6, 12], ['tfg:food/raw_walker_steak']) + .addWeightedLoot([12, 16], ['tfg:food/raw_walker_steak']) + + // TODO: eater, surfer } \ No newline at end of file