From 143fdab6fa4e96a11c5c0eb2f64e5edb7a95f291 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 15 Sep 2025 21:58:59 +0100 Subject: [PATCH] added berserker --- .../biome_modifier/all_biome_modifier.json | 1 + .../iloger_10_biome_modifier.json | 3 +++ .../data/tfg/loot_tables/chests/moonbase.json | 2 +- .../chests/nordic_illager_basic.json | 5 +++++ .../chests/nordic_illager_smithy.json | 5 +++++ .../illager_generic/mobs/berserker.nbt | Bin 0 -> 998 bytes .../structures/norse/ruins/norse_root_ruin.nbt | Bin 937 -> 1000 bytes .../template_pool/illagers/mob_berserker.json | 15 +++++++++++++++ .../template_pool/illagers/mob_strong.json | 9 +++++++++ .../server_scripts/primitive_creatures/loot.js | 16 ++++++++++++++++ pakku-lock.json | 14 +++++++------- 11 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 kubejs/data/primitive_creatures/forge/biome_modifier/iloger_10_biome_modifier.json create mode 100644 kubejs/data/tfg/structures/illager_generic/mobs/berserker.nbt create mode 100644 kubejs/data/tfg/worldgen/template_pool/illagers/mob_berserker.json diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json index cb284711c..f8f2c00b6 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json @@ -13,6 +13,7 @@ "primitive_creatures:iloger_6", "primitive_creatures:musselwarden", "primitive_creatures:piloger_9", + "primitive_creatures:iloger_10", "primitive_creatures:viloger_10", "primitive_creatures:wiloger" ] diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_10_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_10_biome_modifier.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_10_biome_modifier.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/chests/moonbase.json b/kubejs/data/tfg/loot_tables/chests/moonbase.json index f3097989e..ae8a44d9c 100644 --- a/kubejs/data/tfg/loot_tables/chests/moonbase.json +++ b/kubejs/data/tfg/loot_tables/chests/moonbase.json @@ -377,7 +377,7 @@ { "type": "minecraft:item", "name": "species:music_disc_dial", - "weight": 5 + "weight": 8 }, { "type": "minecraft:item", diff --git a/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json index a84cb6f38..3a8a45510 100644 --- a/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json +++ b/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json @@ -591,6 +591,11 @@ "type": "minecraft:item", "name": "chalk:light_gray_chalk", "weight": 70 + }, + { + "type": "minecraft:item", + "name": "species:music_disc_lapidarian", + "weight": 8 } ], "rolls": { diff --git a/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json b/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json index 9e490e0f5..db129db1c 100644 --- a/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json +++ b/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json @@ -342,6 +342,11 @@ "type": "minecraft:item", "name": "minecraft:coast_armor_trim_smithing_template", "weight": 20 + }, + { + "type": "minecraft:item", + "name": "alekiships:music_disc_pirate_crafting", + "weight": 8 } ], "rolls": { diff --git a/kubejs/data/tfg/structures/illager_generic/mobs/berserker.nbt b/kubejs/data/tfg/structures/illager_generic/mobs/berserker.nbt new file mode 100644 index 0000000000000000000000000000000000000000..18d549293c9e903785fbf44cf9267c4bbd42918f GIT binary patch literal 998 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 L8_oZpY8C(h(8=3m diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/mob_berserker.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_berserker.json new file mode 100644 index 000000000..28dc995da --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_berserker.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/mob_berserker", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/berserker", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/mob_strong.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_strong.json index 0913ccf42..e8fc351da 100644 --- a/kubejs/data/tfg/worldgen/template_pool/illagers/mob_strong.json +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_strong.json @@ -28,6 +28,15 @@ "projection": "rigid", "element_type": "minecraft:single_pool_element" } + }, + { + "weight": 80, + "element": { + "location": "tfg:illager_generic/mobs/berserker", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } } ] } \ No newline at end of file diff --git a/kubejs/server_scripts/primitive_creatures/loot.js b/kubejs/server_scripts/primitive_creatures/loot.js index dcfd753bf..359743940 100644 --- a/kubejs/server_scripts/primitive_creatures/loot.js +++ b/kubejs/server_scripts/primitive_creatures/loot.js @@ -210,6 +210,22 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:panther_pants'), Item.of('tfc_textile:panther_boots')]) + // berserker - guy with celtic blue face paint + event.addEntityLootModifier('primitive_creatures:iloger_10') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([ + LootEntry.of('gtceu:cobalt_brass_sword').damage([0.85, 1]), + LootEntry.of('sns:burlap_sack'), + LootEntry.of('sns:seed_pouch'), + LootEntry.of('sns:ore_sack')]) + event.addEntityLootModifier('primitive_creatures:iloger_10') + .randomChance(CLOTHING_DROP_RATE) + .addWeightedLoot([ + Item.of('tfc_textile:sabertooth_hat'), + Item.of('tfc_textile:sabertooth_shirt'), + Item.of('tfc_textile:sabertooth_pants'), + Item.of('tfc_textile:sabertooth_boots')]) + // mistah beeeaaaasssstt event.addEntityLootModifier('primitive_creatures:beast') .removeLoot(ItemFilter.ALWAYS_TRUE) diff --git a/pakku-lock.json b/pakku-lock.json index 95551e7df..da4e587d0 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -10833,7 +10833,7 @@ }, { "type": "curseforge", - "file_name": "primitive creatures V2.0.4 1.20.1.jar", + "file_name": "primitive creatures V2.2 1.20.1 .jar", "mc_versions": [ "1.20.1" ], @@ -10841,18 +10841,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6916/123/primitive creatures V2.0.4 1.20.1.jar", - "id": "6916123", + "url": "https://edge.forgecdn.net/files/7000/784/primitive creatures V2.2 1.20.1 .jar", + "id": "7000784", "parent_id": "1218288", "hashes": { - "sha1": "939d37037cc19b15aa8581afa513a724268858b1", - "md5": "9baf3e79f190339e9df0f86bb87bf523" + "sha1": "f76bde1ecf37c7111859ebb02cdef978ec370191", + "md5": "9cc3392503d06d05fe2d5fe22a64e6cf" }, "required_dependencies": [ "388172" ], - "size": 501549, - "date_published": "2025-08-22T19:27:59.940Z" + "size": 525102, + "date_published": "2025-09-15T19:44:19.663Z" } ] },