This commit also adds edified fences as well as the sign textures

Common/src/generated/resources/assets/hexcasting/blockstates/edified_fence_gate.json

@@ -0,0 +1,80 @@
+{
+  "variants": {
+    "facing=east,in_wall=false,open=false": {
+      "model": "hexcasting:block/edified_fence_gate",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=false,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=false": {
+      "model": "hexcasting:block/edified_fence_gate_wall",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,in_wall=false,open=false": {
+      "model": "hexcasting:block/edified_fence_gate",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=false,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=false": {
+      "model": "hexcasting:block/edified_fence_gate_wall",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=south,in_wall=false,open=false": {
+      "model": "hexcasting:block/edified_fence_gate",
+      "uvlock": true
+    },
+    "facing=south,in_wall=false,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_open",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=false": {
+      "model": "hexcasting:block/edified_fence_gate_wall",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_wall_open",
+      "uvlock": true
+    },
+    "facing=west,in_wall=false,open=false": {
+      "model": "hexcasting:block/edified_fence_gate",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=false,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_open",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=false": {
+      "model": "hexcasting:block/edified_fence_gate_wall",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 90
+    }
+  }
+}

Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_fence_gate",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}

Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_open.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_fence_gate_open",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}

Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_fence_gate_wall",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}

Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall_open.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_fence_gate_wall_open",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}

Common/src/generated/resources/assets/hexcasting/models/item/edified_fence_gate.json

@@ -0,0 +1,3 @@
+{
+  "parent": "hexcasting:block/edified_fence_gate"
+}

Common/src/generated/resources/assets/hexcasting/models/item/staff/bamboo.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_rod",
+  "textures": {
+    "layer0": "hexcasting:item/staff/bamboo"
+  }
+}

Common/src/generated/resources/assets/hexcasting/models/item/staff/cherry.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_rod",
+  "textures": {
+    "layer0": "hexcasting:item/staff/cherry"
+  }
+}

Common/src/generated/resources/assets/hexcasting/models/staff/bamboo.json

@@ -0,0 +1,16 @@
+{
+  "overrides": [
+    {
+      "model": "hexcasting:item/bamboo_staff",
+      "predicate": {
+        "hexcasting:funny_level": 0.0
+      }
+    },
+    {
+      "model": "hexcasting:item/cherry_staff",
+      "predicate": {
+        "hexcasting:funny_level": 2.0
+      }
+    }
+  ]
+}

Common/src/generated/resources/assets/hexcasting/models/staff/cherry.json

@@ -0,0 +1,16 @@
+{
+  "overrides": [
+    {
+      "model": "hexcasting:item/cherry_staff",
+      "predicate": {
+        "hexcasting:funny_level": 0.0
+      }
+    },
+    {
+      "model": "hexcasting:item/cherry_staff",
+      "predicate": {
+        "hexcasting:funny_level": 2.0
+      }
+    }
+  ]
+}

Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFence.java

@@ -0,0 +1,30 @@
+package at.petrak.hexcasting.common.blocks.decoration;
+
+import at.petrak.hexcasting.annotations.SoftImplement;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.FenceBlock;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class BlockHexFence extends FenceBlock {
+
+    public BlockHexFence(Properties $$0) {
+        super($$0);
+    }
+
+    @SoftImplement("forge")
+    public boolean isFlammable(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return true;
+    }
+
+    @SoftImplement("forge")
+    public int getFlammability(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return 20;
+    }
+
+    @SoftImplement("forge")
+    public int getFireSpreadSpeed(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return 5;
+    }
+}

Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFenceGate.java

@@ -0,0 +1,32 @@
+package at.petrak.hexcasting.common.blocks.decoration;
+
+import at.petrak.hexcasting.annotations.SoftImplement;
+import at.petrak.hexcasting.common.lib.HexBlockSetTypes;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.FenceGateBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.WoodType;
+
+public class BlockHexFenceGate extends FenceGateBlock {
+
+    public BlockHexFenceGate(Properties $$0) {
+        super($$0, WoodType.DARK_OAK);
+    }
+
+    @SoftImplement("forge")
+    public boolean isFlammable(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return true;
+    }
+
+    @SoftImplement("forge")
+    public int getFlammability(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return 20;
+    }
+
+    @SoftImplement("forge")
+    public int getFireSpreadSpeed(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return 5;
+    }
+}

Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java

