diff --git a/defaultconfigs/wan_ancient_beasts-server.toml b/defaultconfigs/wan_ancient_beasts-server.toml new file mode 100644 index 000000000..f33c39ee8 --- /dev/null +++ b/defaultconfigs/wan_ancient_beasts-server.toml @@ -0,0 +1,76 @@ + +#Sniffer Attributes +[sniffer] + #Sniffer health [default: 75] + #Range: 1.0 ~ 1024.0 + health = 75.0 + #Sniffer armor [default: 3] + #Range: 0.0 ~ 30.0 + armor = 3.0 + #Sniffer armor toughness [default: 1] + #Range: 0.0 ~ 20.0 + armorToughness = 1.0 + +#Eater Attributes +[eater] + #Eater health [default: 100] + #Range: 1.0 ~ 1024.0 + health = 200.0 + #Eater attack damage [default: 30] + #Range: 0.0 ~ 1024.0 + damage = 30.0 + #Eater armor [default: 5] + #Range: 0.0 ~ 30.0 + armor = 8.0 + #Eater armor toughness [default: 2] + #Range: 0.0 ~ 20.0 + armorToughness = 3.0 + +#Walker Attributes +[walker] + #Walker health [default: 200] + #Range: 1.0 ~ 1024.0 + health = 400.0 + #Walker armor [default: 5] + #Range: 0.0 ~ 30.0 + armor = 14.0 + #Walker armor toughness [default: 4] + #Range: 0.0 ~ 20.0 + armorToughness = 4.0 + +#Crusher Attributes +[crusher] + #Crusher health [default: 50] + #Range: 1.0 ~ 1024.0 + health = 100.0 + #Crusher attack damage [default: 10] + #Range: 0.0 ~ 1024.0 + damage = 10.0 + #Crusher armor [default: 20] + #Range: 0.0 ~ 30.0 + armor = 25.0 + #Crusher armor toughness [default: 4] + #Range: 0.0 ~ 20.0 + armorToughness = 5.0 + +#Glider Attributes +[glider] + #Glider health [default: 25] + #Range: 1.0 ~ 1024.0 + health = 50.0 + +#Soarer Attributes +[soarer] + #Soarer health [default: 40] + #Range: 1.0 ~ 1024.0 + health = 80.0 + #Soarer attack damage [default: 15] + #Range: 0.0 ~ 1024.0 + damage = 25.0 + +#Surfer Attributes +[surfer] + #Surfer health [default: 30] + #Range: 1.0 ~ 1024.0 + health = 30.0 + diff --git a/kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png b/kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png new file mode 100644 index 000000000..5b055d934 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png differ diff --git a/kubejs/assets/tfg/textures/item/food/cooked_glider_wings.png b/kubejs/assets/tfg/textures/item/food/cooked_glider_wings.png new file mode 100644 index 000000000..003a47b08 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/cooked_glider_wings.png differ diff --git a/kubejs/assets/tfg/textures/item/food/cooked_goober_meat.png b/kubejs/assets/tfg/textures/item/food/cooked_goober_meat.png new file mode 100644 index 000000000..041f5433b Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/cooked_goober_meat.png differ diff --git a/kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png b/kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png new file mode 100644 index 000000000..4affb689b Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png differ diff --git a/kubejs/assets/tfg/textures/item/food/cooked_walker_steak.png b/kubejs/assets/tfg/textures/item/food/cooked_walker_steak.png new file mode 100644 index 000000000..25dff55b7 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/cooked_walker_steak.png differ diff --git a/kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png b/kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png new file mode 100644 index 000000000..5004b8e77 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png differ diff --git a/kubejs/assets/tfg/textures/item/food/cooked_wraptor.png b/kubejs/assets/tfg/textures/item/food/cooked_wraptor.png new file mode 100644 index 000000000..06326a0a3 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/cooked_wraptor.png differ diff --git a/kubejs/assets/tfg/textures/item/food/raw_crusher_meat.png b/kubejs/assets/tfg/textures/item/food/raw_crusher_meat.png new file mode 100644 index 000000000..44b3984a0 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/raw_crusher_meat.png differ diff --git a/kubejs/assets/tfg/textures/item/food/raw_glider_wings.png b/kubejs/assets/tfg/textures/item/food/raw_glider_wings.png new file mode 100644 index 000000000..ce34f172a Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/raw_glider_wings.png differ diff --git a/kubejs/assets/tfg/textures/item/food/raw_goober_meat.png b/kubejs/assets/tfg/textures/item/food/raw_goober_meat.png new file mode 100644 index 000000000..5c7a8e937 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/raw_goober_meat.png differ diff --git a/kubejs/assets/tfg/textures/item/food/raw_springling_chops.png b/kubejs/assets/tfg/textures/item/food/raw_springling_chops.png new file mode 100644 index 000000000..57c624022 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/raw_springling_chops.png differ diff --git a/kubejs/assets/tfg/textures/item/food/raw_walker_steak.png b/kubejs/assets/tfg/textures/item/food/raw_walker_steak.png new file mode 100644 index 000000000..3c76c356e Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/raw_walker_steak.png differ diff --git a/kubejs/assets/tfg/textures/item/food/raw_whole_soarer.png b/kubejs/assets/tfg/textures/item/food/raw_whole_soarer.png new file mode 100644 index 000000000..513b7c781 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/raw_whole_soarer.png differ diff --git a/kubejs/assets/tfg/textures/item/food/raw_wraptor.png b/kubejs/assets/tfg/textures/item/food/raw_wraptor.png new file mode 100644 index 000000000..06b3618f7 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/raw_wraptor.png differ diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 7f731e842..538e8d9cf 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -122,6 +122,11 @@ const registerTooltips = (event) => { text.add(1, text.of('Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r')) }) + // Mars Animals + event.addAdvanced(['species:petrified_egg'], (item, advanced, text) => { + text.add(1, text.of("§7Requires Magma to Incubate")) + }) + // MEGA Deprecated 0.10 event.addAdvanced(['#megacells:mega_interface'], (item, advanced, text) => { text.add(1, text.of('§cDeprecated, cannot be crafted any more')) diff --git a/kubejs/data/species/loot_tables/entities/goober.json b/kubejs/data/species/loot_tables/entities/goober.json new file mode 100644 index 000000000..49b61e5fb --- /dev/null +++ b/kubejs/data/species/loot_tables/entities/goober.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_goober_meat", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 8 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 5, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:slimeball", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/species/loot_tables/entities/springling.json b/kubejs/data/species/loot_tables/entities/springling.json new file mode 100644 index 000000000..ac522db86 --- /dev/null +++ b/kubejs/data/species/loot_tables/entities/springling.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_springling_chops", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 6 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "gtceu:copper_spring", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 1, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index b22f94060..7f263b9e5 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -75,22 +75,40 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", + "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 10 + }, { "type": "species:springling", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 20 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 5dc37ca8c..91ff2bae8 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -70,26 +70,38 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", + "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, { - "type": "species:goober", - "maxCount": 1, + "type": "wan_ancient_beasts:walker", + "maxCount": 4, "minCount": 1, "weight": 100 }, { - "type": "species:springling", - "maxCount": 1, + "type": "wan_ancient_beasts:crusher", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 5daa5d6c7..ecb2113ef 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -71,7 +71,27 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "species:goober", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 2, + "minCount": 1, + "weight": 80 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 50 + } + + ], "misc": [], "monster": [ { diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 9ee67959f..669b61600 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -75,8 +75,8 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, @@ -87,9 +87,27 @@ "weight": 100 }, { - "type": "species:springling", + "type": "wan_ancient_beasts:crusher", "maxCount": 3, "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "species:springling", + "maxCount": 5, + "minCount": 2, "weight": 100 } ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 664b6f5c0..2f6d5f406 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -70,8 +70,8 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, @@ -82,14 +82,26 @@ "weight": 100 }, { - "type": "species:goober", - "maxCount": 1, + "type": "wan_ancient_beasts:walker", + "maxCount": 3, "minCount": 1, "weight": 100 }, { - "type": "species:springling", - "maxCount": 1, + "type": "wan_ancient_beasts:crusher", + "maxCount": 4, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index c35dadb41..952b80678 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -75,17 +75,41 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 3, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 40 + }, + { + "type": "species:goober", + "maxCount": 1, + "minCount": 1, + "weight": 50 + }, { "type": "species:springling", "maxCount": 3, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 49e9656fd..f6d77a5ac 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -70,14 +70,32 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:walker", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 4, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, "minCount": 1, "weight": 100 }, @@ -85,11 +103,11 @@ "type": "species:goober", "maxCount": 1, "minCount": 1, - "weight": 100 + "weight": 50 }, { - "type": "species:springling", - "maxCount": 1, + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json new file mode 100644 index 000000000..41865f871 --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_crusher_meat", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 5 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:crusher_spike", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json new file mode 100644 index 000000000..90570f5b2 --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json @@ -0,0 +1,66 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_glider_wings", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 6 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + , + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json new file mode 100644 index 000000000..2499bd85b --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json @@ -0,0 +1,66 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_whole_soarer", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + , + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json new file mode 100644 index 000000000..9808e1bba --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json @@ -0,0 +1,45 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_walker_steak", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 10, + "max": 25 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4, + "max": 10, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 40a689ee7..d41342161 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -349,7 +349,8 @@ const registerAdAstraEntityTypeTags = (event) => { 'endermanoverhaul:end_enderman', 'endermanoverhaul:end_islands_enderman', - 'minecraft:sniffer', + 'tfg:sniffer', + 'tfg:glacian_ram', 'species:wraptor', 'species:goober', 'species:cruncher', @@ -357,7 +358,12 @@ const registerAdAstraEntityTypeTags = (event) => { 'species:quake', 'endermanoverhaul:crimson_forest_enderman', 'endermanoverhaul:warped_forest_enderman', - 'endermanoverhaul:badlands_enderman' + 'endermanoverhaul:badlands_enderman', + 'wan_ancient_beasts:walker', + 'wan_ancient_beasts:eater', + 'wan_ancient_beasts:crusher', + 'wan_ancient_beasts:soarer', + 'wan_ancient_beasts:glider' ] COLD_ENTITIES.forEach(entity => { @@ -378,6 +384,11 @@ const registerAdAstraEntityTypeTags = (event) => { event.add('tfg:ignores_gravity', 'endermanoverhaul:spirit') event.add('tfg:ignores_gravity', 'species:birt') event.add('tfg:ignores_gravity', 'ad_astra:star_crawler') + + event.add('tfg:ignores_gravity', 'species:wraptor') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:crusher') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider') } const registerAdAstraPlacedFeatures = (event) => { diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 509b6c004..1cf9597a5 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -7,6 +7,8 @@ const registerSpeciesBlockTags = (event) => { }) event.removeAll('species:wraptor_nesting_blocks') + + event.add('species:petrified_egg_hatch', '#tfcambiental:warm_stuff') } const registerSpeciesItemTags = (event) => { @@ -17,6 +19,10 @@ const registerSpeciesItemTags = (event) => { event.add('forge:eggs', 'species:birt_egg') event.add('firmalife:foods/raw_eggs', 'species:birt_egg') - + + event.add('species:goober_breed_items', 'betterend:flammalix') + event.add('species:goober_breed_items', 'betterend:small_amaranita_mushroom') + event.add('species:goober_breed_items', 'betterend:bolux_mushroom_product') + event.add('species:goober_breed_items', 'betterend:chorus_mushroom_product') event.add('species:cruncher_eats', '#tfc:foods/meat') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index b5d6df690..561dc4d85 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -128,7 +128,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_moon_rabbit', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -141,7 +141,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_glacian_mutton', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -154,7 +154,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_sniffer_beef', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -166,6 +166,99 @@ const registerTFGFoodData = (event) => { food.decayModifier(1.5) }) + event.foodItem('tfg:food/raw_wraptor', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_wraptor', food => { + food.hunger(6) + food.saturation(4) + food.protein(5) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_springling_chops', food => { + food.hunger(2) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_springling_chops', food => { + food.hunger(4) + food.saturation(3) + food.protein(5) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_walker_steak', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_walker_steak', food => { + food.hunger(6) + food.saturation(3) + food.protein(8) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_glider_wings', food => { + food.hunger(1) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_glider_wings', food => { + food.hunger(3) + food.saturation(3) + food.protein(3) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_whole_soarer', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_whole_soarer', food => { + food.hunger(6) + food.saturation(6) + food.protein(4) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_crusher_meat', food => { + food.hunger(3) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_crusher_meat', food => { + food.hunger(5) + food.saturation(6) + food.protein(4) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_goober_meat', food => { + food.hunger(2) + food.protein(3.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_goober_meat', food => { + food.hunger(4) + food.saturation(3) + food.protein(6) + food.decayModifier(1.5) + }) + + + // high-tech food global.FOOD_FRUIT.forEach(fruit => { diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index f3d7eb3c0..660257cda 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -932,6 +932,27 @@ function registerTFGFoodRecipes(event) { event.recipes.tfc.heating('tfg:food/raw_sniffer_beef', 200) .resultItem(TFC.isp.of('tfg:food/cooked_sniffer_beef').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_wraptor', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_wraptor').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_springling_chops', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_springling_chops').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_walker_steak', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_walker_steak').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_glider_wings', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_glider_wings').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_whole_soarer', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_whole_soarer').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_crusher_meat', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_crusher_meat').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_goober_meat', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_goober_meat').copyFood()) event.recipes.tfc.advanced_shapeless_crafting( TFC.itemStackProvider.of('4x betterend:cave_pumpkin_chunks').copyFood(), diff --git a/kubejs/startup_scripts/species/constants.js b/kubejs/startup_scripts/species/constants.js index 4eb2a3e55..711a5db52 100644 --- a/kubejs/startup_scripts/species/constants.js +++ b/kubejs/startup_scripts/species/constants.js @@ -17,11 +17,9 @@ global.SPECIES_DISABLED_ITEMS = [ 'species:deepfish_bucket', 'species:bone_spike', 'species:ancient_pinecone', - 'species:petrified_egg', 'species:cruncher_egg', 'species:ichor_bottle', 'species:youth_potion', - 'species:springling_egg', 'species:wraptor_egg', 'species:chaindelier', 'species:spectralibur_pedestal', diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index fb83495cd..58563747a 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -74,14 +74,8 @@ function registerTFGFoodItems(event) { .food(food => food.hunger(4).saturation(2)) .tag('tfc:foods/grains') .tag('tfc:foods/usable_in_salad') - - event.create('tfg:food/cooked_moon_rabbit') - .translationKey('item.tfg.food.cooked_moon_rabbit') - .texture('tfg:item/food/cooked_moon_rabbit') - .food(food => food.hunger(4).saturation(8)) - .tag('tfc:foods/meats') - .tag('tfc:foods/cooked_meats') - + + //Moon Rabbit event.create('tfg:food/raw_moon_rabbit') .translationKey('item.tfg.food.raw_moon_rabbit') .texture('tfg:item/food/raw_moon_rabbit') @@ -90,6 +84,14 @@ function registerTFGFoodItems(event) { .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') + event.create('tfg:food/cooked_moon_rabbit') + .translationKey('item.tfg.food.cooked_moon_rabbit') + .texture('tfg:item/food/cooked_moon_rabbit') + .food(food => food.hunger(4).saturation(8)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Glacian Ram event.create('tfg:food/raw_glacian_mutton') .translationKey('item.tfg.food.raw_glacian_mutton') .texture('tfg:item/food/raw_glacian_mutton') @@ -101,10 +103,11 @@ function registerTFGFoodItems(event) { event.create('tfg:food/cooked_glacian_mutton') .translationKey('item.tfg.food.cooked_glacian_mutton') .texture('tfg:item/food/cooked_glacian_mutton') - .food(food => food.hunger(6).saturation(10)) + .food(food => food.hunger(5).saturation(8)) .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') + //Sniffer event.create('tfg:food/raw_sniffer_beef') .translationKey('item.tfg.food.raw_sniffer_beef') .texture('tfg:item/food/raw_sniffer_beef') @@ -116,9 +119,122 @@ function registerTFGFoodItems(event) { event.create('tfg:food/cooked_sniffer_beef') .translationKey('item.tfg.food.cooked_sniffer_beef') .texture('tfg:item/food/cooked_sniffer_beef') + .food(food => food.hunger(8).saturation(9)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Wraptor + event.create('tfg:food/raw_wraptor') + .translationKey('item.tfg.food.raw_wraptor') + .texture('tfg:item/food/raw_wraptor') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_wraptor') + .translationKey('item.tfg.food.cooked_wraptor') + .texture('tfg:item/food/cooked_wraptor') + .food(food => food.hunger(6).saturation(8)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Springling + event.create('tfg:food/raw_springling_chops') + .translationKey('item.tfg.food.raw_springling_chops') + .texture('tfg:item/food/raw_springling_chops') + .food(food => food.hunger(2).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_springling_chops') + .translationKey('item.tfg.food.cooked_springling_chops') + .texture('tfg:item/food/cooked_springling_chops') + .food(food => food.hunger(4).saturation(4)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Walker + event.create('tfg:food/raw_walker_steak') + .translationKey('item.tfg.food.raw_walker_steak') + .texture('tfg:item/food/raw_walker_steak') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_walker_steak') + .translationKey('item.tfg.food.cooked_walker_steak') + .texture('tfg:item/food/cooked_walker_steak') .food(food => food.hunger(8).saturation(10)) .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') + + //Glider + event.create('tfg:food/raw_glider_wings') + .translationKey('item.tfg.food.raw_glider_wings') + .texture('tfg:item/food/raw_glider_wings') + .food(food => food.hunger(1).saturation(1) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_glider_wings') + .translationKey('item.tfg.food.cooked_glider_wings') + .texture('tfg:item/food/cooked_glider_wings') + .food(food => food.hunger(2).saturation(3)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Soarer + event.create('tfg:food/raw_whole_soarer') + .translationKey('item.tfg.food.raw_whole_soarer') + .texture('tfg:item/food/raw_whole_soarer') + .food(food => food.hunger(2).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_whole_soarer') + .translationKey('item.tfg.food.cooked_whole_soarer') + .texture('tfg:item/food/cooked_whole_soarer') + .food(food => food.hunger(6).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Crusher + event.create('tfg:food/raw_crusher_meat') + .translationKey('item.tfg.food.raw_crusher_meat') + .texture('tfg:item/food/raw_crusher_meat') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_crusher_meat') + .translationKey('item.tfg.food.cooked_crusher_meat') + .texture('tfg:item/food/cooked_crusher_meat') + .food(food => food.hunger(5).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Goober + event.create('tfg:food/raw_goober_meat') + .translationKey('item.tfg.food.raw_goober_meat') + .texture('tfg:item/food/raw_goober_meat') + .food(food => food.hunger(1).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_goober_meat') + .translationKey('item.tfg.food.cooked_goober_meat') + .texture('tfg:item/food/cooked_goober_meat') + .food(food => food.hunger(3).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + event.create('tfg:food/ice_soup') .translationKey('item.tfg.food.ice_soup') diff --git a/pakku-lock.json b/pakku-lock.json index ce9c2e3f9..38eaa01cc 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -13522,6 +13522,72 @@ } ] }, + { + "pakku_id": "qM5Yyq0zqqJc8XtT", + "pakku_links": [ + "pB7ARGecP03UXpd6" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "wans-ancient-beasts", + "modrinth": "wab" + }, + "name": { + "curseforge": "Wan's Ancient Beasts", + "modrinth": "Wan's Ancient Beasts" + }, + "id": { + "curseforge": "1108604", + "modrinth": "nWC3kyL3" + }, + "files": [ + { + "type": "curseforge", + "file_name": "wab-1.20.1-1.3.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6871/96/wab-1.20.1-1.3.0.jar", + "id": "6871096", + "parent_id": "1108604", + "hashes": { + "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7", + "md5": "190aa6671f0a42775ee89381a47369a9" + }, + "required_dependencies": [], + "size": 9916516, + "date_published": "2025-08-10T12:28:16.640Z" + }, + { + "type": "modrinth", + "file_name": "wab-1.20.1-1.3.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/txtFU0oY/wab-1.20.1-1.3.0.jar", + "id": "txtFU0oY", + "parent_id": "nWC3kyL3", + "hashes": { + "sha512": "216b256897bfa01671883aebd9f38dceb1077b8abff63a85f12f80ef800cb28d6b7bd8dd42c54ff928a587dd43d4ddc8fde7a8f45ec85459287bfabe578d4760", + "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7" + }, + "required_dependencies": [ + "8BmcQJ2H" + ], + "size": 9916516, + "date_published": "2025-08-12T15:03:58.487235Z" + } + ] + }, { "pakku_id": "zonLLbYfp9ViO9i7", "type": "MOD",