Merge pull request #175 from ChoiceTheorem/ChoiceTheorem/issue150

Issue 150 part 4
ChoiceTheorem · Jul 14, 2024 · e544548 · e544548
2 parents 3aff791 + aa89977
commit e544548
Show file tree

Hide file tree

Showing 127 changed files with 1,012 additions and 368 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,3 +2,5 @@
 
 - Added Jewelry Compat
 - Added Archers Compat
+- Added Rogues Compat
+- All RPG series mod buildings will be restricted to 1 building per villages.
diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/beach.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/beach.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
 					"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/beach/house",
 					"location": "ctov:village/beach/jobsite/archery_range"
 				},
-  				"count": 1,
-				"min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/christmas.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/christmas.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/christmas/house",
 					"location": "ctov:village/christmas/jobsite/archery_range"	
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/dark_forest.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/dark_forest.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
 				"delegate": {
 					"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/halloween/house",
 					"location": "ctov:village/dark_forest/jobsite/archery_range"
 				},
-				"count": 1,
-                "min_depth": 3
+				"limit": 1 
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/desert.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/desert.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
 				"delegate": {
 				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/desert/house",
 					"location": "ctov:village/desert/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/...on/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/desert_oasis.json b/...on/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/desert_oasis.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/desert/house",
 					"location": "ctov:village/desert_oasis/jobsite/archery_range"
 				},
-				"count": 1,
-                "min_depth": 3
+				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/jungle.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/jungle.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/jungle/house",
 					"location": "ctov:village/jungle/jobsite/archery_range"
 				},
-				"count": 1,
-                "min_depth": 3
+				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/jungle_tree.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/jungle_tree.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/jungle/house",
 					"location": "ctov:village/jungle_tree/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mesa.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mesa.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/mesa/house",
 					"location": "ctov:village/mesa/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/.../src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mesa_fortified.json b/.../src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mesa_fortified.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/mesa_fortified/house",
 					"location": "ctov:village/mesa_fortified/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mountain.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mountain.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/mountain/house",
 					"location": "ctov:village/mountain/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/...src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mountain_alpine.json b/...src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mountain_alpine.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/mountain/house",
 					"location": "ctov:village/mountain_alpine/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mushroom.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mushroom.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/mushroom/house_red",
 					"location": "ctov:village/mushroom/jobsite/archery_range"
 				},
-				"count": 1,
-                "min_depth": 3
+				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/plains.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/plains.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
 				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/plains/house",
 					"location": "ctov:village/plains/jobsite/archery_range"
 					},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1  
 			}
 		}
 	]

diff --git a/...rc/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/plains_fortified.json b/...rc/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/plains_fortified.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/plains/house",
 					"location": "ctov:village/plains_fortified/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/savanna.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/savanna.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/savanna/house_orange",
 					"location": "ctov:village/savanna/jobsite/archery_range"
 				},
-				"count": 1,
-                "min_depth": 3
+				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/savanna_na.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/savanna_na.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
 				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/savanna_na/hut",
 					"location": "ctov:village/savanna_na/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/snowy.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/snowy.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
 				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/snowy/house_snow",
 					"location": "ctov:village/snowy_igloo/jobsite/archery_range"
 				},
-				"count": 1,
-                "min_depth": 3
+				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/swamp.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/swamp.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
 				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/swamp/house",
 					"location": "ctov:village/swamp/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/...src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/swamp_fortified.json b/...src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/swamp_fortified.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/swamp/house",
 					"location": "ctov:village/swamp_fortified/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]

diff --git a/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/taiga.json b/common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/taiga.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/taiga/house",
 					"location": "ctov:village/taiga/jobsite/archery_range"
 				},
-				"count": 1,
-                "min_depth": 3
+				"limit": 1
 			}
 		}
 	]

diff --git a/...src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/taiga_fortified.json b/...src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/taiga_fortified.json
@@ -14,15 +14,14 @@
 		{
 			"weight": 5,
 			"element": {
-				"element_type": "lithostitched:guaranteed",
+				"element_type": "lithostitched:limited",
   				"delegate": {
     				"element_type": "minecraft:single_pool_element",
 					"projection": "rigid",
 					"processors": "ctov:village/taiga/house",
 					"location": "ctov:village/taiga_fortified/jobsite/archery_range"
 				},
-  				"count": 1,
-                "min_depth": 3
+  				"limit": 1
 			}
 		}
 	]