@@ -264,6 +264,12 @@ private static BlockBehaviour.Properties quenched() {
         new BlockHexTrapdoor(edifiedWoody().noOcclusion()));
     public static final StairBlock EDIFIED_STAIRS = blockItem("edified_stairs",
         new BlockHexStairs(EDIFIED_PLANKS.defaultBlockState(), edifiedWoody().noOcclusion()));
+
+    public static final FenceBlock EDIFIED_FENCE = blockItem("edified_fence",
+            new BlockHexFence(edifiedWoody().noOcclusion()));
+    public static final FenceGateBlock EDIFIED_FENCE_GATE = blockItem("edified_fence_gate",
+            new BlockHexFenceGate(edifiedWoody().noOcclusion()));
+
     public static final SlabBlock EDIFIED_SLAB = blockItem("edified_slab",
         new BlockHexSlab(edifiedWoody().noOcclusion()));
     public static final ButtonBlock EDIFIED_BUTTON = blockItem("edified_button",

Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java

@@ -58,6 +58,8 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod
     public static final ItemStaff STAFF_CRIMSON = make("staff/crimson", new ItemStaff(unstackable()));
     public static final ItemStaff STAFF_WARPED = make("staff/warped", new ItemStaff(unstackable()));
     public static final ItemStaff STAFF_MANGROVE = make("staff/mangrove", new ItemStaff(unstackable()));
+    public static final ItemStaff STAFF_CHERRY = make("staff/cherry", new ItemStaff(unstackable()));
+    public static final ItemStaff STAFF_BAMBOO = make("staff/bamboo", new ItemStaff(unstackable()));
     public static final ItemStaff STAFF_EDIFIED = make("staff/edified", new ItemStaff(unstackable()));
     public static final ItemStaff STAFF_QUENCHED = make("staff/quenched", new ItemStaff(unstackable()));
     // mindsplice staffaratus

Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java

@@ -58,7 +58,7 @@ protected void makeLootTables(Map<Block, LootTable.Builder> blockTables,
             HexBlocks.EDIFIED_LOG_CITRINE, HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG,
             HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD,
             HexBlocks.EDIFIED_PLANKS, HexBlocks.EDIFIED_TILE, HexBlocks.EDIFIED_PANEL,
-            HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_PRESSURE_PLATE,
+            HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_FENCE, HexBlocks.EDIFIED_FENCE_GATE, HexBlocks.EDIFIED_PRESSURE_PLATE,
             HexBlocks.EDIFIED_BUTTON);
 
         makeSlabTable(blockTables, HexBlocks.EDIFIED_SLAB);

Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java

@@ -71,6 +71,8 @@ public void buildRecipes(Consumer<FinishedRecipe> recipes) {
         staffRecipe(recipes, HexItems.STAFF_CRIMSON, Items.CRIMSON_PLANKS);
         staffRecipe(recipes, HexItems.STAFF_WARPED, Items.WARPED_PLANKS);
         staffRecipe(recipes, HexItems.STAFF_MANGROVE, Items.MANGROVE_PLANKS);
+        staffRecipe(recipes, HexItems.STAFF_CHERRY, Items.CHERRY_PLANKS);
+        staffRecipe(recipes, HexItems.STAFF_BAMBOO, Items.BAMBOO_PLANKS);
         staffRecipe(recipes, HexItems.STAFF_EDIFIED, HexBlocks.EDIFIED_PLANKS.asItem());
         staffRecipe(recipes, HexItems.STAFF_QUENCHED, HexItems.QUENCHED_SHARD);
         staffRecipe(recipes, HexItems.STAFF_MINDSPLICE, Ingredient.of(HexTags.Items.MINDFLAYED_CIRCLE_COMPONENTS));
@@ -348,6 +350,21 @@ public void buildRecipes(Consumer<FinishedRecipe> recipes) {
             .pattern("WWW")
             .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
 
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_FENCE, 3)
+                .define('W', HexTags.Items.EDIFIED_PLANKS)
+                .define('S', Items.STICK)
+                .pattern("WSW")
+                .pattern("WSW")
+                .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
+
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_FENCE_GATE, 1)
+                .define('W', HexTags.Items.EDIFIED_PLANKS)
+                .define('S', Items.STICK)
+                .pattern("SWS")
+                .pattern("SWS")
+                .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
+
+
         ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_SLAB, 6)
             .define('W', HexTags.Items.EDIFIED_PLANKS)
             .pattern("WWW")

Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java

