From c207fb5ae6eef7de1c191971ef36ee411d5410a6 Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Sun, 10 Mar 2024 15:26:29 +0100 Subject: [PATCH] renamed blocks for more clarity and expandability --- .../java/fr/adrien1106/reframed/ReFramed.java | 19 ++++++++++--------- ...Block.java => ReFramedSlabsCubeBlock.java} | 4 ++-- ...Block.java => ReFramedSmallCubeBlock.java} | 4 ++-- .../ReFramedSmallCubesStepBlock.java} | 10 +++++----- ...airsBlock.java => ReFramedStairBlock.java} | 4 ++-- ...lock.java => ReFramedStairsCubeBlock.java} | 8 ++++---- ...Block.java => ReFramedStepsSlabBlock.java} | 4 ++-- .../reframed/client/ReFramedClient.java | 10 +++++----- 8 files changed, 32 insertions(+), 31 deletions(-) rename src/main/java/fr/adrien1106/reframed/block/{ReFramedDoubleSlabBlock.java => ReFramedSlabsCubeBlock.java} (95%) rename src/main/java/fr/adrien1106/reframed/block/{ReFramedSmallBlock.java => ReFramedSmallCubeBlock.java} (97%) rename src/main/java/fr/adrien1106/reframed/{ReFramedDoubleSmallBlock.java => block/ReFramedSmallCubesStepBlock.java} (94%) rename src/main/java/fr/adrien1106/reframed/block/{ReFramedStairsBlock.java => ReFramedStairBlock.java} (99%) rename src/main/java/fr/adrien1106/reframed/block/{ReFramedDoubleStairsBlock.java => ReFramedStairsCubeBlock.java} (97%) rename src/main/java/fr/adrien1106/reframed/block/{ReFramedDoubleStepBlock.java => ReFramedStepsSlabBlock.java} (97%) diff --git a/src/main/java/fr/adrien1106/reframed/ReFramed.java b/src/main/java/fr/adrien1106/reframed/ReFramed.java index 954c421..84c5d05 100644 --- a/src/main/java/fr/adrien1106/reframed/ReFramed.java +++ b/src/main/java/fr/adrien1106/reframed/ReFramed.java @@ -39,7 +39,7 @@ public class ReFramed implements ModInitializer { public static final String MODID = "reframed"; public static final ArrayList BLOCKS = new ArrayList<>(); - public static Block CUBE, SMALL_CUBE, DOUBLE_SMALL_CUBE, STAIRS, DOUBLE_STAIRS, SLAB, DOUBLE_SLAB, STEP, DOUBLE_STEP; + public static Block CUBE, SMALL_CUBE, SMALL_CUBES_STEP, STAIR, STAIRS_CUBE, SLAB, SLABS_CUBE, STEP, STEPS_SLAB; public static ItemGroup ITEM_GROUP; public static BlockEntityType REFRAMED_BLOCK_ENTITY; @@ -50,16 +50,17 @@ public class ReFramed implements ModInitializer { @Override public void onInitialize() { CUBE = registerReFramed("cube" , new ReFramedBlock(cp(Blocks.OAK_PLANKS))); - SMALL_CUBE = registerReFramed("small_cube" , new ReFramedSmallBlock(cp(Blocks.OAK_PLANKS))); - DOUBLE_SMALL_CUBE = registerReFramed("double_small_cube" , new ReFramedDoubleSmallBlock(cp(Blocks.OAK_PLANKS))); - STAIRS = registerReFramed("stairs" , new ReFramedStairsBlock(cp(Blocks.OAK_STAIRS))); - DOUBLE_STAIRS = registerReFramed("double_stairs" , new ReFramedDoubleStairsBlock(cp(Blocks.OAK_STAIRS))); -// CUBE = registerReFramed("half_stairs" , new ReFramedBlock(cp(Blocks.OAK_STAIRS))); // TODO -// CUBE = registerReFramed("double_half_stairs", new ReFramedBlock(cp(Blocks.OAK_STAIRS))); // TODO + SMALL_CUBE = registerReFramed("small_cube" , new ReFramedSmallCubeBlock(cp(Blocks.OAK_PLANKS))); + SMALL_CUBES_STEP = registerReFramed("small_cubes_step" , new ReFramedSmallCubesStepBlock(cp(Blocks.OAK_PLANKS))); + STAIR = registerReFramed("stair" , new ReFramedStairBlock(cp(Blocks.OAK_STAIRS))); + STAIRS_CUBE = registerReFramed("stairs_cube" , new ReFramedStairsCubeBlock(cp(Blocks.OAK_STAIRS))); +// CUBE = registerReFramed("half_stair" , new ReFramedBlock(cp(Blocks.OAK_STAIRS))); // TODO +// CUBE = registerReFramed("half_stairs_stair" , new ReFramedBlock(cp(Blocks.OAK_STAIRS))); // TODO +// CUBE = registerReFramed("half_stairs_slab" , new ReFramedBlock(cp(Blocks.OAK_STAIRS))); // TODO SLAB = registerReFramed("slab" , new ReFramedSlabBlock(cp(Blocks.OAK_SLAB))); - DOUBLE_SLAB = registerReFramed("double_slab" , new ReFramedDoubleSlabBlock(cp(Blocks.OAK_SLAB))); + SLABS_CUBE = registerReFramed("slabs_cube" , new ReFramedSlabsCubeBlock(cp(Blocks.OAK_SLAB))); STEP = registerReFramed("step" , new ReFramedStepBlock(cp(Blocks.OAK_SLAB))); - DOUBLE_STEP = registerReFramed("double_step" , new ReFramedDoubleStepBlock(cp(Blocks.OAK_SLAB))); + STEPS_SLAB = registerReFramed("steps_slab" , new ReFramedStepsSlabBlock(cp(Blocks.OAK_SLAB))); REFRAMED_BLOCK_ENTITY = Registry.register(Registries.BLOCK_ENTITY_TYPE, id("camo"), FabricBlockEntityTypeBuilder.create( diff --git a/src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleSlabBlock.java b/src/main/java/fr/adrien1106/reframed/block/ReFramedSlabsCubeBlock.java similarity index 95% rename from src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleSlabBlock.java rename to src/main/java/fr/adrien1106/reframed/block/ReFramedSlabsCubeBlock.java index 56238d3..42aa1c1 100644 --- a/src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleSlabBlock.java +++ b/src/main/java/fr/adrien1106/reframed/block/ReFramedSlabsCubeBlock.java @@ -23,9 +23,9 @@ import static net.minecraft.data.client.VariantSettings.Rotation.R0; import static net.minecraft.data.client.VariantSettings.Rotation.R90; import static net.minecraft.state.property.Properties.AXIS; -public class ReFramedDoubleSlabBlock extends ReFramedDoubleBlock implements BlockStateProvider { +public class ReFramedSlabsCubeBlock extends ReFramedDoubleBlock implements BlockStateProvider { - public ReFramedDoubleSlabBlock(Settings settings) { + public ReFramedSlabsCubeBlock(Settings settings) { super(settings); setDefaultState(getDefaultState().with(AXIS, Direction.Axis.Y)); } diff --git a/src/main/java/fr/adrien1106/reframed/block/ReFramedSmallBlock.java b/src/main/java/fr/adrien1106/reframed/block/ReFramedSmallCubeBlock.java similarity index 97% rename from src/main/java/fr/adrien1106/reframed/block/ReFramedSmallBlock.java rename to src/main/java/fr/adrien1106/reframed/block/ReFramedSmallCubeBlock.java index 3d18634..1e43fa0 100644 --- a/src/main/java/fr/adrien1106/reframed/block/ReFramedSmallBlock.java +++ b/src/main/java/fr/adrien1106/reframed/block/ReFramedSmallCubeBlock.java @@ -32,11 +32,11 @@ import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER; import static fr.adrien1106.reframed.util.blocks.Corner.*; import static net.minecraft.data.client.VariantSettings.Rotation.*; -public class ReFramedSmallBlock extends WaterloggableReFramedBlock implements BlockStateProvider { +public class ReFramedSmallCubeBlock extends WaterloggableReFramedBlock implements BlockStateProvider { public static final List SMALL_CUBE_VOXELS = new ArrayList<>(8); - public ReFramedSmallBlock(Settings settings) { + public ReFramedSmallCubeBlock(Settings settings) { super(settings); setDefaultState(getDefaultState().with(CORNER, NORTH_EAST_DOWN)); } diff --git a/src/main/java/fr/adrien1106/reframed/ReFramedDoubleSmallBlock.java b/src/main/java/fr/adrien1106/reframed/block/ReFramedSmallCubesStepBlock.java similarity index 94% rename from src/main/java/fr/adrien1106/reframed/ReFramedDoubleSmallBlock.java rename to src/main/java/fr/adrien1106/reframed/block/ReFramedSmallCubesStepBlock.java index 90c145a..7a50811 100644 --- a/src/main/java/fr/adrien1106/reframed/ReFramedDoubleSmallBlock.java +++ b/src/main/java/fr/adrien1106/reframed/block/ReFramedSmallCubesStepBlock.java @@ -1,6 +1,6 @@ -package fr.adrien1106.reframed; +package fr.adrien1106.reframed.block; -import fr.adrien1106.reframed.block.WaterloggableReFramedDoubleBlock; +import fr.adrien1106.reframed.ReFramed; import fr.adrien1106.reframed.generator.BlockStateProvider; import fr.adrien1106.reframed.generator.GBlockstate; import fr.adrien1106.reframed.util.blocks.BlockHelper; @@ -23,16 +23,16 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import org.jetbrains.annotations.Nullable; -import static fr.adrien1106.reframed.block.ReFramedSmallBlock.SMALL_CUBE_VOXELS; +import static fr.adrien1106.reframed.block.ReFramedSmallCubeBlock.SMALL_CUBE_VOXELS; import static fr.adrien1106.reframed.block.ReFramedStepBlock.getStepShape; import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE; import static fr.adrien1106.reframed.util.blocks.Edge.*; import static net.minecraft.data.client.VariantSettings.Rotation.*; import static net.minecraft.util.shape.VoxelShapes.empty; -public class ReFramedDoubleSmallBlock extends WaterloggableReFramedDoubleBlock implements BlockStateProvider { +public class ReFramedSmallCubesStepBlock extends WaterloggableReFramedDoubleBlock implements BlockStateProvider { - public ReFramedDoubleSmallBlock(Settings settings) { + public ReFramedSmallCubesStepBlock(Settings settings) { super(settings); setDefaultState(getDefaultState().with(EDGE, Edge.NORTH_DOWN)); } diff --git a/src/main/java/fr/adrien1106/reframed/block/ReFramedStairsBlock.java b/src/main/java/fr/adrien1106/reframed/block/ReFramedStairBlock.java similarity index 99% rename from src/main/java/fr/adrien1106/reframed/block/ReFramedStairsBlock.java rename to src/main/java/fr/adrien1106/reframed/block/ReFramedStairBlock.java index 3514c44..3908e53 100644 --- a/src/main/java/fr/adrien1106/reframed/block/ReFramedStairsBlock.java +++ b/src/main/java/fr/adrien1106/reframed/block/ReFramedStairBlock.java @@ -39,12 +39,12 @@ import static fr.adrien1106.reframed.util.blocks.StairShape.*; import static net.minecraft.data.client.VariantSettings.Rotation.*; import static fr.adrien1106.reframed.util.blocks.Edge.*; -public class ReFramedStairsBlock extends WaterloggableReFramedBlock implements BlockStateProvider { +public class ReFramedStairBlock extends WaterloggableReFramedBlock implements BlockStateProvider { public static final List VOXEL_LIST = new ArrayList<>(52); private record ModelCacheKey(Edge edge, StairShape shape) {} - public ReFramedStairsBlock(Settings settings) { + public ReFramedStairBlock(Settings settings) { super(settings); setDefaultState(getDefaultState().with(EDGE, Edge.NORTH_DOWN).with(STAIR_SHAPE, STRAIGHT)); } diff --git a/src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleStairsBlock.java b/src/main/java/fr/adrien1106/reframed/block/ReFramedStairsCubeBlock.java similarity index 97% rename from src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleStairsBlock.java rename to src/main/java/fr/adrien1106/reframed/block/ReFramedStairsCubeBlock.java index c018372..c909f8a 100644 --- a/src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleStairsBlock.java +++ b/src/main/java/fr/adrien1106/reframed/block/ReFramedStairsCubeBlock.java @@ -27,16 +27,16 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -import static fr.adrien1106.reframed.block.ReFramedStairsBlock.*; +import static fr.adrien1106.reframed.block.ReFramedStairBlock.*; import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE; import static fr.adrien1106.reframed.util.blocks.BlockProperties.STAIR_SHAPE; -public class ReFramedDoubleStairsBlock extends ReFramedDoubleBlock implements BlockStateProvider { +public class ReFramedStairsCubeBlock extends ReFramedDoubleBlock implements BlockStateProvider { private static final List COMPLEMENT_LIST = new ArrayList<>(52); private record ModelCacheKey(Edge edge, StairShape shape) {} - public ReFramedDoubleStairsBlock(Settings settings) { + public ReFramedStairsCubeBlock(Settings settings) { super(settings); setDefaultState(getDefaultState().with(EDGE, Edge.NORTH_DOWN).with(STAIR_SHAPE, StairShape.STRAIGHT)); } @@ -207,7 +207,7 @@ public class ReFramedDoubleStairsBlock extends ReFramedDoubleBlock implements Bl RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE); ShapelessRecipeJsonBuilder .create(RecipeCategory.BUILDING_BLOCKS, this) - .input(ReFramed.STAIRS) + .input(ReFramed.STAIR) .input(ReFramed.STEP) .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE)) .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this)) diff --git a/src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleStepBlock.java b/src/main/java/fr/adrien1106/reframed/block/ReFramedStepsSlabBlock.java similarity index 97% rename from src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleStepBlock.java rename to src/main/java/fr/adrien1106/reframed/block/ReFramedStepsSlabBlock.java index b64c782..3b65d2f 100644 --- a/src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleStepBlock.java +++ b/src/main/java/fr/adrien1106/reframed/block/ReFramedStepsSlabBlock.java @@ -31,10 +31,10 @@ import static net.minecraft.state.property.Properties.AXIS; import static net.minecraft.state.property.Properties.FACING; import static net.minecraft.util.shape.VoxelShapes.empty; -public class ReFramedDoubleStepBlock extends WaterloggableReFramedDoubleBlock implements BlockStateProvider { +public class ReFramedStepsSlabBlock extends WaterloggableReFramedDoubleBlock implements BlockStateProvider { private record ModelCacheKey(Direction facing, Axis axis) {} - public ReFramedDoubleStepBlock(Settings settings) { + public ReFramedStepsSlabBlock(Settings settings) { super(settings); setDefaultState(getDefaultState().with(FACING, Direction.DOWN).with(AXIS, Axis.X)); } diff --git a/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java b/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java index 11460e0..329cde9 100644 --- a/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java +++ b/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java @@ -48,13 +48,13 @@ public class ReFramedClient implements ClientModInitializer { //item model assignments (in lieu of models/item/___.json) HELPER.assignItemModel("cube_special" , ReFramed.CUBE); HELPER.assignItemModel("small_cube_special" , ReFramed.SMALL_CUBE); - HELPER.assignItemModel("double_small_cube_special" , ReFramed.DOUBLE_SMALL_CUBE); + HELPER.assignItemModel("double_small_cube_special" , ReFramed.SMALL_CUBES_STEP); HELPER.assignItemModel("slab_special" , ReFramed.SLAB); - HELPER.assignItemModel("double_slab_special" , ReFramed.DOUBLE_SLAB); - HELPER.assignItemModel("stairs_special" , ReFramed.STAIRS); - HELPER.assignItemModel("double_stairs_special" , ReFramed.DOUBLE_STAIRS); + HELPER.assignItemModel("double_slab_special" , ReFramed.SLABS_CUBE); + HELPER.assignItemModel("stairs_special" , ReFramed.STAIR); + HELPER.assignItemModel("double_stairs_special" , ReFramed.STAIRS_CUBE); HELPER.assignItemModel("step_special" , ReFramed.STEP); - HELPER.assignItemModel("double_step_special" , ReFramed.DOUBLE_STEP); + HELPER.assignItemModel("double_step_special" , ReFramed.STEPS_SLAB); } private void privateInit() {