Cobblestone Brick Wall Gates

README.md

@@ -7,7 +7,7 @@ It's inspired by mods like Quark and Charm that expand on Minecraft without feel
 Pyrite is available for Minecraft Fabric 1.20.1. Legacy versions are available on GitHub and Modrinth, but are not as actively updated as the 1.20.1 version and may be missing features. No Forge port is planned.
 
 ## Features
-_339 blocks and counting..._
+_341 blocks and counting..._
 - Stained Planks, in every colour of dye (and more!)
   - This includes stained wood slabs, stairs, fences, fence gates, pressure plates, doors, and buttons as well!
 - Dyed Bricks, in every colour of dye (and more!)

src/main/java/cc/cassian/pyrite/Pyrite.java

@@ -106,14 +106,16 @@ public void onInitialize() {
         pyriteBlocks.add(new SlabBlock(FabricBlockSettings.copyOf(Blocks.STONE_BRICK_SLAB)));
         //Cobblestone Brick Walls - 5
         pyriteBlocks.add(new WallBlock(FabricBlockSettings.copyOf(Blocks.STONE_BRICK_WALL)));
+        pyriteBlocks.add(new FenceGateBlock(FabricBlockSettings.copyOf(pyriteBlocks.get(2)), WoodType.CRIMSON));
         //Mossy Cobblestone Bricks - 6
         pyriteBlocks.add(new Block(FabricBlockSettings.copyOf(Blocks.MOSSY_STONE_BRICKS).strength(3.0f)));
         //Mossy Cobblestone Brick Stairs - 7
-        pyriteBlocks.add(new ModStairs(pyriteBlocks.get(6).getDefaultState(),FabricBlockSettings.copyOf(Blocks.MOSSY_STONE_BRICK_STAIRS).strength(3.0f)));
+        pyriteBlocks.add(new ModStairs(pyriteBlocks.get(7).getDefaultState(),FabricBlockSettings.copyOf(Blocks.MOSSY_STONE_BRICK_STAIRS).strength(3.0f)));
         //Mossy Cobblestone Brick Slabs - 8
         pyriteBlocks.add(new SlabBlock(FabricBlockSettings.copyOf(Blocks.MOSSY_STONE_BRICK_SLAB).strength(3.0f)));
         //Mossy Cobblestone Brick Walls - 9
         pyriteBlocks.add(new WallBlock(FabricBlockSettings.copyOf(Blocks.MOSSY_STONE_BRICK_WALL)));
+        pyriteBlocks.add(new FenceGateBlock(FabricBlockSettings.copyOf(pyriteBlocks.get(7)), WoodType.CRIMSON));
         //Grass Carpet - 10
         pyriteBlocks.add(new CarpetBlock(FabricBlockSettings.copyOf(Blocks.MOSS_CARPET)));
         //Mycelium Carpet - 11
@@ -127,7 +129,7 @@ public void onInitialize() {
         //Cut Iron - 15
         pyriteBlocks.add(new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK)));
         //Cut Iron Stairs - 16
-        pyriteBlocks.add(new StairsBlock(pyriteBlocks.get(14).getDefaultState(),FabricBlockSettings.copyOf(Blocks.IRON_BLOCK)));
+        pyriteBlocks.add(new StairsBlock(pyriteBlocks.get(16).getDefaultState(),FabricBlockSettings.copyOf(Blocks.IRON_BLOCK)));
         //Cut Iron Slab - 17
         pyriteBlocks.add(new SlabBlock(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK)));
         //Cut Iron Wall - 18
@@ -143,8 +145,8 @@ public void onInitialize() {
         //Add all manually generated block IDs.
         pyriteBlockIDs.addAll(Arrays.asList(
                 "framed_glass", "framed_glass_pane",
-                "cobblestone_bricks", "cobblestone_brick_stairs", "cobblestone_brick_slab", "cobblestone_brick_wall",
-                "mossy_cobblestone_bricks", "mossy_cobblestone_brick_stairs", "mossy_cobblestone_brick_slab", "mossy_cobblestone_brick_wall",
+                "cobblestone_bricks", "cobblestone_brick_stairs", "cobblestone_brick_slab", "cobblestone_brick_wall", "cobblestone_brick_wall_gate",
+                "mossy_cobblestone_bricks", "mossy_cobblestone_brick_stairs", "mossy_cobblestone_brick_slab", "mossy_cobblestone_brick_wall", "mossy_cobblestone_brick_wall_gate",
                 "grass_carpet", "mycelium_carpet", "podzol_carpet", "path_carpet",
                 "nether_brick_fence_gate",
                 "cut_iron", "cut_iron_stairs", "cut_iron_slab", "cut_iron_wall", "cut_iron_wall_gate",

src/main/java/cc/cassian/pyrite/client/PyriteClient.java

@@ -22,8 +22,8 @@ public class PyriteClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         BlockRenderLayerMap.INSTANCE.putBlock(pyriteBlocks.get(1), RenderLayer.getCutout());
-        ColorProviderRegistry.BLOCK.register((state, view, pos, tintIndex) -> BiomeColors.getGrassColor(view, pos), pyriteBlocks.get(10));
-        ColorProviderRegistry.ITEM.register((stack, tintIndex) -> 7183658, pyriteBlocks.get(10));
+        ColorProviderRegistry.BLOCK.register((state, view, pos, tintIndex) -> BiomeColors.getGrassColor(view, pos), pyriteBlocks.get(12));
+        ColorProviderRegistry.ITEM.register((stack, tintIndex) -> 7183658, pyriteBlocks.get(12));
 
         for (Block pyriteBlock : pyriteBlocks) {
             if (pyriteBlock instanceof DoorBlock) {

src/main/resources/assets/pyrite/blockstates/cobblestone_brick_wall_gate.json

@@ -0,0 +1,79 @@
+{"variants": {
+    "facing=east,in_wall=false,open=false": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=false,open=true": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=false": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_wall",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=true": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_wall_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,in_wall=false,open=false": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=false,open=true": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=false": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_wall",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=true": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_wall_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=south,in_wall=false,open=false": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate",
+      "uvlock": true
+    },
+    "facing=south,in_wall=false,open=true": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_open",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=false": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_wall",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=true": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_wall_open",
+      "uvlock": true
+    },
+    "facing=west,in_wall=false,open=false": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=false,open=true": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_open",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=false": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_wall",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=true": {
+      "model": "pyrite:block/cobblestone_brick_wall_gate_wall_open",
+      "uvlock": true,
+      "y": 90
+    }
+  }
+}

src/main/resources/assets/pyrite/blockstates/mossy_cobblestone_brick_wall_gate.json

@@ -0,0 +1,79 @@
+{"variants": {
+    "facing=east,in_wall=false,open=false": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=false,open=true": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=false": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_wall",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=true": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_wall_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,in_wall=false,open=false": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=false,open=true": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=false": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_wall",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=true": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_wall_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=south,in_wall=false,open=false": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate",
+      "uvlock": true
+    },
+    "facing=south,in_wall=false,open=true": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_open",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=false": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_wall",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=true": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_wall_open",
+      "uvlock": true
+    },
+    "facing=west,in_wall=false,open=false": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=false,open=true": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_open",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=false": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_wall",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=true": {
+      "model": "pyrite:block/mossy_cobblestone_brick_wall_gate_wall_open",
+      "uvlock": true,
+      "y": 90
+    }
+  }
+}

