more cleanup of unused features

src/main/java/net/parsell/cherry/common/blocks/CherryButtonBlock.java

@@ -0,0 +1,10 @@
+package net.parsell.cherry.common.blocks;
+
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.WoodenButtonBlock;
+
+public class CherryButtonBlock extends WoodenButtonBlock {
+    public CherryButtonBlock(AbstractBlock.Settings settings) {
+        super(settings);
+    }
+}

src/main/java/net/parsell/cherry/common/blocks/CherryPressurePlate.java

@@ -0,0 +1,12 @@
+package net.parsell.cherry.common.blocks;
+
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.PressurePlateBlock;
+
+public class CherryPressurePlate extends PressurePlateBlock{
+    public CherryPressurePlate(PressurePlateBlock.ActivationRule type, AbstractBlock.Settings settings){
+        super (type, settings);
+        this.setDefaultState((BlockState)((BlockState)this.stateManager.getDefaultState()).with(POWERED, false));
+    }
+}

src/main/java/net/parsell/cherry/common/blocks/CherryStairsBlock.java

@@ -0,0 +1,15 @@
+package net.parsell.cherry.common.blocks;
+
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.StairsBlock;
+
+public class CherryStairsBlock extends StairsBlock{
+    private Block baseBlock;
+
+    public CherryStairsBlock(BlockState baseBlockState, AbstractBlock.Settings settings) {
+        super(baseBlockState, settings);
+        this.baseBlock = baseBlockState.getBlock();
+     }
+}

src/main/java/net/parsell/cherry/common/features/CherryTree.java

@@ -1,41 +0,0 @@
-package net.parsell.cherry.common.features;
-
-import java.util.Random;
-
-import com.mojang.serialization.Codec;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.world.Heightmap;
-import net.minecraft.world.StructureWorldAccess;
-import net.minecraft.world.gen.chunk.ChunkGenerator;
-import net.minecraft.world.gen.feature.DefaultFeatureConfig;
-import net.minecraft.world.gen.feature.Feature;
-import net.parsell.cherry.core.CherryBlocks;
-
-public class CherryTree extends Feature<DefaultFeatureConfig> {
-  public CherryTree(Codec<DefaultFeatureConfig> config) {
-    super(config);
-  }
-
-  @Override
-  public boolean generate(StructureWorldAccess world, ChunkGenerator generator, Random random, BlockPos pos, DefaultFeatureConfig config) {
-    BlockPos topPos = world.getTopPosition(Heightmap.Type.WORLD_SURFACE, pos);
-    Direction offset = Direction.NORTH;
- /*
-    for (int y = 1; y <= 15; y++) {
-      offset = offset.rotateYClockwise();
-      world.setBlockState(topPos.up(y).offset(offset), CherryBlocks.CHERRYLOG.getDefaultState(), 3);
-    }
-  */
-    if (isSoil(world, topPos.down())){
-      System.out.println(pos.toString() + " is soil! (TOP)");
-      for (int y = 0; y <=7; y++)
-        world.setBlockState(topPos.up(y), CherryBlocks.CHERRYLOG.getDefaultState(), 3);
-    } else {
-      System.out.println(pos.toString() + " is not soil! (TOP)");
-    }
-
-    return true;
-  }
-}

src/main/java/net/parsell/cherry/core/CherryBlocks.java

@@ -7,16 +7,25 @@ import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.FenceBlock;
 import net.minecraft.block.FenceGateBlock;
 import net.minecraft.block.LeavesBlock;
 import net.minecraft.block.PillarBlock;
+import net.minecraft.block.PressurePlateBlock;
+import net.minecraft.block.SignBlock;
 import net.minecraft.block.SlabBlock;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.SignType;
 import net.minecraft.util.registry.Registry;
+import net.parsell.cherry.common.blocks.CherryButtonBlock;
 import net.parsell.cherry.common.blocks.CherryDoorBlock;
