From b4ca10b8238e13aac2c85e05e5a2958462b5abe8 Mon Sep 17 00:00:00 2001
From: Andrew-71 <andrey.nikitin.vladimirovich@gmail.com>
Date: Thu, 7 Mar 2024 11:07:07 +0300
Subject: [PATCH] Remove unused blocks

---
 CHANGELOG                                     |  8 ++-
 .../su/a71/new_soviet/blocks/StoveBlock.java  | 66 -------------------
 .../blocks/lamps/DevTableLampBlock.java       | 17 -----
 3 files changed, 5 insertions(+), 86 deletions(-)
 delete mode 100644 src/main/java/su/a71/new_soviet/blocks/StoveBlock.java
 delete mode 100644 src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java

diff --git a/CHANGELOG b/CHANGELOG
index 3a6d6f3..7432a47 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,7 +52,8 @@ This version focuses on QOL and bug fixes
 
 ### Changelog 0.3 -> 0.4
 Due to sheer amount of changes, some may be undocumented. We hope you enjoy this update! :D
-* Texture changes for various blocks
+
+* Texture improvements for various blocks
 * Reworked wallpaper blocks, added new ones
 * Concrete improvements
     * 3 new colours - basic, dark green and orange
@@ -64,14 +65,15 @@ Due to sheer amount of changes, some may be undocumented. We hope you enjoy this
     * Grain
 * Added USSR anthem music disc
 * Added a new antenna item to improve radio electronics recipes
-* Parquet re-structuring
+* Parquet improvements
     * Separated oak and dark oak parquet in naming
     * Added spruce parquet (TODO)
 * Bug fixes
+    * Stone-cutting recipe for slabs now gives 2 blocks
     * Fixed a few missing drops/tags/recipes related to concrete
         * Concrete with bars is now pickaxe mine-able
         * Fixed some concrete blocks missing drops
         * Cracked concrete now has a dyeing category
 * Technical changes
     * Changed parts of file structure for models and textures
-    * Moved to newer Fabric, Loom etc. versions
\ No newline at end of file
+    * Moved to newer Fabric, Loom etc. versions. Took a while to figure out how to update Gradle :D
\ No newline at end of file
diff --git a/src/main/java/su/a71/new_soviet/blocks/StoveBlock.java b/src/main/java/su/a71/new_soviet/blocks/StoveBlock.java
deleted file mode 100644
index 7608133..0000000
--- a/src/main/java/su/a71/new_soviet/blocks/StoveBlock.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package su.a71.new_soviet.blocks;
-
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.block.*;
-import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.block.piston.PistonBehavior;
-import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.state.StateManager;
-import net.minecraft.state.property.DirectionProperty;
-import net.minecraft.state.property.Properties;
-import net.minecraft.util.BlockMirror;
-import net.minecraft.util.BlockRotation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.util.shape.VoxelShape;
-import net.minecraft.util.shape.VoxelShapes;
-import net.minecraft.world.BlockView;
-
-import org.jetbrains.annotations.Nullable;
-
-public class StoveBlock extends BlockWithEntity {
-    public static final DirectionProperty FACING;
-
-    public StoveBlock() {
-        super(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.BLOCK));
-        setDefaultState(getDefaultState().with(Properties.HORIZONTAL_FACING, Direction.NORTH));
-    }
-
-    @Override
-    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(Properties.HORIZONTAL_FACING);
-    }
-
-    @Nullable
-    @Override
-    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
-        return null;
-    }
-
-    @Override
-    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) {
-        return switch (state.get(FACING)) {
-            case NORTH, SOUTH -> VoxelShapes.cuboid(0.0625f, 0.0f, 0.3125f, 0.9375f, 0.5625f, 0.6875f);
-            case EAST, WEST -> VoxelShapes.cuboid(0.3125f, 0.0f, 0.0625f, 0.6875f, 0.5625f, 0.9375f);
-            default -> VoxelShapes.fullCube();
-        };
-    }
-
-    @Override
-    public BlockState getPlacementState(ItemPlacementContext ctx) {
-        return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite());
-    }
-
-    public BlockState rotate(BlockState state, BlockRotation rotation) {
-        return state.with(FACING, rotation.rotate(state.get(FACING)));
-    }
-
-    public BlockState mirror(BlockState state, BlockMirror mirror) {
-        return state.rotate(mirror.getRotation(state.get(FACING)));
-    }
-
-    static {
-        FACING = Properties.HORIZONTAL_FACING;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java
deleted file mode 100644
index d2892b2..0000000
--- a/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package su.a71.new_soviet.blocks.lamps;
-
-import su.a71.new_soviet.util.Shapes;
-
-import java.util.List;
-
-public class DevTableLampBlock extends GoldenTableLampBlock {
-
-    public DevTableLampBlock(Settings settings) {
-        super(settings);
-        SHAPE = new Shapes.HorizontalShapeLegacy(List.of(
-                List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0),
-                List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0),
-                List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0),
-                List.of(3.0, 9.0, 3.0, 13.0, 13.0, 7.0)));
-    }
-}
\ No newline at end of file