src/main/resources/assets/pyrite/lang/en_us.json

@@ -337,5 +337,7 @@
   "block.pyrite.dragon_stained_trapdoor": "Dragon Stained Trapdoor",
   "block.pyrite.star_stained_trapdoor": "Star Stained Trapdoor",
   "block.pyrite.honey_stained_trapdoor": "Honey Stained Trapdoor",
-  "block.pyrite.nostalgia_stained_trapdoor": "Nostalgia Stained Trapdoor"
+  "block.pyrite.nostalgia_stained_trapdoor": "Nostalgia Stained Trapdoor",
+  "block.pyrite.cobblestone_brick_wall_gate": "Cobblestone Brick Wall Gate",
+  "block.pyrite.mossy_cobblestone_brick_wall_gate": "Mossy Cobblestone Brick Wall Gate"
 }

src/main/resources/assets/pyrite/models/block/black_stained_fence_gate.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate",
-      "textures": {
-        "texture": "pyrite:block/black_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate",
+    "textures": {
+      "texture": "pyrite:block/black_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/black_stained_fence_gate_open.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_open",
-      "textures": {
-        "texture": "pyrite:block/black_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_open",
+    "textures": {
+      "texture": "pyrite:block/black_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/black_stained_fence_gate_wall.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_wall",
-      "textures": {
-        "texture": "pyrite:block/black_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_wall",
+    "textures": {
+      "texture": "pyrite:block/black_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/black_stained_fence_gate_wall_open.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_wall_open",
-      "textures": {
-        "texture": "pyrite:block/black_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_wall_open",
+    "textures": {
+      "texture": "pyrite:block/black_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/blue_stained_fence_gate.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate",
-      "textures": {
-        "texture": "pyrite:block/blue_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate",
+    "textures": {
+      "texture": "pyrite:block/blue_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/blue_stained_fence_gate_open.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_open",
-      "textures": {
-        "texture": "pyrite:block/blue_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_open",
+    "textures": {
+      "texture": "pyrite:block/blue_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/blue_stained_fence_gate_wall.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_wall",
-      "textures": {
-        "texture": "pyrite:block/blue_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_wall",
+    "textures": {
+      "texture": "pyrite:block/blue_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/blue_stained_fence_gate_wall_open.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_wall_open",
-      "textures": {
-        "texture": "pyrite:block/blue_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_wall_open",
+    "textures": {
+      "texture": "pyrite:block/blue_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/brown_stained_fence_gate.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate",
-      "textures": {
-        "texture": "pyrite:block/brown_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate",
+    "textures": {
+      "texture": "pyrite:block/brown_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/brown_stained_fence_gate_open.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_open",
-      "textures": {
-        "texture": "pyrite:block/brown_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_open",
+    "textures": {
+      "texture": "pyrite:block/brown_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/brown_stained_fence_gate_wall.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_wall",
-      "textures": {
-        "texture": "pyrite:block/brown_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_wall",
+    "textures": {
+      "texture": "pyrite:block/brown_stained_planks"
+    }
+  }

src/main/resources/assets/pyrite/models/block/brown_stained_fence_gate_wall_open.json

@@ -1,6 +1,6 @@
 {
-      "parent": "minecraft:block/template_fence_gate_wall_open",
-      "textures": {
-        "texture": "pyrite:block/brown_stained_planks"
-      }
-    }
+    "parent": "minecraft:block/template_fence_gate_wall_open",
+    "textures": {
+      "texture": "pyrite:block/brown_stained_planks"
+    }
+  }