Fix BYG 2.0 compat

- Textures now use new locations - Mangrove -> white mangrove Fixes #263.
Juuxel · Jun 13, 2022 · a29a878 · a29a878
1 parent 26e0241
commit a29a878
Show file tree

Hide file tree

Showing 755 changed files with 1,942 additions and 1,422 deletions.
diff --git a/common/src/main/generatedResources/data/adorn/tags/blocks/benches.json b/common/src/main/generatedResources/data/adorn/tags/blocks/benches.json
@@ -31,7 +31,6 @@
     { "id": "adorn:byg/jacaranda_bench", "required": false },
     { "id": "adorn:byg/lament_bench", "required": false },
     { "id": "adorn:byg/mahogany_bench", "required": false },
-    { "id": "adorn:byg/mangrove_bench", "required": false },
     { "id": "adorn:byg/maple_bench", "required": false },
     { "id": "adorn:byg/nightshade_bench", "required": false },
     { "id": "adorn:byg/palm_bench", "required": false },
@@ -40,6 +39,7 @@
     { "id": "adorn:byg/redwood_bench", "required": false },
     { "id": "adorn:byg/skyris_bench", "required": false },
     { "id": "adorn:byg/sythian_bench", "required": false },
+    { "id": "adorn:byg/white_mangrove_bench", "required": false },
     { "id": "adorn:byg/willow_bench", "required": false },
     { "id": "adorn:byg/witch_hazel_bench", "required": false },
     { "id": "adorn:byg/zelkova_bench", "required": false },
@@ -59,6 +59,22 @@
     { "id": "adorn:terrestria/willow_bench", "required": false },
     { "id": "adorn:terrestria/yucca_palm_bench", "required": false },
     { "id": "adorn:traverse/fir_bench", "required": false },
-    { "id": "adorn:woods_and_mires/pine_bench", "required": false }
+    { "id": "adorn:woods_and_mires/pine_bench", "required": false },
+    { "id": "adorn:architects_palette/twisted_bench", "required": false },
+    { "id": "adorn:biomesoplenty/cherry_bench", "required": false },
+    { "id": "adorn:biomesoplenty/dead_bench", "required": false },
+    { "id": "adorn:biomesoplenty/fir_bench", "required": false },
+    { "id": "adorn:biomesoplenty/hellbark_bench", "required": false },
+    { "id": "adorn:biomesoplenty/jacaranda_bench", "required": false },
+    { "id": "adorn:biomesoplenty/magic_bench", "required": false },
+    { "id": "adorn:biomesoplenty/mahogany_bench", "required": false },
+    { "id": "adorn:biomesoplenty/palm_bench", "required": false },
+    { "id": "adorn:biomesoplenty/redwood_bench", "required": false },
+    { "id": "adorn:biomesoplenty/umbran_bench", "required": false },
+    { "id": "adorn:biomesoplenty/willow_bench", "required": false },
+    { "id": "adorn:ecologics/azalea_bench", "required": false },
+    { "id": "adorn:ecologics/flowering_azalea_bench", "required": false },
+    { "id": "adorn:ecologics/coconut_bench", "required": false },
+    { "id": "adorn:ecologics/walnut_bench", "required": false }
   ]
 }
diff --git a/common/src/main/generatedResources/data/adorn/tags/blocks/chairs.json b/common/src/main/generatedResources/data/adorn/tags/blocks/chairs.json
@@ -31,7 +31,6 @@
     { "id": "adorn:byg/jacaranda_chair", "required": false },
     { "id": "adorn:byg/lament_chair", "required": false },
     { "id": "adorn:byg/mahogany_chair", "required": false },
-    { "id": "adorn:byg/mangrove_chair", "required": false },
     { "id": "adorn:byg/maple_chair", "required": false },
     { "id": "adorn:byg/nightshade_chair", "required": false },
     { "id": "adorn:byg/palm_chair", "required": false },
