From 26275c0b09bafa96c6b52ba17c16f95751e766ed Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 12:47:38 +0100 Subject: [PATCH] buffing nether entity loot tables --- .../loot_tables/entities/cave_enderman.json | 58 ++++++++++++---- .../entities/dark_oak_enderman.json | 46 ++++++++++--- .../entities/mushroom_fields_enderman.json | 50 +++++++++++--- .../entities/nether_wastes_enderman.json | 66 ------------------ .../loot_tables/entities/swamp_enderman.json | 68 +++++++++++++++++-- .../loot_tables/entities/enderman.json | 16 ++--- .../loot_tables/entities/phantom.json | 16 ++--- .../loot_tables/entities/wither_skeleton.json | 46 ++++++++++--- .../server_scripts/endermanoverhaul/tags.js | 13 +++- kubejs/startup_scripts/minecraft/constants.js | 3 +- 10 files changed, 253 insertions(+), 129 deletions(-) delete mode 100644 kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json index 10953fcfc..cdb4a42cc 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json @@ -11,16 +11,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -41,16 +41,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -71,16 +71,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -101,7 +101,37 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "tfc:ore/normal_native_copper" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 1.0, "min": 0.0 }, "function": "minecraft:set_count" @@ -116,7 +146,7 @@ "function": "minecraft:looting_enchant" } ], - "name": "tfc:ore/normal_native_copper" + "name": "endermanoverhaul:summoner_pearl" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json index 3fe97f6cf..19df111fe 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json @@ -11,16 +11,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -42,15 +42,15 @@ "count": { "type": "minecraft:uniform", "max": 8.0, - "min": 0.0 + "min": 4.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -72,6 +72,36 @@ "count": { "type": "minecraft:uniform", "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "minecraft:charcoal" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 1.0, "min": 0.0 }, "function": "minecraft:set_count" @@ -86,7 +116,7 @@ "function": "minecraft:looting_enchant" } ], - "name": "minecraft:charcoal" + "name": "endermanoverhaul:corrupted_pearl" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json index 870221ae6..af35178ec 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json @@ -11,16 +11,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -41,16 +41,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -71,7 +71,37 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 3.0, + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "minecraft:brown_mushroom" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 1.0, "min": 0.0 }, "function": "minecraft:set_count" @@ -86,7 +116,7 @@ "function": "minecraft:looting_enchant" } ], - "name": "minecraft:brown_mushroom" + "name": "endermanoverhaul:summoner_pearl" } ], "rolls": 1.0 diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json deleted file mode 100644 index da0f4b05d..000000000 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "ae2:ender_dust" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "endermanoverhaul:summoner_pearl" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "endermanoverhaul:entities/nether_wastes_enderman" -} \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json index c47a90367..02bf8d53d 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json @@ -11,16 +11,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -31,6 +31,66 @@ ], "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" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "minecraft:glow_berries" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "tfc:wood/sapling/mangrove" + } + ], + "rolls": 1.0 + }, { "bonus_rolls": 0.0, "entries": [ diff --git a/kubejs/data/minecraft/loot_tables/entities/enderman.json b/kubejs/data/minecraft/loot_tables/entities/enderman.json index 7fd609913..8fc22b68f 100644 --- a/kubejs/data/minecraft/loot_tables/entities/enderman.json +++ b/kubejs/data/minecraft/loot_tables/entities/enderman.json @@ -12,16 +12,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -42,16 +42,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 4.0, + "min": 2.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" diff --git a/kubejs/data/minecraft/loot_tables/entities/phantom.json b/kubejs/data/minecraft/loot_tables/entities/phantom.json index c81073174..83e70384a 100644 --- a/kubejs/data/minecraft/loot_tables/entities/phantom.json +++ b/kubejs/data/minecraft/loot_tables/entities/phantom.json @@ -12,16 +12,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 3.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -36,16 +36,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" diff --git a/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json b/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json index 031bb3e7b..be0b4fc56 100644 --- a/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json +++ b/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json @@ -12,16 +12,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 + "max": 4.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -42,16 +42,16 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 + "max": 5.0, + "min": 2.0 }, "function": "minecraft:set_count" }, { "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "enchantment": "minecraft:looting", "function": "minecraft:looting_enchant" @@ -60,6 +60,36 @@ "name": "beneath:cursecoal" } ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ], + "name": "gtceu:rich_raw_coal" + } + ] } ] } \ No newline at end of file diff --git a/kubejs/server_scripts/endermanoverhaul/tags.js b/kubejs/server_scripts/endermanoverhaul/tags.js index b838d389c..c381c1956 100644 --- a/kubejs/server_scripts/endermanoverhaul/tags.js +++ b/kubejs/server_scripts/endermanoverhaul/tags.js @@ -4,7 +4,18 @@ const registerEndermanOverhaulItemTags = (event) => { 'endermanoverhaul:tiny_skull', 'endermanoverhaul:enderman_tooth', 'endermanoverhaul:corrupted_blade', - 'endermanoverhaul:corrupted_shield' + 'endermanoverhaul:corrupted_shield', + + 'endermanoverhaul:badlands_hood', + 'endermanoverhaul:savannah_hood', + 'endermanoverhaul:snowy_hood', + + 'endermanoverhaul:soul_pearl', + 'endermanoverhaul:ancient_pearl', + 'endermanoverhaul:bubble_pearl', + 'endermanoverhaul:icy_pearl', + 'endermanoverhaul:crimson_pearl', + 'endermanoverhaul:warped_pearl' ] DISABLED_ITEMS.forEach(item => { diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 4abb73568..958a8b15e 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -626,8 +626,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:purpur_slab', 'minecraft:shears', 'minecraft:lantern', - 'minecraft:soul_lantern', - 'minecraft:smithing_table', + 'minecraft:soul_lantern', 'minecraft:smoker', 'minecraft:blast_furnace', 'minecraft:chiseled_bookshelf',