diff --git a/kubejs/assets/minecraft/lang/en_gb.json b/kubejs/assets/minecraft/lang/en_gb.json index 397c8584e..a19d1aea1 100644 --- a/kubejs/assets/minecraft/lang/en_gb.json +++ b/kubejs/assets/minecraft/lang/en_gb.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.minecraft.iron_block": "Cast Iron Block", "block.minecraft.chiseled_deepslate": "Chiseled Migmatite", - "block.minecraft.cobbled_deepslate": "Cobbled Migmatite", + "block.minecraft.cobbled_deepslate": "Migmatite Cobble", "block.minecraft.cobbled_deepslate_slab": "Cobbled Migmatite Slab", "block.minecraft.cobbled_deepslate_stairs": "Cobbled Migmatite Stairs", "block.minecraft.cobbled_deepslate_wall": "Cobbled Migmatite Wall", diff --git a/kubejs/assets/minecraft/lang/en_us.json b/kubejs/assets/minecraft/lang/en_us.json index 397c8584e..a19d1aea1 100644 --- a/kubejs/assets/minecraft/lang/en_us.json +++ b/kubejs/assets/minecraft/lang/en_us.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.minecraft.iron_block": "Cast Iron Block", "block.minecraft.chiseled_deepslate": "Chiseled Migmatite", - "block.minecraft.cobbled_deepslate": "Cobbled Migmatite", + "block.minecraft.cobbled_deepslate": "Migmatite Cobble", "block.minecraft.cobbled_deepslate_slab": "Cobbled Migmatite Slab", "block.minecraft.cobbled_deepslate_stairs": "Cobbled Migmatite Stairs", "block.minecraft.cobbled_deepslate_wall": "Cobbled Migmatite Wall", diff --git a/kubejs/assets/primitive_creatures/lang/en_us.json b/kubejs/assets/primitive_creatures/lang/en_us.json index a4bde0679..94560f1fa 100644 --- a/kubejs/assets/primitive_creatures/lang/en_us.json +++ b/kubejs/assets/primitive_creatures/lang/en_us.json @@ -6,12 +6,16 @@ "entity.primitive_creatures.wiloger": "Beast Tamer", "entity.primitive_creatures.iloger_2": "Herbalist", "entity.primitive_creatures.iloger_1": "Forager", + "entity.primitive_creatures.piloger_9": "Warrior", + "entity.primitive_creatures.nahida": "Huntmaster", "item.primitive_creatures.tfc_spawn_egg": "Kaolin Klayze Spawn Egg", "item.primitive_creatures.golem_2_spawn_egg": "Graphite Glayze Spawn Egg", "item.primitive_creatures.iloger_4_spawn_egg": "Ambusher Spawn Egg", "item.primitive_creatures.wiloger_spawn_egg": "Beast Tamer Spawn Egg", "item.primitive_creatures.iloger_2_spawn_egg": "Herbalist Spawn Egg", "item.primitive_creatures.iloger_1_spawn_egg": "Forager Spawn Egg", + "item.primitive_creatures.piloger_9_spawn_egg": "Warrior Spawn Egg", + "item.primitive_creatures.nahida_spawn_egg": "Huntmaster Spawn Egg", "item.primitive_creatures.yhgi": "Flint Club", "item.primitive_creatures.reh": "Fortified Flint Club", "item.primitive_creatures.grh": "Battered Wool", @@ -19,5 +23,6 @@ "item.primitive_creatures.totem_2": "Wooden Lion-Man Idol", "item.primitive_creatures.totem_3": "Hardened Mud Idol", "item.primitive_creatures.tt_5": "Small Shard", - "item.primitive_creatures.f_1": "Primitive Explosives" + "item.primitive_creatures.f_1": "Primitive Explosives", + "item.primitive_creatures.ww_3": "Fragrant Grass" } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 5bdfa936b..7e9727981 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -156,15 +156,15 @@ "block.tfg.spike.deepslate_spike": "Migmatite Spike", "block.tfg.loose.deepslate": "Loose Migmatite Rock", "block.tfg.rock.hardened_blackstone": "Hardened Pyroxenite", - "block.tfg.rock.cobble_blackstone": "Pyroxenite Cobblestone", + "block.tfg.rock.cobble_blackstone": "Pyroxenite Cobble", "block.tfg.rock.gravel_blackstone": "Pyroxenite Gravel", "block.tfg.spike.blackstone_spike": "Pyroxenite Spike", "block.tfg.rock.hardened_dripstone": "Hardened Travertine", - "block.tfg.rock.cobble_dripstone": "Travertine Cobblestone", + "block.tfg.rock.cobble_dripstone": "Travertine Cobble", "block.tfg.rock.gravel_dripstone": "Travertine Gravel", "block.tfg.spike.dripstone_spike": "Travertine Spike", "block.tfg.loose.dripstone": "Loose Travertine Rock", - "block.tfg.rock.cobble_crackrack": "Keratophyre Cobblestone", + "block.tfg.rock.cobble_crackrack": "Keratophyre Cobble", "block.tfg.rock.gravel_crackrack": "Keratophyre Gravel", "block.tfg.rock.polished_crackrack": "Polished Keratophyre", "block.tfg.loose.crackrack": "Loose Keratophyre Rock", @@ -176,7 +176,7 @@ "block.tfg.spike.moon_stone_spike": "Anorthosite Spike", "block.tfg.loose.moon_stone": "Loose Anorthosite Rock", "block.tfg.rock.hardened_moon_deepslate": "Hardened Norite", - "block.tfg.rock.cobble_moon_deepslate": "Norite Cobblestone", + "block.tfg.rock.cobble_moon_deepslate": "Norite Cobble", "block.tfg.rock.gravel_moon_deepslate": "Norite Gravel", "block.tfg.rock.polished_moon_deepslate": "Polished Norite", "block.tfg.rock.bricks_moon_deepslate": "Norite Bricks", @@ -202,7 +202,8 @@ "block.tfg.spike.glacio_stone_spike": "Phonolite Spike", "block.tfg.loose.glacio_stone": "Loose Phonolite Rock", "block.tfg.rock.hardened_permafrost": "Hardened Permafrost", - "block.tfg.rock.cobble_permafrost": "Permafrost Cobblestone", + "block.tfg.rock.cobble_permafrost": "Permafrost Cobble", + "block.tfg.rock.gravel_permafrost": "Permafrost Gravel", "block.tfg.spike.permafrost_spike": "Permafrost Spike", "block.tfg.loose.permafrost": "Loose Permafrost Rock", "block.tfg.rock.raw.stromatolite": "Raw Stromatolite", @@ -574,6 +575,20 @@ "item.tfg.food.raw_sniffer_beef": "Raw Sniffer Beef", "item.tfg.food.cooked_sniffer_beef": "Cooked Sniffer Beef", "item.tfg.spawn_egg.sniffer": "Sniffer Spawn Egg", + "item.tfg.food.raw_wraptor": "Raw Wraptor", + "item.tfg.food.cooked_wraptor": "Cooked Wraptor", + "item.tfg.food.raw_springling_chops": "Raw Springling Chops", + "item.tfg.food.cooked_springling_chops": "Cooked Springling Chops", + "item.tfg.food.raw_walker_steak": "Raw Walker Steak", + "item.tfg.food.cooked_walker_steak": "Cooked Walker Steak", + "item.tfg.food.raw_glider_wings": "Raw Glider Wings", + "item.tfg.food.cooked_glider_wings": "Cooked Glider Wings", + "item.tfg.food.raw_whole_soarer": "Raw Whole Soarer", + "item.tfg.food.cooked_whole_soarer": "Cooked Whole Soarer", + "item.tfg.food.raw_crusher_meat": "Raw Crusher Meat", + "item.tfg.food.cooked_crusher_meat": "Cooked Crusher Meat", + "item.tfg.food.raw_goober_meat": "Raw Goober Meat", + "item.tfg.food.cooked_goober_meat": "Cooked Goober Meat", "item.tfg.roasted_sunflower_seeds": "Roasted Sunflower Seeds", "item.tfg.sunflower_seeds": "Sunflower Seed", "item.tfg.sunflower_product": "Sunflower Cap", diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/musselwarden_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/musselwarden_biome_modifier.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/musselwarden_biome_modifier.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ 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 e1b2aa70e..b51d22956 100644 --- a/kubejs/server_scripts/primitive_creatures/loot.js +++ b/kubejs/server_scripts/primitive_creatures/loot.js @@ -34,10 +34,10 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc:food/strawberry', 4), Item.of('tfc:food/wintergreen_berry', 5)]) .addAlternativesLoot( - LootEntry.of('primitive_creatures:grh').when(c => c.randomChance(0.8)), - LootEntry.of('gtceu:stone_axe').when(c => c.randomChance(0.3)), + LootEntry.of('sns:straw_basket').when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1))) + LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('primitive_creatures:grh')) event.addEntityLootModifier('primitive_creatures:iloger_1') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -53,9 +53,9 @@ function registerPrimitiveCreaturesLoots(event) { .addAlternativesLoot( LootEntry.of('tfc:plant/field_horsetail').when(c => c.randomChance(0.3)), LootEntry.of('tfc:plant/foxglove').when(c => c.randomChance(0.5)), - LootEntry.of('firmalife:beeswax').when(c => c.randomChance(0.8)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1))) + LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('firmalife:beeswax')) event.addEntityLootModifier('primitive_creatures:iloger_2') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -72,7 +72,7 @@ function registerPrimitiveCreaturesLoots(event) { .addAlternativesLoot( LootEntry.of('gtceu:stone_hammer').when(c => c.randomChance(0.2)), LootEntry.of('minecraft:skeleton_skull').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:grh').when(c => c.randomChance(0.5))) // battered wool + LootEntry.of('primitive_creatures:grh')) // battered wool event.addEntityLootModifier('primitive_creatures:iloger_3') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -87,9 +87,9 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([1,3], LootEntry.of('minecraft:tipped_arrow')).addPotion("poison") .addAlternativesLoot( LootEntry.of('firmalife:food/nightshade_berry').when(c => c.randomChance(0.7)), - LootEntry.of('minecraft:spider_eye').when(c => c.randomChance(0.7)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.1))) + LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.1)), + LootEntry.of('sns:quiver')) event.addEntityLootModifier('primitive_creatures:iloger_4') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -104,10 +104,10 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([1,3], LootEntry.of('minecraft:tipped_arrow')).addPotion("weakness") .addAlternativesLoot( // placeholder for a blowpipe - LootEntry.of('minecraft:bamboo').when(c => c.randomChance(0.6)), - LootEntry.of('primitive_creatures:grh').when(c => c.randomChance(0.5)), // battered wool + LootEntry.of('minecraft:bamboo').when(c => c.randomChance(0.5)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1))) + LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('sns:quiver')) // battered wool event.addEntityLootModifier('primitive_creatures:iloger_5') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -122,9 +122,9 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([1,2], ['primitive_creatures:f_1']) // primitive explosives .addWeightedLoot([1,3], ['minecraft:gunpowder']) .addAlternativesLoot( - LootEntry.of('primitive_creatures:grh').when(c => c.randomChance(0.5)), // battered wool LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1))) + LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('primitive_creatures:grh')) // battered wool event.addEntityLootModifier('primitive_creatures:iloger_6') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -138,9 +138,9 @@ function registerPrimitiveCreaturesLoots(event) { .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([0,2], ['primitive_creatures:grh']) // battered wool .addAlternativesLoot( - LootEntry.of('minecraft:lead').when(c => c.randomChance(0.4)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1))) + LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('minecraft:lead')) event.addEntityLootModifier('primitive_creatures:wiloger') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -149,13 +149,13 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:tiger_pants'), Item.of('tfc_textile:tiger_boots')]) - // huntsman - lion fur, holds flint club - stuns you in place when hit + // warrior - lion fur, holds flint club - stuns you in place when hit event.addEntityLootModifier('primitive_creatures:piloger_9') .removeLoot(ItemFilter.ALWAYS_TRUE) .addAlternativesLoot( LootEntry.of('primitive_creatures:yhgi').when(c => c.randomChance(0.2)), // flint club LootEntry.of('tfc:small_raw_hide').when(c => c.randomChance(0.4)), - LootEntry.of('primitive_creatures:grh').when(c => c.randomChance(0.5))) // battered wool + LootEntry.of('primitive_creatures:grh')) // battered wool event.addEntityLootModifier('primitive_creatures:piloger_9') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -169,10 +169,10 @@ function registerPrimitiveCreaturesLoots(event) { .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([1,2], ['minecraft:emerald']) .addAlternativesLoot( - LootEntry.of('primitive_creatures:grh').when(c => c.randomChance(0.8)), // battered wool LootEntry.of('gtceu:stone_knife').when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1))) + LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('primitive_creatures:grh')) // battered wool) event.addEntityLootModifier('primitive_creatures:viloger_10') .randomChance(CLOTHING_DROP_RATE) .addWeightedLoot([ @@ -181,9 +181,33 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc_textile:raw_pants'), Item.of('tfc_textile:raw_socks')]) + // huntmaster - miniboss + event.addEntityLootModifier('primitive_creatures:nahida') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([ + Item.of('gtceu:cobalt_brass_butchery_knife'), + Item.of('gtceu:cobalt_brass_axe'), + Item.of('gtceu:cobalt_brass_pickaxe'), + Item.of('gtceu:cobalt_brass_sword')]) + event.addEntityLootModifier('primitive_creatures:nahida') + .addWeightedLoot([ + Item.of('tfc:goat_horn'), + Item.of('sns:leather_sack'), + Item.of('sns:burlap_sack'), + Item.of('sns:seed_pouch'), + Item.of('sns:ore_sack')]) + event.addEntityLootModifier('primitive_creatures:nahida') + .randomChance(CLOTHING_DROP_RATE) + .addWeightedLoot([ + Item.of('tfc_textile:panther_hat'), + Item.of('tfc_textile:panther_shirt'), + Item.of('tfc_textile:panther_pants'), + Item.of('tfc_textile:panther_boots')]) + // mistah beeeaaaasssstt event.addEntityLootModifier('primitive_creatures:beast') .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([4,8], ['minecraft:bone']) + .addWeightedLoot([2,3], ['tfc:large_raw_hide']) // raw meat? } \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 0a2672ac4..4e72823ad 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -10824,7 +10824,7 @@ "files": [ { "type": "modrinth", - "file_name": "primitive_creatures-2.0.2 -forge-1.20.1.jar", + "file_name": "primitive creatures V2.0.4 1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -10832,20 +10832,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/GfUwaZEm/versions/uNaRNzlu/primitive_creatures-2.0.2 -forge-1.20.1.jar", - "id": "uNaRNzlu", + "url": "https://cdn.modrinth.com/data/GfUwaZEm/versions/WS4cl75O/primitive creatures V2.0.4 1.20.1.jar", + "id": "WS4cl75O", "parent_id": "GfUwaZEm", "hashes": { - "sha512": "d2a385a2c11e89e653df517f364d8daf241343fbc90fa5e127d8927c42fec5f019e0d7608b1b60b77799ac63e8504fe33f2db5296b97f20a6133b3c3d96bf8fe", - "sha1": "636e1df95059035e65a44102811543e7ef4d54ab" + "sha512": "24066d5ac2ce72e86a8bbf11d4e860d681cc67faec01621bb368160d636c1e2121803530c3f46e829a85b4419d16fc0a4715896d11c6101f5e8ffad5a664cd6a", + "sha1": "939d37037cc19b15aa8581afa513a724268858b1" }, "required_dependencies": [], - "size": 432958, - "date_published": "2025-07-27T22:34:47.018170Z" + "size": 501549, + "date_published": "2025-08-22T19:33:48.426929Z" }, { "type": "curseforge", - "file_name": "primitive_creatures-2.0.2 -forge-1.20.1.jar", + "file_name": "primitive creatures V2.0.4 1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -10853,18 +10853,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6819/208/primitive_creatures-2.0.2 -forge-1.20.1.jar", - "id": "6819208", + "url": "https://edge.forgecdn.net/files/6916/123/primitive creatures V2.0.4 1.20.1.jar", + "id": "6916123", "parent_id": "1218288", "hashes": { - "sha1": "636e1df95059035e65a44102811543e7ef4d54ab", - "md5": "f42ff9cf3c6443df4ab473a6c54f3ed2" + "sha1": "939d37037cc19b15aa8581afa513a724268858b1", + "md5": "9baf3e79f190339e9df0f86bb87bf523" }, "required_dependencies": [ "388172" ], - "size": 432958, - "date_published": "2025-07-27T22:32:37.827Z" + "size": 501549, + "date_published": "2025-08-22T19:27:59.940Z" } ] },