@@ -40,6 +39,7 @@
     { "id": "adorn:byg/redwood_chair", "required": false },
     { "id": "adorn:byg/skyris_chair", "required": false },
     { "id": "adorn:byg/sythian_chair", "required": false },
+    { "id": "adorn:byg/white_mangrove_chair", "required": false },
     { "id": "adorn:byg/willow_chair", "required": false },
     { "id": "adorn:byg/witch_hazel_chair", "required": false },
     { "id": "adorn:byg/zelkova_chair", "required": false },
@@ -59,6 +59,22 @@
     { "id": "adorn:terrestria/willow_chair", "required": false },
     { "id": "adorn:terrestria/yucca_palm_chair", "required": false },
     { "id": "adorn:traverse/fir_chair", "required": false },
-    { "id": "adorn:woods_and_mires/pine_chair", "required": false }
+    { "id": "adorn:woods_and_mires/pine_chair", "required": false },
+    { "id": "adorn:architects_palette/twisted_chair", "required": false },
+    { "id": "adorn:biomesoplenty/cherry_chair", "required": false },
+    { "id": "adorn:biomesoplenty/dead_chair", "required": false },
+    { "id": "adorn:biomesoplenty/fir_chair", "required": false },
+    { "id": "adorn:biomesoplenty/hellbark_chair", "required": false },
+    { "id": "adorn:biomesoplenty/jacaranda_chair", "required": false },
+    { "id": "adorn:biomesoplenty/magic_chair", "required": false },
+    { "id": "adorn:biomesoplenty/mahogany_chair", "required": false },
+    { "id": "adorn:biomesoplenty/palm_chair", "required": false },
+    { "id": "adorn:biomesoplenty/redwood_chair", "required": false },
+    { "id": "adorn:biomesoplenty/umbran_chair", "required": false },
+    { "id": "adorn:biomesoplenty/willow_chair", "required": false },
+    { "id": "adorn:ecologics/azalea_chair", "required": false },
+    { "id": "adorn:ecologics/flowering_azalea_chair", "required": false },
+    { "id": "adorn:ecologics/coconut_chair", "required": false },
+    { "id": "adorn:ecologics/walnut_chair", "required": false }
   ]
 }
diff --git a/common/src/main/generatedResources/data/adorn/tags/blocks/coffee_tables.json b/common/src/main/generatedResources/data/adorn/tags/blocks/coffee_tables.json
@@ -31,7 +31,6 @@
     { "id": "adorn:byg/jacaranda_coffee_table", "required": false },
     { "id": "adorn:byg/lament_coffee_table", "required": false },
     { "id": "adorn:byg/mahogany_coffee_table", "required": false },
-    { "id": "adorn:byg/mangrove_coffee_table", "required": false },
     { "id": "adorn:byg/maple_coffee_table", "required": false },
     { "id": "adorn:byg/nightshade_coffee_table", "required": false },
     { "id": "adorn:byg/palm_coffee_table", "required": false },
@@ -40,6 +39,7 @@
     { "id": "adorn:byg/redwood_coffee_table", "required": false },
     { "id": "adorn:byg/skyris_coffee_table", "required": false },
     { "id": "adorn:byg/sythian_coffee_table", "required": false },
+    { "id": "adorn:byg/white_mangrove_coffee_table", "required": false },
     { "id": "adorn:byg/willow_coffee_table", "required": false },
     { "id": "adorn:byg/witch_hazel_coffee_table", "required": false },
     { "id": "adorn:byg/zelkova_coffee_table", "required": false },
@@ -59,6 +59,22 @@
     { "id": "adorn:terrestria/willow_coffee_table", "required": false },
     { "id": "adorn:terrestria/yucca_palm_coffee_table", "required": false },
     { "id": "adorn:traverse/fir_coffee_table", "required": false },
