diff --git a/CHANGELOG.md b/CHANGELOG.md index cd90328d8..f01422d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased ### Changes - Added casting molds for small gears, nuggets, and rods (#2470) @glitchplaysgames714 -- Added some new illages to the hot and dry climates of the world! @MVG31 +- Added some new illages to the hot and dry, and cold and dry climates of the world! @MVG31 - Added some mossy cobblestone to the beneath @Pyritie - Hardened non-TFC rocks are now craftable (#2447) @glitchplaysgames714 - Magma blocks are now hot to hold @Pyritie diff --git a/kubejs/data/tfg/loot_tables/chests/yurts_illager_archery.json b/kubejs/data/tfg/loot_tables/chests/yurts_illager_archery.json new file mode 100644 index 000000000..07f192f54 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/yurts_illager_archery.json @@ -0,0 +1,128 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:arrow", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16, + "min": 12 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:fletching", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 7, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:flint_arrow_head", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 7, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:bow", + "weight": 50 + }, + { + "type": "minecraft:item", + "name": "minecraft:tipped_arrow", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:set_nbt", + "tag": "{Potion: \"minecraft:poison\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:tipped_arrow", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:set_nbt", + "tag": "{Potion: \"minecraft:weakness\"}" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:tipped_arrow", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:set_nbt", + "tag": "{Potion: \"minecraft:harming\"}" + } + ] + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 8, + "min": 6 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json new file mode 100644 index 000000000..eaef2a59f --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json @@ -0,0 +1,559 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:wood/lumber/chestnut", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/sapling/chestnut", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/lumber/pine", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/sapling/pine", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/lumber/ash", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/sapling/ash", + "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": 3, + "min": 1 + }, + "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": 9, + "min": 5 + }, + "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": 10 + }, + { + "type": "minecraft:item", + "name": "minecraft:vex_armor_trim_smithing_template", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "minecraft:wild_armor_trim_smithing_template", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "minecraft:coast_armor_trim_smithing_template", + "weight": 10 + }, + { + "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": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:powder/sulfur", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "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": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle/gray", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:candle/light_gray", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4, + "min": 2 + }, + "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": 5, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/compost", + "weight": 80 + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/guano", + "weight": 80 + }, + { + "type": "minecraft:item", + "name": "firmalife:jar/honey", + "weight": 80 + }, + { + "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": 2, + "min": 1 + }, + "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": 3, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "firmalife:beeswax", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3, + "min": 1 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:flint", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:tricalcium_phosphate_dust", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:charcoal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:glue", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "chalk:gray_chalk", + "weight": 70 + }, + { + "type": "minecraft:item", + "name": "chalk:light_gray_chalk", + "weight": 70 + }, + { + "type": "minecraft:item", + "name": "species:music_disc_lapidarian", + "weight": 10 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 8, + "min": 6 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/chests/yurts_illager_smithy.json b/kubejs/data/tfg/loot_tables/chests/yurts_illager_smithy.json new file mode 100644 index 000000000..7f3e6f9d9 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/yurts_illager_smithy.json @@ -0,0 +1,370 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0, + "entries": [ + { + "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: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": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:raw_coal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 7, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:rich_raw_coal", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 5, + "min": 2 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:cobalt_brass_nugget", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:cobalt_nugget", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "create:copper_nugget", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "create:zinc_nugget", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:lead_nugget", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "create:brass_nugget", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "gtceu:bismuth_nugget", + "weight": 80, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 10, + "min": 6 + }, + "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: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": "gtceu:matches", + "weight": 70, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:sentry_armor_trim_smithing_template", + "weight": 7 + }, + { + "type": "minecraft:item", + "name": "minecraft:vex_armor_trim_smithing_template", + "weight": 7 + }, + { + "type": "minecraft:item", + "name": "minecraft:wild_armor_trim_smithing_template", + "weight": 7 + }, + { + "type": "minecraft:item", + "name": "minecraft:coast_armor_trim_smithing_template", + "weight": 7 + }, + { + "type": "minecraft:item", + "name": "alekiships:music_disc_pirate_crafting", + "weight": 10 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 8, + "min": 6 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/chests/yurts_illager_stable.json b/kubejs/data/tfg/loot_tables/chests/yurts_illager_stable.json new file mode 100644 index 000000000..1ca0e3745 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/yurts_illager_stable.json @@ -0,0 +1,62 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:straw", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 6 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "minecraft:lead", + "weight": 50 + }, + { + "type": "minecraft:item", + "name": "minecraft:leather_horse_armor", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "minecraft:saddle", + "weight": 100 + }, + { + "type": "minecraft:item", + "name": "minecraft:arrow", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16, + "min": 12 + }, + "function": "minecraft:set_count" + } + ] + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 6, + "min": 4 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/structures/illager_generic/huntmaster_camp.nbt b/kubejs/data/tfg/structures/illager_generic/huntmaster_camp.nbt index c3dcea4f5..86e7ff54d 100644 Binary files a/kubejs/data/tfg/structures/illager_generic/huntmaster_camp.nbt and b/kubejs/data/tfg/structures/illager_generic/huntmaster_camp.nbt differ diff --git a/kubejs/data/tfg/structures/illager_generic/mobs/horse.nbt b/kubejs/data/tfg/structures/illager_generic/mobs/horse.nbt new file mode 100644 index 000000000..8405efb9c Binary files /dev/null and b/kubejs/data/tfg/structures/illager_generic/mobs/horse.nbt differ diff --git a/kubejs/data/tfg/structures/illager_generic/small_camp_1.nbt b/kubejs/data/tfg/structures/illager_generic/small_camp_1.nbt index a74a15a4f..59e711b7a 100644 Binary files a/kubejs/data/tfg/structures/illager_generic/small_camp_1.nbt and b/kubejs/data/tfg/structures/illager_generic/small_camp_1.nbt differ diff --git a/kubejs/data/tfg/structures/illager_generic/small_camp_2.nbt b/kubejs/data/tfg/structures/illager_generic/small_camp_2.nbt index 6119022e5..f8e28c734 100644 Binary files a/kubejs/data/tfg/structures/illager_generic/small_camp_2.nbt and b/kubejs/data/tfg/structures/illager_generic/small_camp_2.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/bend_left.nbt b/kubejs/data/tfg/structures/yurts/baseline/bend_left.nbt new file mode 100644 index 000000000..20f45bf70 Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/bend_left.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/bend_right.nbt b/kubejs/data/tfg/structures/yurts/baseline/bend_right.nbt new file mode 100644 index 000000000..23602f476 Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/bend_right.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/cross.nbt b/kubejs/data/tfg/structures/yurts/baseline/cross.nbt new file mode 100644 index 000000000..cbe50770a Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/cross.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/fork_left.nbt b/kubejs/data/tfg/structures/yurts/baseline/fork_left.nbt new file mode 100644 index 000000000..c0d762a5d Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/fork_left.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/fork_right.nbt b/kubejs/data/tfg/structures/yurts/baseline/fork_right.nbt new file mode 100644 index 000000000..150b9d1e0 Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/fork_right.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house1.nbt b/kubejs/data/tfg/structures/yurts/baseline/house1.nbt index fd8f504d4..8c7658d69 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house1.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house1.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house2.nbt b/kubejs/data/tfg/structures/yurts/baseline/house2.nbt index 0bec2d738..23dc63195 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house2.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house2.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house3.nbt b/kubejs/data/tfg/structures/yurts/baseline/house3.nbt index 060bce8ff..2474198ba 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house3.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house3.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/larder.nbt b/kubejs/data/tfg/structures/yurts/baseline/larder.nbt index b0a679563..f895f1a59 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/larder.nbt and b/kubejs/data/tfg/structures/yurts/baseline/larder.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/monument.nbt b/kubejs/data/tfg/structures/yurts/baseline/monument.nbt index 1903d20fc..60370782b 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/monument.nbt and b/kubejs/data/tfg/structures/yurts/baseline/monument.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/shooting_range.nbt b/kubejs/data/tfg/structures/yurts/baseline/shooting_range.nbt index 8ecf504b6..5c22dd6f4 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/shooting_range.nbt and b/kubejs/data/tfg/structures/yurts/baseline/shooting_range.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/stable.nbt b/kubejs/data/tfg/structures/yurts/baseline/stable.nbt index 6b9cd2ee5..477a1b088 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/stable.nbt and b/kubejs/data/tfg/structures/yurts/baseline/stable.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/straight_long.nbt b/kubejs/data/tfg/structures/yurts/baseline/straight_long.nbt new file mode 100644 index 000000000..627d6ddb5 Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/straight_long.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/straight_medium.nbt b/kubejs/data/tfg/structures/yurts/baseline/straight_medium.nbt new file mode 100644 index 000000000..4997aaa84 Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/straight_medium.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/straight_short.nbt b/kubejs/data/tfg/structures/yurts/baseline/straight_short.nbt new file mode 100644 index 000000000..224576df6 Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/straight_short.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/t_junction.nbt b/kubejs/data/tfg/structures/yurts/baseline/t_junction.nbt new file mode 100644 index 000000000..1ff2a1efa Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/t_junction.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt b/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt index 9528029c7..08933834b 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt and b/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/tower.nbt b/kubejs/data/tfg/structures/yurts/baseline/tower.nbt index 7b0f7b03a..9c267fa6e 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/tower.nbt and b/kubejs/data/tfg/structures/yurts/baseline/tower.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/workshop.nbt b/kubejs/data/tfg/structures/yurts/baseline/workshop.nbt index f88387dd9..b306243b4 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/workshop.nbt and b/kubejs/data/tfg/structures/yurts/baseline/workshop.nbt differ diff --git a/kubejs/data/tfg/worldgen/processor_list/illagers/yurts_paths.json b/kubejs/data/tfg/worldgen/processor_list/illagers/yurts_paths.json new file mode 100644 index 000000000..ffe662188 --- /dev/null +++ b/kubejs/data/tfg/worldgen/processor_list/illagers/yurts_paths.json @@ -0,0 +1,103 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "tfc:wood/planks/pine" + } + }, + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "tfc:river_water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "tfc:wood/planks/pine" + } + }, + + + + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:random_block_match", + "probability": 0.1 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "rnr:rock/gravel_road/slate" + } + }, + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:random_block_match", + "probability": 0.1 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "rnr:rock/gravel_road/phyllite" + } + }, + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "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": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:random_block_match", + "probability": 0.1 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "tfc:grass/silty_loam" + } + }, + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:random_block_match", + "probability": 1.0 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "rnr:hoggin" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/processor_list/illagers/yurts_structures.json b/kubejs/data/tfg/worldgen/processor_list/illagers/yurts_structures.json new file mode 100644 index 000000000..b4451a848 --- /dev/null +++ b/kubejs/data/tfg/worldgen/processor_list/illagers/yurts_structures.json @@ -0,0 +1,50 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "tfc:wood/planks/pine" + } + }, + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "tfc:river_water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "tfc:wood/planks/pine" + } + }, + + + { + "input_predicate": { + "block": "tfc:rock/bricks/andesite", + "predicate_type": "minecraft:random_block_match", + "probability": 1.0 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "rnr:hoggin" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/illagers/yurts_village_living.json b/kubejs/data/tfg/worldgen/structure/illagers/yurts_village_living.json new file mode 100644 index 000000000..8d7dd8573 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure/illagers/yurts_village_living.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:jigsaw", + "start_pool": "tfg:illagers/yurts_village_living_start_pool", + "size": 5, + "max_distance_from_center": 116, + "biomes": "#tfg:has_structure/illages", + "step": "surface_structures", + "terrain_adaptation": "beard_thin", + "start_height": { + "absolute": -1 + }, + "project_start_to_heightmap": "MOTION_BLOCKING", + "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_set/illagers/yurts_village.json b/kubejs/data/tfg/worldgen/structure_set/illagers/yurts_village.json new file mode 100644 index 000000000..f1a76756f --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/yurts_village.json @@ -0,0 +1,21 @@ +{ + "structures": [ + { + "structure": "tfg:illagers/yurts_village_living", + "weight": 100 + } + ], + "placement": { + "type": "tfc:climate", + "salt": 26256356324, + "spacing": 40, + "separation": 30, + "climate": { + "min_temperature": -12, + "max_temperature": 8, + "min_rainfall": 100, + "max_rainfall": 250, + "max_forest": "edge" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/mob_horse.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_horse.json new file mode 100644 index 000000000..2ecd41ec2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_horse.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/mob_horse", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/horse", + "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/yurts_village_living_buildings.json b/kubejs/data/tfg/worldgen/template_pool/illagers/yurts_village_living_buildings.json new file mode 100644 index 000000000..0362604d3 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/yurts_village_living_buildings.json @@ -0,0 +1,118 @@ +{ + "name": "tfg:illagers/yurts_village_living_buildings", + "fallback": "tfg:illagers/yurts_village_living_paths", + "elements": [ + { + "weight": 100, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:yurts/baseline/larder", + "processors": "tfg:illagers/yurts_structures", + "projection": "rigid" + }, + "limit": 1 + } + }, + { + "weight": 100, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:yurts/baseline/workshop", + "processors": "tfg:illagers/yurts_structures", + "projection": "rigid" + }, + "limit": 1 + } + }, + { + "weight": 100, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:yurts/baseline/tower", + "processors": "tfg:illagers/yurts_structures", + "projection": "rigid" + }, + "limit": 2 + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/house1", + "processors": "tfg:illagers/yurts_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/house2", + "processors": "tfg:illagers/yurts_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/house3", + "processors": "tfg:illagers/yurts_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:yurts/baseline/stable", + "processors": "tfg:illagers/yurts_structures", + "projection": "rigid" + }, + "limit": 2 + } + }, + { + "weight": 100, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:yurts/baseline/shooting_range", + "processors": "tfg:illagers/yurts_structures", + "projection": "rigid" + }, + "limit": 1 + } + }, + { + "weight": 50, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:yurts/baseline/monument", + "processors": "tfg:illagers/yurts_paths", + "projection": "rigid" + }, + "limit": 1 + } + }, + { + "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/yurts_village_living_paths.json b/kubejs/data/tfg/worldgen/template_pool/illagers/yurts_village_living_paths.json new file mode 100644 index 000000000..a7b7d49ea --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/yurts_village_living_paths.json @@ -0,0 +1,94 @@ +{ + "name": "tfg:illagers/yurts_village_living_paths", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/straight_short", + "processors": "tfg:illagers/yurts_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/straight_medium", + "processors": "tfg:illagers/yurts_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/straight_long", + "processors": "tfg:illagers/yurts_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/bend_left", + "processors": "tfg:illagers/yurts_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/bend_right", + "processors": "tfg:illagers/yurts_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/t_junction", + "processors": "tfg:illagers/yurts_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/fork_left", + "processors": "tfg:illagers/yurts_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/fork_right", + "processors": "tfg:illagers/yurts_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 80, + "element": { + "location": "tfg:yurts/baseline/cross", + "processors": "tfg:illagers/yurts_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/yurts_village_living_start_pool.json b/kubejs/data/tfg/worldgen/template_pool/illagers/yurts_village_living_start_pool.json new file mode 100644 index 000000000..c7eff737e --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/yurts_village_living_start_pool.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/yurts_village_living_start_pool", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:yurts/baseline/throne_house", + "processors": "tfg:illagers/yurts_paths", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file