+import net.parsell.cherry.common.blocks.CherryPressurePlate;
+import net.parsell.cherry.common.blocks.CherryStairsBlock;
 import net.parsell.cherry.common.blocks.CherryTrapdoorBlock;
 import net.parsell.cherry.mixin.AxeItemAccessor;
 
@@ -29,11 +38,15 @@ public class CherryBlocks {
 	public static final Block CHERRYWOODSTRIPPED = registerPillar("stripped_cherry_wood", FabricBlockSettings.copyOf(Blocks.STRIPPED_OAK_WOOD), 5, 5);
 	public static final Block CHERRYLEAVES = registerLeaves("cherry_leaves", FabricBlockSettings.copyOf(Blocks.OAK_LEAVES), 30, 60, 6649929);
 	public static final Block CHERRYPLANKS = registerBlock("cherry_planks", FabricBlockSettings.copyOf(Blocks.OAK_PLANKS), 5, 20);
-	public static final Block CHERRYFENCE = registerFence("cherry_fence", FabricBlockSettings.copyOf(Blocks.OAK_FENCE), 5, 20); // TODO: Textures, tags (as required)
+	public static final Block CHERRYFENCE = registerFence("cherry_fence", FabricBlockSettings.copyOf(Blocks.OAK_FENCE), 5, 20); // TODO: tags (as required)
-	public static final Block CHERRYFENCEGATE = registerFenceGate("cherry_fence_gate", FabricBlockSettings.copyOf(Blocks.OAK_FENCE_GATE), 5, 20); // Textures, recipe, loot_tables, tags (as required)
+	public static final Block CHERRYFENCEGATE = registerFenceGate("cherry_fence_gate", FabricBlockSettings.copyOf(Blocks.OAK_FENCE_GATE), 5, 20); // TODO: recipe, loot_tables, tags (as required)
 	public static final Block CHERRYDOOR = registerDoor("cherry_door", FabricBlockSettings.copyOf(Blocks.OAK_DOOR), 5, 20); // TODO: recipe, loot_tables, tags (as required)
 	public static final Block CHERRYTRAPDOOR = registerTrapDoor("cherry_trapdoor", FabricBlockSettings.copyOf(Blocks.OAK_TRAPDOOR), 5, 20); //TODO: recipe, loot_tables, tags (as required)
 	public static final Block CHERRYSLAB = registerSlab("cherry_slab", FabricBlockSettings.copyOf(Blocks.OAK_SLAB), 5, 20); // TODO: recipe, loot tables, tags (as required)
+	public static final Block CHERRYSTAIRS = registerStair("cherry_stairs", CHERRYPLANKS.getDefaultState(), FabricBlockSettings.copyOf(Blocks.OAK_STAIRS), 5, 20); //TODO: recipe, loot tables, tags (as required)
+	public static final Block CHERRYBUTTON = registerButton("cherry_button", FabricBlockSettings.copyOf(Blocks.OAK_BUTTON), 5, 20); //TODO: recipe, loot tables, tags (as required)
+	public static final Block CHERRYPRESSUREPLATE = registerPressurePlate("cherry_pressure_plate", PressurePlateBlock.ActivationRule.EVERYTHING, FabricBlockSettings.copyOf(Blocks.OAK_PRESSURE_PLATE), 5, 20); //TODO: recipe, loot tables, tags (as required)
+	public static final Block CHERRYSIGN = registerSign("cherry_sign", SignType.OAK, FabricBlockSettings.copyOf(Blocks.OAK_SIGN), 5, 20); // TODO: recipe, loot tables
 
 	private static Block registerBlock(String blockID, FabricBlockSettings settings, int burnChance, int burnSpread) {
 		Block block = new Block(settings);
@@ -49,6 +62,35 @@ public class CherryBlocks {
 		return block;
 	}
 
+	private static Block registerStair(String blockID, BlockState baseBlockState, FabricBlockSettings settings, int burnChance, int burnSpread) {
+		Block block = new CherryStairsBlock(baseBlockState, settings);
+		Registry.register(Registry.BLOCK, new Identifier("cherry", blockID), block);
+		FlammableBlockRegistry.getDefaultInstance().add(block, burnChance, burnSpread);
+		return block;
+	}
+
+	private static Block registerButton(String blockID, FabricBlockSettings settings, int burnChance, int burnSpread) {
+		Block block = new CherryButtonBlock(settings);
+		Registry.register(Registry.BLOCK, new Identifier("cherry", blockID), block);
+		FlammableBlockRegistry.getDefaultInstance().add(block, burnChance, burnSpread);
+		return block;
+	}
+
+	private static Block registerPressurePlate(String blockID, PressurePlateBlock.ActivationRule rule, FabricBlockSettings settings, int burnChance, int burnSpread) {
+		Block block = new CherryPressurePlate(rule, settings);
+		Registry.register(Registry.BLOCK, new Identifier("cherry", blockID), block);
+		FlammableBlockRegistry.getDefaultInstance().add(block, burnChance, burnSpread);
+		return block;
+	}
+
+	private static Block registerSign(String blockID, SignType type, FabricBlockSettings settings, int burnChance, int burnSpread) {
+		Block block = new SignBlock(settings, type);
+		Registry.register(Registry.BLOCK, new Identifier("cherry", blockID), block);
+		Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier("cherry", blockID), BlockEntityType.Builder.create(SignBlockEntity::new, block).build(null));
+		FlammableBlockRegistry.getDefaultInstance().add(block, burnChance, burnSpread);
+		return block;
+	}
+
 	private static Block registerFence(String blockID, FabricBlockSettings settings, int burnChance, int burnSpread) {
 		Block block = new FenceBlock(settings);
 		Registry.register(Registry.BLOCK, new Identifier("cherry", blockID), block);

src/main/java/net/parsell/cherry/core/CherryFeatures.java

@@ -16,7 +16,6 @@ import net.minecraft.world.gen.decorator.CountExtraDecoratorConfig;
 import net.minecraft.world.gen.decorator.Decorator;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import net.minecraft.world.gen.feature.ConfiguredFeatures;
-import net.minecraft.world.gen.feature.DefaultFeatureConfig;
 import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.RandomFeatureConfig;
 import net.minecraft.world.gen.feature.TreeFeatureConfig;
@@ -24,24 +23,17 @@ import net.minecraft.world.gen.feature.size.TwoLayersFeatureSize;
 import net.minecraft.world.gen.foliage.BlobFoliagePlacer;
 import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider;
 import net.minecraft.world.gen.trunk.StraightTrunkPlacer;
-import net.parsell.cherry.common.features.CherryTree;
 
 public class CherryFeatures {
 	private static final BlockState CHERRYLOG_STATE = CherryBlocks.CHERRYLOG.getDefaultState();
 	private static final BlockState CHERRYLEAVES_STATE = CherryBlocks.CHERRYLEAVES.getDefaultState();
 
-	// Create the features
-	private static final Feature<DefaultFeatureConfig> CHERRY_TREE_1 = new CherryTree(DefaultFeatureConfig.CODEC);
-
 	// Configure the features
 	static TreeFeatureConfig CHERRY_TREE_1_CONFIG = new TreeFeatureConfig.Builder(new SimpleBlockStateProvider(CHERRYLOG_STATE), new SimpleBlockStateProvider(CHERRYLEAVES_STATE), new BlobFoliagePlacer(UniformIntDistribution.of(2), UniformIntDistribution.of(0), 3), new StraightTrunkPlacer(4, 2, 0), new TwoLayersFeatureSize(1, 0, 1)).ignoreVines().build();
 	public static final ConfiguredFeature<?, ?> CHERRY_TREE_1_C = Feature.TREE.configure(CHERRY_TREE_1_CONFIG);
 	public static final ConfiguredFeature<?, ?> CHERRY_TREE_1_C_R = Feature.RANDOM_SELECTOR.configure(new RandomFeatureConfig(ImmutableList.of(CHERRY_TREE_1_C.withChance(0.8F)), CHERRY_TREE_1_C)).decorate(ConfiguredFeatures.Decorators.SQUARE_HEIGHTMAP).decorate(Decorator.COUNT_EXTRA.configure(new CountExtraDecoratorConfig(1, 0.1F, 1)));
 
 	private static void addFeatures(){
-		// Register the features
-		Registry.register(Registry.FEATURE, new Identifier("cherry", "cherry_tree"), CHERRY_TREE_1);
-
 		// Register the configured features
 		RegistryKey<ConfiguredFeature<?, ?>> cherryTree1 = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("cherry", "cherry_tree_1"));
 		Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, cherryTree1.getValue(), CHERRY_TREE_1_C_R);

src/main/java/net/parsell/cherry/core/CherryItems.java

@@ -5,6 +5,7 @@ import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.SignItem;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
@@ -21,6 +22,10 @@ public class CherryItems {
 		registerBlockItem("cherry_door", CherryBlocks.CHERRYDOOR, ItemGroup.BUILDING_BLOCKS);
 		registerBlockItem("cherry_trapdoor", CherryBlocks.CHERRYTRAPDOOR, ItemGroup.BUILDING_BLOCKS);
 		registerBlockItem("cherry_slab", CherryBlocks.CHERRYSLAB, ItemGroup.BUILDING_BLOCKS);
+		registerBlockItem("cherry_stairs", CherryBlocks.CHERRYSTAIRS, ItemGroup.BUILDING_BLOCKS);
+		registerBlockItem("cherry_button", CherryBlocks.CHERRYBUTTON, ItemGroup.BUILDING_BLOCKS);
+		registerBlockItem("cherry_pressure_plate", CherryBlocks.CHERRYPRESSUREPLATE, ItemGroup.BUILDING_BLOCKS);
+		registerSignItem("cherry_sign", CherryBlocks.CHERRYSIGN, CherryBlocks.CHERRYSIGN, ItemGroup.BUILDING_BLOCKS);
 	}
 
 	// Register a standard blockItem
@@ -38,6 +43,10 @@ public class CherryItems {
 		);
 	}
 
+	private static void registerSignItem(String itemID, Block standingBlock, Block wallBlock, ItemGroup group) {
+		Registry.register(Registry.ITEM, new Identifier("cherry", itemID), new SignItem(new FabricItemSettings().group(group), standingBlock, wallBlock));
+	}
+
 	public static void init(){
 		registerBlockItems();
 	}

src/main/resources/assets/cherry/blockstates/cherry_button.json

@@ -0,0 +1,118 @@
+{
+    "variants": {
+      "face=ceiling,facing=east,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 270,
+        "x": 180
+      },
+      "face=ceiling,facing=east,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 270,
+        "x": 180
+      },
+      "face=ceiling,facing=north,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 180,
+        "x": 180
+      },
+      "face=ceiling,facing=north,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 180,
+        "x": 180
+      },
+      "face=ceiling,facing=south,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "x": 180
+      },
+      "face=ceiling,facing=south,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "x": 180
+      },
+      "face=ceiling,facing=west,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 90,
+        "x": 180
+      },
+      "face=ceiling,facing=west,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 90,
+        "x": 180
+      },
+      "face=floor,facing=east,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 90
+      },
+      "face=floor,facing=east,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 90
+      },
+      "face=floor,facing=north,powered=false": {
+        "model": "cherry:block/cherry_button"
+      },
+      "face=floor,facing=north,powered=true": {
+        "model": "cherry:block/cherry_button_pressed"
+      },
+      "face=floor,facing=south,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 180
+      },
+      "face=floor,facing=south,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 180
+      },
+      "face=floor,facing=west,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 270
+      },
+      "face=floor,facing=west,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 270
+      },
+      "face=wall,facing=east,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 90,
+        "x": 90,
+        "uvlock": true
+      },
+      "face=wall,facing=east,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 90,
+        "x": 90,
+        "uvlock": true
+      },
+      "face=wall,facing=north,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "x": 90,
+        "uvlock": true
+      },
+      "face=wall,facing=north,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "x": 90,
+        "uvlock": true
+      },
+      "face=wall,facing=south,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 180,
+        "x": 90,
+        "uvlock": true
+      },
+      "face=wall,facing=south,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 180,
+        "x": 90,
+        "uvlock": true
+      },
+      "face=wall,facing=west,powered=false": {
+        "model": "cherry:block/cherry_button",
+        "y": 270,
+        "x": 90,
+        "uvlock": true
+      },
+      "face=wall,facing=west,powered=true": {
+        "model": "cherry:block/cherry_button_pressed",
+        "y": 270,
+        "x": 90,
+        "uvlock": true
+      }
+    }
+  }