-    { "id": "adorn:woods_and_mires/pine_coffee_table", "required": false }
+    { "id": "adorn:woods_and_mires/pine_coffee_table", "required": false },
+    { "id": "adorn:architects_palette/twisted_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/cherry_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/dead_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/fir_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/hellbark_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/jacaranda_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/magic_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/mahogany_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/palm_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/redwood_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/umbran_coffee_table", "required": false },
+    { "id": "adorn:biomesoplenty/willow_coffee_table", "required": false },
+    { "id": "adorn:ecologics/azalea_coffee_table", "required": false },
+    { "id": "adorn:ecologics/flowering_azalea_coffee_table", "required": false },
+    { "id": "adorn:ecologics/coconut_coffee_table", "required": false },
+    { "id": "adorn:ecologics/walnut_coffee_table", "required": false }
   ]
 }
diff --git a/common/src/main/generatedResources/data/adorn/tags/blocks/drawers.json b/common/src/main/generatedResources/data/adorn/tags/blocks/drawers.json
@@ -31,7 +31,6 @@
     { "id": "adorn:byg/jacaranda_drawer", "required": false },
     { "id": "adorn:byg/lament_drawer", "required": false },
     { "id": "adorn:byg/mahogany_drawer", "required": false },
-    { "id": "adorn:byg/mangrove_drawer", "required": false },
     { "id": "adorn:byg/maple_drawer", "required": false },
     { "id": "adorn:byg/nightshade_drawer", "required": false },
     { "id": "adorn:byg/palm_drawer", "required": false },
@@ -40,6 +39,7 @@
     { "id": "adorn:byg/redwood_drawer", "required": false },
     { "id": "adorn:byg/skyris_drawer", "required": false },
     { "id": "adorn:byg/sythian_drawer", "required": false },
+    { "id": "adorn:byg/white_mangrove_drawer", "required": false },
     { "id": "adorn:byg/willow_drawer", "required": false },
     { "id": "adorn:byg/witch_hazel_drawer", "required": false },
     { "id": "adorn:byg/zelkova_drawer", "required": false },
@@ -59,6 +59,22 @@
     { "id": "adorn:terrestria/willow_drawer", "required": false },
     { "id": "adorn:terrestria/yucca_palm_drawer", "required": false },
     { "id": "adorn:traverse/fir_drawer", "required": false },
-    { "id": "adorn:woods_and_mires/pine_drawer", "required": false }
+    { "id": "adorn:woods_and_mires/pine_drawer", "required": false },
+    { "id": "adorn:architects_palette/twisted_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/cherry_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/dead_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/fir_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/hellbark_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/jacaranda_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/magic_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/mahogany_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/palm_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/redwood_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/umbran_drawer", "required": false },
+    { "id": "adorn:biomesoplenty/willow_drawer", "required": false },
+    { "id": "adorn:ecologics/azalea_drawer", "required": false },
+    { "id": "adorn:ecologics/flowering_azalea_drawer", "required": false },
+    { "id": "adorn:ecologics/coconut_drawer", "required": false },
+    { "id": "adorn:ecologics/walnut_drawer", "required": false }
   ]
 }
diff --git a/common/src/main/generatedResources/data/adorn/tags/blocks/kitchen_counters.json b/common/src/main/generatedResources/data/adorn/tags/blocks/kitchen_counters.json
@@ -31,7 +31,6 @@
     { "id": "adorn:byg/jacaranda_kitchen_counter", "required": false },
     { "id": "adorn:byg/lament_kitchen_counter", "required": false },
     { "id": "adorn:byg/mahogany_kitchen_counter", "required": false },
-    { "id": "adorn:byg/mangrove_kitchen_counter", "required": false },
     { "id": "adorn:byg/maple_kitchen_counter", "required": false },
     { "id": "adorn:byg/nightshade_kitchen_counter", "required": false },
     { "id": "adorn:byg/palm_kitchen_counter", "required": false },
@@ -40,6 +39,7 @@
     { "id": "adorn:byg/redwood_kitchen_counter", "required": false },
     { "id": "adorn:byg/skyris_kitchen_counter", "required": false },
     { "id": "adorn:byg/sythian_kitchen_counter", "required": false },
