diff --git a/src/main/java/org/betterx/betterend/blocks/AmberBlock.java b/src/main/java/org/betterx/betterend/blocks/AmberBlock.java index ec5ad231..c136385e 100644 --- a/src/main/java/org/betterx/betterend/blocks/AmberBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/AmberBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.bclib.blocks.BaseBlock; import net.minecraft.world.level.block.Blocks; @@ -7,7 +8,7 @@ import net.minecraft.world.level.material.MapColor; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -public class AmberBlock extends BaseBlock { +public class AmberBlock extends BaseBlock implements BehaviourStone { public AmberBlock() { super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.COLOR_YELLOW)); } diff --git a/src/main/java/org/betterx/betterend/blocks/AncientEmeraldIceBlock.java b/src/main/java/org/betterx/betterend/blocks/AncientEmeraldIceBlock.java index 1ade5057..55ba0116 100644 --- a/src/main/java/org/betterx/betterend/blocks/AncientEmeraldIceBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/AncientEmeraldIceBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourIce; import org.betterx.bclib.blocks.BaseBlock; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; @@ -25,7 +26,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; -public class AncientEmeraldIceBlock extends BaseBlock { +public class AncientEmeraldIceBlock extends BaseBlock implements BehaviourIce { public AncientEmeraldIceBlock() { super(FabricBlockSettings.copyOf(Blocks.BLUE_ICE).randomTicks()); } diff --git a/src/main/java/org/betterx/betterend/blocks/BrimstoneBlock.java b/src/main/java/org/betterx/betterend/blocks/BrimstoneBlock.java index 59bb998a..878ece03 100644 --- a/src/main/java/org/betterx/betterend/blocks/BrimstoneBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/BrimstoneBlock.java @@ -26,7 +26,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import org.jetbrains.annotations.Nullable; -public class BrimstoneBlock extends BaseBlock { +public class BrimstoneBlock extends BaseBlock.Stone { public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE; public BrimstoneBlock() { diff --git a/src/main/java/org/betterx/betterend/blocks/CharcoalBlock.java b/src/main/java/org/betterx/betterend/blocks/CharcoalBlock.java index 11e12b5b..4a6d389c 100644 --- a/src/main/java/org/betterx/betterend/blocks/CharcoalBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/CharcoalBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.bclib.blocks.BaseBlock; import org.betterx.bclib.interfaces.Fuel; @@ -7,7 +8,7 @@ import net.minecraft.world.level.block.Blocks; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -public class CharcoalBlock extends BaseBlock implements Fuel { +public class CharcoalBlock extends BaseBlock implements Fuel, BehaviourStone { public CharcoalBlock() { super(FabricBlockSettings.copyOf(Blocks.COAL_BLOCK)); } diff --git a/src/main/java/org/betterx/betterend/blocks/DenseEmeraldIceBlock.java b/src/main/java/org/betterx/betterend/blocks/DenseEmeraldIceBlock.java index 0f94d7b9..612d87cd 100644 --- a/src/main/java/org/betterx/betterend/blocks/DenseEmeraldIceBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/DenseEmeraldIceBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourIce; import org.betterx.bclib.blocks.BaseBlock; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.RenderLayerProvider; @@ -17,7 +18,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; -public class DenseEmeraldIceBlock extends BaseBlock implements RenderLayerProvider { +public class DenseEmeraldIceBlock extends BaseBlock implements RenderLayerProvider, BehaviourIce { public DenseEmeraldIceBlock() { super(FabricBlockSettings.copyOf(Blocks.PACKED_ICE)); } diff --git a/src/main/java/org/betterx/betterend/blocks/EmeraldIceBlock.java b/src/main/java/org/betterx/betterend/blocks/EmeraldIceBlock.java index 24af54d1..d2a74bb2 100644 --- a/src/main/java/org/betterx/betterend/blocks/EmeraldIceBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EmeraldIceBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourIce; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.BlockModelProvider; import org.betterx.bclib.interfaces.RenderLayerProvider; @@ -30,7 +31,7 @@ import java.util.Collections; import java.util.List; import org.jetbrains.annotations.Nullable; -public class EmeraldIceBlock extends HalfTransparentBlock implements RenderLayerProvider, BlockModelProvider { +public class EmeraldIceBlock extends HalfTransparentBlock implements RenderLayerProvider, BlockModelProvider, BehaviourIce { public EmeraldIceBlock() { super(FabricBlockSettings.copyOf(Blocks.ICE)); } diff --git a/src/main/java/org/betterx/betterend/blocks/EndLotusStemBlock.java b/src/main/java/org/betterx/betterend/blocks/EndLotusStemBlock.java index 32dfebd8..28dd1232 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndLotusStemBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndLotusStemBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourWood; import org.betterx.bclib.blocks.BaseBlock; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties.TripleShape; @@ -30,7 +31,7 @@ import com.google.common.collect.Maps; import java.util.Map; -public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlock, RenderLayerProvider { +public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlock, RenderLayerProvider, BehaviourWood { public static final EnumProperty FACING = BlockStateProperties.FACING; public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final BooleanProperty LEAF = BooleanProperty.create("leaf"); diff --git a/src/main/java/org/betterx/betterend/blocks/EndPedestal.java b/src/main/java/org/betterx/betterend/blocks/EndPedestal.java index ac60ec17..a3f25aef 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndPedestal.java +++ b/src/main/java/org/betterx/betterend/blocks/EndPedestal.java @@ -1,5 +1,8 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourMetal; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; +import org.betterx.bclib.behaviours.interfaces.BehaviourWood; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.blocks.basis.PedestalBlock; @@ -11,9 +14,9 @@ import com.google.common.collect.Maps; import java.util.Map; -public class EndPedestal extends PedestalBlock { +public abstract class EndPedestal extends PedestalBlock { - public EndPedestal(Block parent) { + protected EndPedestal(Block parent) { super(parent); } @@ -29,4 +32,25 @@ public class EndPedestal extends PedestalBlock { textures.put("%bottom%", name + "_polished"); return textures; } + + public static class Stone extends EndPedestal implements BehaviourStone { + public Stone(Block parent) { + super(parent); + } + + } + + public static class Wood extends EndPedestal implements BehaviourWood { + public Wood(Block parent) { + super(parent); + } + + } + + public static class Metal extends EndPedestal implements BehaviourMetal { + public Metal(Block parent) { + super(parent); + } + + } } diff --git a/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java b/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java index 1e5c6522..87172bfa 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndstoneDustBlock.java @@ -1,7 +1,7 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourSand; import org.betterx.bclib.interfaces.TagProvider; -import org.betterx.bclib.interfaces.tools.AddMineableShovel; import org.betterx.ui.ColorUtil; import org.betterx.worlds.together.tag.v3.CommonBlockTags; @@ -23,7 +23,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; -public class EndstoneDustBlock extends FallingBlock implements TagProvider, AddMineableShovel { +public class EndstoneDustBlock extends FallingBlock implements TagProvider, BehaviourSand { @Environment(EnvType.CLIENT) private static final int COLOR = ColorUtil.color(226, 239, 168); diff --git a/src/main/java/org/betterx/betterend/blocks/EternalPedestal.java b/src/main/java/org/betterx/betterend/blocks/EternalPedestal.java index 2a96e2cc..e2d8b742 100644 --- a/src/main/java/org/betterx/betterend/blocks/EternalPedestal.java +++ b/src/main/java/org/betterx/betterend/blocks/EternalPedestal.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.betterend.blocks.basis.PedestalBlock; import org.betterx.betterend.blocks.entities.EternalPedestalEntity; import org.betterx.betterend.registry.EndBlocks; @@ -29,7 +30,7 @@ import com.google.common.collect.Lists; import java.util.List; -public class EternalPedestal extends PedestalBlock { +public class EternalPedestal extends PedestalBlock implements BehaviourStone { public static final BooleanProperty ACTIVATED = EndBlockProperties.ACTIVE; public EternalPedestal() { diff --git a/src/main/java/org/betterx/betterend/blocks/FlowerPotBlock.java b/src/main/java/org/betterx/betterend/blocks/FlowerPotBlock.java index 1e43dc81..93af8925 100644 --- a/src/main/java/org/betterx/betterend/blocks/FlowerPotBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/FlowerPotBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.bclib.blocks.BaseBlockNotFull; import org.betterx.bclib.client.models.BasePatterns; import org.betterx.bclib.client.models.ModelsHelper; @@ -453,6 +454,12 @@ public class FlowerPotBlock extends BaseBlockNotFull implements RenderLayerProvi return BCLRenderLayer.CUTOUT; } + public static class Stone extends FlowerPotBlock implements BehaviourStone { + public Stone(Block source) { + super(source); + } + } + static { SHAPE_EMPTY = Shapes.or(Block.box(4, 1, 4, 12, 8, 12), Block.box(5, 0, 5, 11, 1, 11)); SHAPE_FULL = Shapes.or(SHAPE_EMPTY, Block.box(3, 8, 3, 13, 16, 13)); diff --git a/src/main/java/org/betterx/betterend/blocks/InfusionPedestal.java b/src/main/java/org/betterx/betterend/blocks/InfusionPedestal.java index ca04431b..a0799214 100644 --- a/src/main/java/org/betterx/betterend/blocks/InfusionPedestal.java +++ b/src/main/java/org/betterx/betterend/blocks/InfusionPedestal.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.betterend.blocks.basis.PedestalBlock; import org.betterx.betterend.blocks.entities.InfusionPedestalEntity; import org.betterx.betterend.rituals.InfusionRitual; @@ -21,7 +22,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; @SuppressWarnings("deprecation") -public class InfusionPedestal extends PedestalBlock { +public class InfusionPedestal extends PedestalBlock implements BehaviourStone { private static final VoxelShape SHAPE_DEFAULT; private static final VoxelShape SHAPE_PEDESTAL_TOP; diff --git a/src/main/java/org/betterx/betterend/blocks/MissingTileBlock.java b/src/main/java/org/betterx/betterend/blocks/MissingTileBlock.java index bf543766..13ded5fe 100644 --- a/src/main/java/org/betterx/betterend/blocks/MissingTileBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/MissingTileBlock.java @@ -1,12 +1,13 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.bclib.blocks.BaseBlock; import net.minecraft.world.level.block.Blocks; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -public class MissingTileBlock extends BaseBlock { +public class MissingTileBlock extends BaseBlock implements BehaviourStone { public MissingTileBlock() { super(FabricBlockSettings.copyOf(Blocks.END_STONE)); } diff --git a/src/main/java/org/betterx/betterend/blocks/MossyDragonBoneBlock.java b/src/main/java/org/betterx/betterend/blocks/MossyDragonBoneBlock.java index 93f11c6a..f0eb5086 100644 --- a/src/main/java/org/betterx/betterend/blocks/MossyDragonBoneBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/MossyDragonBoneBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.bclib.blocks.BaseRotatedPillarBlock; import org.betterx.betterend.registry.EndBlocks; @@ -24,7 +25,7 @@ import java.util.Collections; import java.util.List; @SuppressWarnings("deprecation") -public class MossyDragonBoneBlock extends BaseRotatedPillarBlock { +public class MossyDragonBoneBlock extends BaseRotatedPillarBlock implements BehaviourStone { public MossyDragonBoneBlock() { super(FabricBlockSettings.copyOf(Blocks.BONE_BLOCK).hardness(0.5F).randomTicks()); } diff --git a/src/main/java/org/betterx/betterend/blocks/MossyObsidian.java b/src/main/java/org/betterx/betterend/blocks/MossyObsidian.java index feec82e1..70de39df 100644 --- a/src/main/java/org/betterx/betterend/blocks/MossyObsidian.java +++ b/src/main/java/org/betterx/betterend/blocks/MossyObsidian.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourObsidian; import org.betterx.bclib.blocks.BaseBlock; import net.minecraft.core.BlockPos; @@ -22,7 +23,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import java.util.Collections; import java.util.List; -public class MossyObsidian extends BaseBlock { +public class MossyObsidian extends BaseBlock implements BehaviourObsidian { public MossyObsidian() { super(FabricBlockSettings.copyOf(Blocks.OBSIDIAN).hardness(3).randomTicks()); } diff --git a/src/main/java/org/betterx/betterend/blocks/PedestalVanilla.java b/src/main/java/org/betterx/betterend/blocks/PedestalVanilla.java index 9e0f3519..5fccafe8 100644 --- a/src/main/java/org/betterx/betterend/blocks/PedestalVanilla.java +++ b/src/main/java/org/betterx/betterend/blocks/PedestalVanilla.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.betterend.blocks.basis.PedestalBlock; import net.minecraft.core.registries.BuiltInRegistries; @@ -9,7 +10,7 @@ import net.minecraft.world.level.block.Block; import java.util.HashMap; import java.util.Map; -public class PedestalVanilla extends PedestalBlock { +public class PedestalVanilla extends PedestalBlock implements BehaviourStone { public PedestalVanilla(Block parent) { super(parent); diff --git a/src/main/java/org/betterx/betterend/blocks/RunedFlavolite.java b/src/main/java/org/betterx/betterend/blocks/RunedFlavolite.java index 592a0819..fb483743 100644 --- a/src/main/java/org/betterx/betterend/blocks/RunedFlavolite.java +++ b/src/main/java/org/betterx/betterend/blocks/RunedFlavolite.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import java.util.List; -public class RunedFlavolite extends BaseBlock { +public class RunedFlavolite extends BaseBlock.Stone { public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE; public RunedFlavolite(boolean unbreakable) { diff --git a/src/main/java/org/betterx/betterend/blocks/UmbrellaTreeMembraneBlock.java b/src/main/java/org/betterx/betterend/blocks/UmbrellaTreeMembraneBlock.java index 84c45df1..1c957def 100644 --- a/src/main/java/org/betterx/betterend/blocks/UmbrellaTreeMembraneBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/UmbrellaTreeMembraneBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks; +import org.betterx.bclib.behaviours.interfaces.BehaviourLeaves; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.BlockModelProvider; import org.betterx.bclib.interfaces.RenderLayerProvider; @@ -31,7 +32,7 @@ import com.google.common.collect.Lists; import java.util.Collections; import java.util.List; -public class UmbrellaTreeMembraneBlock extends SlimeBlock implements RenderLayerProvider, BlockModelProvider { +public class UmbrellaTreeMembraneBlock extends SlimeBlock implements RenderLayerProvider, BlockModelProvider, BehaviourLeaves { public static final IntegerProperty COLOR = EndBlockProperties.COLOR; private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0); diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndAnvilBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndAnvilBlock.java index facaff87..b0e0f644 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndAnvilBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndAnvilBlock.java @@ -1,11 +1,12 @@ package org.betterx.betterend.blocks.basis; +import org.betterx.bclib.behaviours.interfaces.BehaviourMetal; import org.betterx.bclib.blocks.LeveledAnvilBlock; import org.betterx.betterend.complexmaterials.MetalMaterial; import net.minecraft.world.level.material.MapColor; -public class EndAnvilBlock extends LeveledAnvilBlock { +public class EndAnvilBlock extends LeveledAnvilBlock implements BehaviourMetal { protected MetalMaterial metalMaterial; public EndAnvilBlock(MapColor color, int level) { diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java index 00bd5a9b..ac0e5e29 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java @@ -1,5 +1,6 @@ package org.betterx.betterend.blocks.basis; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.bclib.blocks.BaseTerrainBlock; import org.betterx.bclib.interfaces.TagProvider; import org.betterx.betterend.interfaces.PottableTerrain; @@ -13,7 +14,7 @@ import net.minecraft.world.level.material.MapColor; import java.util.List; -public class EndTerrainBlock extends BaseTerrainBlock implements PottableTerrain, TagProvider { +public class EndTerrainBlock extends BaseTerrainBlock implements PottableTerrain, TagProvider, BehaviourStone { public EndTerrainBlock(MapColor color) { super(Blocks.END_STONE, color); } diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndTripleTerrain.java b/src/main/java/org/betterx/betterend/blocks/basis/EndTripleTerrain.java index a7f8e1ed..db23fe2d 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndTripleTerrain.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndTripleTerrain.java @@ -1,12 +1,13 @@ package org.betterx.betterend.blocks.basis; +import org.betterx.bclib.behaviours.interfaces.BehaviourStone; import org.betterx.bclib.blocks.TripleTerrainBlock; import org.betterx.betterend.interfaces.PottableTerrain; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.MapColor; -public class EndTripleTerrain extends TripleTerrainBlock implements PottableTerrain { +public class EndTripleTerrain extends TripleTerrainBlock implements PottableTerrain, BehaviourStone { public EndTripleTerrain(MapColor color) { super(Blocks.END_STONE, color); } diff --git a/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java index 93042d9b..1b82996e 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java @@ -39,7 +39,7 @@ public class CrystalSubblocksMaterial { stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock.Stone(source)); slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Stone(source)); wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock.Stone(source)); - pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(source)); + pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal.Stone(source)); bricks = EndBlocks.registerBlock(name + "_bricks", new LitBaseBlock(material)); brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock.Stone(bricks)); brick_slab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock.Stone(bricks)); diff --git a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java index 09c65eb5..686fd471 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java @@ -202,8 +202,8 @@ public class MetalMaterial { slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Metal(tile)); door = EndBlocks.registerBlock(name + "_door", new BaseDoorBlock.Metal(block, BlockSetType.IRON)); trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new BaseTrapdoorBlock.Metal(block, BlockSetType.IRON)); - bars = EndBlocks.registerBlock(name + "_bars", new BaseMetalBarsBlock(block)); - chain = EndBlocks.registerBlock(name + "_chain", new BaseChainBlock(block.defaultMapColor())); + bars = EndBlocks.registerBlock(name + "_bars", new BaseBarsBlock.Metal(block)); + chain = EndBlocks.registerBlock(name + "_chain", new BaseChainBlock.Metal(block.defaultMapColor())); pressurePlate = EndBlocks.registerBlock( name + "_plate", new BasePressurePlateBlock.Wood(block, BlockSetType.IRON) diff --git a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java index eb08e51a..a591c7c2 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java @@ -52,9 +52,9 @@ public class StoneMaterial { FabricBlockSettings material = createMaterial(color); this.baseName = name; - stone = EndBlocks.registerBlock(name, new BaseBlock(material)); - polished = EndBlocks.registerBlock(name + "_polished", new BaseBlock(material)); - tiles = EndBlocks.registerBlock(name + "_tiles", new BaseBlock(material)); + stone = EndBlocks.registerBlock(name, new BaseBlock.Stone(material)); + polished = EndBlocks.registerBlock(name + "_polished", new BaseBlock.Stone(material)); + tiles = EndBlocks.registerBlock(name + "_tiles", new BaseBlock.Stone(material)); pillar = EndBlocks.registerBlock(name + "_pillar", new BaseRotatedPillarBlock.Stone(material)); stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock.Stone(stone)); slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Stone(stone)); @@ -64,15 +64,15 @@ public class StoneMaterial { name + "_plate", new BasePressurePlateBlock.Stone(stone, BlockSetType.STONE) ); - pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(stone)); + pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal.Stone(stone)); lantern = EndBlocks.registerBlock(name + "_lantern", new StoneLanternBlock(stone)); - bricks = EndBlocks.registerBlock(name + "_bricks", new BaseBlock(material)); + bricks = EndBlocks.registerBlock(name + "_bricks", new BaseBlock.Stone(material)); brickStairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock.Stone(bricks)); brickSlab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock.Stone(bricks)); brickWall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock.Stone(bricks)); - furnace = EndBlocks.registerBlock(name + "_furnace", new BaseFurnaceBlock(bricks)); - flowerPot = EndBlocks.registerBlock(name + "_flower_pot", new FlowerPotBlock(bricks)); + furnace = EndBlocks.registerBlock(name + "_furnace", new BaseFurnaceBlock.Stone(bricks)); + flowerPot = EndBlocks.registerBlock(name + "_flower_pot", new FlowerPotBlock.Stone(bricks)); // Recipes // BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks"), bricks) diff --git a/src/main/java/org/betterx/betterend/registry/EndBlocks.java b/src/main/java/org/betterx/betterend/registry/EndBlocks.java index 9bfed329..e5cbc8ef 100644 --- a/src/main/java/org/betterx/betterend/registry/EndBlocks.java +++ b/src/main/java/org/betterx/betterend/registry/EndBlocks.java @@ -120,20 +120,32 @@ public class EndBlocks { ); // Roads // - public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new BasePathBlock(END_MYCELIUM)); - public static final Block END_MOSS_PATH = registerBlock("end_moss_path", new BasePathBlock(END_MOSS)); + public static final Block END_MYCELIUM_PATH = registerBlock( + "end_mycelium_path", + new BasePathBlock.Stone(END_MYCELIUM) + ); + public static final Block END_MOSS_PATH = registerBlock("end_moss_path", new BasePathBlock.Stone(END_MOSS)); public static final Block CHORUS_NYLIUM_PATH = registerBlock( "chorus_nylium_path", - new BasePathBlock(CHORUS_NYLIUM) + new BasePathBlock.Stone(CHORUS_NYLIUM) ); - public static final Block CAVE_MOSS_PATH = registerBlock("cave_moss_path", new BasePathBlock(CAVE_MOSS)); - public static final Block CRYSTAL_MOSS_PATH = registerBlock("crystal_moss_path", new BasePathBlock(CRYSTAL_MOSS)); - public static final Block SHADOW_GRASS_PATH = registerBlock("shadow_grass_path", new BasePathBlock(SHADOW_GRASS)); - public static final Block PINK_MOSS_PATH = registerBlock("pink_moss_path", new BasePathBlock(PINK_MOSS)); - public static final Block AMBER_MOSS_PATH = registerBlock("amber_moss_path", new BasePathBlock(AMBER_MOSS)); - public static final Block JUNGLE_MOSS_PATH = registerBlock("jungle_moss_path", new BasePathBlock(JUNGLE_MOSS)); - public static final Block SANGNUM_PATH = registerBlock("sangnum_path", new BasePathBlock(SANGNUM)); - public static final Block RUTISCUS_PATH = registerBlock("rutiscus_path", new BasePathBlock(RUTISCUS)); + public static final Block CAVE_MOSS_PATH = registerBlock("cave_moss_path", new BasePathBlock.Stone(CAVE_MOSS)); + public static final Block CRYSTAL_MOSS_PATH = registerBlock( + "crystal_moss_path", + new BasePathBlock.Stone(CRYSTAL_MOSS) + ); + public static final Block SHADOW_GRASS_PATH = registerBlock( + "shadow_grass_path", + new BasePathBlock.Stone(SHADOW_GRASS) + ); + public static final Block PINK_MOSS_PATH = registerBlock("pink_moss_path", new BasePathBlock.Stone(PINK_MOSS)); + public static final Block AMBER_MOSS_PATH = registerBlock("amber_moss_path", new BasePathBlock.Stone(AMBER_MOSS)); + public static final Block JUNGLE_MOSS_PATH = registerBlock( + "jungle_moss_path", + new BasePathBlock.Stone(JUNGLE_MOSS) + ); + public static final Block SANGNUM_PATH = registerBlock("sangnum_path", new BasePathBlock.Stone(SANGNUM)); + public static final Block RUTISCUS_PATH = registerBlock("rutiscus_path", new BasePathBlock.Stone(RUTISCUS)); public static final Block MOSSY_OBSIDIAN = registerBlock( "mossy_obsidian", @@ -178,7 +190,7 @@ public class EndBlocks { public static final Block MISSING_TILE = registerBlock("missing_tile", new MissingTileBlock()); public static final Block ENDSTONE_FLOWER_POT = registerBlock( "endstone_flower_pot", - new FlowerPotBlock(Blocks.END_STONE) + new FlowerPotBlock.Stone(Blocks.END_STONE) ); public static final Block FLAVOLITE_RUNED = registerBlock("flavolite_runed", new RunedFlavolite(false)); @@ -215,11 +227,11 @@ public class EndBlocks { public static final Block END_STONE_STALACTITE = registerBlock( "end_stone_stalactite", - new StalactiteBlock(Blocks.END_STONE) + new StalactiteBlock.Stone(Blocks.END_STONE) ); public static final Block END_STONE_STALACTITE_CAVEMOSS = registerBlock( "end_stone_stalactite_cavemoss", - new StalactiteBlock(CAVE_MOSS) + new StalactiteBlock.Stone(CAVE_MOSS) ); // Wooden Materials And Trees // @@ -724,7 +736,7 @@ public class EndBlocks { // Blocks With Entity // public static final Block END_STONE_FURNACE = registerBlock( "end_stone_furnace", - new BaseFurnaceBlock(Blocks.END_STONE) + new BaseFurnaceBlock.Stone(Blocks.END_STONE) ); public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter()); public static final Block ETERNAL_PEDESTAL = registerBlock("eternal_pedestal", new EternalPedestal());