fix mangrove blocks

Signed-off-by: woodiertexas <[email protected]>
DebuggyTeam · Jun 29, 2022 · d12f792 · d12f792
1 parent dcdea4b
commit d12f792
Show file tree

Hide file tree

Showing 27 changed files with 199 additions and 38 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Mod Properties
-version = 2.0.0+1.19
+version = 1.0.0+1.19
 maven_group = io.github.woodiertexas
 archives_base_name = architecture_extensions
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,9 @@
 [versions]
 # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
-minecraft = "1.18.2"
-quilt_mappings = "1.18.2+build.24"
-quilt_loader = "0.17.1-beta.4"
-quilt_standard_libraries = "1.1.0-beta.21+1.18.2"
-quilted_fabric_api = "1.0.0-beta.22+0.56.0-1.18.2"
+minecraft = "1.19"
+quilt_mappings = "1.19+build.1"
+quilt_loader = "0.17.1-beta.2"
+quilted_fabric_api = "2.0.0-alpha.3+0.55.3-1.19"
 
 # Stone Cutter Recipe Tags
 #scrt = "3.0.1-fabric"
@@ -13,12 +12,13 @@ quilted_fabric_api = "1.0.0-beta.22+0.56.0-1.18.2"
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" }
 quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" }
-quilt_standard_libraries = { module = "org.quiltmc:qsl", version.ref = "quilt_standard_libraries" }
+
 quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" }
+quilted_fabric_api_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "quilted_fabric_api" }
 
 # If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
-# [bundles]
-# example = ["example-a", "example-b", "example-c"]
+[bundles]
+quilted_fabric_api = ["quilted_fabric_api", "quilted_fabric_api_deprecated"]
 
 [plugins]
 quilt_loom = { id = "org.quiltmc.loom", version = "0.12.+" }

diff --git a/python_scripts/anApiThingy.py b/python_scripts/anApiThingy.py
@@ -26,22 +26,23 @@
     "deepslate_brick_arch", "deepslate_tile_arch", "nether_brick_arch", "red_nether_brick_arch", "end_stone_brick_arch",
     "smooth_quartz_arch", "prismarine_brick_arch", "blackstone_arch", "polished_blackstone_brick_arch", "polished_blackstone_arch",
 
-    "oak_beam", "spruce_beam", "birch_beam", "jungle_beam", "acacia_beam", "dark_oak_beam", "crimson_beam", "warped_beam",
-    "iron_h_beam",
+    "oak_beam", "spruce_beam", "birch_beam", "jungle_beam", "acacia_beam", "dark_oak_beam", "mangrove_beam",
+    "crimson_beam", "warped_beam", "iron_h_beam",
 
     "oak_fence_post", "spruce_fence_post", "birch_fence_post", "jungle_fence_post", "acacia_fence_post", "dark_oak_fence_post",
-    "crimson_fence_post", "warped_fence_post",
+    "mangrove_fence_post", "crimson_fence_post", "warped_fence_post",
 
-    "oak_joist", "spruce_joist", "birch_joist", "jungle_joist", "acacia_joist", "dark_oak_joist", "crimson_joist", "warped_joist",
+    "oak_joist", "spruce_joist", "birch_joist", "jungle_joist", "acacia_joist", "dark_oak_joist", "mangrove_joist", "crimson_joist",
+    "warped_joist",
 
     "oak_crown_molding", "spruce_crown_molding", "birch_crown_molding", "jungle_crown_molding", "acacia_crown_molding",
-    "dark_oak_crown_molding", "crimson_crown_molding", "warped_crown_molding",
+    "dark_oak_crown_molding", "mangrove_crown_molding", "crimson_crown_molding", "warped_crown_molding",
 
     "bamboo_rod", "copper_rod", "end_rod_nubless", "iron_rod", "debuggy_block", "fake_end_portal_block",
 
     "oak_post_cap", "oak_post_lantern", "spruce_post_cap", "spruce_post_lantern", "birch_post_cap", "birch_post_lantern",
     "jungle_post_cap", "jungle_post_lantern", "acacia_post_cap", "acacia_post_lantern", "dark_oak_post_cap", "dark_oak_post_lantern",