+    { "id": "adorn:byg/white_mangrove_kitchen_counter", "required": false },
     { "id": "adorn:byg/willow_kitchen_counter", "required": false },
     { "id": "adorn:byg/witch_hazel_kitchen_counter", "required": false },
     { "id": "adorn:byg/zelkova_kitchen_counter", "required": false },
@@ -59,6 +59,22 @@
     { "id": "adorn:terrestria/willow_kitchen_counter", "required": false },
     { "id": "adorn:terrestria/yucca_palm_kitchen_counter", "required": false },
     { "id": "adorn:traverse/fir_kitchen_counter", "required": false },
-    { "id": "adorn:woods_and_mires/pine_kitchen_counter", "required": false }
+    { "id": "adorn:woods_and_mires/pine_kitchen_counter", "required": false },
+    { "id": "adorn:architects_palette/twisted_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/cherry_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/dead_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/fir_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/hellbark_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/jacaranda_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/magic_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/mahogany_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/palm_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/redwood_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/umbran_kitchen_counter", "required": false },
+    { "id": "adorn:biomesoplenty/willow_kitchen_counter", "required": false },
+    { "id": "adorn:ecologics/azalea_kitchen_counter", "required": false },
+    { "id": "adorn:ecologics/flowering_azalea_kitchen_counter", "required": false },
+    { "id": "adorn:ecologics/coconut_kitchen_counter", "required": false },
+    { "id": "adorn:ecologics/walnut_kitchen_counter", "required": false }
   ]
 }
diff --git a/common/src/main/generatedResources/data/adorn/tags/blocks/kitchen_cupboards.json b/common/src/main/generatedResources/data/adorn/tags/blocks/kitchen_cupboards.json
@@ -31,7 +31,6 @@
     { "id": "adorn:byg/jacaranda_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/lament_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/mahogany_kitchen_cupboard", "required": false },
-    { "id": "adorn:byg/mangrove_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/maple_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/nightshade_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/palm_kitchen_cupboard", "required": false },
@@ -40,6 +39,7 @@
     { "id": "adorn:byg/redwood_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/skyris_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/sythian_kitchen_cupboard", "required": false },
+    { "id": "adorn:byg/white_mangrove_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/willow_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/witch_hazel_kitchen_cupboard", "required": false },
     { "id": "adorn:byg/zelkova_kitchen_cupboard", "required": false },
@@ -59,6 +59,22 @@
     { "id": "adorn:terrestria/willow_kitchen_cupboard", "required": false },
     { "id": "adorn:terrestria/yucca_palm_kitchen_cupboard", "required": false },
     { "id": "adorn:traverse/fir_kitchen_cupboard", "required": false },
-    { "id": "adorn:woods_and_mires/pine_kitchen_cupboard", "required": false }
+    { "id": "adorn:woods_and_mires/pine_kitchen_cupboard", "required": false },
+    { "id": "adorn:architects_palette/twisted_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/cherry_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/dead_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/fir_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/hellbark_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/jacaranda_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/magic_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/mahogany_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/palm_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/redwood_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/umbran_kitchen_cupboard", "required": false },
+    { "id": "adorn:biomesoplenty/willow_kitchen_cupboard", "required": false },
+    { "id": "adorn:ecologics/azalea_kitchen_cupboard", "required": false },
+    { "id": "adorn:ecologics/flowering_azalea_kitchen_cupboard", "required": false },
+    { "id": "adorn:ecologics/coconut_kitchen_cupboard", "required": false },
+    { "id": "adorn:ecologics/walnut_kitchen_cupboard", "required": false }
   ]
 }
diff --git a/common/src/main/generatedResources/data/adorn/tags/blocks/kitchen_sinks.json b/common/src/main/generatedResources/data/adorn/tags/blocks/kitchen_sinks.json
@@ -31,7 +31,6 @@
     { "id": "adorn:byg/jacaranda_kitchen_sink", "required": false },
     { "id": "adorn:byg/lament_kitchen_sink", "required": false },
     { "id": "adorn:byg/mahogany_kitchen_sink", "required": false },