src/main/resources/assets/cherry/blockstates/cherry_fence.json

@@ -2,7 +2,7 @@
     "multipart": [
       {
         "apply": {
-          "model": "minecraft:block/acacia_fence_post"
+          "model": "cherry:block/cherry_fence_post"
         }
       },
       {
@@ -10,7 +10,7 @@
           "north": "true"
         },
         "apply": {
-          "model": "minecraft:block/acacia_fence_side",
+          "model": "cherry:block/cherry_fence_side",
           "uvlock": true
         }
       },
@@ -19,7 +19,7 @@
           "east": "true"
         },
         "apply": {
-          "model": "minecraft:block/acacia_fence_side",
+          "model": "cherry:block/cherry_fence_side",
           "y": 90,
           "uvlock": true
         }
@@ -29,7 +29,7 @@
           "south": "true"
         },
         "apply": {
-          "model": "minecraft:block/acacia_fence_side",
+          "model": "cherry:block/cherry_fence_side",
           "y": 180,
           "uvlock": true
         }
@@ -39,7 +39,7 @@
           "west": "true"
         },
         "apply": {
-          "model": "minecraft:block/acacia_fence_side",
+          "model": "cherry:block/cherry_fence_side",
           "y": 270,
           "uvlock": true
         }

src/main/resources/assets/cherry/blockstates/cherry_fence_gate.json