-    "crimson_post_cap", "crimson_post_lantern", "warped_post_cap", "warped_post_lantern",
+    "mangrove_post_cap", "mangrove_post_lantern", "crimson_post_cap", "crimson_post_lantern", "warped_post_cap", "warped_post_lantern",
 
     # Soul Ice Blocks
     "soul_ice_column", "polished_soul_ice_column", "soul_ice_brick_column", "lightstone_column",
@@ -78,9 +79,10 @@
     "Granite Roof", "Diorite Roof", "Andesite Roof", "Cobbled Deepslate Roof", "Polished Deepslate Roof",
     "Cobblestone Roof",
     "Sandstone Roof", "Red Sandstone Roof", "Brick Roof", "Mossy Cobblestone Roof", "Stone Brick Roof",
-    "Mossy Stone Brick Roof", "Deepslate Brick Roof", "Deepslate Tile Roof", "Nether Brick Roof", "Red Nether Brick Roof",
-    "End Stone Brick Roof", "Smooth Quartz Roof", "Prismarine Brick Roof", "Blackstone Roof",
-    "Polished Blackstone Brick Roof", "Polished Blackstone Roof",
+    "Mossy Stone Brick Roof",
+    "Deepslate Brick Roof", "Deepslate Tile Roof", "Nether Brick Roof", "Red Nether Brick Roof", "End Stone Brick Roof",
+    "Smooth Quartz Roof", "Prismarine Brick Roof", "Blackstone Roof", "Polished Blackstone Brick Roof",
+    "Polished Blackstone Roof",
 
     "Granite Arch", "Diorite Arch", "Andesite Arch", "Cobbled Deepslate Arch", "Polished Deepslate Arch",
     "Cobblestone Arch",
@@ -90,22 +92,25 @@
     "Smooth Quartz Arch", "Prismarine Brick Arch", "Blackstone Arch", "Polished Blackstone Brick Arch",
     "Polished Blackstone Arch",
 
-    "Oak Beam", "Spruce Beam", "Birch Beam", "Jungle Beam", "Acacia Beam", "Dark Oak Beam", "Crimson Beam",
-    "Warped Beam", "Iron H Beam",
+    "Oak Beam", "Spruce Beam", "Birch Beam", "Jungle Beam", "Acacia Beam", "Dark Oak Beam", "Mangrove Beam",
+    "Crimson Beam", "Warped Beam", "Iron H Beam",
 
     "Oak Fence Post", "Spruce Fence Post", "Birch Fence Post", "Jungle Fence Post", "Acacia Fence Post",
-    "Dark Oak Fence Post", "Crimson Fence Post", "Warped Fence Post",
+    "Dark Oak Fence Post",
+    "Mangrove Fence Post", "Crimson Fence Post", "Warped Fence Post",
 
-    "Oak Joist", "Spruce Joist", "Birch Joist", "Jungle Joist", "Acacia Joist", "Dark Oak Joist", "Crimson Joist", "Warped Joist",
+    "Oak Joist", "Spruce Joist", "Birch Joist", "Jungle Joist", "Acacia Joist", "Dark Oak Joist", "Mangrove Joist",
+    "Crimson Joist", "Warped Joist",
 
     "Oak Crown Molding", "Spruce Crown Molding", "Birch Crown Molding", "Jungle Crown Molding", "Acacia Crown Molding",
