diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/end_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/end_enderman.json new file mode 100644 index 000000000..4ce0c5338 --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/end_enderman.json @@ -0,0 +1,45 @@ +{ + "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" + }, + { + "type": "minecraft:item", + "name": "tfg:lunar_chorus_flower" + } + ], + "rolls": 2.0 + } + ], + "random_sequence": "endermanoverhaul:entities/soulsand_valley_enderman" +} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json new file mode 100644 index 000000000..7d6f58110 --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:ancient_pearl" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "endermanoverhaul:corrupted_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:soul_pearl" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "endermanoverhaul:entities/soulsand_valley_enderman" +} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/soulsand_valley_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/soulsand_valley_enderman.json new file mode 100644 index 000000000..5cd23cb7a --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/soulsand_valley_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/soulsand_valley_enderman" +} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json new file mode 100644 index 000000000..238199e52 --- /dev/null +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json @@ -0,0 +1,41 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:ender_pearl" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:summoner_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/windswept_hills_enderman" +} \ 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 292a75f4d..112da387f 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -176,10 +176,13 @@ const registerAdAstraEntityTypeTags = (event) => { 'minecraft:endermite', 'minecraft:shulker', 'minecraft:shulker_bullet', + 'minecraft:skeleton', 'species:limpet', 'endermanoverhaul:windswept_hills_enderman', 'endermanoverhaul:soulsand_valley_enderman', - 'endermanoverhaul:spirit' + 'endermanoverhaul:spirit', + 'endermanoverhaul:end_enderman', + 'endermanoverhaul:end_islands_enderman' ] MOON_ENTITIES.forEach(entity => { @@ -189,8 +192,11 @@ const registerAdAstraEntityTypeTags = (event) => { }) event.add('tfc:deals_crushing_damage', 'minecraft:enderman') + event.add('tfc:deals_crushing_damage', 'minecraft:skeleton') event.add('tfc:deals_crushing_damage', 'endermanoverhaul:windswept_hills_enderman') event.add('tfc:deals_crushing_damage', 'endermanoverhaul:soulsand_valley_enderman') + event.add('tfc:deals_crushing_damage', 'endermanoverhaul:end_enderman') + event.add('tfc:deals_crushing_damage', 'endermanoverhaul:end_islands_enderman') event.add('tfc:deals_piercing_damage', 'minecraft:endermite') event.add('tfc:deals_crushing_damage', 'ad_astra:star_crawler') }