From 3c3684452cf64c7caa532060f28a482db45eadd6 Mon Sep 17 00:00:00 2001 From: Bill Parrott Date: Sat, 19 Oct 2024 23:08:56 -0500 Subject: [PATCH] chore: remove redundant implements notation --- .../minekea/block/building/beams/GenericBeamBlock.java | 3 +-- .../block/building/compressed/GenericCompressedBlock.java | 3 +-- .../minekea/block/building/covers/GenericCoverBlock.java | 3 +-- .../chimericdream/minekea/block/building/dyed/DyedBlock.java | 3 +-- .../minekea/block/building/dyed/DyedPillarBlock.java | 3 +-- .../minekea/block/building/framed/FramedPlanksBlock.java | 3 +-- .../minekea/block/building/general/BasaltBricksBlock.java | 3 +-- .../block/building/general/ChiseledBasaltBricksBlock.java | 3 +-- .../block/building/general/CrackedBasaltBricksBlock.java | 3 +-- .../block/building/general/CrimsonBasaltBricksBlock.java | 3 +-- .../minekea/block/building/general/MossyBasaltBricksBlock.java | 3 +-- .../block/building/general/WarpedBasaltBricksBlock.java | 3 +-- .../block/building/general/WarpedNetherBricksBlock.java | 3 +-- .../chimericdream/minekea/block/building/general/WaxBlock.java | 3 +-- .../minekea/block/building/slabs/GenericSlabBlock.java | 3 +-- .../minekea/block/building/slabs/GenericVerticalSlabBlock.java | 3 +-- .../minekea/block/building/stairs/GenericStairsBlock.java | 3 +-- .../block/building/stairs/GenericVerticalStairsBlock.java | 3 +-- .../chimericdream/minekea/block/building/storage/DyeBlock.java | 3 +-- .../minekea/block/building/storage/GenericStorageBlock.java | 3 +-- .../minekea/block/building/storage/SetOfEggsBlock.java | 3 +-- .../minekea/block/building/walls/GenericWallBlock.java | 3 +-- .../chimericdream/minekea/block/containers/GlassJarBlock.java | 3 +-- .../minekea/block/containers/barrels/GenericBarrel.java | 3 +-- .../minekea/block/containers/crates/GenericCrate.java | 3 +-- .../minekea/block/decorations/candles/GenericVotiveCandle.java | 3 +-- .../minekea/block/decorations/lighting/AncientLantern.java | 3 +-- .../minekea/block/decorations/lighting/DoomLantern.java | 3 +-- .../minekea/block/decorations/lighting/EndLantern.java | 3 +-- .../minekea/block/decorations/lighting/EndlessRod.java | 3 +-- .../chimericdream/minekea/block/decorations/misc/FakeCake.java | 3 +-- .../minekea/block/furniture/armoires/GenericArmoireBlock.java | 3 +-- .../minekea/block/furniture/bookshelves/GenericBookshelf.java | 3 +-- .../block/furniture/displaycases/GenericDisplayCase.java | 3 +-- .../minekea/block/furniture/doors/GenericBookshelfDoor.java | 3 +-- .../minekea/block/furniture/pillows/PillowBlock.java | 3 +-- .../minekea/block/furniture/seating/GenericChair.java | 3 +-- .../minekea/block/furniture/seating/GenericStool.java | 3 +-- .../minekea/block/furniture/shelves/GenericShelf.java | 3 +-- .../minekea/block/furniture/shutters/OpenShutterHalf.java | 3 +-- .../minekea/block/furniture/shutters/ShutterBlock.java | 3 +-- .../minekea/block/furniture/tables/GenericTable.java | 3 +-- .../block/furniture/trapdoors/GenericBookshelfTrapdoor.java | 3 +-- .../com/chimericdream/minekea/crops/WarpedWartPlantBlock.java | 3 +-- 44 files changed, 44 insertions(+), 88 deletions(-) diff --git a/src/main/java/com/chimericdream/minekea/block/building/beams/GenericBeamBlock.java b/src/main/java/com/chimericdream/minekea/block/building/beams/GenericBeamBlock.java index d6cc01d7..11190bfd 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/beams/GenericBeamBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/beams/GenericBeamBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.beams; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -65,7 +64,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericBeamBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericBeamBlock extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { protected static final Model CONNECTED_NORTH_MODEL = makeModel("north"); protected static final Model CONNECTED_SOUTH_MODEL = makeModel("south"); protected static final Model CONNECTED_EAST_MODEL = makeModel("east"); diff --git a/src/main/java/com/chimericdream/minekea/block/building/compressed/GenericCompressedBlock.java b/src/main/java/com/chimericdream/minekea/block/building/compressed/GenericCompressedBlock.java index 886c484b..173b9b97 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/compressed/GenericCompressedBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/compressed/GenericCompressedBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.compressed; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -45,7 +44,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericCompressedBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericCompressedBlock extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { public final Identifier BLOCK_ID; public final BlockConfig config; diff --git a/src/main/java/com/chimericdream/minekea/block/building/covers/GenericCoverBlock.java b/src/main/java/com/chimericdream/minekea/block/building/covers/GenericCoverBlock.java index 713e1be1..f9e894d4 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/covers/GenericCoverBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/covers/GenericCoverBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.covers; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -45,7 +44,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericCoverBlock extends CarpetBlock implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericCoverBlock extends CarpetBlock implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { // yowza public static final Model COVER_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/building/cover")), diff --git a/src/main/java/com/chimericdream/minekea/block/building/dyed/DyedBlock.java b/src/main/java/com/chimericdream/minekea/block/building/dyed/DyedBlock.java index 5a52e922..5f781825 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/dyed/DyedBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/dyed/DyedBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.dyed; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.colors.ColorHelpers; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; @@ -55,7 +54,7 @@ import java.util.Optional; import java.util.function.Function; -public class DyedBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class DyedBlock extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { public static final EnumProperty AXIS; static { diff --git a/src/main/java/com/chimericdream/minekea/block/building/dyed/DyedPillarBlock.java b/src/main/java/com/chimericdream/minekea/block/building/dyed/DyedPillarBlock.java index 1c52d873..67d434e8 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/dyed/DyedPillarBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/dyed/DyedPillarBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.dyed; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.colors.ColorHelpers; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; @@ -61,7 +60,7 @@ import java.util.Optional; import java.util.function.Function; -public class DyedPillarBlock extends PillarBlock implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class DyedPillarBlock extends PillarBlock implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { public static final EnumProperty AXIS; static { diff --git a/src/main/java/com/chimericdream/minekea/block/building/framed/FramedPlanksBlock.java b/src/main/java/com/chimericdream/minekea/block/building/framed/FramedPlanksBlock.java index bd82b71d..bb71931f 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/framed/FramedPlanksBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/framed/FramedPlanksBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.framed; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -47,7 +46,7 @@ import java.util.Optional; import java.util.function.Function; -public class FramedPlanksBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class FramedPlanksBlock extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { protected static final Model CORE_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/building/framed_planks/core")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/building/general/BasaltBricksBlock.java b/src/main/java/com/chimericdream/minekea/block/building/general/BasaltBricksBlock.java index 0e72394a..a7966ee2 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/general/BasaltBricksBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/general/BasaltBricksBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.general; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -26,7 +25,7 @@ import java.util.function.Function; -public class BasaltBricksBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class BasaltBricksBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "building/general/basalt_bricks"); public BasaltBricksBlock() { diff --git a/src/main/java/com/chimericdream/minekea/block/building/general/ChiseledBasaltBricksBlock.java b/src/main/java/com/chimericdream/minekea/block/building/general/ChiseledBasaltBricksBlock.java index 52f011d9..c5ecd163 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/general/ChiseledBasaltBricksBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/general/ChiseledBasaltBricksBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.general; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -28,7 +27,7 @@ import static com.chimericdream.minekea.block.building.BuildingBlocks.BASALT_BRICKS_BLOCK; -public class ChiseledBasaltBricksBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class ChiseledBasaltBricksBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "building/general/chiseled_basalt_bricks"); public ChiseledBasaltBricksBlock() { diff --git a/src/main/java/com/chimericdream/minekea/block/building/general/CrackedBasaltBricksBlock.java b/src/main/java/com/chimericdream/minekea/block/building/general/CrackedBasaltBricksBlock.java index c391233f..de451bf1 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/general/CrackedBasaltBricksBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/general/CrackedBasaltBricksBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.general; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -27,7 +26,7 @@ import static com.chimericdream.minekea.block.building.BuildingBlocks.BASALT_BRICKS_BLOCK; -public class CrackedBasaltBricksBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class CrackedBasaltBricksBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "building/general/cracked_basalt_bricks"); public CrackedBasaltBricksBlock() { diff --git a/src/main/java/com/chimericdream/minekea/block/building/general/CrimsonBasaltBricksBlock.java b/src/main/java/com/chimericdream/minekea/block/building/general/CrimsonBasaltBricksBlock.java index ad5a33cc..6b2e415b 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/general/CrimsonBasaltBricksBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/general/CrimsonBasaltBricksBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.general; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -28,7 +27,7 @@ import static com.chimericdream.minekea.block.building.BuildingBlocks.BASALT_BRICKS_BLOCK; -public class CrimsonBasaltBricksBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class CrimsonBasaltBricksBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "building/general/crimson_basalt_bricks"); public CrimsonBasaltBricksBlock() { diff --git a/src/main/java/com/chimericdream/minekea/block/building/general/MossyBasaltBricksBlock.java b/src/main/java/com/chimericdream/minekea/block/building/general/MossyBasaltBricksBlock.java index d80a1f8e..f04eefa7 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/general/MossyBasaltBricksBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/general/MossyBasaltBricksBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.general; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -28,7 +27,7 @@ import static com.chimericdream.minekea.block.building.BuildingBlocks.BASALT_BRICKS_BLOCK; -public class MossyBasaltBricksBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class MossyBasaltBricksBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "building/general/mossy_basalt_bricks"); public MossyBasaltBricksBlock() { diff --git a/src/main/java/com/chimericdream/minekea/block/building/general/WarpedBasaltBricksBlock.java b/src/main/java/com/chimericdream/minekea/block/building/general/WarpedBasaltBricksBlock.java index d5d21324..7b23f188 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/general/WarpedBasaltBricksBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/general/WarpedBasaltBricksBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.general; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -28,7 +27,7 @@ import static com.chimericdream.minekea.block.building.BuildingBlocks.BASALT_BRICKS_BLOCK; -public class WarpedBasaltBricksBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class WarpedBasaltBricksBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "building/general/warped_basalt_bricks"); public WarpedBasaltBricksBlock() { diff --git a/src/main/java/com/chimericdream/minekea/block/building/general/WarpedNetherBricksBlock.java b/src/main/java/com/chimericdream/minekea/block/building/general/WarpedNetherBricksBlock.java index 655aefb6..62c67d0b 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/general/WarpedNetherBricksBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/general/WarpedNetherBricksBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.general; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -28,7 +27,7 @@ import static com.chimericdream.minekea.crops.Crops.WARPED_WART_ITEM; -public class WarpedNetherBricksBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class WarpedNetherBricksBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "building/general/warped_nether_bricks"); public WarpedNetherBricksBlock() { diff --git a/src/main/java/com/chimericdream/minekea/block/building/general/WaxBlock.java b/src/main/java/com/chimericdream/minekea/block/building/general/WaxBlock.java index f58e716a..e49ffc1a 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/general/WaxBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/general/WaxBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.general; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.colors.ColorHelpers; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; @@ -32,7 +31,7 @@ import java.util.List; import java.util.function.Function; -public class WaxBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class WaxBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public final Identifier BLOCK_ID; protected final String color; diff --git a/src/main/java/com/chimericdream/minekea/block/building/slabs/GenericSlabBlock.java b/src/main/java/com/chimericdream/minekea/block/building/slabs/GenericSlabBlock.java index 98e58801..3da91b72 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/slabs/GenericSlabBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/slabs/GenericSlabBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.slabs; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -36,7 +35,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericSlabBlock extends SlabBlock implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericSlabBlock extends SlabBlock implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { public final Identifier BLOCK_ID; public final BlockConfig config; diff --git a/src/main/java/com/chimericdream/minekea/block/building/slabs/GenericVerticalSlabBlock.java b/src/main/java/com/chimericdream/minekea/block/building/slabs/GenericVerticalSlabBlock.java index 4bfce2c2..e00196df 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/slabs/GenericVerticalSlabBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/slabs/GenericVerticalSlabBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.slabs; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -49,7 +48,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericVerticalSlabBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericVerticalSlabBlock extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { public static final Model VERTICAL_SLAB_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/building/slabs/vertical")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/building/stairs/GenericStairsBlock.java b/src/main/java/com/chimericdream/minekea/block/building/stairs/GenericStairsBlock.java index e6e4d11b..29d5701f 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/stairs/GenericStairsBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/stairs/GenericStairsBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.stairs; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -38,7 +37,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericStairsBlock extends StairsBlock implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericStairsBlock extends StairsBlock implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { public final Identifier BLOCK_ID; public final BlockConfig config; diff --git a/src/main/java/com/chimericdream/minekea/block/building/stairs/GenericVerticalStairsBlock.java b/src/main/java/com/chimericdream/minekea/block/building/stairs/GenericVerticalStairsBlock.java index 4b9b502a..fc20b42e 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/stairs/GenericVerticalStairsBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/stairs/GenericVerticalStairsBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.stairs; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -50,7 +49,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericVerticalStairsBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericVerticalStairsBlock extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { public static final Model VERTICAL_STAIRS_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/building/stairs/vertical")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/building/storage/DyeBlock.java b/src/main/java/com/chimericdream/minekea/block/building/storage/DyeBlock.java index d03cccfd..cf017485 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/storage/DyeBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/storage/DyeBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.storage; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.colors.ColorHelpers; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; @@ -37,7 +36,7 @@ import java.util.Optional; -public class DyeBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class DyeBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { private static final Model DYE_BLOCK_MODEL = new Model( Optional.of(Identifier.of("minekea:block/storage/dye_block")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/building/storage/GenericStorageBlock.java b/src/main/java/com/chimericdream/minekea/block/building/storage/GenericStorageBlock.java index 147a39a3..cace4123 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/storage/GenericStorageBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/storage/GenericStorageBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.storage; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -65,7 +64,7 @@ import java.util.function.Function; import java.util.function.Supplier; -abstract public class GenericStorageBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +abstract public class GenericStorageBlock extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { protected static final Model COMPRESSED_COLUMN_BLOCK_MODEL = new Model( Optional.of(Identifier.of("minekea:block/storage/compressed_column")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/building/storage/SetOfEggsBlock.java b/src/main/java/com/chimericdream/minekea/block/building/storage/SetOfEggsBlock.java index 69375d23..d23cc3af 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/storage/SetOfEggsBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/storage/SetOfEggsBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.building.storage; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -43,7 +42,7 @@ import java.util.function.Function; // @TODO: turn this into a slab-like block with top/bottom/full variations -public class SetOfEggsBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock, Waterloggable { +public class SetOfEggsBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock, Waterloggable { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "storage/set_of_eggs"); public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; diff --git a/src/main/java/com/chimericdream/minekea/block/building/walls/GenericWallBlock.java b/src/main/java/com/chimericdream/minekea/block/building/walls/GenericWallBlock.java index 4e6f2389..012d91a9 100644 --- a/src/main/java/com/chimericdream/minekea/block/building/walls/GenericWallBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/building/walls/GenericWallBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.building.walls; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -38,7 +37,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericWallBlock extends WallBlock implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericWallBlock extends WallBlock implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { public final Identifier BLOCK_ID; public final BlockConfig config; diff --git a/src/main/java/com/chimericdream/minekea/block/containers/GlassJarBlock.java b/src/main/java/com/chimericdream/minekea/block/containers/GlassJarBlock.java index 2d30d0e9..f037d58f 100644 --- a/src/main/java/com/chimericdream/minekea/block/containers/GlassJarBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/containers/GlassJarBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.containers; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -87,7 +86,7 @@ import java.util.function.Function; import java.util.function.UnaryOperator; -public class GlassJarBlock extends BlockWithEntity implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock, Waterloggable { +public class GlassJarBlock extends BlockWithEntity implements FabricBlockDataGenerator, RegisterableBlock, Waterloggable { public static final MapCodec CODEC = createCodec(GlassJarBlock::new); public static final Map ALLOWED_ITEMS = new LinkedHashMap<>(); diff --git a/src/main/java/com/chimericdream/minekea/block/containers/barrels/GenericBarrel.java b/src/main/java/com/chimericdream/minekea/block/containers/barrels/GenericBarrel.java index d196e5d8..81b713ef 100644 --- a/src/main/java/com/chimericdream/minekea/block/containers/barrels/GenericBarrel.java +++ b/src/main/java/com/chimericdream/minekea/block/containers/barrels/GenericBarrel.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.containers.barrels; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -67,7 +66,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericBarrel extends BlockWithEntity implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericBarrel extends BlockWithEntity implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { public static final MapCodec CODEC = createCodec(GenericBarrel::new); public final Identifier BLOCK_ID; diff --git a/src/main/java/com/chimericdream/minekea/block/containers/crates/GenericCrate.java b/src/main/java/com/chimericdream/minekea/block/containers/crates/GenericCrate.java index fddbadd2..3607cb52 100644 --- a/src/main/java/com/chimericdream/minekea/block/containers/crates/GenericCrate.java +++ b/src/main/java/com/chimericdream/minekea/block/containers/crates/GenericCrate.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.containers.crates; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -73,7 +72,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericCrate extends BlockWithEntity implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericCrate extends BlockWithEntity implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { protected static final Model CRATE_MODEL = new Model( Optional.of(Identifier.of("minekea:block/containers/crate")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/decorations/candles/GenericVotiveCandle.java b/src/main/java/com/chimericdream/minekea/block/decorations/candles/GenericVotiveCandle.java index 4cb5dfac..2a886389 100644 --- a/src/main/java/com/chimericdream/minekea/block/decorations/candles/GenericVotiveCandle.java +++ b/src/main/java/com/chimericdream/minekea/block/decorations/candles/GenericVotiveCandle.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.decorations.candles; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.colors.ColorHelpers; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; @@ -41,7 +40,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericVotiveCandle extends CandleBlock implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericVotiveCandle extends CandleBlock implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { protected static final Model VOTIVE_ITEM_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/candles/template_votive_item")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/decorations/lighting/AncientLantern.java b/src/main/java/com/chimericdream/minekea/block/decorations/lighting/AncientLantern.java index 8397ee5c..ea1ee7d9 100644 --- a/src/main/java/com/chimericdream/minekea/block/decorations/lighting/AncientLantern.java +++ b/src/main/java/com/chimericdream/minekea/block/decorations/lighting/AncientLantern.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.decorations.lighting; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -29,7 +28,7 @@ import java.util.function.Function; -public class AncientLantern extends LanternBlock implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class AncientLantern extends LanternBlock implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "decorations/lighting/ancient_lantern"); public AncientLantern() { diff --git a/src/main/java/com/chimericdream/minekea/block/decorations/lighting/DoomLantern.java b/src/main/java/com/chimericdream/minekea/block/decorations/lighting/DoomLantern.java index 41c37daf..562e8d08 100644 --- a/src/main/java/com/chimericdream/minekea/block/decorations/lighting/DoomLantern.java +++ b/src/main/java/com/chimericdream/minekea/block/decorations/lighting/DoomLantern.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.decorations.lighting; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -29,7 +28,7 @@ import java.util.function.Function; -public class DoomLantern extends LanternBlock implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class DoomLantern extends LanternBlock implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "decorations/lighting/doom_lantern"); public DoomLantern() { diff --git a/src/main/java/com/chimericdream/minekea/block/decorations/lighting/EndLantern.java b/src/main/java/com/chimericdream/minekea/block/decorations/lighting/EndLantern.java index e4d5b7b3..4bfc326f 100644 --- a/src/main/java/com/chimericdream/minekea/block/decorations/lighting/EndLantern.java +++ b/src/main/java/com/chimericdream/minekea/block/decorations/lighting/EndLantern.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.decorations.lighting; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -29,7 +28,7 @@ import java.util.function.Function; -public class EndLantern extends LanternBlock implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class EndLantern extends LanternBlock implements FabricBlockDataGenerator, RegisterableBlock { public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "decorations/lighting/end_lantern"); public EndLantern() { diff --git a/src/main/java/com/chimericdream/minekea/block/decorations/lighting/EndlessRod.java b/src/main/java/com/chimericdream/minekea/block/decorations/lighting/EndlessRod.java index b475cc03..dd5f6043 100644 --- a/src/main/java/com/chimericdream/minekea/block/decorations/lighting/EndlessRod.java +++ b/src/main/java/com/chimericdream/minekea/block/decorations/lighting/EndlessRod.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.decorations.lighting; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -30,7 +29,7 @@ import net.minecraft.util.math.random.Random; import net.minecraft.world.World; -public class EndlessRod extends RodBlock implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class EndlessRod extends RodBlock implements FabricBlockDataGenerator, RegisterableBlock { public final static Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "decorations/lighting/endless_rod"); public static final MapCodec CODEC = createCodec(EndlessRod::new); diff --git a/src/main/java/com/chimericdream/minekea/block/decorations/misc/FakeCake.java b/src/main/java/com/chimericdream/minekea/block/decorations/misc/FakeCake.java index 66f30a95..4ea80280 100644 --- a/src/main/java/com/chimericdream/minekea/block/decorations/misc/FakeCake.java +++ b/src/main/java/com/chimericdream/minekea/block/decorations/misc/FakeCake.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.decorations.misc; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -46,7 +45,7 @@ import java.util.List; import java.util.function.Function; -public class FakeCake extends CakeBlock implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class FakeCake extends CakeBlock implements FabricBlockDataGenerator, RegisterableBlock { public final static String TOOLTIP_KEY = "block.minekea.decorations.misc.fake_cake.tooltip"; public final static Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "decorations/misc/fake_cake"); diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/armoires/GenericArmoireBlock.java b/src/main/java/com/chimericdream/minekea/block/furniture/armoires/GenericArmoireBlock.java index 2268c4b8..660fce2e 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/armoires/GenericArmoireBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/armoires/GenericArmoireBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.armoires; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -71,7 +70,7 @@ import static com.chimericdream.minekea.item.MinekeaItemGroups.FURNITURE_ITEM_GROUP_KEY; -public class GenericArmoireBlock extends BlockWithEntity implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericArmoireBlock extends BlockWithEntity implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { protected static final Model BOTTOM_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/furniture/armoires/bottom")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/bookshelves/GenericBookshelf.java b/src/main/java/com/chimericdream/minekea/block/furniture/bookshelves/GenericBookshelf.java index d40ffb25..cf72ac1f 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/bookshelves/GenericBookshelf.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/bookshelves/GenericBookshelf.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.bookshelves; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -35,7 +34,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericBookshelf extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericBookshelf extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { protected static final Model BOOKSHELF_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/furniture/bookshelves/bookshelf")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/displaycases/GenericDisplayCase.java b/src/main/java/com/chimericdream/minekea/block/furniture/displaycases/GenericDisplayCase.java index 92cfb2cc..056882e9 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/displaycases/GenericDisplayCase.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/displaycases/GenericDisplayCase.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.displaycases; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -65,7 +64,7 @@ import static com.chimericdream.minekea.item.MinekeaItemGroups.FURNITURE_ITEM_GROUP_KEY; -public class GenericDisplayCase extends BlockWithEntity implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericDisplayCase extends BlockWithEntity implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { private static final Model DISPLAY_CASE_MODEL = new Model( Optional.of(Identifier.of("minekea:block/furniture/display_case")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/doors/GenericBookshelfDoor.java b/src/main/java/com/chimericdream/minekea/block/furniture/doors/GenericBookshelfDoor.java index 35df378e..0e5008d6 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/doors/GenericBookshelfDoor.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/doors/GenericBookshelfDoor.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.doors; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -41,7 +40,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericBookshelfDoor extends DoorBlock implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericBookshelfDoor extends DoorBlock implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { protected static final Model ITEM_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "item/furniture/doors/bookshelf")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/pillows/PillowBlock.java b/src/main/java/com/chimericdream/minekea/block/furniture/pillows/PillowBlock.java index 44b3280f..826172e5 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/pillows/PillowBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/pillows/PillowBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.block.furniture.pillows; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.colors.ColorHelpers; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; @@ -40,7 +39,7 @@ import static com.chimericdream.minekea.item.MinekeaItemGroups.FURNITURE_ITEM_GROUP_KEY; -public class PillowBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class PillowBlock extends Block implements FabricBlockDataGenerator, RegisterableBlock { public final Identifier BLOCK_ID; protected final String color; diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericChair.java b/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericChair.java index 47313615..775cd458 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericChair.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericChair.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.seating; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.entities.SimpleSeatEntity; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; @@ -61,7 +60,7 @@ import static com.chimericdream.minekea.item.MinekeaItemGroups.FURNITURE_ITEM_GROUP_KEY; -public class GenericChair extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericChair extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { protected static final Model CHAIR_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/furniture/seating/chair")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericStool.java b/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericStool.java index ef3aa44e..bd0bf9fa 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericStool.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/seating/GenericStool.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.seating; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.entities.SimpleSeatEntity; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; @@ -54,7 +53,7 @@ import static com.chimericdream.minekea.item.MinekeaItemGroups.FURNITURE_ITEM_GROUP_KEY; -public class GenericStool extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericStool extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { protected static final Model STOOL_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/furniture/seating/stool")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/shelves/GenericShelf.java b/src/main/java/com/chimericdream/minekea/block/furniture/shelves/GenericShelf.java index 623f4a5b..719fe81e 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/shelves/GenericShelf.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/shelves/GenericShelf.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.shelves; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -65,7 +64,7 @@ import static com.chimericdream.minekea.item.MinekeaItemGroups.FURNITURE_ITEM_GROUP_KEY; -public class GenericShelf extends BlockWithEntity implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericShelf extends BlockWithEntity implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { protected static final Model SHELF_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/furniture/shelves/supported")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/shutters/OpenShutterHalf.java b/src/main/java/com/chimericdream/minekea/block/furniture/shutters/OpenShutterHalf.java index df3eca80..73afb854 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/shutters/OpenShutterHalf.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/shutters/OpenShutterHalf.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.shutters; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.registries.FabricRegistryHelpers; @@ -59,7 +58,7 @@ import static com.chimericdream.minekea.block.furniture.shutters.Shutters.SHUTTERS; -public class OpenShutterHalf extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class OpenShutterHalf extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { protected static final Model LEFT_HALF_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/furniture/shutters/left_half")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/shutters/ShutterBlock.java b/src/main/java/com/chimericdream/minekea/block/furniture/shutters/ShutterBlock.java index e895fb73..dd487998 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/shutters/ShutterBlock.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/shutters/ShutterBlock.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.shutters; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -63,7 +62,7 @@ import static com.chimericdream.minekea.item.MinekeaItemGroups.FURNITURE_ITEM_GROUP_KEY; -public class ShutterBlock extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class ShutterBlock extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { protected static final Model CLOSED_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/furniture/shutters/closed")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/tables/GenericTable.java b/src/main/java/com/chimericdream/minekea/block/furniture/tables/GenericTable.java index 9c127a8d..f709ab41 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/tables/GenericTable.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/tables/GenericTable.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.tables; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -57,7 +56,7 @@ import static com.chimericdream.minekea.item.MinekeaItemGroups.FURNITURE_ITEM_GROUP_KEY; -public class GenericTable extends Block implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { +public class GenericTable extends Block implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock, Waterloggable { public static final String TOOLTIP_KEY = "block.minekea.furniture.tables.tooltip"; protected static final Model CORE_MODEL = new Model( diff --git a/src/main/java/com/chimericdream/minekea/block/furniture/trapdoors/GenericBookshelfTrapdoor.java b/src/main/java/com/chimericdream/minekea/block/furniture/trapdoors/GenericBookshelfTrapdoor.java index 9c093c4a..f599d47f 100644 --- a/src/main/java/com/chimericdream/minekea/block/furniture/trapdoors/GenericBookshelfTrapdoor.java +++ b/src/main/java/com/chimericdream/minekea/block/furniture/trapdoors/GenericBookshelfTrapdoor.java @@ -1,7 +1,6 @@ package com.chimericdream.minekea.block.furniture.trapdoors; import com.chimericdream.lib.blocks.BlockConfig; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.fabric.blocks.FabricItemGroupEventHelpers; @@ -38,7 +37,7 @@ import java.util.Optional; import java.util.function.Function; -public class GenericBookshelfTrapdoor extends TrapdoorBlock implements BlockDataGenerator, FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { +public class GenericBookshelfTrapdoor extends TrapdoorBlock implements FabricBlockDataGenerator, ModConfigurable, RegisterableBlock { protected static final Model BOTTOM_MODEL = new Model( Optional.of(Identifier.of(ModInfo.MOD_ID, "block/furniture/trapdoors/bookshelves/bottom")), Optional.empty(), diff --git a/src/main/java/com/chimericdream/minekea/crops/WarpedWartPlantBlock.java b/src/main/java/com/chimericdream/minekea/crops/WarpedWartPlantBlock.java index 9ef236fe..ad4de954 100644 --- a/src/main/java/com/chimericdream/minekea/crops/WarpedWartPlantBlock.java +++ b/src/main/java/com/chimericdream/minekea/crops/WarpedWartPlantBlock.java @@ -1,6 +1,5 @@ package com.chimericdream.minekea.crops; -import com.chimericdream.lib.blocks.BlockDataGenerator; import com.chimericdream.lib.blocks.RegisterableBlock; import com.chimericdream.lib.fabric.blocks.FabricBlockDataGenerator; import com.chimericdream.lib.registries.RegistryHelpers; @@ -43,7 +42,7 @@ import static com.chimericdream.minekea.crops.Crops.WARPED_WART_ITEM; -public class WarpedWartPlantBlock extends PlantBlock implements BlockDataGenerator, FabricBlockDataGenerator, RegisterableBlock { +public class WarpedWartPlantBlock extends PlantBlock implements FabricBlockDataGenerator, RegisterableBlock { public static final MapCodec CODEC = createCodec(_unused -> new WarpedWartPlantBlock()); public static final Identifier BLOCK_ID = Identifier.of(ModInfo.MOD_ID, "crops/warped_wart/block");