GH-27 - Fix waystones always named identical (#28)

* GH-27 - Fixed waystones having the same naming * GH-27 - Set default template_pool to none-waystone * NTR - Prepare next release
WaldiNet · Aug 7, 2022 · 9da9530 · 9da9530
1 parent af8e305
commit 9da9530
Show file tree

Hide file tree

Showing 28 changed files with 14 additions and 11 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -50,6 +50,7 @@ body:
       label: Mod Version
       description: "Please select the used version of 'Towers of the Wild: Reworked'."
       options:
+        - "v4.0.2"
         - "v4.0.1"
         - "v4.0.0"
         - "v3.0.0"
@@ -78,6 +79,8 @@ body:
       label: Minecraft Version
       description: "Please select the used version of 'Minecraft'."
       options:
+        - "1.19.2"
+        - "1.19.1"
         - "1.19"
         - "1.18.2"
         - "1.18.1"

diff --git a/data/totw_reworked/structures/derelict/fabric_waystone_derelict_tower_top.nbt b/data/totw_reworked/structures/derelict/fabric_waystone_derelict_tower_top.nbt
diff --git a/data/totw_reworked/structures/derelict/fwaystones_derelict_tower_top.nbt b/data/totw_reworked/structures/derelict/fwaystones_derelict_tower_top.nbt
diff --git a/data/totw_reworked/structures/derelict/waystone_derelict_tower_top.nbt b/data/totw_reworked/structures/derelict/waystone_derelict_tower_top.nbt
diff --git a/data/totw_reworked/structures/derelict_grass/fabric_waystone_derelict_grass_tower_top.nbt b/data/totw_reworked/structures/derelict_grass/fabric_waystone_derelict_grass_tower_top.nbt
diff --git a/data/totw_reworked/structures/derelict_grass/fwaystones_derelict_grass_tower_top.nbt b/data/totw_reworked/structures/derelict_grass/fwaystones_derelict_grass_tower_top.nbt
diff --git a/data/totw_reworked/structures/derelict_grass/waystone_derelict_grass_tower_top.nbt b/data/totw_reworked/structures/derelict_grass/waystone_derelict_grass_tower_top.nbt
diff --git a/data/totw_reworked/structures/ice/fabric_waystone_ice_tower_top.nbt b/data/totw_reworked/structures/ice/fabric_waystone_ice_tower_top.nbt
diff --git a/data/totw_reworked/structures/ice/fwaystones_ice_tower_top.nbt b/data/totw_reworked/structures/ice/fwaystones_ice_tower_top.nbt
diff --git a/data/totw_reworked/structures/ice/waystone_ice_tower_top.nbt b/data/totw_reworked/structures/ice/waystone_ice_tower_top.nbt
diff --git a/data/totw_reworked/structures/jungle/fabric_waystone_jungle_tower_top.nbt b/data/totw_reworked/structures/jungle/fabric_waystone_jungle_tower_top.nbt
diff --git a/data/totw_reworked/structures/jungle/fwaystones_jungle_tower_top.nbt b/data/totw_reworked/structures/jungle/fwaystones_jungle_tower_top.nbt
diff --git a/data/totw_reworked/structures/jungle/waystone_jungle_tower_top.nbt b/data/totw_reworked/structures/jungle/waystone_jungle_tower_top.nbt
diff --git a/data/totw_reworked/structures/ocean/fabric_waystone_ocean_tower_top.nbt b/data/totw_reworked/structures/ocean/fabric_waystone_ocean_tower_top.nbt
diff --git a/data/totw_reworked/structures/ocean/fwaystones_ocean_tower_top.nbt b/data/totw_reworked/structures/ocean/fwaystones_ocean_tower_top.nbt
diff --git a/data/totw_reworked/structures/ocean/waystone_ocean_tower_top.nbt b/data/totw_reworked/structures/ocean/waystone_ocean_tower_top.nbt
diff --git a/data/totw_reworked/structures/ocean_warm/fabric_waystone_ocean_warm_tower_top.nbt b/data/totw_reworked/structures/ocean_warm/fabric_waystone_ocean_warm_tower_top.nbt
diff --git a/data/totw_reworked/structures/ocean_warm/fwaystones_ocean_warm_tower_top.nbt b/data/totw_reworked/structures/ocean_warm/fwaystones_ocean_warm_tower_top.nbt
diff --git a/data/totw_reworked/structures/ocean_warm/waystone_ocean_warm_tower_top.nbt b/data/totw_reworked/structures/ocean_warm/waystone_ocean_warm_tower_top.nbt
diff --git a/data/totw_reworked/structures/regular/fabric_waystone_tower_top.nbt b/data/totw_reworked/structures/regular/fabric_waystone_tower_top.nbt
diff --git a/data/totw_reworked/structures/regular/fwaystones_tower_top.nbt b/data/totw_reworked/structures/regular/fwaystones_tower_top.nbt
diff --git a/data/totw_reworked/structures/regular/waystone_tower_top.nbt b/data/totw_reworked/structures/regular/waystone_tower_top.nbt
diff --git a/data/totw_reworked/worldgen/structure_set/derelict.json b/data/totw_reworked/worldgen/structure_set/derelict.json
@@ -7,8 +7,8 @@
     ],
     "placement": {
         "type": "minecraft:random_spread",
-        "spacing": 45,
-        "separation": 25,
+        "spacing": 55,
+        "separation": 35,
         "salt": 1689780
     }
 }
diff --git a/data/totw_reworked/worldgen/structure_set/derelict_grass.json b/data/totw_reworked/worldgen/structure_set/derelict_grass.json
@@ -7,8 +7,8 @@
     ],
     "placement": {
         "type": "minecraft:random_spread",
-        "spacing": 45,
-        "separation": 25,
+        "spacing": 55,
+        "separation": 35,
         "salt": 1689781
     }
 }
diff --git a/data/totw_reworked/worldgen/structure_set/ice.json b/data/totw_reworked/worldgen/structure_set/ice.json
@@ -7,8 +7,8 @@
     ],
     "placement": {
         "type": "minecraft:random_spread",
-        "spacing": 45,
-        "separation": 25,
+        "spacing": 55,
+        "separation": 35,
         "salt": 1689779
     }
 }
diff --git a/data/totw_reworked/worldgen/structure_set/jungle.json b/data/totw_reworked/worldgen/structure_set/jungle.json
@@ -7,8 +7,8 @@
     ],
     "placement": {
         "type": "minecraft:random_spread",
-        "spacing": 45,
-        "separation": 25,
+        "spacing": 55,
+        "separation": 35,
         "salt": 1689778
     }
 }
diff --git a/data/totw_reworked/worldgen/structure_set/ocean.json b/data/totw_reworked/worldgen/structure_set/ocean.json
@@ -7,7 +7,7 @@
     ],
     "placement": {
         "type": "minecraft:random_spread",
-        "spacing": 45,
+        "spacing": 55,
         "separation": 25,
         "salt": 1689783
     }

diff --git a/data/totw_reworked/worldgen/structure_set/regular.json b/data/totw_reworked/worldgen/structure_set/regular.json
@@ -7,8 +7,8 @@
     ],
     "placement": {
         "type": "minecraft:random_spread",
-        "spacing": 72,
-        "separation": 25,
+        "spacing": 92,
+        "separation": 35,
         "salt": 1689777
     }
 }