-    "Dark Oak Crown Molding", "Crimson Crown Molding", "Warped Crown Molding",
+    "Dark Oak Crown Molding", "Mangrove Crown Molding", "Crimson Crown Molding", "Warped Crown Molding",
 
     "Bamboo Rod", "Copper Rod", "End Rod Nubless", "Iron Rod", "Oddly Colored Block", "Starry Night Sky Block",
 
     "Oak Post Cap", "Oak Post Lantern", "Spruce Post Cap", "Spruce Post Lantern", "Birch Post Cap", "Birch Post Lantern",
     "Jungle Post Cap", "Jungle Post Lantern", "Acacia Post Cap", "Acacia Post Lantern", "Dark Oak Post Cap",
-    "Dark Oak Post Lantern", "Crimson Post Cap", "Crimson Post Lantern", "Warped Post Cap", "Warped Post Lantern",
+    "Dark Oak Post Lantern", "Mangrove Post Cap", "Mangrove Post Lantern", "Crimson Post Cap", "Crimson Post Lantern",
+    "Warped Post Cap", "Warped Post Lantern",
 
     # Soul Ice Blocks
     "Soul Ice Column", "Polished Soul Ice Column", "Soul Ice Brick Column", "Lightstone Column",
@@ -450,7 +455,7 @@ def post_caps_recipe(arch_ex_block, recipe_item, namespace):
         ],
         "result": {
             "item": f"architecture_extensions:{arch_ex_block}_post_cap",
-            "count": 7
+            "count": 8
         }
     }
     return post_cap_recipe

diff --git a/...ain/java/io/github/woodiertexas/architecture_extensions/ArchitectureExtensionsBlocks.java b/...ain/java/io/github/woodiertexas/architecture_extensions/ArchitectureExtensionsBlocks.java
@@ -123,6 +123,7 @@ public class ArchitectureExtensionsBlocks {
     public static final BeamBlock JUNGLE_BEAM = new BeamBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final BeamBlock ACACIA_BEAM = new BeamBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final BeamBlock DARK_OAK_BEAM = new BeamBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
+    public static final BeamBlock MANGROVE_BEAM = new BeamBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final BeamBlock CRIMSON_BEAM = new BeamBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final BeamBlock WARPED_BEAM = new BeamBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final BeamBlock IRON_H_BEAM = new BeamBlock(QuiltBlockSettings.of(Material.METAL).strength(8f).sounds(BlockSoundGroup.ANVIL).requiresTool());
@@ -134,6 +135,7 @@ public class ArchitectureExtensionsBlocks {
     public static final FencePostBlock JUNGLE_FENCE_POST = new FencePostBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final FencePostBlock ACACIA_FENCE_POST = new FencePostBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final FencePostBlock DARK_OAK_FENCE_POST = new FencePostBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
+    public static final FencePostBlock MANGROVE_FENCE_POST = new FencePostBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final FencePostBlock CRIMSON_FENCE_POST = new FencePostBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final FencePostBlock WARPED_FENCE_POST= new FencePostBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
 
@@ -150,6 +152,8 @@ public class ArchitectureExtensionsBlocks {
     public static final PostLanternBlock ACACIA_POST_LANTERN = new PostLanternBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).luminance(15).requiresTool());
     public static final PostCapBlock DARK_OAK_POST_CAP = new PostCapBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final PostLanternBlock DARK_OAK_POST_LANTERN = new PostLanternBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).luminance(15).requiresTool());
+    public static final PostCapBlock MANGROVE_POST_CAP = new PostCapBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
+    public static final PostLanternBlock MANGROVE_POST_LANTERN = new PostLanternBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).luminance(15).requiresTool());
     public static final PostCapBlock CRIMSON_POST_CAP = new PostCapBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final PostLanternBlock CRIMSON_POST_LANTERN = new PostLanternBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).luminance(15).requiresTool());
     public static final PostCapBlock WARPED_POST_CAP = new PostCapBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
