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 zcmb2|=3v;}aUz4^e{IO#erZ>c`hREM#r4flQ4wS;5eijmV)AU%Ie1k5$Gase>6Vt4 zT%vl*kAG9yY&?7B#@_yCQCd>BIHV?Ithm%TMWdckNY{yxvvU$tXWxgkO8dQqh2fj#lYIGAwR($xTWy#m6tYFJ?NR*~jio`)`3%Z8#s5za zuDQ9a;D*|7)&QZ}$BtJ8Oqa0vsrX#*nAo`TvWlrOzt(pZVKy68OZ8emTaD#GpOkg3 zv-t?f?V9r1+cc4DE{mteoLDd6oBYa}A1-@{Hr$`cvA{KmS5737XY10Jwq{pSvR>Ov z6Y}d_xXssU5`vScXwTEnd;96_a_)i8?1`yUKLRK zL9V{^-F5G?-Px)i$~RtKw=-h{+ta;!=WaW?>-RVF=k>n|pHI)%pDSte=lOk;_JU3A zuBTI+m#1i%{R-+a)%md3Zo`)q+0K^>Ty7SmI0+p;(>6ajI>4&j@@>qfz;lNdDhby- z|7w5hf9~twm**$G?|K?3;AqLHP-n9RW{Xczt+vaTi0}V3b ze2UXFyQJqXId}TC=XOKU-HrbL_uMZ26y=<_{nn1SwStcp+fhuQhQg`LX#tjm_N1-F(@m}>URDKf@S z?{nP42S0C3xBqiDGrqRs!-K{4`yTHPe^Ak0a4#)F>rjztXuiks^;2j6{BiN*smuEB z;vy!Uy|>Cd_^6P|Y^cuVGpLqdTH!!|pzN^FdPB zS>=({y>>mLB>la5OC7(=o7-S5D7qpq_|VxEA4|)McYU7y`AKs#&#|rZnm<1|b@0!> z>DDuz{QNAm=hD)Pt{e(cVp&6Ue1IgQ}(~FwSWJy)n$)MMx)cw|A{P$DRF{(o;~}{bavZP zkNhh_VVsT=FNGLa@Cz;xTgCaJZkcIgJ6m-|N4r`{1{41?x5r6&CVI~nl+L=gW5!1I z;>CrA=2GIud2^SU>OIS|2a#@%lhoE;-g4}yOqGGTlsHI9``XJ}mK~SrNwR z)_$k{+V5At?0J^FK4V6@;k$<(o3~^$xyvP;-n=Qh>dgJ#*HTY+Zpvoj=lyo!OWK?2 z-OG;G*uFcTbE4RG-QDnJTNB%7>EEga^aWRLvvM=`O+9DwtMI(`G_PHkXYakCwsJ+n z%GRF1FODC)7Dse#T5@~RQH?dN8W+!3P0zQmIXyEZTX;*Wxz9ZVj;Oa4uBV^$C24B! z)O4BmnX5^ASNe-xo0ES>&7YR>aXQ0cOO2Mw&%AWE>tgk4kIrVjU8-A_#4ft_<=)II zcE8Uy$h4lgw*8p7=~=5QrbpIuH;8{SS@0^^W%nnBy`ATLt0k_kZ+qplfGh5)YVd32 zH%l#M#Xb(={S)qf!z@HiK*By8<3}$LzMGrK(RW7h1nJ zH#xoI8B^L4z06bJ)?CVBcBsG6n84Nk_JX>H@0Jz%3(jWFz0e=C@ImtP>Z@mkrrfZr ztKBI&ea`J!y3hJAJ>DH#YWlO(I_bjWSI?xQ=0883`u9>qdQaNPiPKV<+P$K9cz&Oh zYyMS#d4uSh89q;xch2|k`@iJfzRi2z#OuwhzZ-w=#Wjg(iYo2S?X#RY&hnQQ*~Q6A z_7j?f7Q$T1-GRYcl{EtWm>-a KhtL5D1_l7zjrfQF literal 937 zcmb2|=3oGW|97V!?7M9y;NZR}<#gF)-%UG3Tm!ybiRKlt{dsHA@dYmyhBr>r=}s ztDTU&_ZPFHj%b+6|8?aH+D?}_|DTo4#IN=xVFJ6b<%|P|cc#Xi(|ugTx69{q&uPmq z1$mOwi%;*Eb6D@P&EukX=ac6ZT5j(-Em=DAndJ21ClBu!={=uTXz3oitTOF^j8D3q zg!TP|m_ns~i;22^8RtbS3>LCC%lIS|?>o4ohKYav1MZrbznr#nocW($IBfZ)fX{Z$ z#CGFP1#WWZP8^o3v~ZWRo7nE3^4alnB=7ORoo~)4_~oRtmFg}tHtXEH#kkqxphtQ4_ETqOH6xp-b?Apv_eJCUj?ztA9+Zg zyv(-ROKpRu#^KVcsg<=C;!~N#v!*{}pOmz!*o8-)uyw)MLHj)@Z- zJc=uBD!+HN*_|JM9fy5Sb>2(uk(UV@)Hez~z%r#ICu z?#d~*c=j?b;O~!JQ)fJVzUA2u2Hj7`6qX+N^f~|fhJUdi+BjT0%lcIxFE>8Ix^AiF zUza7X!ddFKb*b8~S{46lT8a0IN$XgJcXv%!O}(3bUwWeO^Pk@iJ~`{NxzBg;_k3;L z^G7RFOs{lw|5{Nk96#%u#p?GxSC2Y`O_^#s@%Cgp?>eL9Zmlv;@6Y)X*cBD-_-UWC z=sNC*H#>v=EJ$BAV+{7{}MQ1j;VzP+)Z*NVgzPSf$fbmsNPox6U17B9Pe`^7qe zIV(fVE%&PJH+P;9*K%p)@!NUJwzB>HAiwQ_(S>zlcV=I)JXl$EsB~?wYgn%kU$brN z*Ea`kLl2u(xw>f0)A;=~?Cbt3wr6tmf8UNi`TwqL!l(4C7&h^c_~|!dmT%Y-<9__v z#M_f!i~jiWclyVQKmV5Q+#kPfy~4%$L5FLqR^9m1CHgP;e|>^O#Ygi$%+hE7&(9KL GU;qHn$=hTA 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" } ] },