@@ -3,78 +3,78 @@
     "facing=east,in_wall=false,open=false": {
       "uvlock": true,
       "y": 270,
-      "model": "minecraft:block/acacia_fence_gate"
+      "model": "cherry:block/cherry_fence_gate"
     },
     "facing=east,in_wall=false,open=true": {
       "uvlock": true,
       "y": 270,
-      "model": "minecraft:block/acacia_fence_gate_open"
+      "model": "cherry:block/cherry_fence_gate_open"
     },
     "facing=east,in_wall=true,open=false": {
       "uvlock": true,
       "y": 270,
-      "model": "minecraft:block/acacia_fence_gate_wall"
+      "model": "cherry:block/cherry_fence_gate_wall"
     },
     "facing=east,in_wall=true,open=true": {
       "uvlock": true,
       "y": 270,
-      "model": "minecraft:block/acacia_fence_gate_wall_open"
+      "model": "cherry:block/cherry_fence_gate_wall_open"
     },
     "facing=north,in_wall=false,open=false": {
       "uvlock": true,
       "y": 180,
-      "model": "minecraft:block/acacia_fence_gate"
+      "model": "cherry:block/cherry_fence_gate"
     },
     "facing=north,in_wall=false,open=true": {
       "uvlock": true,
       "y": 180,
-      "model": "minecraft:block/acacia_fence_gate_open"
+      "model": "cherry:block/cherry_fence_gate_open"
     },
     "facing=north,in_wall=true,open=false": {
       "uvlock": true,
       "y": 180,
-      "model": "minecraft:block/acacia_fence_gate_wall"
+      "model": "cherry:block/cherry_fence_gate_wall"
     },
     "facing=north,in_wall=true,open=true": {
       "uvlock": true,
       "y": 180,
-      "model": "minecraft:block/acacia_fence_gate_wall_open"
+      "model": "cherry:block/cherry_fence_gate_wall_open"
     },
     "facing=south,in_wall=false,open=false": {
       "uvlock": true,
-      "model": "minecraft:block/acacia_fence_gate"
+      "model": "cherry:block/cherry_fence_gate"
     },
     "facing=south,in_wall=false,open=true": {
       "uvlock": true,
-      "model": "minecraft:block/acacia_fence_gate_open"
+      "model": "cherry:block/cherry_fence_gate_open"
     },
     "facing=south,in_wall=true,open=false": {
       "uvlock": true,
-      "model": "minecraft:block/acacia_fence_gate_wall"
+      "model": "cherry:block/cherry_fence_gate_wall"
     },
     "facing=south,in_wall=true,open=true": {
       "uvlock": true,
-      "model": "minecraft:block/acacia_fence_gate_wall_open"
+      "model": "cherry:block/cherry_fence_gate_wall_open"
     },
     "facing=west,in_wall=false,open=false": {
       "uvlock": true,
       "y": 90,
-      "model": "minecraft:block/acacia_fence_gate"
+      "model": "cherry:block/cherry_fence_gate"
     },
     "facing=west,in_wall=false,open=true": {
       "uvlock": true,
       "y": 90,
-      "model": "minecraft:block/acacia_fence_gate_open"
+      "model": "cherry:block/cherry_fence_gate_open"
     },
     "facing=west,in_wall=true,open=false": {
       "uvlock": true,
       "y": 90,
-      "model": "minecraft:block/acacia_fence_gate_wall"
+      "model": "cherry:block/cherry_fence_gate_wall"
     },
     "facing=west,in_wall=true,open=true": {
       "uvlock": true,
       "y": 90,
-      "model": "minecraft:block/acacia_fence_gate_wall_open"
+      "model": "cherry:block/cherry_fence_gate_wall_open"
     }
   }
 }

