diff --git a/kubejs/data/minecraft/loot_tables/blocks/torch.json b/kubejs/data/minecraft/loot_tables/blocks/torch.json new file mode 100644 index 000000000..002d2c0ac --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/torch.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:torch" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json index 7a4f0943b..8caa99546 100644 --- a/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json @@ -23,8 +23,8 @@ ], "placement": { "salt": 1442136151, - "spacing": 70, - "separation": 50, + "spacing": 50, + "separation": 35, "type": "minecraft:random_spread" } } \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json index 740104fcc..798b8ee98 100644 --- a/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json @@ -23,8 +23,8 @@ ], "placement": { "salt": 1442136152, - "spacing": 60, - "separation": 40, + "spacing": 45, + "separation": 25, "type": "minecraft:random_spread" } } \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/towerhouse_1.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/towerhouse_1.json index 339e6135c..963399e5b 100644 --- a/kubejs/data/tfc_ruined_world/worldgen/structure_set/towerhouse_1.json +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/towerhouse_1.json @@ -19,8 +19,8 @@ ], "placement": { "salt": 1442136153, - "spacing": 120, - "separation": 100, + "spacing": 70, + "separation": 50, "type": "minecraft:random_spread" } } \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json new file mode 100644 index 000000000..a84cb6f38 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json @@ -0,0 +1,603 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:wood/lumber/hickory", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/sapling/hickory", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/lumber/willow", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/sapling/willow", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "afc:wood/lumber/cypress", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "afc:wood/sapling/cypress", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wool", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "primitive_creatures:grh", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wool_yarn", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:leather", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:ceramic/gray_glazed_vessel", + "weight": 50 + }, + { + "type": "minecraft:item", + "name": "tfc:ceramic/light_gray_glazed_vessel", + "weight": 50 + }, + { + "type": "minecraft:item", + "name": "primitive_creatures:totem_0", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "primitive_creatures:totem_2", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "primitive_creatures:totem_3", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "minecraft:rabbit_foot", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "minecraft:sentry_armor_trim_smithing_template", + "weight": 20 + }, + { + "type": "minecraft:item", + "name": "minecraft:vex_armor_trim_smithing_template", + "weight": 20 + }, + { + "type": "minecraft:item", + "name": "minecraft:wild_armor_trim_smithing_template", + "weight": 20 + }, + { + "type": "minecraft:item", + "name": "minecraft:coast_armor_trim_smithing_template", + "weight": 20 + }, + { + "type": "minecraft:item", + "name": "tfc:powder/salt", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:powder/saltpeter", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:powder/sulfur", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:powder/wood_ash", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle/gray", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle/light_gray", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:emerald", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:arrow", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 20, + "min": 12 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:bone", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/compost", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/guano", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/honey", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:bowl", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:paper", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:groundcover/pumice", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:conifer_rosin", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "firmalife:beeswax", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:flint", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:tricalcium_phosphate_dust", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:charcoal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:glue", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "chalk:gray_chalk", + "weight": 70 + }, + { + "type": "minecraft:item", + "name": "chalk:light_gray_chalk", + "weight": 70 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 12, + "min": 8 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json b/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json new file mode 100644 index 000000000..9e490e0f5 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json @@ -0,0 +1,354 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:charcoal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 20, + "min": 12 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:ceramic/ingot_mold", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:clay_ball", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 15, + "min": 9 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:mortar", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 15, + "min": 9 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:poor_raw_coal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 14, + "min": 8 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:raw_coal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:rich_raw_coal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:cobalt_brass_ingot", + "weight": 40, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:cobalt_ingot", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:copper_ingot", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "create:zinc_ingot", + "weight": 40, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:lead_ingot", + "weight": 40, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "create:brass_ingot", + "weight": 40, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:bismuth_ingot", + "weight": 60, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfchotornot:tongs/copper", + "weight": 20 + }, + { + "type": "minecraft:item", + "name": "tfchotornot:tongs/wood", + "weight": 30 + }, + { + "type": "minecraft:item", + "name": "tfc:ceramic/vessel", + "weight": 50 + }, + { + "type": "minecraft:item", + "name": "tfc:powder/flux", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:powder/lime", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:hematitic_glass_batch", + "weight": 30, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:olivine_glass_batch", + "weight": 30, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:volcanic_glass_batch", + "weight": 30, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:sentry_armor_trim_smithing_template", + "weight": 20 + }, + { + "type": "minecraft:item", + "name": "minecraft:vex_armor_trim_smithing_template", + "weight": 20 + }, + { + "type": "minecraft:item", + "name": "minecraft:wild_armor_trim_smithing_template", + "weight": 20 + }, + { + "type": "minecraft:item", + "name": "minecraft:coast_armor_trim_smithing_template", + "weight": 20 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 12, + "min": 8 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_burial_base.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_burial_base.nbt index 1864553a3..c7a68aa3b 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_burial_base.nbt and b/kubejs/data/tfg/structures/norse/baseline/norse_burial_base.nbt differ diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_base.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_base.nbt index c9ee37e50..0cd220c51 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_base.nbt and b/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_base.nbt differ diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_based.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_based.nbt deleted file mode 100644 index 939a604ed..000000000 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_based.nbt and /dev/null differ diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_farmhousebig_base.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_farmhousebig_base.nbt index 31f66f86f..eb164b3f7 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_farmhousebig_base.nbt and b/kubejs/data/tfg/structures/norse/baseline/norse_farmhousebig_base.nbt differ diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_longhouse_base.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_longhouse_base.nbt index 4f4c3c483..3dd3ab305 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_longhouse_base.nbt and b/kubejs/data/tfg/structures/norse/baseline/norse_longhouse_base.nbt differ diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_mosshouse_base.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_mosshouse_base.nbt index 98b8119bd..7aa64c831 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_mosshouse_base.nbt and b/kubejs/data/tfg/structures/norse/baseline/norse_mosshouse_base.nbt differ diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_root_base.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_root_base.nbt index 3d243c761..1edac1332 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_root_base.nbt and b/kubejs/data/tfg/structures/norse/baseline/norse_root_base.nbt differ diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_smithy_base.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_smithy_base.nbt index a41dea19c..5fec0efb5 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_smithy_base.nbt and b/kubejs/data/tfg/structures/norse/baseline/norse_smithy_base.nbt differ diff --git a/kubejs/data/tfg/structures/norse/baseline/t_junction.nbt b/kubejs/data/tfg/structures/norse/baseline/t_junction.nbt index de486f1f0..34931d087 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/t_junction.nbt and b/kubejs/data/tfg/structures/norse/baseline/t_junction.nbt differ diff --git a/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt b/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt index 83d4c6c04..1eac3b081 100644 Binary files a/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt and b/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt differ diff --git a/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt b/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt index 62b6c2a13..7fc98a1fe 100644 Binary files a/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt and b/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/bend_left.nbt b/kubejs/data/tfg/structures/norse/ruins/bend_left.nbt new file mode 100644 index 000000000..550233d8b Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/bend_left.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/bend_right.nbt b/kubejs/data/tfg/structures/norse/ruins/bend_right.nbt new file mode 100644 index 000000000..545fae375 Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/bend_right.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/cross.nbt b/kubejs/data/tfg/structures/norse/ruins/cross.nbt new file mode 100644 index 000000000..2f66efabe Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/cross.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/fork_left.nbt b/kubejs/data/tfg/structures/norse/ruins/fork_left.nbt new file mode 100644 index 000000000..f7f8ea6fb Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/fork_left.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/fork_right.nbt b/kubejs/data/tfg/structures/norse/ruins/fork_right.nbt new file mode 100644 index 000000000..dbb0196f0 Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/fork_right.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_burial_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_burial_ruin.nbt index dae60614a..6c9af09fc 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_burial_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_burial_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt index 327fd7329..2af578b4c 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt index e31e61e92..8d55c5cb0 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt index f77e8034b..cf0721606 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt index 914a4ad1b..6d274be26 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_root_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_root_ruin.nbt new file mode 100644 index 000000000..cbe8af046 Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/norse_root_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt index be7a0442d..6cadb587b 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/straight_long.nbt b/kubejs/data/tfg/structures/norse/ruins/straight_long.nbt new file mode 100644 index 000000000..7a33bfad8 Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/straight_long.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/straight_medium.nbt b/kubejs/data/tfg/structures/norse/ruins/straight_medium.nbt new file mode 100644 index 000000000..dfe1a716a Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/straight_medium.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/straight_short.nbt b/kubejs/data/tfg/structures/norse/ruins/straight_short.nbt new file mode 100644 index 000000000..564a3f3a2 Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/straight_short.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/t_junction.nbt b/kubejs/data/tfg/structures/norse/ruins/t_junction.nbt new file mode 100644 index 000000000..77ffe0df8 Binary files /dev/null and b/kubejs/data/tfg/structures/norse/ruins/t_junction.nbt differ diff --git a/kubejs/data/tfg/worldgen/processor_list/illagers/norse_paths.json b/kubejs/data/tfg/worldgen/processor_list/illagers/norse_paths.json new file mode 100644 index 000000000..37e57b9df --- /dev/null +++ b/kubejs/data/tfg/worldgen/processor_list/illagers/norse_paths.json @@ -0,0 +1,90 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "rnr:hoggin", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "tfc:rock/bricks/andesite" + } + }, + { + "input_predicate": { + "block": "rnr:hoggin", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "tfc:fluid/river_water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "tfc:rock/bricks/andesite" + } + }, + + + + { + "input_predicate": { + "block": "rnr:hoggin", + "predicate_type": "minecraft:random_block_match", + "probability": 0.1 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "rnr:rock/gravel_road/andesite" + } + }, + { + "input_predicate": { + "block": "rnr:hoggin", + "predicate_type": "minecraft:random_block_match", + "probability": 0.1 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "rnr:rock/gravel_road/gabbro" + } + }, + { + "input_predicate": { + "block": "rnr:hoggin", + "predicate_type": "minecraft:random_block_match", + "probability": 0.15 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "tfc:grass_path/silty_loam" + } + }, + { + "input_predicate": { + "block": "rnr:hoggin", + "predicate_type": "minecraft:random_block_match", + "probability": 0.1 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "tfc:grass/sandy_loam" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/processor_list/illagers/norse_structures.json b/kubejs/data/tfg/worldgen/processor_list/illagers/norse_structures.json new file mode 100644 index 000000000..6711ea3cf --- /dev/null +++ b/kubejs/data/tfg/worldgen/processor_list/illagers/norse_structures.json @@ -0,0 +1,10 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/illagers/norse_village_living.json b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_living.json new file mode 100644 index 000000000..af36442d3 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_living.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:jigsaw", + "start_pool": "tfg:illagers/norse_village_living_start_pool", + "size": 4, + "max_distance_from_center": 116, + "biomes": "#tfg:has_structure/illages", + "step": "surface_structures", + "terrain_adaptation": "beard_thin", + "start_height": { + "absolute": 0 + }, + "project_start_to_heightmap": "WORLD_SURFACE_WG", + "use_expansion_hack": false, + "adapt_noise": true, + "spawn_overrides": { + "creature": { + "bounding_box": "full", + "spawns": [] + }, + "monster": { + "bounding_box": "full", + "spawns": [] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json new file mode 100644 index 000000000..32442d1f4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:jigsaw", + "start_pool": "tfg:illagers/norse_village_ruined_start_pool", + "size": 4, + "max_distance_from_center": 116, + "biomes": "#tfg:has_structure/illages", + "step": "surface_structures", + "terrain_adaptation": "beard_thin", + "start_height": { + "absolute": 0 + }, + "project_start_to_heightmap": "WORLD_SURFACE_WG", + "use_expansion_hack": false, + "adapt_noise": true, + "spawn_overrides": {} +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/aqueduct/aqueduct.json b/kubejs/data/tfg/worldgen/structure_set/aqueduct/aqueduct.json index 92337c58c..f9ace5af8 100644 --- a/kubejs/data/tfg/worldgen/structure_set/aqueduct/aqueduct.json +++ b/kubejs/data/tfg/worldgen/structure_set/aqueduct/aqueduct.json @@ -1,14 +1,18 @@ { - "structures": [ - { - "structure": "tfg:aqueduct/aqueduct", - "weight": 1 - } - ], - "placement": { - "salt": 264226226, - "spacing": 128, - "separation": 120, - "type": "minecraft:random_spread" - } - } \ No newline at end of file + "structures": [ + { + "structure": "tfg:aqueduct/aqueduct", + "weight": 1 + } + ], + "placement": { + "salt": 264226226, + "spacing": 128, + "separation": 120, + "type": "tfc:climate", + "climate": { + "min_temperature": -5, + "max_rainfall": 350 + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json b/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json new file mode 100644 index 000000000..883d038f3 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json @@ -0,0 +1,24 @@ +{ + "structures": [ + { + "structure": "tfg:illagers/norse_village_living", + "weight": 75 + }, + { + "structure": "tfg:illagers/norse_village_ruined", + "weight": 25 + } + ], + "placement": { + "salt": 26256356324, + "spacing": 40, + "separation": 25, + "type": "tfc:climate", + "climate": { + "min_temperature": -12, + "max_temperature": 5, + "min_rainfall": 200, + "max_forest": "edge" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/temperate/plains_temperate_house.json b/kubejs/data/tfg/worldgen/structure_set/temperate/plains_temperate_house.json index 2af0bca7b..7241235dd 100644 --- a/kubejs/data/tfg/worldgen/structure_set/temperate/plains_temperate_house.json +++ b/kubejs/data/tfg/worldgen/structure_set/temperate/plains_temperate_house.json @@ -1,14 +1,21 @@ { - "structures": [ - { - "structure": "tfg:temperate/plains_temperate_house_0", - "weight": 1 - } - ], - "placement": { - "salt": 264167119, - "spacing": 90, - "separation": 70, - "type": "minecraft:random_spread" - } - } \ No newline at end of file + "structures": [ + { + "structure": "tfg:temperate/plains_temperate_house_0", + "weight": 1 + } + ], + "placement": { + "salt": 264167119, + "spacing": 90, + "separation": 70, + "type": "tfc:climate", + "climate": { + "min_temperature": -5, + "max_temperature": 10, + "min_rainfall": 150, + "max_rainfall": 400, + "max_forest": "normal" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/mob_outdoors.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_outdoors.json new file mode 100644 index 000000000..50f3487c7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_outdoors.json @@ -0,0 +1,33 @@ +{ + "name": "tfg:illagers/mob_outdoors", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/shaman", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/beast_tamer", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 20, + "element": { + "location": "tfg:illager_generic/mobs/beast", + "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_ranged.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_ranged.json new file mode 100644 index 000000000..9a7fe201b --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_ranged.json @@ -0,0 +1,24 @@ +{ + "name": "tfg:illagers/mob_ranged", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 50, + "element": { + "location": "tfg:illager_generic/mobs/ambusher", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/hunter", + "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 new file mode 100644 index 000000000..0913ccf42 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_strong.json @@ -0,0 +1,33 @@ +{ + "name": "tfg:illagers/mob_strong", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/bonebreaker", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 80, + "element": { + "location": "tfg:illager_generic/mobs/warrior", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 40, + "element": { + "location": "tfg:illager_generic/mobs/ambusher", + "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_weak.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_weak.json new file mode 100644 index 000000000..5ed1dcfe2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_weak.json @@ -0,0 +1,42 @@ +{ + "name": "tfg:illagers/mob_weak", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/forager", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 70, + "element": { + "location": "tfg:illager_generic/mobs/herbalist", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 20, + "element": { + "location": "tfg:illager_generic/mobs/warrior", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 40, + "element": { + "location": "tfg:illager_generic/mobs/mercenary", + "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/norse_village_living_buildings.json b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_buildings.json new file mode 100644 index 000000000..349c435bf --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_buildings.json @@ -0,0 +1,67 @@ +{ + "name": "tfg:illagers/norse_village_living_buildings", + "fallback": "tfg:illagers/norse_village_living_paths", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/norse_longhouse_base", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/norse_smithy_base", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 40, + "element": { + "location": "tfg:norse/baseline/norse_burial_base", + "processors": "tfg:illagers/norse_structures", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 80, + "element": { + "location": "tfg:norse/baseline/norse_farmhousebig_base", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/norse_farmhouse_base", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/norse_mosshouse_base", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 10, + "element": { + "projection": "rigid", + "element_type": "minecraft:empty_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_paths.json b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_paths.json new file mode 100644 index 000000000..27b4326fd --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_paths.json @@ -0,0 +1,94 @@ +{ + "name": "tfg:illagers/norse_village_living_paths", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/straight_short", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/straight_medium", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/straight_long", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/bend_left", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/bend_right", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/t_junction", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/fork_left", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/fork_right", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 80, + "element": { + "location": "tfg:norse/baseline/cross", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 10, + "element": { + "projection": "rigid", + "element_type": "minecraft:empty_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_start_pool.json b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_start_pool.json new file mode 100644 index 000000000..ade7adbc3 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_start_pool.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/norse_village_living_start_pool", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:norse/baseline/norse_root_base", + "processors": "tfg:illagers/norse_paths", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_buildings.json b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_buildings.json new file mode 100644 index 000000000..dd9e1ddcc --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_buildings.json @@ -0,0 +1,85 @@ +{ + "name": "tfg:illagers/norse_village_ruined_buildings", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 40, + "element": { + "location": "tfg:norse/ruins/norse_burial_ruin", + "processors": "minecraft:empty", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 80, + "element": { + "location": "tfg:norse/ruins/norse_farmhousebig_ruin", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/norse_farmhouse_ruin", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/norse_longhouse_ruin", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 50, + "element": { + "location": "tfg:norse/ruins/norse_mosshouse_ruin", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 50, + "element": { + "location": "tfg:norse/burned/norse_mosshouse_burn", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 50, + "element": { + "location": "tfg:norse/ruins/norse_smithy_ruin", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 50, + "element": { + "location": "tfg:norse/burned/norse_smithy_burn", + "processors": "tfg:illagers/norse_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 10, + "element": { + "projection": "rigid", + "element_type": "minecraft:empty_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_paths.json b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_paths.json new file mode 100644 index 000000000..b35011c46 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_paths.json @@ -0,0 +1,94 @@ +{ + "name": "tfg:illagers/norse_village_ruined_paths", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/straight_short", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/straight_medium", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/straight_long", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/bend_left", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/bend_right", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/t_junction", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/fork_left", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/fork_right", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 80, + "element": { + "location": "tfg:norse/ruins/cross", + "processors": "tfg:illagers/norse_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 10, + "element": { + "projection": "rigid", + "element_type": "minecraft:empty_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_start_pool.json b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_start_pool.json new file mode 100644 index 000000000..34f4ee909 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_ruined_start_pool.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/norse_village_ruined_start_pool", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:norse/ruins/norse_root_ruin", + "processors": "tfg:illagers/norse_paths", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index c618babb6..0656fc05a 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -1060,6 +1060,7 @@ const registerTFGBiomeTags = (event) => { // #region TFG Structure Biomes event.add('tfg:has_structure/plains_temperate_0', 'tfc:plains') + event.add('tfg:has_structure/plains_temperate_0', 'tfc:plateau') event.add('tfg:has_structure/plains_temperate_0', 'tfc:highlands') event.add('tfg:has_structure/aqueduct', 'tfc:plains') @@ -1070,6 +1071,13 @@ const registerTFGBiomeTags = (event) => { event.add('tfg:has_structure/ocean_moai_0', 'tfc:volcanic_oceanic_mountains') event.add('tfg:has_structure/ocean_moai_0', 'tfc:volcanic_mountains') + event.add('tfg:has_structure/illages', 'tfc:plains') + event.add('tfg:has_structure/illages', 'tfc:hills') + event.add('tfg:has_structure/illages', 'tfc:rolling_hills') + event.add('tfg:has_structure/illages', 'tfc:badlands') + event.add('tfg:has_structure/illages', 'tfc:plateau') + event.add('tfg:has_structure/illages', 'tfc:old_mountains') + // #endregion // #region Nether biomes