diff --git a/CHANGELOG.md b/CHANGELOG.md index d47fb3106..6a1731687 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased ### Changes +- Added some new illages to the hot and dry climates of the world! @MVG31 ### Bug fixes - Fixes some curving press tool head recipes being cheaper than intended (#2478) @Pyritie ### Translation updates diff --git a/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json new file mode 100644 index 000000000..38ef47961 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json @@ -0,0 +1,559 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:wood/lumber/acacia", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/sapling/acacia", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/lumber/blackwood", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/sapling/blackwood", + "weight": 50, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6, + "min": 3 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/lumber/palm", + "weight": 100, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8, + "min": 4 + }, + "function": "minecraft:set_count" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfc:wood/sapling/palm", + "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/arabic_illager_smithy.json b/kubejs/data/tfg/loot_tables/chests/arabic_illager_smithy.json new file mode 100644 index 000000000..7f3e6f9d9 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/chests/arabic_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/nordic_illager_smithy.json b/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json index ffe60e5c4..7f3e6f9d9 100644 --- a/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json +++ b/kubejs/data/tfg/loot_tables/chests/nordic_illager_smithy.json @@ -119,14 +119,14 @@ { "type": "minecraft:item", "name": "gtceu:cobalt_brass_nugget", - "weight": 40, + "weight": 80, "functions": [ { "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 10, + "min": 6 }, "function": "minecraft:set_count" } @@ -135,14 +135,14 @@ { "type": "minecraft:item", "name": "gtceu:cobalt_nugget", - "weight": 50, + "weight": 100, "functions": [ { "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 10, + "min": 6 }, "function": "minecraft:set_count" } @@ -151,14 +151,14 @@ { "type": "minecraft:item", "name": "create:copper_nugget", - "weight": 80, + "weight": 100, "functions": [ { "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 10, + "min": 6 }, "function": "minecraft:set_count" } @@ -167,14 +167,14 @@ { "type": "minecraft:item", "name": "create:zinc_nugget", - "weight": 40, + "weight": 100, "functions": [ { "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 10, + "min": 6 }, "function": "minecraft:set_count" } @@ -183,14 +183,14 @@ { "type": "minecraft:item", "name": "gtceu:lead_nugget", - "weight": 40, + "weight": 100, "functions": [ { "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 10, + "min": 6 }, "function": "minecraft:set_count" } @@ -199,14 +199,14 @@ { "type": "minecraft:item", "name": "create:brass_nugget", - "weight": 40, + "weight": 80, "functions": [ { "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 10, + "min": 6 }, "function": "minecraft:set_count" } @@ -215,14 +215,14 @@ { "type": "minecraft:item", "name": "gtceu:bismuth_nugget", - "weight": 60, + "weight": 80, "functions": [ { "add": false, "count": { "type": "minecraft:uniform", - "max": 4, - "min": 2 + "max": 10, + "min": 6 }, "function": "minecraft:set_count" } @@ -238,11 +238,6 @@ "name": "tfchotornot:tongs/wood", "weight": 30 }, - { - "type": "minecraft:item", - "name": "tfc:ceramic/vessel", - "weight": 50 - }, { "type": "minecraft:item", "name": "tfc:powder/flux", diff --git a/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt b/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt new file mode 100644 index 000000000..fa92c96a3 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/bend_left.nbt b/kubejs/data/tfg/structures/arabic/baseline/bend_left.nbt new file mode 100644 index 000000000..06339095c Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/bend_left.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/bend_right.nbt b/kubejs/data/tfg/structures/arabic/baseline/bend_right.nbt new file mode 100644 index 000000000..5659e9745 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/bend_right.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/cross.nbt b/kubejs/data/tfg/structures/arabic/baseline/cross.nbt new file mode 100644 index 000000000..bae99f16b Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/cross.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/fork_left.nbt b/kubejs/data/tfg/structures/arabic/baseline/fork_left.nbt new file mode 100644 index 000000000..1df52be54 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/fork_left.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/fork_right.nbt b/kubejs/data/tfg/structures/arabic/baseline/fork_right.nbt new file mode 100644 index 000000000..5641bf38d Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/fork_right.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house1.nbt b/kubejs/data/tfg/structures/arabic/baseline/house1.nbt new file mode 100644 index 000000000..6974d4616 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/house1.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house2.nbt b/kubejs/data/tfg/structures/arabic/baseline/house2.nbt new file mode 100644 index 000000000..b13a3f48c Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/house2.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt b/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt new file mode 100644 index 000000000..dd23674e9 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt b/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt new file mode 100644 index 000000000..1f3ab03b8 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt new file mode 100644 index 000000000..d4306cab8 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt new file mode 100644 index 000000000..3d6a0581d Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt new file mode 100644 index 000000000..ff90623b8 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/straight_long.nbt b/kubejs/data/tfg/structures/arabic/baseline/straight_long.nbt new file mode 100644 index 000000000..5c7110c3e Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/straight_long.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/straight_medium.nbt b/kubejs/data/tfg/structures/arabic/baseline/straight_medium.nbt new file mode 100644 index 000000000..64fc8d2f7 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/straight_medium.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/straight_short.nbt b/kubejs/data/tfg/structures/arabic/baseline/straight_short.nbt new file mode 100644 index 000000000..83121f674 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/straight_short.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/t_junction.nbt b/kubejs/data/tfg/structures/arabic/baseline/t_junction.nbt new file mode 100644 index 000000000..ebfe14399 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/t_junction.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/well.nbt b/kubejs/data/tfg/structures/arabic/baseline/well.nbt new file mode 100644 index 000000000..2d67e4b13 Binary files /dev/null and b/kubejs/data/tfg/structures/arabic/baseline/well.nbt differ diff --git a/kubejs/data/tfg/structures/illager_generic/mobs/goat.nbt b/kubejs/data/tfg/structures/illager_generic/mobs/goat.nbt new file mode 100644 index 000000000..4e2a61062 Binary files /dev/null and b/kubejs/data/tfg/structures/illager_generic/mobs/goat.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house1.nbt b/kubejs/data/tfg/structures/yurts/baseline/house1.nbt new file mode 100644 index 000000000..fd8f504d4 Binary files /dev/null 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 new file mode 100644 index 000000000..0bec2d738 Binary files /dev/null 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 new file mode 100644 index 000000000..060bce8ff Binary files /dev/null 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 new file mode 100644 index 000000000..b0a679563 Binary files /dev/null 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 new file mode 100644 index 000000000..1903d20fc Binary files /dev/null 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 new file mode 100644 index 000000000..8ecf504b6 Binary files /dev/null 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 new file mode 100644 index 000000000..6b9cd2ee5 Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/stable.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt b/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt new file mode 100644 index 000000000..9528029c7 Binary files /dev/null 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 new file mode 100644 index 000000000..7b0f7b03a Binary files /dev/null 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 new file mode 100644 index 000000000..f88387dd9 Binary files /dev/null and b/kubejs/data/tfg/structures/yurts/baseline/workshop.nbt differ diff --git a/kubejs/data/tfg/worldgen/processor_list/illagers/arabic_paths.json b/kubejs/data/tfg/worldgen/processor_list/illagers/arabic_paths.json new file mode 100644 index 000000000..e9088cd9d --- /dev/null +++ b/kubejs/data/tfg/worldgen/processor_list/illagers/arabic_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/acacia" + } + }, + { + "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/acacia" + } + }, + + + + { + "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/claystone" + } + }, + { + "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/limestone" + } + }, + { + "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/sandy_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/sandy_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/arabic_structures.json b/kubejs/data/tfg/worldgen/processor_list/illagers/arabic_structures.json new file mode 100644 index 000000000..fc091e687 --- /dev/null +++ b/kubejs/data/tfg/worldgen/processor_list/illagers/arabic_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/acacia" + } + }, + { + "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/acacia" + } + }, + + + { + "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/arabic_village_living.json b/kubejs/data/tfg/worldgen/structure/illagers/arabic_village_living.json new file mode 100644 index 000000000..57d631889 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure/illagers/arabic_village_living.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:jigsaw", + "start_pool": "tfg:illagers/arabic_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/arabic_village.json b/kubejs/data/tfg/worldgen/structure_set/illagers/arabic_village.json new file mode 100644 index 000000000..2a74d0ac0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/arabic_village.json @@ -0,0 +1,21 @@ +{ + "structures": [ + { + "structure": "tfg:illagers/arabic_village_living", + "weight": 100 + } + ], + "placement": { + "type": "tfc:climate", + "salt": 26256356324, + "spacing": 40, + "separation": 30, + "climate": { + "min_temperature": 10, + "max_temperature": 25, + "min_rainfall": 100, + "max_rainfall": 250, + "max_forest": "edge" + } + } +} \ 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 index 007b01c56..d04ff6361 100644 --- a/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json @@ -16,8 +16,8 @@ "separation": 30, "climate": { "min_temperature": -12, - "max_temperature": 5, - "min_rainfall": 200, + "max_temperature": 8, + "min_rainfall": 250, "max_forest": "edge" } } diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/arabic_village_living_buildings.json b/kubejs/data/tfg/worldgen/template_pool/illagers/arabic_village_living_buildings.json new file mode 100644 index 000000000..ac82be9ee --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/arabic_village_living_buildings.json @@ -0,0 +1,109 @@ +{ + "name": "tfg:illagers/arabic_village_living_buildings", + "fallback": "tfg:illagers/arabic_village_living_paths", + "elements": [ + { + "weight": 100, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:arabic/baseline/house_garden", + "processors": "tfg:illagers/arabic_structures", + "projection": "rigid" + }, + "limit": 2 + } + }, + { + "weight": 100, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:arabic/baseline/smithy", + "processors": "tfg:illagers/arabic_structures", + "projection": "rigid" + }, + "limit": 1 + } + }, + { + "weight": 40, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:arabic/baseline/barracks", + "processors": "tfg:illagers/arabic_structures", + "projection": "rigid" + }, + "limit": 1 + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/house1", + "processors": "tfg:illagers/arabic_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/house2", + "processors": "tfg:illagers/arabic_structures", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 30, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:arabic/baseline/stall_gray", + "processors": "tfg:illagers/arabic_structures", + "projection": "rigid" + }, + "limit": 2 + } + }, + { + "weight": 30, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:arabic/baseline/stall_green", + "processors": "tfg:illagers/arabic_structures", + "projection": "rigid" + }, + "limit": 2 + } + }, + { + "weight": 30, + "element": { + "element_type": "lithostitched:limited", + "delegate": { + "element_type": "minecraft:single_pool_element", + "location": "tfg:arabic/baseline/stall_yellow", + "processors": "tfg:illagers/arabic_structures", + "projection": "rigid" + }, + "limit": 2 + } + }, + { + "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/arabic_village_living_paths.json b/kubejs/data/tfg/worldgen/template_pool/illagers/arabic_village_living_paths.json new file mode 100644 index 000000000..c1ec84c99 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/arabic_village_living_paths.json @@ -0,0 +1,94 @@ +{ + "name": "tfg:illagers/arabic_village_living_paths", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/straight_short", + "processors": "tfg:illagers/arabic_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/straight_medium", + "processors": "tfg:illagers/arabic_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/straight_long", + "processors": "tfg:illagers/arabic_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/bend_left", + "processors": "tfg:illagers/arabic_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/bend_right", + "processors": "tfg:illagers/arabic_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/t_junction", + "processors": "tfg:illagers/arabic_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/fork_left", + "processors": "tfg:illagers/arabic_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/fork_right", + "processors": "tfg:illagers/arabic_paths", + "projection": "terrain_matching", + "element_type": "minecraft:single_pool_element" + } + }, + { + "weight": 80, + "element": { + "location": "tfg:arabic/baseline/cross", + "processors": "tfg:illagers/arabic_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/arabic_village_living_start_pool.json b/kubejs/data/tfg/worldgen/template_pool/illagers/arabic_village_living_start_pool.json new file mode 100644 index 000000000..1fb1c3597 --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/arabic_village_living_start_pool.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/arabic_village_living_start_pool", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:arabic/baseline/well", + "processors": "tfg:illagers/arabic_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/mob_beast.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_beast.json new file mode 100644 index 000000000..137f09cbc --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_beast.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/mob_beast", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "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_goat.json b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_goat.json new file mode 100644 index 000000000..45e5aa5ab --- /dev/null +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/mob_goat.json @@ -0,0 +1,15 @@ +{ + "name": "tfg:illagers/mob_goat", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 100, + "element": { + "location": "tfg:illager_generic/mobs/goat", + "processors": "minecraft:empty", + "projection": "rigid", + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file