src/main/resources/assets/cherry/blockstates/cherry_pressure_plate.json

@@ -0,0 +1,10 @@
+{
+    "variants": {
+      "powered=false": {
+        "model": "cherry:block/cherry_pressure_plate"
+      },
+      "powered=true": {
+        "model": "cherry:block/cherry_pressure_plate_down"
+      }
+    }
+  }

src/main/resources/assets/cherry/blockstates/cherry_sign.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+      "": {
+        "model": "cherry:block/cherry_sign"
+      }
+    }
+  }

src/main/resources/assets/cherry/blockstates/cherry_stairs.json

@@ -0,0 +1,209 @@
+{
+    "variants": {
+      "facing=east,half=bottom,shape=inner_left": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=east,half=bottom,shape=inner_right": {
+        "model": "cherry:block/cherry_stairs_inner"
+      },
+      "facing=east,half=bottom,shape=outer_left": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=east,half=bottom,shape=outer_right": {
+        "model": "cherry:block/cherry_stairs_outer"
+      },
+      "facing=east,half=bottom,shape=straight": {
+        "model": "cherry:block/cherry_stairs"
+      },
+      "facing=east,half=top,shape=inner_left": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "x": 180,
+        "uvlock": true
+      },
+      "facing=east,half=top,shape=inner_right": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "x": 180,
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=east,half=top,shape=outer_left": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "x": 180,
+        "uvlock": true
+      },
+      "facing=east,half=top,shape=outer_right": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "x": 180,
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=east,half=top,shape=straight": {
+        "model": "cherry:block/cherry_stairs",
+        "x": 180,
+        "uvlock": true
+      },
+      "facing=north,half=bottom,shape=inner_left": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=north,half=bottom,shape=inner_right": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=north,half=bottom,shape=outer_left": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=north,half=bottom,shape=outer_right": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=north,half=bottom,shape=straight": {
+        "model": "cherry:block/cherry_stairs",
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=north,half=top,shape=inner_left": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "x": 180,
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=north,half=top,shape=inner_right": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "x": 180,
+        "uvlock": true
+      },
+      "facing=north,half=top,shape=outer_left": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "x": 180,
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=north,half=top,shape=outer_right": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "x": 180,
+        "uvlock": true
+      },
+      "facing=north,half=top,shape=straight": {
+        "model": "cherry:block/cherry_stairs",
+        "x": 180,
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=south,half=bottom,shape=inner_left": {
+        "model": "cherry:block/cherry_stairs_inner"
+      },
+      "facing=south,half=bottom,shape=inner_right": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=south,half=bottom,shape=outer_left": {
+        "model": "cherry:block/cherry_stairs_outer"
+      },
+      "facing=south,half=bottom,shape=outer_right": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=south,half=bottom,shape=straight": {
+        "model": "cherry:block/cherry_stairs",
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=south,half=top,shape=inner_left": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "x": 180,
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=south,half=top,shape=inner_right": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "x": 180,
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=south,half=top,shape=outer_left": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "x": 180,
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=south,half=top,shape=outer_right": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "x": 180,
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=south,half=top,shape=straight": {
+        "model": "cherry:block/cherry_stairs",
+        "x": 180,
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=west,half=bottom,shape=inner_left": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=west,half=bottom,shape=inner_right": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=west,half=bottom,shape=outer_left": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "y": 90,
+        "uvlock": true
+      },
+      "facing=west,half=bottom,shape=outer_right": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=west,half=bottom,shape=straight": {
+        "model": "cherry:block/cherry_stairs",
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=west,half=top,shape=inner_left": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "x": 180,
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=west,half=top,shape=inner_right": {
+        "model": "cherry:block/cherry_stairs_inner",
+        "x": 180,
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=west,half=top,shape=outer_left": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "x": 180,
+        "y": 180,
+        "uvlock": true
+      },
+      "facing=west,half=top,shape=outer_right": {
+        "model": "cherry:block/cherry_stairs_outer",
+        "x": 180,
+        "y": 270,
+        "uvlock": true
+      },
+      "facing=west,half=top,shape=straight": {
+        "model": "cherry:block/cherry_stairs",
+        "x": 180,
+        "y": 180,
+        "uvlock": true
+      }
+    }
+  }

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