@@ -54,7 +54,7 @@ protected void addTags(HolderLookup.Provider provider) {
             HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD,
             HexBlocks.EDIFIED_PLANKS, HexBlocks.EDIFIED_PANEL, HexBlocks.EDIFIED_TILE,
             HexBlocks.EDIFIED_DOOR, HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_SLAB,
-            HexBlocks.EDIFIED_BUTTON, HexBlocks.EDIFIED_STAIRS);
+            HexBlocks.EDIFIED_BUTTON, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_FENCE, HexBlocks.EDIFIED_FENCE_GATE);
 
         add(tag(BlockTags.MINEABLE_WITH_HOE),
             HexBlocks.AMETHYST_EDIFIED_LEAVES, HexBlocks.AVENTURINE_EDIFIED_LEAVES,
@@ -93,6 +93,19 @@ protected void addTags(HolderLookup.Provider provider) {
             HexBlocks.EDIFIED_SLAB);
         add(tag(BlockTags.STAIRS),
             HexBlocks.EDIFIED_STAIRS);
+        add(tag(BlockTags.FENCES),
+                HexBlocks.EDIFIED_FENCE);
+        add(tag(BlockTags.WOODEN_FENCES),
+                HexBlocks.EDIFIED_FENCE);
+        add(tag(BlockTags.FENCE_GATES),
+                HexBlocks.EDIFIED_FENCE_GATE);
+        add(tag(BlockTags.UNSTABLE_BOTTOM_CENTER),
+                HexBlocks.EDIFIED_FENCE_GATE);
+
+
+
+        add(tag(BlockTags.WOODEN_FENCES),
+                HexBlocks.EDIFIED_FENCE);
         add(tag(BlockTags.WOODEN_STAIRS),
             HexBlocks.EDIFIED_STAIRS);
         add(tag(BlockTags.DOORS),

Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java

@@ -40,6 +40,7 @@ protected void addTags(HolderLookup.Provider provider) {
             HexItems.STAFF_OAK, HexItems.STAFF_SPRUCE, HexItems.STAFF_BIRCH,
             HexItems.STAFF_JUNGLE, HexItems.STAFF_ACACIA, HexItems.STAFF_DARK_OAK,
             HexItems.STAFF_CRIMSON, HexItems.STAFF_WARPED, HexItems.STAFF_MANGROVE,
+            HexItems.STAFF_CHERRY,HexItems.STAFF_BAMBOO,
             HexItems.STAFF_QUENCHED, HexItems.STAFF_MINDSPLICE);
 
         add(tag(HexTags.Items.PHIAL_BASE),

Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5

@@ -13,6 +13,8 @@
       "crimson": "Crimson Staff",
       "warped": "Warped Staff",
       "mangrove": "Mangrove Staff",
+      "cherry": "Cherry Staff",
+      "bamboo": "Bamboo Staff",
       "edified": "Edified Staff",
       "quenched": "Quenched Shard Staff",
       "mindsplice": "Mindsplice Staff"
@@ -149,6 +151,8 @@
     "edified_door": "Edified Door",
     "edified_trapdoor": "Edified Trapdoor",
     "edified_stairs": "Edified Stairs",
+    "edified_fence": "Edified Fence",
+    "edified_fence_gate": "Edified Fence Gate",
     "edified_slab": "Edified Slab",
     "edified_button": "Edified Button",
     "edified_pressure_plate": "Edified Pressure Plate",

Common/src/main/resources/assets/hexcasting/models/block/edified_fence_inventory.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/fence_inventory",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}

Fabric/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json

@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "hexcasting:edified_planks"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "hexcasting:edified_fence_gate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "hexcasting:edified_fence_gate"
+    ]
+  },
+  "sends_telemetry_event": false
+}