From 34c4bb5fb4db146d85f3b3d30f7afaae90fecd54 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 31 Jan 2026 18:50:46 +0000 Subject: [PATCH] stuff and things --- config/carryon-common.toml | 2 +- defaultconfigs/createhorsepower-server.toml | 2 +- defaultconfigs/wan_ancient_beasts-server.toml | 27 +++++++++++++++++ kubejs/server_scripts/tfg/food/tags.food.js | 1 + kubejs/server_scripts/tfg/mars/tags.mars.js | 15 +++++++--- .../server_scripts/tfg/worldgen/data.fauna.js | 30 +++++++++++++++++++ .../server_scripts/wan_ancient_beasts/tags.js | 13 ++++++-- kubejs/startup_scripts/tfg/worldgen/fauna.js | 3 ++ 8 files changed, 84 insertions(+), 9 deletions(-) diff --git a/config/carryon-common.toml b/config/carryon-common.toml index bcd253142..c8fe92609 100644 --- a/config/carryon-common.toml +++ b/config/carryon-common.toml @@ -57,7 +57,7 @@ [whitelist] #Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config #Entities that CAN be picked up (useWhitelistEntities must be true) - allowedEntities = ["minecraft:axolotl", "tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfc:sheep", "tfc:wolf", "tfc:dog", "tfc:pig", "tfc:goat", "tfc:alpaca", "tfg:wraptor", "tfg:surfer", "tfg:moon_rabbit", "species:limpet", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram", "wan_ancient_beasts:crusher", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer", "wan_ancient_beasts:surfer", "primitive_creatures:viloger_10"] + allowedEntities = ["minecraft:axolotl", "tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfc:sheep", "tfc:wolf", "tfc:dog", "tfc:pig", "tfc:goat", "tfc:alpaca", "tfg:wraptor", "tfg:surfer", "tfg:moon_rabbit", "species:limpet", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram", "wan_ancient_beasts:crusher", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer", "wan_ancient_beasts:surfer", "wan_ancient_beasts:snatcher", "primitive_creatures:viloger_10"] #Blocks that CAN be picked up (useWhitelistBlocks must be true) allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "afc:wood/chest/*", "afc:wood/trapped_chest/*", "#forge:chests/wooden"] #Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true) diff --git a/defaultconfigs/createhorsepower-server.toml b/defaultconfigs/createhorsepower-server.toml index a6a5b86ba..d97583958 100644 --- a/defaultconfigs/createhorsepower-server.toml +++ b/defaultconfigs/createhorsepower-server.toml @@ -30,5 +30,5 @@ smallCreatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tf #Valid "Medium" creatures mediumCreatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"] #Valid "Large" creatures -largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher"] +largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher", "wan_ancient_beasts:charger"] diff --git a/defaultconfigs/wan_ancient_beasts-server.toml b/defaultconfigs/wan_ancient_beasts-server.toml index c665ed8e1..607b1c43a 100644 --- a/defaultconfigs/wan_ancient_beasts-server.toml +++ b/defaultconfigs/wan_ancient_beasts-server.toml @@ -74,3 +74,30 @@ #Range: 1.0 ~ 1024.0 health = 80.0 +#Raider Attributes +[charger] + #Raider health [default: 60] + #Range: 1.0 ~ 1024.0 + health = 200.0 + #Raider armor [default: 4] + #Range: 0.0 ~ 30.0 + armor = 6.0 + #Raider attack damage [default: 15] + #Range: 0.0 ~ 1024.0 + armorToughness = 4.0 + +[raider] + #Raider health [default: 60] + #Range: 1.0 ~ 1024.0 + health = 200.0 + #Raider armor [default: 4] + #Range: 0.0 ~ 30.0 + armor = 6.0 + #Raider attack damage [default: 15] + #Range: 0.0 ~ 1024.0 + armorToughness = 4.0 + +[snatcher] + #Raider health [default: 60] + #Range: 1.0 ~ 1024.0 + health = 50.0 \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/food/tags.food.js b/kubejs/server_scripts/tfg/food/tags.food.js index 97826d234..40323f389 100644 --- a/kubejs/server_scripts/tfg/food/tags.food.js +++ b/kubejs/server_scripts/tfg/food/tags.food.js @@ -66,6 +66,7 @@ function registerTFGFoodItemTags(event) { event.add('tfg:raw_dinosaur_meat', 'tfg:food/raw_cruncher_ribs') event.add('tfg:raw_dinosaur_meat', 'tfg:food/raw_surfer_steak') event.add('tfg:raw_dinosaur_meat', 'wan_ancient_beasts:raw_ancient_meat') + // TODO add meat for charger, raider, snatcher /** * List of items that can make light stock. diff --git a/kubejs/server_scripts/tfg/mars/tags.mars.js b/kubejs/server_scripts/tfg/mars/tags.mars.js index 368274952..68f49594c 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -34,10 +34,8 @@ function registerTFGMarsItemTags(event) { event.add('tfg:martian_animal_foods', 'betterend:shadow_berry_product') event.add('tfg:martian_animal_foods', 'betterend:bolux_mushroom_product') event.add('tfg:martian_animal_foods', 'betterend:cave_pumpkin_chunks') - - event.add('tfg:glacian_ram_food', '#tfg:martian_animal_foods') - event.add('tfg:sniffer_food', '#tfg:martian_animal_foods') - event.add('tfg:wraptor_food', '#tfg:martian_animal_foods') + + event.add('tfg:martian_meat_foods', '#firmalife:foods/raw_fish') event.remove('minecraft:wool', 'ad_astra:glacian_fur') @@ -407,6 +405,9 @@ function registerTFGMarsEntityTypeTags(event) { 'wan_ancient_beasts:glider', 'wan_ancient_beasts:toxlacanth', 'wan_ancient_beasts:surfer', + 'wan_ancient_beasts:charger', + 'wan_ancient_beasts:raider', + 'wan_ancient_beasts:snatcher', 'tfg:surfer' ] @@ -420,10 +421,13 @@ function registerTFGMarsEntityTypeTags(event) { event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:eater') event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:soarer') event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:glider') + event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:raider') + event.add('tfc:deals_piercing_damage', 'wan_ancient_beasts:snatcher') event.add('tfc:deals_piercing_damage', 'ad_astra:martian_raptor') event.add('tfc:deals_crushing_damage', 'species:quake') event.add('tfc:deals_crushing_damage', 'wan_ancient_beasts:walker') event.add('tfc:deals_crushing_damage', 'wan_ancient_beasts:crusher') + event.add('tfc:deals_crushing_damage', 'wan_ancient_beasts:charger') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:crimson_forest_enderman') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:warped_forest_enderman') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:badlands_enderman') @@ -434,11 +438,14 @@ function registerTFGMarsEntityTypeTags(event) { // this huge guy also looks silly in low grav event.add('tfg:ignores_gravity', 'wan_ancient_beasts:walker') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:eater') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:raider') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:charger') // flying mobs event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider') // swimming mobs event.add('tfg:ignores_gravity', 'tfg:surfer') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:surfer') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:toxlacanth') event.add('tfg:ignores_gravity', 'endermanoverhaul:coral_enderman') } diff --git a/kubejs/server_scripts/tfg/worldgen/data.fauna.js b/kubejs/server_scripts/tfg/worldgen/data.fauna.js index 6a54f27b4..e68ce1c84 100644 --- a/kubejs/server_scripts/tfg/worldgen/data.fauna.js +++ b/kubejs/server_scripts/tfg/worldgen/data.fauna.js @@ -86,6 +86,26 @@ function registerTFGFauna(event) { }, "wan_ancient_beasts:crusher") + event.fauna( + climate => { + climate.minTemp(-109) + climate.fuzzy(true) + }, + faunaData => { + faunaData.solidGround(true) + }, + "wan_ancient_beasts:raider") + + event.fauna( + climate => { + climate.minTemp(-107) + climate.fuzzy(true) + }, + faunaData => { + faunaData.solidGround(true) + }, + "wan_ancient_beasts:charger") + event.fauna( climate => { climate.minTemp(-105) @@ -105,4 +125,14 @@ function registerTFGFauna(event) { faunaData.solidGround(true) }, "wan_ancient_beasts:glider") + + event.fauna( + climate => { + climate.minTemp(-105) + climate.fuzzy(true) + }, + faunaData => { + faunaData.solidGround(true) + }, + "wan_ancient_beasts:snatcher") } diff --git a/kubejs/server_scripts/wan_ancient_beasts/tags.js b/kubejs/server_scripts/wan_ancient_beasts/tags.js index 1a7c110d4..3dd151ff7 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/tags.js +++ b/kubejs/server_scripts/wan_ancient_beasts/tags.js @@ -22,7 +22,7 @@ const registerWABItemTags = (event) => { event.removeAll('wan_ancient_beasts:paleontologist_common') event.removeAll('wan_ancient_beasts:paleontologist_rare') event.removeAll('wan_ancient_beasts:paleontologist_items') - event.removeAll('wan_ancient_beasts:eater_food') + event.removeAll('wan_ancient_beasts:meat_food') event.add('tfc:foods/raw_meats', 'wan_ancient_beasts:toxlacanth') event.add('firmalife:foods/raw_fish', 'wan_ancient_beasts:toxlacanth') @@ -38,8 +38,7 @@ const registerWABItemTags = (event) => { event.add('tfc:foods/cooked_meats', 'wan_ancient_beasts:cooked_ancient_meat') event.add('tfc:foods/meats', 'wan_ancient_beasts:cooked_ancient_meat') - event.add('wan_ancient_beasts:surfer_food', '#firmalife:foods/raw_fish') - event.add('wan_ancient_beasts:eater_food', '#tfg:martian_animal_foods') + event.add('wan_antcient_beasts:meat_food', '#tfc:foods/raw_meats') // Eggs event.add('tfg:martian_eggs', 'wan_ancient_beasts:eater_egg') @@ -48,6 +47,9 @@ const registerWABItemTags = (event) => { event.add('tfg:martian_eggs', 'wan_ancient_beasts:glider_egg') event.add('tfg:martian_eggs', 'wan_ancient_beasts:soarer_egg') event.add('tfg:martian_eggs', 'wan_ancient_beasts:surfer_egg') + event.add('tfg:martian_eggs', 'wan_ancient_beasts:snatcher_egg') + event.add('tfg:martian_eggs', 'wan_ancient_beasts:raider_egg') + event.add('tfg:martian_eggs', 'wan_ancient_beasts:charger_egg') } const registerWABEntityTypeTags = (event) => { @@ -58,6 +60,11 @@ const registerWABEntityTypeTags = (event) => { event.add('wan_ancient_beasts:eater_ignore', 'species:springling') event.add('wan_ancient_beasts:eater_ignore', 'species:quake') + event.add('wan_ancient_beasts:raider_ignore', 'tfg:sniffer') + event.add('wan_ancient_beasts:raider_ignore', 'tfg:wraptor') + event.add('wan_ancient_beasts:raider_ignore', 'species:springling') + event.add('wan_ancient_beasts:raider_ignore', 'species:quake') + } const registerWansAncientBeastsBiomeTags = (event) => { diff --git a/kubejs/startup_scripts/tfg/worldgen/fauna.js b/kubejs/startup_scripts/tfg/worldgen/fauna.js index 46141c358..98a64bcf4 100644 --- a/kubejs/startup_scripts/tfg/worldgen/fauna.js +++ b/kubejs/startup_scripts/tfg/worldgen/fauna.js @@ -10,6 +10,9 @@ TFCEvents.registerFaunas(event => { event.replace("wan_ancient_beasts:walker", "on_ground", "ocean_floor"); event.replace("wan_ancient_beasts:eater", "on_ground", "ocean_floor"); event.replace("wan_ancient_beasts:crusher", "on_ground", "ocean_floor"); + event.replace("wan_ancient_beasts:snatcher", "on_ground", "ocean_floor"); + event.replace("wan_ancient_beasts:charger", "on_ground", "ocean_floor"); + event.replace("wan_ancient_beasts:raider", "on_ground", "ocean_floor"); event.replace("wan_ancient_beasts:soarer", "no_restrictions", "world_surface"); event.replace("wan_ancient_beasts:glider", "no_restrictions", "world_surface");