@@ -9,5 +9,7 @@
     "block.cherry.cherry_fence_gate": "Cherry Fence Gate",
     "block.cherry.cherry_door": "Cherry Door",
     "block.cherry.cherry_trapdoor": "Cherry Trapdoor",
-    "block.cherry.cherry_slab": "Cherry Slab"
+    "block.cherry.cherry_slab": "Cherry Slab",
+    "block.cherry.cherry_stairs": "Cherry Stairs",
+    "block.cherry.cherry_button": "Cherry Button"
 }

src/main/resources/assets/cherry/models/block/cherry_button.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/button",
+    "textures": {
+      "texture": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/block/cherry_button_inventory.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/button_inventory",
+    "textures": {
+      "texture": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/block/cherry_button_pressed.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/button_pressed",
+    "textures": {
+      "texture": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/block/cherry_fence_gate.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/template_fence_gate",
     "textures": {
-      "texture": "minecraft:block/oak_planks"
+      "texture": "cherry:block/cherry_planks"
     }
   }

src/main/resources/assets/cherry/models/block/cherry_fence_gate_open.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/template_fence_gate_open",
     "textures": {
-      "texture": "minecraft:block/oak_planks"
+      "texture": "cherry:block/cherry_planks"
     }
   }

src/main/resources/assets/cherry/models/block/cherry_fence_gate_wall.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/template_fence_gate_wall",
     "textures": {
-      "texture": "minecraft:block/oak_planks"
+      "texture": "cherry:block/cherry_planks"
     }
   }