-    { "id": "adorn:byg/mangrove_kitchen_sink", "required": false },
     { "id": "adorn:byg/maple_kitchen_sink", "required": false },
     { "id": "adorn:byg/nightshade_kitchen_sink", "required": false },
     { "id": "adorn:byg/palm_kitchen_sink", "required": false },
@@ -40,6 +39,7 @@
     { "id": "adorn:byg/redwood_kitchen_sink", "required": false },
     { "id": "adorn:byg/skyris_kitchen_sink", "required": false },
     { "id": "adorn:byg/sythian_kitchen_sink", "required": false },
+    { "id": "adorn:byg/white_mangrove_kitchen_sink", "required": false },
     { "id": "adorn:byg/willow_kitchen_sink", "required": false },
     { "id": "adorn:byg/witch_hazel_kitchen_sink", "required": false },
     { "id": "adorn:byg/zelkova_kitchen_sink", "required": false },
@@ -59,6 +59,22 @@
     { "id": "adorn:terrestria/willow_kitchen_sink", "required": false },
     { "id": "adorn:terrestria/yucca_palm_kitchen_sink", "required": false },
     { "id": "adorn:traverse/fir_kitchen_sink", "required": false },
-    { "id": "adorn:woods_and_mires/pine_kitchen_sink", "required": false }
+    { "id": "adorn:woods_and_mires/pine_kitchen_sink", "required": false },
+    { "id": "adorn:architects_palette/twisted_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/cherry_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/dead_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/fir_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/hellbark_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/jacaranda_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/magic_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/mahogany_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/palm_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/redwood_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/umbran_kitchen_sink", "required": false },
+    { "id": "adorn:biomesoplenty/willow_kitchen_sink", "required": false },
+    { "id": "adorn:ecologics/azalea_kitchen_sink", "required": false },
+    { "id": "adorn:ecologics/flowering_azalea_kitchen_sink", "required": false },
+    { "id": "adorn:ecologics/coconut_kitchen_sink", "required": false },
+    { "id": "adorn:ecologics/walnut_kitchen_sink", "required": false }
   ]
 }
diff --git a/common/src/main/generatedResources/data/adorn/tags/blocks/stone_platforms.json b/common/src/main/generatedResources/data/adorn/tags/blocks/stone_platforms.json
@@ -59,6 +59,19 @@
     { "id": "adorn:terrestria/basalt_cobblestone_platform", "required": false },
     { "id": "adorn:terrestria/mossy_basalt_brick_platform", "required": false },
     { "id": "adorn:terrestria/mossy_basalt_cobblestone_platform", "required": false },
-    { "id": "adorn:terrestria/smooth_basalt_platform", "required": false }
+    { "id": "adorn:terrestria/smooth_basalt_platform", "required": false },
+    { "id": "adorn:architects_palette/myonite_platform", "required": false },
+    { "id": "adorn:architects_palette/myonite_brick_platform", "required": false },
+    { "id": "adorn:architects_palette/mushy_myonite_brick_platform", "required": false },
+    { "id": "adorn:biomesoplenty/mud_brick_platform", "required": false },
+    { "id": "adorn:biomesoplenty/black_sandstone_platform", "required": false },
+    { "id": "adorn:biomesoplenty/cut_black_sandstone_platform", "required": false },
+    { "id": "adorn:biomesoplenty/smooth_black_sandstone_platform", "required": false },
+    { "id": "adorn:biomesoplenty/orange_sandstone_platform", "required": false },
+    { "id": "adorn:biomesoplenty/cut_orange_sandstone_platform", "required": false },
+    { "id": "adorn:biomesoplenty/smooth_orange_sandstone_platform", "required": false },
+    { "id": "adorn:biomesoplenty/white_sandstone_platform", "required": false },
+    { "id": "adorn:biomesoplenty/cut_white_sandstone_platform", "required": false },
+    { "id": "adorn:biomesoplenty/smooth_white_sandstone_platform", "required": false }
   ]
 }