@@ -162,6 +166,7 @@ public class ArchitectureExtensionsBlocks {
     public static final JoistBlock JUNGLE_JOIST = new JoistBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final JoistBlock ACACIA_JOIST = new JoistBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final JoistBlock DARK_OAK_JOIST = new JoistBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
+    public static final JoistBlock MANGROVE_JOIST = new JoistBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final JoistBlock CRIMSON_JOIST = new JoistBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final JoistBlock WARPED_JOIST = new JoistBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
 
@@ -172,6 +177,7 @@ public class ArchitectureExtensionsBlocks {
     public static final MoldingBlock JUNGLE_CROWN_MOLDING = new MoldingBlock(Blocks.JUNGLE_PLANKS.getDefaultState(), QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final MoldingBlock ACACIA_CROWN_MOLDING = new MoldingBlock(Blocks.ACACIA_PLANKS.getDefaultState(), QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final MoldingBlock DARK_OAK_CROWN_MOLDING = new MoldingBlock(Blocks.DARK_OAK_PLANKS.getDefaultState(), QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
+    public static final MoldingBlock MANGROVE_CROWN_MOLDING = new MoldingBlock(Blocks.DARK_OAK_PLANKS.getDefaultState(), QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final MoldingBlock CRIMSON_CROWN_MOLDING = new MoldingBlock(Blocks.CRIMSON_PLANKS.getDefaultState(), QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
     public static final MoldingBlock WARPED_CROWN_MOLDING = new MoldingBlock(Blocks.WARPED_PLANKS.getDefaultState(), QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
 
@@ -211,22 +217,23 @@ public class ArchitectureExtensionsBlocks {
                 "deepslate_brick_arch", "deepslate_tile_arch", "nether_brick_arch", "red_nether_brick_arch", "end_stone_brick_arch",
                 "smooth_quartz_arch", "prismarine_brick_arch", "blackstone_arch", "polished_blackstone_brick_arch", "polished_blackstone_arch",
 
-                "oak_beam", "spruce_beam", "birch_beam", "jungle_beam", "acacia_beam", "dark_oak_beam", "crimson_beam", "warped_beam",
-                "iron_h_beam",
+                "oak_beam", "spruce_beam", "birch_beam", "jungle_beam", "acacia_beam", "dark_oak_beam", "mangrove_beam",
+                "crimson_beam", "warped_beam", "iron_h_beam",
 
                 "oak_fence_post", "spruce_fence_post", "birch_fence_post", "jungle_fence_post", "acacia_fence_post", "dark_oak_fence_post",
-                "crimson_fence_post", "warped_fence_post",
+                "mangrove_fence_post", "crimson_fence_post", "warped_fence_post",
 
-                "oak_joist", "spruce_joist", "birch_joist", "jungle_joist", "acacia_joist", "dark_oak_joist", "crimson_joist", "warped_joist",
+                "oak_joist", "spruce_joist", "birch_joist", "jungle_joist", "acacia_joist", "dark_oak_joist", "mangrove_joist", "crimson_joist",
+                "warped_joist",
 
                 "oak_crown_molding", "spruce_crown_molding", "birch_crown_molding", "jungle_crown_molding", "acacia_crown_molding",
-                "dark_oak_crown_molding", "crimson_crown_molding", "warped_crown_molding",
+                "dark_oak_crown_molding", "mangrove_crown_molding", "crimson_crown_molding", "warped_crown_molding",
 
                 "bamboo_rod", "copper_rod", "end_rod_nubless", "iron_rod", "debuggy_block", "fake_end_portal_block",
 
                 "oak_post_cap", "oak_post_lantern", "spruce_post_cap", "spruce_post_lantern", "birch_post_cap", "birch_post_lantern",
                 "jungle_post_cap", "jungle_post_lantern", "acacia_post_cap", "acacia_post_lantern", "dark_oak_post_cap", "dark_oak_post_lantern",
-                "crimson_post_cap", "crimson_post_lantern", "warped_post_cap", "warped_post_lantern"
+                "mangrove_post_cap", "mangrove_post_lantern", "crimson_post_cap", "crimson_post_lantern", "warped_post_cap", "warped_post_lantern"
         };
 
         Block[] anotherBlocksArray = {
@@ -251,22 +258,22 @@ public class ArchitectureExtensionsBlocks {
                 DEEPSLATE_TILE_ARCH, NETHER_BRICK_ARCH, RED_NETHER_BRICK_ARCH, END_STONE_BRICK_ARCH, SMOOTH_QUARTZ_ARCH, PRISMARINE_BRICK_ARCH,
                 BLACKSTONE_ARCH, POLISHED_BLACKSTONE_BRICK_ARCH, POLISHED_BLACKSTONE_ARCH,
 
-                OAK_BEAM, SPRUCE_BEAM, BIRCH_BEAM, JUNGLE_BEAM, ACACIA_BEAM, DARK_OAK_BEAM, CRIMSON_BEAM, WARPED_BEAM,
+                OAK_BEAM, SPRUCE_BEAM, BIRCH_BEAM, JUNGLE_BEAM, ACACIA_BEAM, DARK_OAK_BEAM, MANGROVE_BEAM, CRIMSON_BEAM, WARPED_BEAM,
                 IRON_H_BEAM,
 
                 OAK_FENCE_POST, SPRUCE_FENCE_POST, BIRCH_FENCE_POST, JUNGLE_FENCE_POST, ACACIA_FENCE_POST, DARK_OAK_FENCE_POST,
-                CRIMSON_FENCE_POST, WARPED_FENCE_POST,
+                MANGROVE_FENCE_POST, CRIMSON_FENCE_POST, WARPED_FENCE_POST,
 
-                OAK_JOIST, SPRUCE_JOIST, BIRCH_JOIST, JUNGLE_JOIST, ACACIA_JOIST, DARK_OAK_JOIST, CRIMSON_JOIST, WARPED_JOIST,
+                OAK_JOIST, SPRUCE_JOIST, BIRCH_JOIST, JUNGLE_JOIST, ACACIA_JOIST, DARK_OAK_JOIST, MANGROVE_JOIST, CRIMSON_JOIST, WARPED_JOIST,
 
                 OAK_CROWN_MOLDING, SPRUCE_CROWN_MOLDING, BIRCH_CROWN_MOLDING, JUNGLE_CROWN_MOLDING, ACACIA_CROWN_MOLDING,
-                DARK_OAK_CROWN_MOLDING, CRIMSON_CROWN_MOLDING, WARPED_CROWN_MOLDING,
+                DARK_OAK_CROWN_MOLDING, MANGROVE_CROWN_MOLDING, CRIMSON_CROWN_MOLDING, WARPED_CROWN_MOLDING,
 
                 BAMBOO_ROD, COPPER_ROD, END_ROD_NUBLESS, IRON_ROD, DEBUGGY_BLOCK, FAKE_END_PORTAL_BLOCK,
 
                 OAK_POST_CAP, OAK_POST_LANTERN, SPRUCE_POST_CAP, SPRUCE_POST_LANTERN, BIRCH_POST_CAP, BIRCH_POST_LANTERN, JUNGLE_POST_CAP,
-                JUNGLE_POST_LANTERN, ACACIA_POST_CAP, ACACIA_POST_LANTERN, DARK_OAK_POST_CAP, DARK_OAK_POST_LANTERN, CRIMSON_POST_CAP,
-                CRIMSON_POST_LANTERN, WARPED_POST_CAP, WARPED_POST_LANTERN
+                JUNGLE_POST_LANTERN, ACACIA_POST_CAP, ACACIA_POST_LANTERN, DARK_OAK_POST_CAP, DARK_OAK_POST_LANTERN, MANGROVE_POST_CAP,
+                MANGROVE_POST_LANTERN, CRIMSON_POST_CAP, CRIMSON_POST_LANTERN, WARPED_POST_CAP, WARPED_POST_LANTERN
         };
 
         // Checks to see if the arrays are of the same length. If not, stop the Minecraft process.