src/main/resources/assets/cherry/models/block/cherry_fence_gate_wall_open.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/template_fence_gate_wall_open",
     "textures": {
-      "texture": "minecraft:block/oak_planks"
+      "texture": "cherry:block/cherry_planks"
     }
   }

src/main/resources/assets/cherry/models/block/cherry_fence_inventory.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/fence_inventory",
     "textures": {
-      "texture": "minecraft:block/oak_planks"
+      "texture": "cherry:block/cherry_planks"
     }
   }

src/main/resources/assets/cherry/models/block/cherry_fence_post.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/fence_post",
     "textures": {
-      "texture": "minecraft:block/oak_planks"
+      "texture": "cherry:block/cherry_planks"
     }
   }

src/main/resources/assets/cherry/models/block/cherry_fence_side.json

@@ -1,6 +1,6 @@
 {
     "parent": "minecraft:block/fence_side",
     "textures": {
-      "texture": "minecraft:block/oak_planks"
+      "texture": "cherry:block/cherry_planks"
     }
   }

src/main/resources/assets/cherry/models/block/cherry_pressure_plate.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/pressure_plate_up",
+    "textures": {
+      "texture": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/block/cherry_pressure_plate_down.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/pressure_plate_down",
+    "textures": {
+      "texture": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/block/cherry_sign.json

@@ -0,0 +1,5 @@
+{
+    "textures": {
+      "particle": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/block/cherry_stairs.json

@@ -0,0 +1,8 @@
+{
+    "parent": "minecraft:block/stairs",
+    "textures": {
+      "bottom": "cherry:block/cherry_planks",
+      "top": "cherry:block/cherry_planks",
+      "side": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/block/cherry_stairs_inner.json

@@ -0,0 +1,8 @@
+{
+    "parent": "minecraft:block/inner_stairs",
+    "textures": {
+      "bottom": "cherry:block/cherry_planks",
+      "top": "cherry:block/cherry_planks",
+      "side": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/block/cherry_stairs_outer.json

@@ -0,0 +1,8 @@
+{
+    "parent": "minecraft:block/outer_stairs",
+    "textures": {
+      "bottom": "cherry:block/cherry_planks",
+      "top": "cherry:block/cherry_planks",
+      "side": "cherry:block/cherry_planks"
+    }
+  }

src/main/resources/assets/cherry/models/item/cherry_button.json

@@ -0,0 +1,3 @@
+{
+    "parent": "cherry:block/cherry_button_inventory"
+  }

src/main/resources/assets/cherry/models/item/cherry_fence.json

@@ -0,0 +1,3 @@
+{
+    "parent": "cherry:block/cherry_fence_inventory"
+  }

src/main/resources/assets/cherry/models/item/cherry_fence_gate.json

@@ -0,0 +1,3 @@
+{
+    "parent": "cherry:block/cherry_fence_gate"
+  }

src/main/resources/assets/cherry/models/item/cherry_pressure_plate.json

@@ -0,0 +1,3 @@
+{
+    "parent": "cherry:block/cherry_pressure_plate"
+  }

src/main/resources/assets/cherry/models/item/cherry_sign.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+      "layer0": "cherry:item/cherry_sign"
+    }
+  }

src/main/resources/assets/cherry/models/item/cherry_stairs.json

@@ -0,0 +1,3 @@
+{
+    "parent": "cherry:block/cherry_stairs"
+  }

src/main/resources/data/minecraft/tags/blocks/signs.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "cherry:cherry_sign"
+    ]
+}

src/main/resources/data/minecraft/tags/blocks/standing_signs.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "cherry:cherry_sign"
+    ]
+}

src/main/resources/data/minecraft/tags/blocks/wall_post_override.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "cherry:cherry_sign"
+    ]
+}