Merge pull request #1435 from TelepathicGrunt/1.21-rs-compat1

Update Repurposed Structures compatibility
TeamLapen · Nov 3, 2024 · 19617e2 · 19617e2
2 parents 64d54bb + fc2265b
commit 19617e2
Show file tree

Hide file tree

Showing 27 changed files with 94 additions and 10 deletions.
diff --git a/...wn_counts_additions/village_badlands.json → ...pieces_spawn_counts/village_badlands.json b/...wn_counts_additions/village_badlands.json → ...pieces_spawn_counts/village_badlands.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_badlands",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_bamboo.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_bamboo.json
@@ -0,0 +1,13 @@
+{
+  "target_structure": "repurposed_structures:village_bamboo",
+  "pieces_spawn_counts": [
+    {
+      "nbt_piece_name": "vampirism:village/totem",
+      "never_spawn_more_than_this_many": 1
+    },
+    {
+      "nbt_piece_name": "vampirism:village/bamboo/houses/hunter_trainer",
+      "never_spawn_more_than_this_many": 1
+    }
+  ]
+}
diff --git a/...spawn_counts_additions/village_birch.json → ...rs_pieces_spawn_counts/village_birch.json b/...spawn_counts_additions/village_birch.json → ...rs_pieces_spawn_counts/village_birch.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_birch",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_cherry.json b/src/main/resources/data/vampirism/rs_pieces_spawn_counts/village_cherry.json
@@ -0,0 +1,13 @@
+{
+  "target_structure": "repurposed_structures:village_cherry",
+  "pieces_spawn_counts": [
+    {
+      "nbt_piece_name": "vampirism:village/totem",
+      "never_spawn_more_than_this_many": 1
+    },
+    {
+      "nbt_piece_name": "vampirism:village/cherry/houses/hunter_trainer",
+      "never_spawn_more_than_this_many": 1
+    }
+  ]
+}
diff --git a/...awn_counts_additions/village_crimson.json → ..._pieces_spawn_counts/village_crimson.json b/...awn_counts_additions/village_crimson.json → ..._pieces_spawn_counts/village_crimson.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_crimson",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/...counts_additions/village_dark_forest.json → ...ces_spawn_counts/village_dark_forest.json b/...counts_additions/village_dark_forest.json → ...ces_spawn_counts/village_dark_forest.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_dark_forest",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/...counts_additions/village_giant_taiga.json → ...ces_spawn_counts/village_giant_taiga.json b/...counts_additions/village_giant_taiga.json → ...ces_spawn_counts/village_giant_taiga.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_giant_taiga",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/...pawn_counts_additions/village_jungle.json → ...s_pieces_spawn_counts/village_jungle.json b/...pawn_counts_additions/village_jungle.json → ...s_pieces_spawn_counts/village_jungle.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_jungle",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/...n_counts_additions/village_mountains.json → ...ieces_spawn_counts/village_mountains.json b/...n_counts_additions/village_mountains.json → ...ieces_spawn_counts/village_mountains.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_mountains",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/...s_spawn_counts_additions/village_oak.json → ...m/rs_pieces_spawn_counts/village_oak.json b/...s_spawn_counts_additions/village_oak.json → ...m/rs_pieces_spawn_counts/village_oak.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_oak",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/...spawn_counts_additions/village_swamp.json → ...rs_pieces_spawn_counts/village_swamp.json b/...spawn_counts_additions/village_swamp.json → ...rs_pieces_spawn_counts/village_swamp.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_swamp",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/...pawn_counts_additions/village_warped.json → ...s_pieces_spawn_counts/village_warped.json b/...pawn_counts_additions/village_warped.json → ...s_pieces_spawn_counts/village_warped.json
@@ -1,4 +1,5 @@
 {
+  "target_structure": "repurposed_structures:village_warped",
   "pieces_spawn_counts": [
     {
       "nbt_piece_name": "vampirism:village/totem",

diff --git a/...l_additions/villages/badlands/houses.json → ...l_additions/villages/badlands/houses.json b/...l_additions/villages/badlands/houses.json → ...l_additions/villages/badlands/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/badlands/houses",
+  "target_pool": "repurposed_structures:villages/badlands/houses",
   "fallback": "repurposed_structures:villages/badlands/terminators",
   "elements": [
     {

diff --git a/src/main/resources/data/vampirism/rs_pool_additions/villages/bamboo/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/bamboo/houses.json
@@ -0,0 +1,24 @@
+{
+  "target_pool": "repurposed_structures:villages/bamboo/houses",
+  "fallback": "repurposed_structures:villages/bamboo/terminators",
+  "elements": [
+    {
+      "weight": 400,
+      "element": {
+        "location": "vampirism:village/bamboo/houses/hunter_trainer",
+        "processors": "minecraft:empty",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 20,
+      "element": {
+        "location": "vampirism:village/totem",
+        "processors": "minecraft:empty",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    }
+  ]
+}
diff --git a/...pool_additions/villages/birch/houses.json → ...pool_additions/villages/birch/houses.json b/...pool_additions/villages/birch/houses.json → ...pool_additions/villages/birch/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/birch/houses",
+  "target_pool": "repurposed_structures:villages/birch/houses",
   "fallback": "repurposed_structures:villages/birch/terminators",
   "elements": [
     {

diff --git a/src/main/resources/data/vampirism/rs_pool_additions/villages/cherry/houses.json b/src/main/resources/data/vampirism/rs_pool_additions/villages/cherry/houses.json
@@ -0,0 +1,24 @@
+{
+  "target_pool": "repurposed_structures:villages/cherry/houses",
+  "fallback": "repurposed_structures:villages/cherry/terminators",
+  "elements": [
+    {
+      "weight": 400,
+      "element": {
+        "location": "vampirism:village/cherry/houses/hunter_trainer",
+        "processors": "minecraft:empty",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 20,
+      "element": {
+        "location": "vampirism:village/totem",
+        "processors": "minecraft:empty",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    }
+  ]
+}
diff --git a/...ol_additions/villages/crimson/houses.json → ...ol_additions/villages/crimson/houses.json b/...ol_additions/villages/crimson/houses.json → ...ol_additions/villages/crimson/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/crimson/houses",
+  "target_pool": "repurposed_structures:villages/crimson/houses",
   "fallback": "repurposed_structures:villages/crimson/terminators",
   "elements": [
     {

diff --git a/...dditions/villages/dark_forest/houses.json → ...dditions/villages/dark_forest/houses.json b/...dditions/villages/dark_forest/houses.json → ...dditions/villages/dark_forest/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/dark_forest/houses",
+  "target_pool": "repurposed_structures:villages/dark_forest/houses",
   "fallback": "repurposed_structures:villages/dark_forest/terminators",
   "elements": [
     {

diff --git a/...dditions/villages/giant_taiga/houses.json → ...dditions/villages/giant_taiga/houses.json b/...dditions/villages/giant_taiga/houses.json → ...dditions/villages/giant_taiga/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/giant_taiga/houses",
+  "target_pool": "repurposed_structures:villages/giant_taiga/houses",
   "fallback": "repurposed_structures:villages/giant_taiga/terminators",
   "elements": [
     {

diff --git a/...ool_additions/villages/jungle/houses.json → ...ool_additions/villages/jungle/houses.json b/...ool_additions/villages/jungle/houses.json → ...ool_additions/villages/jungle/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/jungle/houses",
+  "target_pool": "repurposed_structures:villages/jungle/houses",
   "fallback": "repurposed_structures:villages/jungle/terminators",
   "elements": [
     {

diff --git a/..._additions/villages/mountains/houses.json → ..._additions/villages/mountains/houses.json b/..._additions/villages/mountains/houses.json → ..._additions/villages/mountains/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/mountains/houses",
+  "target_pool": "repurposed_structures:villages/mountains/houses",
   "fallback": "repurposed_structures:villages/mountains/terminators",
   "elements": [
     {

diff --git a/...s/pool_additions/villages/oak/houses.json → ...s_pool_additions/villages/oak/houses.json b/...s/pool_additions/villages/oak/houses.json → ...s_pool_additions/villages/oak/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/oak/houses",
+  "target_pool": "repurposed_structures:villages/oak/houses",
   "fallback": "repurposed_structures:villages/oak/terminators",
   "elements": [
     {

diff --git a/...pool_additions/villages/swamp/houses.json → ...pool_additions/villages/swamp/houses.json b/...pool_additions/villages/swamp/houses.json → ...pool_additions/villages/swamp/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/swamp/houses",
+  "target_pool": "repurposed_structures:villages/swamp/houses",
   "fallback": "repurposed_structures:villages/swamp/terminators",
   "elements": [
     {

diff --git a/...ool_additions/villages/warped/houses.json → ...ool_additions/villages/warped/houses.json b/...ool_additions/villages/warped/houses.json → ...ool_additions/villages/warped/houses.json
@@ -1,5 +1,5 @@
 {
-  "name": "repurposed_structures:villages/warped/houses",
+  "target_pool": "repurposed_structures:villages/warped/houses",
   "fallback": "repurposed_structures:villages/warped/terminators",
   "elements": [
     {

diff --git a/src/main/resources/data/vampirism/structure/village/bamboo/houses/hunter_trainer.nbt b/src/main/resources/data/vampirism/structure/village/bamboo/houses/hunter_trainer.nbt
diff --git a/src/main/resources/data/vampirism/structure/village/cherry/houses/hunter_trainer.nbt b/src/main/resources/data/vampirism/structure/village/cherry/houses/hunter_trainer.nbt
diff --git a/src/main/resources/data/vampirism/structure/village/mountains/houses/hunter_trainer.nbt b/src/main/resources/data/vampirism/structure/village/mountains/houses/hunter_trainer.nbt