diff --git a/src/main/java/ru/betterend/blocks/AeterniumBlock.java b/src/main/java/ru/betterend/blocks/AeterniumBlock.java index e5e11578..580971f0 100644 --- a/src/main/java/ru/betterend/blocks/AeterniumBlock.java +++ b/src/main/java/ru/betterend/blocks/AeterniumBlock.java @@ -9,9 +9,9 @@ import net.minecraft.block.MaterialColor; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class AeterniumBlock extends BlockBase { +public class AeterniumBlock extends BaseBlock { public AeterniumBlock() { super(FabricBlockSettings.of(Material.METAL, MaterialColor.GRAY) diff --git a/src/main/java/ru/betterend/blocks/BlockAmber.java b/src/main/java/ru/betterend/blocks/AmberBlock.java similarity index 69% rename from src/main/java/ru/betterend/blocks/BlockAmber.java rename to src/main/java/ru/betterend/blocks/AmberBlock.java index a55fadb3..ccb5c7e1 100644 --- a/src/main/java/ru/betterend/blocks/BlockAmber.java +++ b/src/main/java/ru/betterend/blocks/AmberBlock.java @@ -3,10 +3,10 @@ package ru.betterend.blocks; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Blocks; import net.minecraft.block.MaterialColor; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class BlockAmber extends BlockBase { - public BlockAmber() { +public class AmberBlock extends BaseBlock { + public AmberBlock() { super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).materialColor(MaterialColor.YELLOW)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockAncientEmeraldIce.java b/src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/BlockAncientEmeraldIce.java rename to src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java index 4cf5d63b..cf79803a 100644 --- a/src/main/java/ru/betterend/blocks/BlockAncientEmeraldIce.java +++ b/src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java @@ -8,14 +8,14 @@ import net.minecraft.block.Blocks; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndParticles; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; -public class BlockAncientEmeraldIce extends BlockBase { - public BlockAncientEmeraldIce() { +public class AncientEmeraldIceBlock extends BaseBlock { + public AncientEmeraldIceBlock() { super(FabricBlockSettings.copyOf(Blocks.BLUE_ICE).ticksRandomly()); } diff --git a/src/main/java/ru/betterend/blocks/BlockBlueVine.java b/src/main/java/ru/betterend/blocks/BlueVineBlock.java similarity index 83% rename from src/main/java/ru/betterend/blocks/BlockBlueVine.java rename to src/main/java/ru/betterend/blocks/BlueVineBlock.java index 18512735..122225ae 100644 --- a/src/main/java/ru/betterend/blocks/BlockBlueVine.java +++ b/src/main/java/ru/betterend/blocks/BlueVineBlock.java @@ -5,10 +5,10 @@ import net.minecraft.block.BlockState; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockUpDownPlant; +import ru.betterend.blocks.basis.UpDownPlantBlock; import ru.betterend.registry.EndBlocks; -public class BlockBlueVine extends BlockUpDownPlant { +public class BlueVineBlock extends UpDownPlantBlock { public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; @Override diff --git a/src/main/java/ru/betterend/blocks/BlockBlueVineLantern.java b/src/main/java/ru/betterend/blocks/BlueVineLanternBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/BlockBlueVineLantern.java rename to src/main/java/ru/betterend/blocks/BlueVineLanternBlock.java index 00be15ff..d89b2cda 100644 --- a/src/main/java/ru/betterend/blocks/BlockBlueVineLantern.java +++ b/src/main/java/ru/betterend/blocks/BlueVineLanternBlock.java @@ -13,13 +13,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.registry.EndBlocks; -public class BlockBlueVineLantern extends BlockBase { +public class BlueVineLanternBlock extends BaseBlock { public static final BooleanProperty NATURAL = BlockProperties.NATURAL; - public BlockBlueVineLantern() { + public BlueVineLanternBlock() { super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sounds(BlockSoundGroup.WART_BLOCK).luminance(15)); this.setDefaultState(this.stateManager.getDefaultState().with(NATURAL, false)); } diff --git a/src/main/java/ru/betterend/blocks/BlockBlueVineSeed.java b/src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java similarity index 81% rename from src/main/java/ru/betterend/blocks/BlockBlueVineSeed.java rename to src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java index 6b99ee18..de67fdac 100644 --- a/src/main/java/ru/betterend/blocks/BlockBlueVineSeed.java +++ b/src/main/java/ru/betterend/blocks/BlueVineSeedBlock.java @@ -7,13 +7,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockFur; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.FurBlock; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; -public class BlockBlueVineSeed extends BlockPlantWithAge { +public class BlueVineSeedBlock extends PlantWithAgeBlock { @Override public void growAdult(StructureWorldAccess world, Random random, BlockPos pos) { int height = MHelper.randRange(2, 5, random); @@ -30,15 +30,15 @@ public class BlockBlueVineSeed extends BlockPlantWithAge { } private void placeLantern(StructureWorldAccess world, BlockPos pos) { - BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.BLUE_VINE_LANTERN.getDefaultState().with(BlockBlueVineLantern.NATURAL, true)); + BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.BLUE_VINE_LANTERN.getDefaultState().with(BlueVineLanternBlock.NATURAL, true)); for (Direction dir: BlocksHelper.HORIZONTAL) { BlockPos p = pos.offset(dir); if (world.isAir(p)) { - BlocksHelper.setWithoutUpdate(world, p, EndBlocks.BLUE_VINE_FUR.getDefaultState().with(BlockFur.FACING, dir)); + BlocksHelper.setWithoutUpdate(world, p, EndBlocks.BLUE_VINE_FUR.getDefaultState().with(FurBlock.FACING, dir)); } } if (world.isAir(pos.up())) { - BlocksHelper.setWithoutUpdate(world, pos.up(), EndBlocks.BLUE_VINE_FUR.getDefaultState().with(BlockFur.FACING, Direction.UP)); + BlocksHelper.setWithoutUpdate(world, pos.up(), EndBlocks.BLUE_VINE_FUR.getDefaultState().with(FurBlock.FACING, Direction.UP)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockBrimstone.java b/src/main/java/ru/betterend/blocks/BrimstoneBlock.java similarity index 75% rename from src/main/java/ru/betterend/blocks/BlockBrimstone.java rename to src/main/java/ru/betterend/blocks/BrimstoneBlock.java index 7cbc9008..8d213b02 100644 --- a/src/main/java/ru/betterend/blocks/BlockBrimstone.java +++ b/src/main/java/ru/betterend/blocks/BrimstoneBlock.java @@ -13,14 +13,14 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockBrimstone extends BlockBase { +public class BrimstoneBlock extends BaseBlock { public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE; - public BlockBrimstone() { + public BrimstoneBlock() { super(FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(MaterialColor.BROWN).ticksRandomly()); setDefaultState(stateManager.getDefaultState().with(ACTIVATED, false)); } @@ -47,17 +47,17 @@ public class BlockBrimstone extends BlockBase { Direction dir = BlocksHelper.randomDirection(random); BlockPos side = pos.offset(dir); BlockState sideState = world.getBlockState(side); - if (sideState.getBlock() instanceof BlockSulphurCrystal) { - if (sideState.get(BlockSulphurCrystal.AGE) < 2 && sideState.get(BlockSulphurCrystal.WATERLOGGED)) { - int age = sideState.get(BlockSulphurCrystal.AGE) + 1; - world.setBlockState(side, sideState.with(BlockSulphurCrystal.AGE, age)); + if (sideState.getBlock() instanceof SulphurCrystalBlock) { + if (sideState.get(SulphurCrystalBlock.AGE) < 2 && sideState.get(SulphurCrystalBlock.WATERLOGGED)) { + int age = sideState.get(SulphurCrystalBlock.AGE) + 1; + world.setBlockState(side, sideState.with(SulphurCrystalBlock.AGE, age)); } } else if (sideState.getFluidState().getFluid() == Fluids.WATER) { BlockState crystal = EndBlocks.SULPHUR_CRYSTAL.getDefaultState() - .with(BlockSulphurCrystal.FACING, dir) - .with(BlockSulphurCrystal.WATERLOGGED, true) - .with(BlockSulphurCrystal.AGE, 0); + .with(SulphurCrystalBlock.FACING, dir) + .with(SulphurCrystalBlock.WATERLOGGED, true) + .with(SulphurCrystalBlock.AGE, 0); world.setBlockState(side, crystal); } } diff --git a/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java b/src/main/java/ru/betterend/blocks/BubbleCoralBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/BlockBubbleCoral.java rename to src/main/java/ru/betterend/blocks/BubbleCoralBlock.java index f2bff154..0cab0586 100644 --- a/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java +++ b/src/main/java/ru/betterend/blocks/BubbleCoralBlock.java @@ -17,12 +17,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockUnderwaterPlant; +import ru.betterend.blocks.basis.UnderwaterPlantBlock; -public class BlockBubbleCoral extends BlockUnderwaterPlant { +public class BubbleCoralBlock extends UnderwaterPlantBlock { private static final VoxelShape SHAPE = Block.createCuboidShape(0, 0, 0, 16, 14, 16); - public BlockBubbleCoral() { + public BubbleCoralBlock() { super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.CORAL) diff --git a/src/main/java/ru/betterend/blocks/BlockBulbVine.java b/src/main/java/ru/betterend/blocks/BulbVineBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/BlockBulbVine.java rename to src/main/java/ru/betterend/blocks/BulbVineBlock.java index 5f17366f..d88e55aa 100644 --- a/src/main/java/ru/betterend/blocks/BlockBulbVine.java +++ b/src/main/java/ru/betterend/blocks/BulbVineBlock.java @@ -11,13 +11,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockVine; +import ru.betterend.blocks.basis.VineBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; import ru.betterend.util.MHelper; -public class BlockBulbVine extends BlockVine { - public BlockBulbVine() { +public class BulbVineBlock extends VineBlock { + public BulbVineBlock() { super(15, true); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBulbVineLantern.java b/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java similarity index 81% rename from src/main/java/ru/betterend/blocks/basis/BlockBulbVineLantern.java rename to src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java index a02c7b44..1a6f715c 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBulbVineLantern.java +++ b/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java @@ -1,4 +1,4 @@ -package ru.betterend.blocks.basis; +package ru.betterend.blocks; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; @@ -11,14 +11,15 @@ import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; +import ru.betterend.blocks.basis.EndLanternBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; -public class BlockBulbVineLantern extends BlockLantern implements IRenderTypeable { +public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTypeable { private static final VoxelShape SHAPE_CEIL = Block.createCuboidShape(4, 4, 4, 12, 16, 12); private static final VoxelShape SHAPE_FLOOR = Block.createCuboidShape(4, 0, 4, 12, 12, 12); - public BlockBulbVineLantern() { + public BulbVineLanternBlock() { this(FabricBlockSettings.of(Material.METAL) .sounds(BlockSoundGroup.LANTERN) .hardness(1) @@ -29,7 +30,7 @@ public class BlockBulbVineLantern extends BlockLantern implements IRenderTypeabl .luminance(15)); } - public BlockBulbVineLantern(FabricBlockSettings settings) { + public BulbVineLanternBlock(FabricBlockSettings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBulbVineLanternColored.java b/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java similarity index 83% rename from src/main/java/ru/betterend/blocks/basis/BlockBulbVineLanternColored.java rename to src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java index b567a990..edcbbbb3 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBulbVineLanternColored.java +++ b/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java @@ -1,4 +1,4 @@ -package ru.betterend.blocks.basis; +package ru.betterend.blocks; import java.io.Reader; @@ -10,8 +10,8 @@ import ru.betterend.interfaces.IColorProvider; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockBulbVineLanternColored extends BlockBulbVineLantern implements IColorProvider, BlockPatterned { - public BlockBulbVineLanternColored(FabricBlockSettings settings) { +public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider, BlockPatterned { + public BulbVineLanternColoredBlock(FabricBlockSettings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/BlockBulbVineSeed.java b/src/main/java/ru/betterend/blocks/BulbVineSeedBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/BlockBulbVineSeed.java rename to src/main/java/ru/betterend/blocks/BulbVineSeedBlock.java index c1b265e5..f22f46f0 100644 --- a/src/main/java/ru/betterend/blocks/BlockBulbVineSeed.java +++ b/src/main/java/ru/betterend/blocks/BulbVineSeedBlock.java @@ -8,12 +8,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; import ru.betterend.util.BlocksHelper; -public class BlockBulbVineSeed extends BlockPlantWithAge { +public class BulbVineSeedBlock extends PlantWithAgeBlock { @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { BlockState up = world.getBlockState(pos.up()); diff --git a/src/main/java/ru/betterend/blocks/BlockCharnia.java b/src/main/java/ru/betterend/blocks/CharniaBlock.java similarity index 77% rename from src/main/java/ru/betterend/blocks/BlockCharnia.java rename to src/main/java/ru/betterend/blocks/CharniaBlock.java index 044a506e..e1162d4b 100644 --- a/src/main/java/ru/betterend/blocks/BlockCharnia.java +++ b/src/main/java/ru/betterend/blocks/CharniaBlock.java @@ -5,9 +5,9 @@ import net.minecraft.fluid.Fluids; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.WorldView; -import ru.betterend.blocks.basis.BlockUnderwaterPlant; +import ru.betterend.blocks.basis.UnderwaterPlantBlock; -public class BlockCharnia extends BlockUnderwaterPlant { +public class CharniaBlock extends UnderwaterPlantBlock { @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { return sideCoversSmallSquare(world, pos.down(), Direction.UP) && world.getFluidState(pos).getFluid() == Fluids.WATER; diff --git a/src/main/java/ru/betterend/blocks/BlockChorusGrass.java b/src/main/java/ru/betterend/blocks/ChorusGrassBlock.java similarity index 62% rename from src/main/java/ru/betterend/blocks/BlockChorusGrass.java rename to src/main/java/ru/betterend/blocks/ChorusGrassBlock.java index c9cfefc3..2b603a45 100644 --- a/src/main/java/ru/betterend/blocks/BlockChorusGrass.java +++ b/src/main/java/ru/betterend/blocks/ChorusGrassBlock.java @@ -1,11 +1,11 @@ package ru.betterend.blocks; import net.minecraft.block.BlockState; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; -public class BlockChorusGrass extends BlockPlant { - public BlockChorusGrass() { +public class ChorusGrassBlock extends EndPlantBlock { + public ChorusGrassBlock() { super(true); } diff --git a/src/main/java/ru/betterend/blocks/BlockDenseEmeraldIce.java b/src/main/java/ru/betterend/blocks/DenseEmeraldIceBlock.java similarity index 71% rename from src/main/java/ru/betterend/blocks/BlockDenseEmeraldIce.java rename to src/main/java/ru/betterend/blocks/DenseEmeraldIceBlock.java index f2232a99..e94b0a6f 100644 --- a/src/main/java/ru/betterend/blocks/BlockDenseEmeraldIce.java +++ b/src/main/java/ru/betterend/blocks/DenseEmeraldIceBlock.java @@ -2,12 +2,12 @@ package ru.betterend.blocks; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Blocks; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; -public class BlockDenseEmeraldIce extends BlockBase implements IRenderTypeable { - public BlockDenseEmeraldIce() { +public class DenseEmeraldIceBlock extends BaseBlock implements IRenderTypeable { + public DenseEmeraldIceBlock() { super(FabricBlockSettings.copyOf(Blocks.PACKED_ICE)); } diff --git a/src/main/java/ru/betterend/blocks/BlockDenseSnow.java b/src/main/java/ru/betterend/blocks/DenseSnowBlock.java similarity index 68% rename from src/main/java/ru/betterend/blocks/BlockDenseSnow.java rename to src/main/java/ru/betterend/blocks/DenseSnowBlock.java index 5ea8e7a0..a408291f 100644 --- a/src/main/java/ru/betterend/blocks/BlockDenseSnow.java +++ b/src/main/java/ru/betterend/blocks/DenseSnowBlock.java @@ -3,10 +3,10 @@ package ru.betterend.blocks; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Material; import net.minecraft.sound.BlockSoundGroup; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class BlockDenseSnow extends BlockBase { - public BlockDenseSnow() { +public class DenseSnowBlock extends BaseBlock { + public DenseSnowBlock() { super(FabricBlockSettings.of(Material.SNOW_BLOCK).strength(0.2F).sounds(BlockSoundGroup.SNOW)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockDragonTreeSapling.java b/src/main/java/ru/betterend/blocks/DragonTreeSaplingBlock.java similarity index 75% rename from src/main/java/ru/betterend/blocks/BlockDragonTreeSapling.java rename to src/main/java/ru/betterend/blocks/DragonTreeSaplingBlock.java index fe2d405c..5fdd924e 100644 --- a/src/main/java/ru/betterend/blocks/BlockDragonTreeSapling.java +++ b/src/main/java/ru/betterend/blocks/DragonTreeSaplingBlock.java @@ -4,12 +4,12 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldView; import net.minecraft.world.gen.feature.Feature; -import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.blocks.basis.FeatureSaplingBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; -public class BlockDragonTreeSapling extends BlockFeatureSapling { - public BlockDragonTreeSapling() { +public class DragonTreeSaplingBlock extends FeatureSaplingBlock { + public DragonTreeSaplingBlock() { super(); } diff --git a/src/main/java/ru/betterend/blocks/BlockEmeraldIce.java b/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java similarity index 94% rename from src/main/java/ru/betterend/blocks/BlockEmeraldIce.java rename to src/main/java/ru/betterend/blocks/EmeraldIceBlock.java index 3e67efbd..ee96f6a1 100644 --- a/src/main/java/ru/betterend/blocks/BlockEmeraldIce.java +++ b/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java @@ -29,8 +29,8 @@ import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockEmeraldIce extends TransparentBlock implements IRenderTypeable, BlockPatterned { - public BlockEmeraldIce() { +public class EmeraldIceBlock extends TransparentBlock implements IRenderTypeable, BlockPatterned { + public EmeraldIceBlock() { super(FabricBlockSettings.copyOf(Blocks.ICE)); } diff --git a/src/main/java/ru/betterend/blocks/BlockEndLily.java b/src/main/java/ru/betterend/blocks/EndLilyBlock.java similarity index 94% rename from src/main/java/ru/betterend/blocks/BlockEndLily.java rename to src/main/java/ru/betterend/blocks/EndLilyBlock.java index 5b78d7ef..6d43dd97 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndLily.java +++ b/src/main/java/ru/betterend/blocks/EndLilyBlock.java @@ -31,17 +31,17 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockUnderwaterPlant; +import ru.betterend.blocks.basis.UnderwaterPlantBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; import ru.betterend.util.MHelper; -public class BlockEndLily extends BlockUnderwaterPlant { +public class EndLilyBlock extends UnderwaterPlantBlock { public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; private static final VoxelShape SHAPE_BOTTOM = Block.createCuboidShape(4, 0, 4, 12, 16, 12); private static final VoxelShape SHAPE_TOP = Block.createCuboidShape(2, 0, 2, 14, 6, 14); - public BlockEndLily() { + public EndLilyBlock() { super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) diff --git a/src/main/java/ru/betterend/blocks/BlockEndLilySeed.java b/src/main/java/ru/betterend/blocks/EndLilySeedBlock.java similarity index 73% rename from src/main/java/ru/betterend/blocks/BlockEndLilySeed.java rename to src/main/java/ru/betterend/blocks/EndLilySeedBlock.java index 6eb44873..05226df8 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndLilySeed.java +++ b/src/main/java/ru/betterend/blocks/EndLilySeedBlock.java @@ -6,21 +6,21 @@ import net.minecraft.fluid.Fluids; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockUnderwaterPlantWithAge; +import ru.betterend.blocks.basis.UnderwaterPlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockEndLilySeed extends BlockUnderwaterPlantWithAge { +public class EndLilySeedBlock extends UnderwaterPlantWithAgeBlock { @Override public void grow(StructureWorldAccess world, Random random, BlockPos pos) { if (canGrow(world, pos)) { - BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.BOTTOM)); + BlocksHelper.setWithoutUpdate(world, pos, EndBlocks.END_LILY.getDefaultState().with(EndLilyBlock.SHAPE, TripleShape.BOTTOM)); BlockPos up = pos.up(); while (world.getFluidState(up).isStill()) { - BlocksHelper.setWithoutUpdate(world, up, EndBlocks.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.MIDDLE)); + BlocksHelper.setWithoutUpdate(world, up, EndBlocks.END_LILY.getDefaultState().with(EndLilyBlock.SHAPE, TripleShape.MIDDLE)); up = up.up(); } - BlocksHelper.setWithoutUpdate(world, up, EndBlocks.END_LILY.getDefaultState().with(BlockEndLily.SHAPE, TripleShape.TOP)); + BlocksHelper.setWithoutUpdate(world, up, EndBlocks.END_LILY.getDefaultState().with(EndLilyBlock.SHAPE, TripleShape.TOP)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockEndLotusFlower.java b/src/main/java/ru/betterend/blocks/EndLotusFlowerBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/BlockEndLotusFlower.java rename to src/main/java/ru/betterend/blocks/EndLotusFlowerBlock.java index b2680baf..8222111e 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndLotusFlower.java +++ b/src/main/java/ru/betterend/blocks/EndLotusFlowerBlock.java @@ -17,15 +17,15 @@ import net.minecraft.loot.context.LootContext; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.MHelper; -public class BlockEndLotusFlower extends BlockPlant { +public class EndLotusFlowerBlock extends EndPlantBlock { private static final VoxelShape SHAPE_OUTLINE = Block.createCuboidShape(2, 0, 2, 14, 14, 14); private static final VoxelShape SHAPE_COLLISION = Block.createCuboidShape(0, 0, 0, 16, 2, 16); - public BlockEndLotusFlower() { + public EndLotusFlowerBlock() { super(FabricBlockSettings.of(Material.PLANT).nonOpaque().luminance(15)); } diff --git a/src/main/java/ru/betterend/blocks/BlockEndLotusLeaf.java b/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java similarity index 92% rename from src/main/java/ru/betterend/blocks/BlockEndLotusLeaf.java rename to src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java index 3ec3bcef..2281bb7e 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndLotusLeaf.java +++ b/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java @@ -21,18 +21,18 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockBaseNotFull; +import ru.betterend.blocks.basis.BaseBlockNotFull; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockEndLotusLeaf extends BlockBaseNotFull implements IRenderTypeable { +public class EndLotusLeafBlock extends BaseBlockNotFull implements IRenderTypeable { public static final EnumProperty HORIZONTAL_FACING = Properties.HORIZONTAL_FACING; public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; private static final VoxelShape VSHAPE = Block.createCuboidShape(0, 0, 0, 16, 1, 16); - public BlockEndLotusLeaf() { + public EndLotusLeafBlock() { super(FabricBlockSettings.of(Material.PLANT).nonOpaque().sounds(BlockSoundGroup.WET_GRASS)); } diff --git a/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java b/src/main/java/ru/betterend/blocks/EndLotusSeedBlock.java similarity index 71% rename from src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java rename to src/main/java/ru/betterend/blocks/EndLotusSeedBlock.java index 31fe5b20..ce8fc56a 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java +++ b/src/main/java/ru/betterend/blocks/EndLotusSeedBlock.java @@ -9,16 +9,16 @@ import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockUnderwaterPlantWithAge; +import ru.betterend.blocks.basis.UnderwaterPlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge { +public class EndLotusSeedBlock extends UnderwaterPlantWithAgeBlock { @Override public void grow(StructureWorldAccess world, Random random, BlockPos pos) { if (canGrow(world, pos)) { - BlockState startLeaf = EndBlocks.END_LOTUS_STEM.getDefaultState().with(BlockEndLotusStem.LEAF, true); - BlockState roots = EndBlocks.END_LOTUS_STEM.getDefaultState().with(BlockEndLotusStem.SHAPE, TripleShape.BOTTOM).with(BlockEndLotusStem.WATERLOGGED, true); + BlockState startLeaf = EndBlocks.END_LOTUS_STEM.getDefaultState().with(EndLotusStemBlock.LEAF, true); + BlockState roots = EndBlocks.END_LOTUS_STEM.getDefaultState().with(EndLotusStemBlock.SHAPE, TripleShape.BOTTOM).with(EndLotusStemBlock.WATERLOGGED, true); BlockState stem = EndBlocks.END_LOTUS_STEM.getDefaultState(); BlockState flower = EndBlocks.END_LOTUS_FLOWER.getDefaultState(); @@ -26,7 +26,7 @@ public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge { Mutable bpos = new Mutable().set(pos); bpos.setY(bpos.getY() + 1); while (world.getFluidState(bpos).isStill()) { - BlocksHelper.setWithoutUpdate(world, bpos, stem.with(BlockEndLotusStem.WATERLOGGED, true)); + BlocksHelper.setWithoutUpdate(world, bpos, stem.with(EndLotusStemBlock.WATERLOGGED, true)); bpos.setY(bpos.getY() + 1); } @@ -36,10 +36,10 @@ public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge { BlockPos leafCenter = bpos.toImmutable().offset(dir); if (hasLeaf(world, leafCenter)) { generateLeaf(world, leafCenter); - BlocksHelper.setWithoutUpdate(world, bpos, startLeaf.with(BlockEndLotusStem.SHAPE, shape).with(BlockEndLotusStem.FACING, dir)); + BlocksHelper.setWithoutUpdate(world, bpos, startLeaf.with(EndLotusStemBlock.SHAPE, shape).with(EndLotusStemBlock.FACING, dir)); } else { - BlocksHelper.setWithoutUpdate(world, bpos, stem.with(BlockEndLotusStem.SHAPE, shape)); + BlocksHelper.setWithoutUpdate(world, bpos, stem.with(EndLotusStemBlock.SHAPE, shape)); } bpos.setY(bpos.getY() + 1); @@ -49,7 +49,7 @@ public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge { BlocksHelper.setWithoutUpdate(world, bpos, flower); bpos.setY(bpos.getY() - 1); stem = world.getBlockState(bpos); - BlocksHelper.setWithoutUpdate(world, bpos, stem.with(BlockEndLotusStem.SHAPE, TripleShape.TOP)); + BlocksHelper.setWithoutUpdate(world, bpos, stem.with(EndLotusStemBlock.SHAPE, TripleShape.TOP)); return; } BlocksHelper.setWithoutUpdate(world, bpos, stem); @@ -66,15 +66,15 @@ public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge { if (!stem.isOf(EndBlocks.END_LOTUS_STEM)) { stem = EndBlocks.END_LOTUS_STEM.getDefaultState(); if (!world.getBlockState(bpos.north()).getFluidState().isEmpty()) { - stem = stem.with(BlockEndLotusStem.WATERLOGGED, true); + stem = stem.with(EndLotusStemBlock.WATERLOGGED, true); } } if (world.getBlockState(bpos.offset(dir)).isOf(EndBlocks.END_LOTUS_LEAF)) { - stem = stem.with(BlockEndLotusStem.LEAF, true).with(BlockEndLotusStem.FACING, dir); + stem = stem.with(EndLotusStemBlock.LEAF, true).with(EndLotusStemBlock.FACING, dir); } - BlocksHelper.setWithoutUpdate(world, bpos, stem.with(BlockEndLotusStem.SHAPE, TripleShape.TOP)); + BlocksHelper.setWithoutUpdate(world, bpos, stem.with(EndLotusStemBlock.SHAPE, TripleShape.TOP)); } } @@ -90,14 +90,14 @@ public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge { private void generateLeaf(StructureWorldAccess world, BlockPos pos) { Mutable p = new Mutable(); BlockState leaf = EndBlocks.END_LOTUS_LEAF.getDefaultState(); - BlocksHelper.setWithoutUpdate(world, pos, leaf.with(BlockEndLotusLeaf.SHAPE, TripleShape.BOTTOM)); + BlocksHelper.setWithoutUpdate(world, pos, leaf.with(EndLotusLeafBlock.SHAPE, TripleShape.BOTTOM)); for (Direction move: BlocksHelper.HORIZONTAL) { - BlocksHelper.setWithoutUpdate(world, p.set(pos).move(move), leaf.with(BlockEndLotusLeaf.HORIZONTAL_FACING, move).with(BlockEndLotusLeaf.SHAPE, TripleShape.MIDDLE)); + BlocksHelper.setWithoutUpdate(world, p.set(pos).move(move), leaf.with(EndLotusLeafBlock.HORIZONTAL_FACING, move).with(EndLotusLeafBlock.SHAPE, TripleShape.MIDDLE)); } for (int i = 0; i < 4; i ++) { Direction d1 = BlocksHelper.HORIZONTAL[i]; Direction d2 = BlocksHelper.HORIZONTAL[(i + 1) & 3]; - BlocksHelper.setWithoutUpdate(world, p.set(pos).move(d1).move(d2), leaf.with(BlockEndLotusLeaf.HORIZONTAL_FACING, d1).with(BlockEndLotusLeaf.SHAPE, TripleShape.TOP)); + BlocksHelper.setWithoutUpdate(world, p.set(pos).move(d1).move(d2), leaf.with(EndLotusLeafBlock.HORIZONTAL_FACING, d1).with(EndLotusLeafBlock.SHAPE, TripleShape.TOP)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockEndLotusStem.java b/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockEndLotusStem.java rename to src/main/java/ru/betterend/blocks/EndLotusStemBlock.java index ec17e2f0..62acf529 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndLotusStem.java +++ b/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java @@ -26,19 +26,19 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.util.BlocksHelper; -public class BlockEndLotusStem extends BlockBase implements Waterloggable, IRenderTypeable { +public class EndLotusStemBlock extends BaseBlock implements Waterloggable, IRenderTypeable { public static final EnumProperty FACING = Properties.FACING; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; public static final BooleanProperty LEAF = BooleanProperty.of("leaf"); public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; private static final Map SHAPES = Maps.newEnumMap(Axis.class); - public BlockEndLotusStem() { + public EndLotusStemBlock() { super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS)); this.setDefaultState(getDefaultState().with(WATERLOGGED, false).with(SHAPE, TripleShape.MIDDLE).with(LEAF, false).with(FACING, Direction.UP)); } diff --git a/src/main/java/ru/betterend/blocks/BlockPath.java b/src/main/java/ru/betterend/blocks/EndPathBlock.java similarity index 84% rename from src/main/java/ru/betterend/blocks/BlockPath.java rename to src/main/java/ru/betterend/blocks/EndPathBlock.java index f6f99453..4b3a28bf 100644 --- a/src/main/java/ru/betterend/blocks/BlockPath.java +++ b/src/main/java/ru/betterend/blocks/EndPathBlock.java @@ -16,15 +16,15 @@ import net.minecraft.loot.context.LootContextParameters; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import ru.betterend.blocks.basis.BlockBaseNotFull; +import ru.betterend.blocks.basis.BaseBlockNotFull; -public class BlockPath extends BlockBaseNotFull { +public class EndPathBlock extends BaseBlockNotFull { private static final VoxelShape SHAPE = Block.createCuboidShape(0, 0, 0, 16, 15, 16); - public BlockPath(Block source) { + public EndPathBlock(Block source) { super(FabricBlockSettings.copyOf(source).allowsSpawning((state, world, pos, type) -> { return false; })); - if (source instanceof BlockTerrain) { - BlockTerrain terrain = (BlockTerrain) source; + if (source instanceof EndTerrainBlock) { + EndTerrainBlock terrain = (EndTerrainBlock) source; terrain.setPathBlock(this); } } diff --git a/src/main/java/ru/betterend/blocks/EndPedestal.java b/src/main/java/ru/betterend/blocks/EndPedestal.java index 54517efa..e46e154f 100644 --- a/src/main/java/ru/betterend/blocks/EndPedestal.java +++ b/src/main/java/ru/betterend/blocks/EndPedestal.java @@ -7,10 +7,10 @@ import net.minecraft.block.Block; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; -import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.patterns.Patterns; -public class EndPedestal extends BlockPedestal { +public class EndPedestal extends PedestalBlock { public EndPedestal(Block parent) { super(parent); diff --git a/src/main/java/ru/betterend/blocks/BlockStone.java b/src/main/java/ru/betterend/blocks/EndStoneBlock.java similarity index 69% rename from src/main/java/ru/betterend/blocks/BlockStone.java rename to src/main/java/ru/betterend/blocks/EndStoneBlock.java index d8b9dd53..399333c1 100644 --- a/src/main/java/ru/betterend/blocks/BlockStone.java +++ b/src/main/java/ru/betterend/blocks/EndStoneBlock.java @@ -4,11 +4,10 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Blocks; import net.minecraft.block.MaterialColor; import net.minecraft.sound.BlockSoundGroup; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class BlockStone extends BlockBase { - - public BlockStone(MaterialColor color) { +public class EndStoneBlock extends BaseBlock { + public EndStoneBlock(MaterialColor color) { super(FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color).sounds(BlockSoundGroup.STONE)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockTerrain.java b/src/main/java/ru/betterend/blocks/EndTerrainBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockTerrain.java rename to src/main/java/ru/betterend/blocks/EndTerrainBlock.java index e47e1905..489fbdd8 100644 --- a/src/main/java/ru/betterend/blocks/BlockTerrain.java +++ b/src/main/java/ru/betterend/blocks/EndTerrainBlock.java @@ -29,12 +29,12 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraft.world.WorldView; import net.minecraft.world.chunk.light.ChunkLightProvider; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class BlockTerrain extends BlockBase { +public class EndTerrainBlock extends BaseBlock { private Block pathBlock; - public BlockTerrain(MaterialColor color) { + public EndTerrainBlock(MaterialColor color) { super(FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color).sounds(BlockSounds.TERRAIN_SOUND).ticksRandomly()); } diff --git a/src/main/java/ru/betterend/blocks/EnderBlock.java b/src/main/java/ru/betterend/blocks/EnderBlock.java index 1b80fabd..e1d1552f 100644 --- a/src/main/java/ru/betterend/blocks/EnderBlock.java +++ b/src/main/java/ru/betterend/blocks/EnderBlock.java @@ -9,9 +9,9 @@ import net.minecraft.block.MaterialColor; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class EnderBlock extends BlockBase { +public class EnderBlock extends BaseBlock { public EnderBlock() { super(FabricBlockSettings.of(Material.STONE, MaterialColor.field_25708) diff --git a/src/main/java/ru/betterend/blocks/BlockEndstoneDust.java b/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/BlockEndstoneDust.java rename to src/main/java/ru/betterend/blocks/EndstoneDustBlock.java index 77843c7f..81504106 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndstoneDust.java +++ b/src/main/java/ru/betterend/blocks/EndstoneDustBlock.java @@ -15,11 +15,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import ru.betterend.util.MHelper; -public class BlockEndstoneDust extends FallingBlock { +public class EndstoneDustBlock extends FallingBlock { @Environment(EnvType.CLIENT) private static final int COLOR = MHelper.color(226, 239, 168); - public BlockEndstoneDust() { + public EndstoneDustBlock() { super(FabricBlockSettings.copyOf(Blocks.SAND).materialColor(Blocks.END_STONE.getDefaultMaterialColor())); } diff --git a/src/main/java/ru/betterend/blocks/EternalPedestal.java b/src/main/java/ru/betterend/blocks/EternalPedestal.java index 12333694..deef385c 100644 --- a/src/main/java/ru/betterend/blocks/EternalPedestal.java +++ b/src/main/java/ru/betterend/blocks/EternalPedestal.java @@ -23,13 +23,13 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.explosion.Explosion; -import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.blocks.entities.EternalPedestalEntity; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; import ru.betterend.rituals.EternalRitual; -public class EternalPedestal extends BlockPedestal { +public class EternalPedestal extends PedestalBlock { public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE; public EternalPedestal() { diff --git a/src/main/java/ru/betterend/blocks/BlockGlowingMoss.java b/src/main/java/ru/betterend/blocks/GlowingMossBlock.java similarity index 80% rename from src/main/java/ru/betterend/blocks/BlockGlowingMoss.java rename to src/main/java/ru/betterend/blocks/GlowingMossBlock.java index f87780be..6b8aee7c 100644 --- a/src/main/java/ru/betterend/blocks/BlockGlowingMoss.java +++ b/src/main/java/ru/betterend/blocks/GlowingMossBlock.java @@ -5,11 +5,11 @@ import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; -public class BlockGlowingMoss extends BlockPlant { - public BlockGlowingMoss(int light) { +public class GlowingMossBlock extends EndPlantBlock { + public GlowingMossBlock(int light) { super(light); } diff --git a/src/main/java/ru/betterend/blocks/BlockGlowingPillarLuminophor.java b/src/main/java/ru/betterend/blocks/GlowingPillarLuminophorBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/BlockGlowingPillarLuminophor.java rename to src/main/java/ru/betterend/blocks/GlowingPillarLuminophorBlock.java index 1ad2970f..15f2f295 100644 --- a/src/main/java/ru/betterend/blocks/BlockGlowingPillarLuminophor.java +++ b/src/main/java/ru/betterend/blocks/GlowingPillarLuminophorBlock.java @@ -14,13 +14,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.registry.EndBlocks; -public class BlockGlowingPillarLuminophor extends BlockBase { +public class GlowingPillarLuminophorBlock extends BaseBlock { public static final BooleanProperty NATURAL = BooleanProperty.of("natural"); - public BlockGlowingPillarLuminophor() { + public GlowingPillarLuminophorBlock() { super(FabricBlockSettings.of(Material.LEAVES) .materialColor(MaterialColor.ORANGE) .breakByTool(FabricToolTags.SHEARS) diff --git a/src/main/java/ru/betterend/blocks/BlockGlowingPillarRoots.java b/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java similarity index 81% rename from src/main/java/ru/betterend/blocks/BlockGlowingPillarRoots.java rename to src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java index e393ee96..bd7264eb 100644 --- a/src/main/java/ru/betterend/blocks/BlockGlowingPillarRoots.java +++ b/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java @@ -5,10 +5,10 @@ import net.minecraft.block.BlockState; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockUpDownPlant; +import ru.betterend.blocks.basis.UpDownPlantBlock; import ru.betterend.registry.EndBlocks; -public class BlockGlowingPillarRoots extends BlockUpDownPlant { +public class GlowingPillarRootsBlock extends UpDownPlantBlock { public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; @Override diff --git a/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java b/src/main/java/ru/betterend/blocks/GlowingPillarSeedBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java rename to src/main/java/ru/betterend/blocks/GlowingPillarSeedBlock.java index 7bb20c66..97ea66f5 100644 --- a/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java +++ b/src/main/java/ru/betterend/blocks/GlowingPillarSeedBlock.java @@ -13,13 +13,13 @@ import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; -public class BlockGlowingPillarSeed extends BlockPlantWithAge { - public BlockGlowingPillarSeed() { +public class GlowingPillarSeedBlock extends PlantWithAgeBlock { + public GlowingPillarSeedBlock() { super(FabricBlockSettings.of(Material.PLANT) .luminance((state) -> { return state.get(AGE) * 3 + 3; }) .breakByTool(FabricToolTags.SHEARS) @@ -49,7 +49,7 @@ public class BlockGlowingPillarSeed extends BlockPlantWithAge { BlocksHelper.setWithUpdate(world, mut, roots.with(BlockProperties.TRIPLE_SHAPE, TripleShape.TOP)); mut.move(Direction.UP); } - BlocksHelper.setWithUpdate(world, mut, EndBlocks.GLOWING_PILLAR_LUMINOPHOR.getDefaultState().with(BlockBlueVineLantern.NATURAL, true)); + BlocksHelper.setWithUpdate(world, mut, EndBlocks.GLOWING_PILLAR_LUMINOPHOR.getDefaultState().with(BlueVineLanternBlock.NATURAL, true)); for (Direction dir: BlocksHelper.DIRECTIONS) { pos = mut.offset(dir); if (world.isAir(pos)) { diff --git a/src/main/java/ru/betterend/blocks/BlockHelixTreeLeaves.java b/src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockHelixTreeLeaves.java rename to src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java index 7555ae70..fb299993 100644 --- a/src/main/java/ru/betterend/blocks/BlockHelixTreeLeaves.java +++ b/src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java @@ -23,17 +23,17 @@ import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.IntProperty; import net.minecraft.util.math.MathHelper; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.interfaces.IColorProvider; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.util.MHelper; -public class BlockHelixTreeLeaves extends BlockBase implements IColorProvider { +public class HelixTreeLeavesBlock extends BaseBlock implements IColorProvider { public static final IntProperty COLOR = IntProperty.of("color", 0, 7); private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0); - public BlockHelixTreeLeaves() { + public HelixTreeLeavesBlock() { super(FabricBlockSettings.of(Material.LEAVES) .materialColor(MaterialColor.ORANGE) .breakByTool(FabricToolTags.SHEARS) diff --git a/src/main/java/ru/betterend/blocks/BlockHelixTreeSapling.java b/src/main/java/ru/betterend/blocks/HelixTreeSaplingBlock.java similarity index 62% rename from src/main/java/ru/betterend/blocks/BlockHelixTreeSapling.java rename to src/main/java/ru/betterend/blocks/HelixTreeSaplingBlock.java index 754e7316..0bce2c4c 100644 --- a/src/main/java/ru/betterend/blocks/BlockHelixTreeSapling.java +++ b/src/main/java/ru/betterend/blocks/HelixTreeSaplingBlock.java @@ -1,10 +1,10 @@ package ru.betterend.blocks; import net.minecraft.world.gen.feature.Feature; -import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.blocks.basis.FeatureSaplingBlock; import ru.betterend.registry.EndFeatures; -public class BlockHelixTreeSapling extends BlockFeatureSapling { +public class HelixTreeSaplingBlock extends FeatureSaplingBlock { @Override protected Feature getFeature() { return EndFeatures.HELIX_TREE.getFeature(); diff --git a/src/main/java/ru/betterend/blocks/BlockHydralux.java b/src/main/java/ru/betterend/blocks/HydraluxBlock.java similarity index 92% rename from src/main/java/ru/betterend/blocks/BlockHydralux.java rename to src/main/java/ru/betterend/blocks/HydraluxBlock.java index cbba5ddb..53fc0eb2 100644 --- a/src/main/java/ru/betterend/blocks/BlockHydralux.java +++ b/src/main/java/ru/betterend/blocks/HydraluxBlock.java @@ -23,15 +23,15 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.HydraluxShape; -import ru.betterend.blocks.basis.BlockUnderwaterPlant; +import ru.betterend.blocks.basis.UnderwaterPlantBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; import ru.betterend.util.MHelper; -public class BlockHydralux extends BlockUnderwaterPlant { +public class HydraluxBlock extends UnderwaterPlantBlock { public static final EnumProperty SHAPE = BlockProperties.HYDRALUX_SHAPE; - public BlockHydralux() { + public HydraluxBlock() { super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) diff --git a/src/main/java/ru/betterend/blocks/BlockHydraluxPetal.java b/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java similarity index 77% rename from src/main/java/ru/betterend/blocks/BlockHydraluxPetal.java rename to src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java index 9fa569a2..81722164 100644 --- a/src/main/java/ru/betterend/blocks/BlockHydraluxPetal.java +++ b/src/main/java/ru/betterend/blocks/HydraluxPetalBlock.java @@ -8,10 +8,10 @@ import net.minecraft.entity.Entity; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class BlockHydraluxPetal extends BlockBase { - public BlockHydraluxPetal() { +public class HydraluxPetalBlock extends BaseBlock { + public HydraluxPetalBlock() { this(FabricBlockSettings.of(Material.PLANT) .materialColor(MaterialColor.SPRUCE) .sounds(BlockSoundGroup.WART_BLOCK) @@ -21,7 +21,7 @@ public class BlockHydraluxPetal extends BlockBase { .breakByHand(true)); } - public BlockHydraluxPetal(FabricBlockSettings settings) { + public HydraluxPetalBlock(FabricBlockSettings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/BlockHydraluxPetalColored.java b/src/main/java/ru/betterend/blocks/HydraluxPetalColoredBlock.java similarity index 84% rename from src/main/java/ru/betterend/blocks/BlockHydraluxPetalColored.java rename to src/main/java/ru/betterend/blocks/HydraluxPetalColoredBlock.java index a0ab719a..4cd1adb1 100644 --- a/src/main/java/ru/betterend/blocks/BlockHydraluxPetalColored.java +++ b/src/main/java/ru/betterend/blocks/HydraluxPetalColoredBlock.java @@ -9,8 +9,8 @@ import net.minecraft.util.Identifier; import ru.betterend.interfaces.IColorProvider; import ru.betterend.patterns.Patterns; -public class BlockHydraluxPetalColored extends BlockHydraluxPetal implements IColorProvider { - public BlockHydraluxPetalColored(FabricBlockSettings settings) { +public class HydraluxPetalColoredBlock extends HydraluxPetalBlock implements IColorProvider { + public HydraluxPetalColoredBlock(FabricBlockSettings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java b/src/main/java/ru/betterend/blocks/HydraluxSaplingBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java rename to src/main/java/ru/betterend/blocks/HydraluxSaplingBlock.java index b3615fe3..ae1544c0 100644 --- a/src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java +++ b/src/main/java/ru/betterend/blocks/HydraluxSaplingBlock.java @@ -8,12 +8,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.world.StructureWorldAccess; import ru.betterend.blocks.BlockProperties.HydraluxShape; -import ru.betterend.blocks.basis.BlockUnderwaterPlantWithAge; +import ru.betterend.blocks.basis.UnderwaterPlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; -public class BlockHydraluxSapling extends BlockUnderwaterPlantWithAge { +public class HydraluxSaplingBlock extends UnderwaterPlantWithAgeBlock { @Override public void grow(StructureWorldAccess world, Random random, BlockPos pos) { int h = MHelper.randRange(4, 8, random); diff --git a/src/main/java/ru/betterend/blocks/BlockHydrothermalVent.java b/src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java similarity index 94% rename from src/main/java/ru/betterend/blocks/BlockHydrothermalVent.java rename to src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java index b433ebcd..0b2807c6 100644 --- a/src/main/java/ru/betterend/blocks/BlockHydrothermalVent.java +++ b/src/main/java/ru/betterend/blocks/HydrothermalVentBlock.java @@ -36,18 +36,18 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import ru.betterend.blocks.basis.BlockBaseNotFull; +import ru.betterend.blocks.basis.BaseBlockNotFull; import ru.betterend.blocks.entities.BlockEntityHydrothermalVent; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndParticles; import ru.betterend.util.BlocksHelper; -public class BlockHydrothermalVent extends BlockBaseNotFull implements BlockEntityProvider, FluidFillable, Waterloggable { +public class HydrothermalVentBlock extends BaseBlockNotFull implements BlockEntityProvider, FluidFillable, Waterloggable { public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE; private static final VoxelShape SHAPE = Block.createCuboidShape(1, 1, 1, 15, 16, 15); - public BlockHydrothermalVent() { + public HydrothermalVentBlock() { super(FabricBlockSettings.of(Material.STONE) .breakByTool(FabricToolTags.PICKAXES) .sounds(BlockSoundGroup.STONE) diff --git a/src/main/java/ru/betterend/blocks/InfusionPedestal.java b/src/main/java/ru/betterend/blocks/InfusionPedestal.java index ff59fbbb..b10bbf5c 100644 --- a/src/main/java/ru/betterend/blocks/InfusionPedestal.java +++ b/src/main/java/ru/betterend/blocks/InfusionPedestal.java @@ -14,11 +14,11 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.blocks.entities.InfusionPedestalEntity; import ru.betterend.rituals.InfusionRitual; -public class InfusionPedestal extends BlockPedestal { +public class InfusionPedestal extends PedestalBlock { private static final VoxelShape SHAPE_DEFAULT; private static final VoxelShape SHAPE_PEDESTAL_TOP; diff --git a/src/main/java/ru/betterend/blocks/BlockJellyshroomCap.java b/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockJellyshroomCap.java rename to src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java index 506ed546..482966fb 100644 --- a/src/main/java/ru/betterend/blocks/BlockJellyshroomCap.java +++ b/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java @@ -29,14 +29,14 @@ import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; import ru.betterend.util.MHelper; -public class BlockJellyshroomCap extends SlimeBlock implements IRenderTypeable, BlockPatterned, IColorProvider { +public class JellyshroomCapBlock extends SlimeBlock implements IRenderTypeable, BlockPatterned, IColorProvider { public static final IntProperty COLOR = IntProperty.of("color", 0, 7); private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0); private final Vec3i colorStart; private final Vec3i colorEnd; private final int coloritem; - public BlockJellyshroomCap(int r1, int g1, int b1, int r2, int g2, int b2) { + public JellyshroomCapBlock(int r1, int g1, int b1, int r2, int g2, int b2) { super(FabricBlockSettings.copyOf(Blocks.SLIME_BLOCK)); colorStart = new Vec3i(r1, g1, b1); colorEnd = new Vec3i(r2, g2, b2); diff --git a/src/main/java/ru/betterend/blocks/BlockLacugroveSapling.java b/src/main/java/ru/betterend/blocks/LacugroveSaplingBlock.java similarity index 77% rename from src/main/java/ru/betterend/blocks/BlockLacugroveSapling.java rename to src/main/java/ru/betterend/blocks/LacugroveSaplingBlock.java index 95fb5e9f..7302e964 100644 --- a/src/main/java/ru/betterend/blocks/BlockLacugroveSapling.java +++ b/src/main/java/ru/betterend/blocks/LacugroveSaplingBlock.java @@ -4,12 +4,12 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldView; import net.minecraft.world.gen.feature.Feature; -import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.blocks.basis.FeatureSaplingBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; -public class BlockLacugroveSapling extends BlockFeatureSapling { - public BlockLacugroveSapling() { +public class LacugroveSaplingBlock extends FeatureSaplingBlock { + public LacugroveSaplingBlock() { super(); } diff --git a/src/main/java/ru/betterend/blocks/BlockLanceleaf.java b/src/main/java/ru/betterend/blocks/LanceleafBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/BlockLanceleaf.java rename to src/main/java/ru/betterend/blocks/LanceleafBlock.java index 50005609..1a940095 100644 --- a/src/main/java/ru/betterend/blocks/BlockLanceleaf.java +++ b/src/main/java/ru/betterend/blocks/LanceleafBlock.java @@ -11,14 +11,14 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.PentaShape; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; -public class BlockLanceleaf extends BlockPlant { +public class LanceleafBlock extends EndPlantBlock { public static final EnumProperty SHAPE = BlockProperties.PENTA_SHAPE; public static final IntProperty ROTATION = BlockProperties.ROTATION; - public BlockLanceleaf() { + public LanceleafBlock() { super(); } diff --git a/src/main/java/ru/betterend/blocks/BlockLanceleafSeed.java b/src/main/java/ru/betterend/blocks/LanceleafSeedBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/BlockLanceleafSeed.java rename to src/main/java/ru/betterend/blocks/LanceleafSeedBlock.java index 2744a0b8..b7e944c0 100644 --- a/src/main/java/ru/betterend/blocks/BlockLanceleafSeed.java +++ b/src/main/java/ru/betterend/blocks/LanceleafSeedBlock.java @@ -8,12 +8,12 @@ import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; import ru.betterend.blocks.BlockProperties.PentaShape; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; -public class BlockLanceleafSeed extends BlockPlantWithAge { +public class LanceleafSeedBlock extends PlantWithAgeBlock { @Override public void growAdult(StructureWorldAccess world, Random random, BlockPos pos) { int height = MHelper.randRange(4, 6, random); diff --git a/src/main/java/ru/betterend/blocks/BlockMengerSponge.java b/src/main/java/ru/betterend/blocks/MengerSpongeBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockMengerSponge.java rename to src/main/java/ru/betterend/blocks/MengerSpongeBlock.java index 1b8c26e3..d7cffe8f 100644 --- a/src/main/java/ru/betterend/blocks/BlockMengerSponge.java +++ b/src/main/java/ru/betterend/blocks/MengerSpongeBlock.java @@ -19,13 +19,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; -import ru.betterend.blocks.basis.BlockBaseNotFull; +import ru.betterend.blocks.basis.BaseBlockNotFull; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; -public class BlockMengerSponge extends BlockBaseNotFull implements IRenderTypeable { - public BlockMengerSponge() { +public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTypeable { + public MengerSpongeBlock() { super(FabricBlockSettings.copyOf(Blocks.SPONGE).nonOpaque()); } diff --git a/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java b/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java similarity index 92% rename from src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java rename to src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java index c9e32571..8439dfd3 100644 --- a/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java +++ b/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java @@ -16,14 +16,14 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockBaseNotFull; +import ru.betterend.blocks.basis.BaseBlockNotFull; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockMengerSpongeWet extends BlockBaseNotFull implements IRenderTypeable { - public BlockMengerSpongeWet() { +public class MengerSpongeWetBlock extends BaseBlockNotFull implements IRenderTypeable { + public MengerSpongeWetBlock() { super(FabricBlockSettings.copyOf(Blocks.WET_SPONGE).nonOpaque()); } diff --git a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomCap.java b/src/main/java/ru/betterend/blocks/MossyGlowshroomCapBlock.java similarity index 87% rename from src/main/java/ru/betterend/blocks/BlockMossyGlowshroomCap.java rename to src/main/java/ru/betterend/blocks/MossyGlowshroomCapBlock.java index 8fea3727..9aabe27f 100644 --- a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomCap.java +++ b/src/main/java/ru/betterend/blocks/MossyGlowshroomCapBlock.java @@ -9,13 +9,13 @@ import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.registry.EndBlocks; -public class BlockMossyGlowshroomCap extends BlockBase { +public class MossyGlowshroomCapBlock extends BaseBlock { public static final BooleanProperty TRANSITION = BooleanProperty.of("transition"); - public BlockMossyGlowshroomCap() { + public MossyGlowshroomCapBlock() { super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sounds(BlockSoundGroup.WOOD)); this.setDefaultState(this.stateManager.getDefaultState().with(TRANSITION, false)); } diff --git a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomHymenophore.java b/src/main/java/ru/betterend/blocks/MossyGlowshroomHymenophoreBlock.java similarity index 70% rename from src/main/java/ru/betterend/blocks/BlockMossyGlowshroomHymenophore.java rename to src/main/java/ru/betterend/blocks/MossyGlowshroomHymenophoreBlock.java index 16a209df..a74c85bf 100644 --- a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomHymenophore.java +++ b/src/main/java/ru/betterend/blocks/MossyGlowshroomHymenophoreBlock.java @@ -4,10 +4,10 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Material; import net.minecraft.sound.BlockSoundGroup; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class BlockMossyGlowshroomHymenophore extends BlockBase { - public BlockMossyGlowshroomHymenophore() { +public class MossyGlowshroomHymenophoreBlock extends BaseBlock { + public MossyGlowshroomHymenophoreBlock() { super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sounds(BlockSoundGroup.WART_BLOCK).luminance(15)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java b/src/main/java/ru/betterend/blocks/MossyGlowshroomSaplingBlock.java similarity index 76% rename from src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java rename to src/main/java/ru/betterend/blocks/MossyGlowshroomSaplingBlock.java index 0a287ab4..24c1ffff 100644 --- a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java +++ b/src/main/java/ru/betterend/blocks/MossyGlowshroomSaplingBlock.java @@ -4,12 +4,12 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldView; import net.minecraft.world.gen.feature.Feature; -import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.blocks.basis.FeatureSaplingBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; -public class BlockMossyGlowshroomSapling extends BlockFeatureSapling { - public BlockMossyGlowshroomSapling() { +public class MossyGlowshroomSaplingBlock extends FeatureSaplingBlock { + public MossyGlowshroomSaplingBlock() { super(7); } diff --git a/src/main/java/ru/betterend/blocks/BlockMurkweed.java b/src/main/java/ru/betterend/blocks/MurkweedBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/BlockMurkweed.java rename to src/main/java/ru/betterend/blocks/MurkweedBlock.java index 8b47efbe..14fd6e19 100644 --- a/src/main/java/ru/betterend/blocks/BlockMurkweed.java +++ b/src/main/java/ru/betterend/blocks/MurkweedBlock.java @@ -12,10 +12,10 @@ import net.minecraft.entity.effect.StatusEffects; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; -public class BlockMurkweed extends BlockPlant { +public class MurkweedBlock extends EndPlantBlock { @Override @Environment(EnvType.CLIENT) public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { diff --git a/src/main/java/ru/betterend/blocks/BlockNeedlegrass.java b/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/BlockNeedlegrass.java rename to src/main/java/ru/betterend/blocks/NeedlegrassBlock.java index 6d9aaa9f..fe6bd91e 100644 --- a/src/main/java/ru/betterend/blocks/BlockNeedlegrass.java +++ b/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java @@ -17,11 +17,11 @@ import net.minecraft.loot.context.LootContext; import net.minecraft.loot.context.LootContextParameters; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.MHelper; -public class BlockNeedlegrass extends BlockPlant { +public class NeedlegrassBlock extends EndPlantBlock { @Override public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { if (entity instanceof LivingEntity) { diff --git a/src/main/java/ru/betterend/blocks/PedestalVanilla.java b/src/main/java/ru/betterend/blocks/PedestalVanilla.java index 29f8039a..b7848ce1 100644 --- a/src/main/java/ru/betterend/blocks/PedestalVanilla.java +++ b/src/main/java/ru/betterend/blocks/PedestalVanilla.java @@ -6,10 +6,10 @@ import java.util.Map; import net.minecraft.block.Block; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.patterns.Patterns; -public class PedestalVanilla extends BlockPedestal { +public class PedestalVanilla extends PedestalBlock { public PedestalVanilla(Block parent) { super(parent); diff --git a/src/main/java/ru/betterend/blocks/BlockPythadendronSapling.java b/src/main/java/ru/betterend/blocks/PythadendronSaplingBlock.java similarity index 75% rename from src/main/java/ru/betterend/blocks/BlockPythadendronSapling.java rename to src/main/java/ru/betterend/blocks/PythadendronSaplingBlock.java index cdb301ad..40926215 100644 --- a/src/main/java/ru/betterend/blocks/BlockPythadendronSapling.java +++ b/src/main/java/ru/betterend/blocks/PythadendronSaplingBlock.java @@ -4,12 +4,12 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldView; import net.minecraft.world.gen.feature.Feature; -import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.blocks.basis.FeatureSaplingBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; -public class BlockPythadendronSapling extends BlockFeatureSapling { - public BlockPythadendronSapling() { +public class PythadendronSaplingBlock extends FeatureSaplingBlock { + public PythadendronSaplingBlock() { super(); } diff --git a/src/main/java/ru/betterend/blocks/BlockRespawnObelisk.java b/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java similarity index 95% rename from src/main/java/ru/betterend/blocks/BlockRespawnObelisk.java rename to src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java index 77e9192f..8443c9f3 100644 --- a/src/main/java/ru/betterend/blocks/BlockRespawnObelisk.java +++ b/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java @@ -36,7 +36,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IColorProvider; import ru.betterend.interfaces.IRenderTypeable; @@ -46,13 +46,13 @@ import ru.betterend.registry.EndItems; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; -public class BlockRespawnObelisk extends BlockBase implements IColorProvider, IRenderTypeable { +public class RespawnObeliskBlock extends BaseBlock implements IColorProvider, IRenderTypeable { private static final VoxelShape VOXEL_SHAPE_BOTTOM = Block.createCuboidShape(1, 0, 1, 15, 16, 15); private static final VoxelShape VOXEL_SHAPE_MIDDLE_TOP = Block.createCuboidShape(2, 0, 2, 14, 16, 14); public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; - public BlockRespawnObelisk() { + public RespawnObeliskBlock() { super(FabricBlockSettings.copyOf(Blocks.END_STONE).luminance((state) -> { return (state.get(SHAPE) == TripleShape.BOTTOM) ? 0 : 15; })); diff --git a/src/main/java/ru/betterend/blocks/RunedFlavolite.java b/src/main/java/ru/betterend/blocks/RunedFlavolite.java index 9e4b18d4..4ce7a552 100644 --- a/src/main/java/ru/betterend/blocks/RunedFlavolite.java +++ b/src/main/java/ru/betterend/blocks/RunedFlavolite.java @@ -6,10 +6,10 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.registry.EndBlocks; -public class RunedFlavolite extends BlockBase { +public class RunedFlavolite extends BaseBlock { public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE; public RunedFlavolite() { diff --git a/src/main/java/ru/betterend/blocks/BlockShadowBerry.java b/src/main/java/ru/betterend/blocks/ShadowBerryBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/BlockShadowBerry.java rename to src/main/java/ru/betterend/blocks/ShadowBerryBlock.java index 2e192fc1..2cca0ec5 100644 --- a/src/main/java/ru/betterend/blocks/BlockShadowBerry.java +++ b/src/main/java/ru/betterend/blocks/ShadowBerryBlock.java @@ -16,12 +16,12 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; import ru.betterend.util.MHelper; -public class BlockShadowBerry extends BlockPlantWithAge { +public class ShadowBerryBlock extends PlantWithAgeBlock { private static final VoxelShape SHAPE = Block.createCuboidShape(1, 0, 1, 15, 8, 15); @Override diff --git a/src/main/java/ru/betterend/blocks/BlockShadowGrass.java b/src/main/java/ru/betterend/blocks/ShadowGrassBlock.java similarity index 87% rename from src/main/java/ru/betterend/blocks/BlockShadowGrass.java rename to src/main/java/ru/betterend/blocks/ShadowGrassBlock.java index 9fd872b9..20ca5978 100644 --- a/src/main/java/ru/betterend/blocks/BlockShadowGrass.java +++ b/src/main/java/ru/betterend/blocks/ShadowGrassBlock.java @@ -10,8 +10,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import ru.betterend.registry.EndParticles; -public class BlockShadowGrass extends BlockTerrain { - public BlockShadowGrass() { +public class ShadowGrassBlock extends EndTerrainBlock { + public ShadowGrassBlock() { super(MaterialColor.BLACK); } diff --git a/src/main/java/ru/betterend/blocks/BlockSilkMothNest.java b/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockSilkMothNest.java rename to src/main/java/ru/betterend/blocks/SilkMothNestBlock.java index 1c99e9cb..deacc08a 100644 --- a/src/main/java/ru/betterend/blocks/BlockSilkMothNest.java +++ b/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java @@ -27,18 +27,18 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.util.BlocksHelper; -public class BlockSilkMothNest extends BlockBase implements IRenderTypeable { +public class SilkMothNestBlock extends BaseBlock implements IRenderTypeable { public static final BooleanProperty ACTIVE = BlockProperties.ACTIVE; public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; private static final VoxelShape TOP = createCuboidShape(6, 0, 6, 10, 16, 10); private static final VoxelShape BOTTOM = createCuboidShape(0, 0, 0, 16, 16, 16); - public BlockSilkMothNest() { + public SilkMothNestBlock() { super(FabricBlockSettings.of(Material.WOOL).hardness(0.5F).resistance(0.1F).sounds(BlockSoundGroup.WOOL).nonOpaque()); this.setDefaultState(getDefaultState().with(ACTIVE, true)); } diff --git a/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java b/src/main/java/ru/betterend/blocks/SmallJellyshroomBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java rename to src/main/java/ru/betterend/blocks/SmallJellyshroomBlock.java index f3f15238..01b16b4c 100644 --- a/src/main/java/ru/betterend/blocks/BlockSmallJellyshroom.java +++ b/src/main/java/ru/betterend/blocks/SmallJellyshroomBlock.java @@ -29,17 +29,17 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; -import ru.betterend.blocks.basis.BlockAttached; +import ru.betterend.blocks.basis.AttachedBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndTags; import ru.betterend.util.BlocksHelper; -public class BlockSmallJellyshroom extends BlockAttached implements IRenderTypeable, Fertilizable { +public class SmallJellyshroomBlock extends AttachedBlock implements IRenderTypeable, Fertilizable { private static final EnumMap BOUNDING_SHAPES = Maps.newEnumMap(Direction.class); - public BlockSmallJellyshroom() { + public SmallJellyshroomBlock() { super(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.NETHER_WART) diff --git a/src/main/java/ru/betterend/blocks/BlockSulphurCrystal.java b/src/main/java/ru/betterend/blocks/SulphurCrystalBlock.java similarity index 94% rename from src/main/java/ru/betterend/blocks/BlockSulphurCrystal.java rename to src/main/java/ru/betterend/blocks/SulphurCrystalBlock.java index bfa5f4d8..17ba297c 100644 --- a/src/main/java/ru/betterend/blocks/BlockSulphurCrystal.java +++ b/src/main/java/ru/betterend/blocks/SulphurCrystalBlock.java @@ -34,19 +34,19 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import ru.betterend.blocks.basis.BlockAttached; +import ru.betterend.blocks.basis.AttachedBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; import ru.betterend.util.MHelper; -public class BlockSulphurCrystal extends BlockAttached implements IRenderTypeable, Waterloggable, FluidFillable { +public class SulphurCrystalBlock extends AttachedBlock implements IRenderTypeable, Waterloggable, FluidFillable { private static final EnumMap BOUNDING_SHAPES = Maps.newEnumMap(Direction.class); public static final IntProperty AGE = IntProperty.of("age", 0, 2); public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; - public BlockSulphurCrystal() { + public SulphurCrystalBlock() { super(FabricBlockSettings.of(Material.STONE) .materialColor(MaterialColor.YELLOW) .breakByTool(FabricToolTags.PICKAXES) diff --git a/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java b/src/main/java/ru/betterend/blocks/TenaneaFlowersBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java rename to src/main/java/ru/betterend/blocks/TenaneaFlowersBlock.java index fbd09f88..447f2635 100644 --- a/src/main/java/ru/betterend/blocks/BlockTenaneaFlowers.java +++ b/src/main/java/ru/betterend/blocks/TenaneaFlowersBlock.java @@ -12,15 +12,15 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3i; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockVine; +import ru.betterend.blocks.basis.VineBlock; import ru.betterend.interfaces.IColorProvider; import ru.betterend.registry.EndParticles; import ru.betterend.util.MHelper; -public class BlockTenaneaFlowers extends BlockVine implements IColorProvider { +public class TenaneaFlowersBlock extends VineBlock implements IColorProvider { public static final Vec3i[] COLORS; - public BlockTenaneaFlowers() { + public TenaneaFlowersBlock() { super(15); } diff --git a/src/main/java/ru/betterend/blocks/BlockTenaneaSapling.java b/src/main/java/ru/betterend/blocks/TenaneaSaplingBlock.java similarity index 76% rename from src/main/java/ru/betterend/blocks/BlockTenaneaSapling.java rename to src/main/java/ru/betterend/blocks/TenaneaSaplingBlock.java index b8140315..85775e93 100644 --- a/src/main/java/ru/betterend/blocks/BlockTenaneaSapling.java +++ b/src/main/java/ru/betterend/blocks/TenaneaSaplingBlock.java @@ -4,12 +4,12 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldView; import net.minecraft.world.gen.feature.Feature; -import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.blocks.basis.FeatureSaplingBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; -public class BlockTenaneaSapling extends BlockFeatureSapling { - public BlockTenaneaSapling() { +public class TenaneaSaplingBlock extends FeatureSaplingBlock { + public TenaneaSaplingBlock() { super(); } diff --git a/src/main/java/ru/betterend/blocks/TerminiteBlock.java b/src/main/java/ru/betterend/blocks/TerminiteBlock.java index 204a2e55..627fe65f 100644 --- a/src/main/java/ru/betterend/blocks/TerminiteBlock.java +++ b/src/main/java/ru/betterend/blocks/TerminiteBlock.java @@ -4,9 +4,9 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; import net.minecraft.sound.BlockSoundGroup; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; -public class TerminiteBlock extends BlockBase { +public class TerminiteBlock extends BaseBlock { public TerminiteBlock() { super(FabricBlockSettings.of(Material.METAL, MaterialColor.field_25708) .hardness(7F) diff --git a/src/main/java/ru/betterend/blocks/BlockTerrainPlant.java b/src/main/java/ru/betterend/blocks/TerrainPlantBlock.java similarity index 62% rename from src/main/java/ru/betterend/blocks/BlockTerrainPlant.java rename to src/main/java/ru/betterend/blocks/TerrainPlantBlock.java index d3587c9b..53e3b007 100644 --- a/src/main/java/ru/betterend/blocks/BlockTerrainPlant.java +++ b/src/main/java/ru/betterend/blocks/TerrainPlantBlock.java @@ -2,12 +2,12 @@ package ru.betterend.blocks; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.EndPlantBlock; -public class BlockTerrainPlant extends BlockPlant { +public class TerrainPlantBlock extends EndPlantBlock { private final Block ground; - public BlockTerrainPlant(Block ground) { + public TerrainPlantBlock(Block ground) { super(true); this.ground = ground; } diff --git a/src/main/java/ru/betterend/blocks/BlockTwistedUmbrellaMoss.java b/src/main/java/ru/betterend/blocks/TwistedUmbrellaMossBlock.java similarity index 76% rename from src/main/java/ru/betterend/blocks/BlockTwistedUmbrellaMoss.java rename to src/main/java/ru/betterend/blocks/TwistedUmbrellaMossBlock.java index b5e9ce91..af0257a6 100644 --- a/src/main/java/ru/betterend/blocks/BlockTwistedUmbrellaMoss.java +++ b/src/main/java/ru/betterend/blocks/TwistedUmbrellaMossBlock.java @@ -9,13 +9,13 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockDoublePlant; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.DoublePlantBlock; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockTwistedUmbrellaMoss extends BlockPlant { - public BlockTwistedUmbrellaMoss() { +public class TwistedUmbrellaMossBlock extends EndPlantBlock { + public TwistedUmbrellaMossBlock() { super(11); } @@ -42,8 +42,8 @@ public class BlockTwistedUmbrellaMoss extends BlockPlant { @Override public void grow(ServerWorld world, Random random, BlockPos pos, BlockState state) { int rot = world.random.nextInt(4); - BlockState bs = EndBlocks.TWISTED_UMBRELLA_MOSS_TALL.getDefaultState().with(BlockDoublePlant.ROTATION, rot); + BlockState bs = EndBlocks.TWISTED_UMBRELLA_MOSS_TALL.getDefaultState().with(DoublePlantBlock.ROTATION, rot); BlocksHelper.setWithoutUpdate(world, pos, bs); - BlocksHelper.setWithoutUpdate(world, pos.up(), bs.with(BlockDoublePlant.TOP, true)); + BlocksHelper.setWithoutUpdate(world, pos.up(), bs.with(DoublePlantBlock.TOP, true)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockTwistedUmbrellaMossTall.java b/src/main/java/ru/betterend/blocks/TwistedUmbrellaMossTallBlock.java similarity index 80% rename from src/main/java/ru/betterend/blocks/BlockTwistedUmbrellaMossTall.java rename to src/main/java/ru/betterend/blocks/TwistedUmbrellaMossTallBlock.java index c9657bb6..fbad6c9c 100644 --- a/src/main/java/ru/betterend/blocks/BlockTwistedUmbrellaMossTall.java +++ b/src/main/java/ru/betterend/blocks/TwistedUmbrellaMossTallBlock.java @@ -7,11 +7,11 @@ import net.minecraft.entity.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; -import ru.betterend.blocks.basis.BlockDoublePlant; +import ru.betterend.blocks.basis.DoublePlantBlock; import ru.betterend.registry.EndBlocks; -public class BlockTwistedUmbrellaMossTall extends BlockDoublePlant { - public BlockTwistedUmbrellaMossTall() { +public class TwistedUmbrellaMossTallBlock extends DoublePlantBlock { + public TwistedUmbrellaMossTallBlock() { super(12); } diff --git a/src/main/java/ru/betterend/blocks/BlockUmbrellaMoss.java b/src/main/java/ru/betterend/blocks/UmbrellaMossBlock.java similarity index 78% rename from src/main/java/ru/betterend/blocks/BlockUmbrellaMoss.java rename to src/main/java/ru/betterend/blocks/UmbrellaMossBlock.java index 2edb374a..90173d0d 100644 --- a/src/main/java/ru/betterend/blocks/BlockUmbrellaMoss.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaMossBlock.java @@ -9,13 +9,13 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockDoublePlant; -import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.blocks.basis.DoublePlantBlock; +import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockUmbrellaMoss extends BlockPlant { - public BlockUmbrellaMoss() { +public class UmbrellaMossBlock extends EndPlantBlock { + public UmbrellaMossBlock() { super(11); } @@ -42,8 +42,8 @@ public class BlockUmbrellaMoss extends BlockPlant { @Override public void grow(ServerWorld world, Random random, BlockPos pos, BlockState state) { int rot = world.random.nextInt(4); - BlockState bs = EndBlocks.UMBRELLA_MOSS_TALL.getDefaultState().with(BlockDoublePlant.ROTATION, rot); + BlockState bs = EndBlocks.UMBRELLA_MOSS_TALL.getDefaultState().with(DoublePlantBlock.ROTATION, rot); BlocksHelper.setWithoutUpdate(world, pos, bs); - BlocksHelper.setWithoutUpdate(world, pos.up(), bs.with(BlockDoublePlant.TOP, true)); + BlocksHelper.setWithoutUpdate(world, pos.up(), bs.with(DoublePlantBlock.TOP, true)); } } diff --git a/src/main/java/ru/betterend/blocks/BlockUmbrellaMossTall.java b/src/main/java/ru/betterend/blocks/UmbrellaMossTallBlock.java similarity index 81% rename from src/main/java/ru/betterend/blocks/BlockUmbrellaMossTall.java rename to src/main/java/ru/betterend/blocks/UmbrellaMossTallBlock.java index 85333686..c3a90063 100644 --- a/src/main/java/ru/betterend/blocks/BlockUmbrellaMossTall.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaMossTallBlock.java @@ -7,11 +7,11 @@ import net.minecraft.entity.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; -import ru.betterend.blocks.basis.BlockDoublePlant; +import ru.betterend.blocks.basis.DoublePlantBlock; import ru.betterend.registry.EndBlocks; -public class BlockUmbrellaMossTall extends BlockDoublePlant { - public BlockUmbrellaMossTall() { +public class UmbrellaMossTallBlock extends DoublePlantBlock { + public UmbrellaMossTallBlock() { super(12); } diff --git a/src/main/java/ru/betterend/blocks/BlockUmbrellaTreeCluster.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/BlockUmbrellaTreeCluster.java rename to src/main/java/ru/betterend/blocks/UmbrellaTreeClusterBlock.java index 8f013990..55c2d478 100644 --- a/src/main/java/ru/betterend/blocks/BlockUmbrellaTreeCluster.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterBlock.java @@ -17,15 +17,15 @@ import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; import ru.betterend.util.BlocksHelper; -public class BlockUmbrellaTreeCluster extends BlockBase { +public class UmbrellaTreeClusterBlock extends BaseBlock { public static final BooleanProperty NATURAL = BlockProperties.NATURAL; - public BlockUmbrellaTreeCluster() { + public UmbrellaTreeClusterBlock() { super(FabricBlockSettings.copyOf(Blocks.NETHER_WART_BLOCK) .materialColor(MaterialColor.PURPLE) .luminance(15)); diff --git a/src/main/java/ru/betterend/blocks/BlockUmbrellaTreeClusterEmpty.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java similarity index 82% rename from src/main/java/ru/betterend/blocks/BlockUmbrellaTreeClusterEmpty.java rename to src/main/java/ru/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java index decab1f9..6cb335b5 100644 --- a/src/main/java/ru/betterend/blocks/BlockUmbrellaTreeClusterEmpty.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java @@ -11,14 +11,14 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.math.BlockPos; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BaseBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockUmbrellaTreeClusterEmpty extends BlockBase { +public class UmbrellaTreeClusterEmptyBlock extends BaseBlock { public static final BooleanProperty NATURAL = BlockProperties.NATURAL; - public BlockUmbrellaTreeClusterEmpty() { + public UmbrellaTreeClusterEmptyBlock() { super(FabricBlockSettings.copyOf(Blocks.NETHER_WART_BLOCK) .materialColor(MaterialColor.PURPLE) .ticksRandomly()); @@ -33,7 +33,7 @@ public class BlockUmbrellaTreeClusterEmpty extends BlockBase { @Override public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { if (state.get(NATURAL) && random.nextInt(16) == 0) { - BlocksHelper.setWithUpdate(world, pos, EndBlocks.UMBRELLA_TREE_CLUSTER.getDefaultState().with(BlockUmbrellaTreeCluster.NATURAL, true)); + BlocksHelper.setWithUpdate(world, pos, EndBlocks.UMBRELLA_TREE_CLUSTER.getDefaultState().with(UmbrellaTreeClusterBlock.NATURAL, true)); } } } diff --git a/src/main/java/ru/betterend/blocks/BlockUmbrellaTreeMembrane.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockUmbrellaTreeMembrane.java rename to src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java index 61042adf..75075069 100644 --- a/src/main/java/ru/betterend/blocks/BlockUmbrellaTreeMembrane.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java @@ -31,11 +31,11 @@ import ru.betterend.patterns.Patterns; import ru.betterend.registry.EndBlocks; import ru.betterend.util.MHelper; -public class BlockUmbrellaTreeMembrane extends SlimeBlock implements IRenderTypeable, BlockPatterned { +public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderTypeable, BlockPatterned { public static final IntProperty COLOR = IntProperty.of("color", 0, 7); private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0); - public BlockUmbrellaTreeMembrane() { + public UmbrellaTreeMembraneBlock() { super(FabricBlockSettings.copyOf(Blocks.SLIME_BLOCK)); } diff --git a/src/main/java/ru/betterend/blocks/BlockUmbrellaTreeSapling.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java similarity index 78% rename from src/main/java/ru/betterend/blocks/BlockUmbrellaTreeSapling.java rename to src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java index 485008e1..eba60eff 100644 --- a/src/main/java/ru/betterend/blocks/BlockUmbrellaTreeSapling.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java @@ -4,13 +4,13 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldView; import net.minecraft.world.gen.feature.Feature; -import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.blocks.basis.FeatureSaplingBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; -public class BlockUmbrellaTreeSapling extends BlockFeatureSapling { - public BlockUmbrellaTreeSapling() { +public class UmbrellaTreeSaplingBlock extends FeatureSaplingBlock { + public UmbrellaTreeSaplingBlock() { super(); } diff --git a/src/main/java/ru/betterend/blocks/BlockVentBubbleColumn.java b/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java similarity index 95% rename from src/main/java/ru/betterend/blocks/BlockVentBubbleColumn.java rename to src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java index 7391c96b..970d866a 100644 --- a/src/main/java/ru/betterend/blocks/BlockVentBubbleColumn.java +++ b/src/main/java/ru/betterend/blocks/VentBubbleColumnBlock.java @@ -32,8 +32,8 @@ import net.minecraft.world.WorldView; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockVentBubbleColumn extends Block implements FluidDrainable, FluidFillable { - public BlockVentBubbleColumn() { +public class VentBubbleColumnBlock extends Block implements FluidDrainable, FluidFillable { + public VentBubbleColumnBlock() { super(FabricBlockSettings.of(Material.BUBBLE_COLUMN).nonOpaque().noCollision().dropsNothing()); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockAttached.java b/src/main/java/ru/betterend/blocks/basis/AttachedBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/basis/BlockAttached.java rename to src/main/java/ru/betterend/blocks/basis/AttachedBlock.java index 6a6f8525..e5a58779 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockAttached.java +++ b/src/main/java/ru/betterend/blocks/basis/AttachedBlock.java @@ -16,10 +16,10 @@ import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import ru.betterend.util.BlocksHelper; -public abstract class BlockAttached extends BlockBaseNotFull { +public abstract class AttachedBlock extends BaseBlockNotFull { public static final DirectionProperty FACING = Properties.FACING; - public BlockAttached(Settings settings) { + public AttachedBlock(Settings settings) { super(settings); this.setDefaultState(this.getDefaultState().with(FACING, Direction.UP)); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBark.java b/src/main/java/ru/betterend/blocks/basis/BarkBlock.java similarity index 86% rename from src/main/java/ru/betterend/blocks/basis/BlockBark.java rename to src/main/java/ru/betterend/blocks/basis/BarkBlock.java index 94847b94..f6c3587b 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBark.java +++ b/src/main/java/ru/betterend/blocks/basis/BarkBlock.java @@ -6,8 +6,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import ru.betterend.patterns.Patterns; -public class BlockBark extends BlockPillar { - public BlockBark(Settings settings) { +public class BarkBlock extends EndPillarBlock { + public BarkBlock(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBase.java b/src/main/java/ru/betterend/blocks/basis/BaseBlock.java similarity index 88% rename from src/main/java/ru/betterend/blocks/basis/BlockBase.java rename to src/main/java/ru/betterend/blocks/basis/BaseBlock.java index cdebbf74..a58755b9 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBase.java +++ b/src/main/java/ru/betterend/blocks/basis/BaseBlock.java @@ -13,8 +13,8 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockBase extends Block implements BlockPatterned { - public BlockBase(Settings settings) { +public class BaseBlock extends Block implements BlockPatterned { + public BaseBlock(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBaseNotFull.java b/src/main/java/ru/betterend/blocks/basis/BaseBlockNotFull.java similarity index 81% rename from src/main/java/ru/betterend/blocks/basis/BlockBaseNotFull.java rename to src/main/java/ru/betterend/blocks/basis/BaseBlockNotFull.java index dbf23923..fb967f7e 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBaseNotFull.java +++ b/src/main/java/ru/betterend/blocks/basis/BaseBlockNotFull.java @@ -5,9 +5,9 @@ import net.minecraft.entity.EntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; -public class BlockBaseNotFull extends BlockBase { +public class BaseBlockNotFull extends BaseBlock { - public BlockBaseNotFull(Settings settings) { + public BaseBlockNotFull(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java b/src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java index 4442e05d..b0f49174 100644 --- a/src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java +++ b/src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java @@ -11,7 +11,6 @@ import net.minecraft.loot.context.LootContext; import net.minecraft.world.BlockView; public class BaseBlockWithEntity extends BlockWithEntity { - public BaseBlockWithEntity(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockDoublePlant.java b/src/main/java/ru/betterend/blocks/basis/DoublePlantBlock.java similarity index 94% rename from src/main/java/ru/betterend/blocks/basis/BlockDoublePlant.java rename to src/main/java/ru/betterend/blocks/basis/DoublePlantBlock.java index c1290b9e..e21e6d92 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockDoublePlant.java +++ b/src/main/java/ru/betterend/blocks/basis/DoublePlantBlock.java @@ -40,12 +40,12 @@ import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndTags; import ru.betterend.util.BlocksHelper; -public class BlockDoublePlant extends BlockBaseNotFull implements IRenderTypeable, Fertilizable { +public class DoublePlantBlock extends BaseBlockNotFull implements IRenderTypeable, Fertilizable { private static final VoxelShape SHAPE = Block.createCuboidShape(4, 2, 4, 12, 16, 12); public static final IntProperty ROTATION = BlockProperties.ROTATION; public static final BooleanProperty TOP = BooleanProperty.of("top"); - public BlockDoublePlant() { + public DoublePlantBlock() { super(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) @@ -54,7 +54,7 @@ public class BlockDoublePlant extends BlockBaseNotFull implements IRenderTypeabl this.setDefaultState(this.stateManager.getDefaultState().with(TOP, false)); } - public BlockDoublePlant(int light) { + public DoublePlantBlock(int light) { super(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBarrel.java b/src/main/java/ru/betterend/blocks/basis/EndBarrelBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/basis/BlockBarrel.java rename to src/main/java/ru/betterend/blocks/basis/EndBarrelBlock.java index 8cf0e69c..7098b82b 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBarrel.java +++ b/src/main/java/ru/betterend/blocks/basis/EndBarrelBlock.java @@ -30,8 +30,8 @@ import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; import ru.betterend.registry.EndBlockEntities; -public class BlockBarrel extends BarrelBlock implements BlockPatterned { - public BlockBarrel(Block source) { +public class EndBarrelBlock extends BarrelBlock implements BlockPatterned { + public EndBarrelBlock(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBarkStripable.java b/src/main/java/ru/betterend/blocks/basis/EndBlockStripableLogLog.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockBarkStripable.java rename to src/main/java/ru/betterend/blocks/basis/EndBlockStripableLogLog.java index 5adef8f5..8813267a 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBarkStripable.java +++ b/src/main/java/ru/betterend/blocks/basis/EndBlockStripableLogLog.java @@ -16,10 +16,10 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockBarkStripable extends BlockBark { +public class EndBlockStripableLogLog extends EndPillarBlock { private final Block striped; - public BlockBarkStripable(MaterialColor color, Block striped) { + public EndBlockStripableLogLog(MaterialColor color, Block striped) { super(FabricBlockSettings.copyOf(striped).materialColor(color)); this.striped = striped; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBookshelf.java b/src/main/java/ru/betterend/blocks/basis/EndBookshelfBlock.java similarity index 92% rename from src/main/java/ru/betterend/blocks/basis/BlockBookshelf.java rename to src/main/java/ru/betterend/blocks/basis/EndBookshelfBlock.java index a2b7cce5..b275fd37 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBookshelf.java +++ b/src/main/java/ru/betterend/blocks/basis/EndBookshelfBlock.java @@ -17,8 +17,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import ru.betterend.patterns.Patterns; -public class BlockBookshelf extends BlockBase { - public BlockBookshelf(Block source) { +public class EndBookshelfBlock extends BaseBlock { + public EndBookshelfBlock(Block source) { super(FabricBlockSettings.copyOf(source)); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockChest.java b/src/main/java/ru/betterend/blocks/basis/EndChestBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/basis/BlockChest.java rename to src/main/java/ru/betterend/blocks/basis/EndChestBlock.java index 580f3ca8..1d4d5582 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockChest.java +++ b/src/main/java/ru/betterend/blocks/basis/EndChestBlock.java @@ -17,11 +17,10 @@ import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; import ru.betterend.registry.EndBlockEntities; -public class BlockChest extends ChestBlock implements BlockPatterned { - +public class EndChestBlock extends ChestBlock implements BlockPatterned { private final Block parent; - public BlockChest(Block source) { + public EndChestBlock(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque(), () -> { return EndBlockEntities.CHEST; }); diff --git a/src/main/java/ru/betterend/blocks/basis/BlockComposter.java b/src/main/java/ru/betterend/blocks/basis/EndComposterBlock.java similarity index 88% rename from src/main/java/ru/betterend/blocks/basis/BlockComposter.java rename to src/main/java/ru/betterend/blocks/basis/EndComposterBlock.java index 2c4cc28c..8d8a77f2 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockComposter.java +++ b/src/main/java/ru/betterend/blocks/basis/EndComposterBlock.java @@ -15,8 +15,8 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockComposter extends ComposterBlock implements BlockPatterned { - public BlockComposter(Block source) { +public class EndComposterBlock extends ComposterBlock implements BlockPatterned { + public EndComposterBlock(Block source) { super(FabricBlockSettings.copyOf(source)); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockCraftingTable.java b/src/main/java/ru/betterend/blocks/basis/EndCraftingTableBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockCraftingTable.java rename to src/main/java/ru/betterend/blocks/basis/EndCraftingTableBlock.java index 7840de90..a918ac34 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockCraftingTable.java +++ b/src/main/java/ru/betterend/blocks/basis/EndCraftingTableBlock.java @@ -16,8 +16,8 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockCraftingTable extends CraftingTableBlock implements BlockPatterned { - public BlockCraftingTable(Block source) { +public class EndCraftingTableBlock extends CraftingTableBlock implements BlockPatterned { + public EndCraftingTableBlock(Block source) { super(FabricBlockSettings.copyOf(source)); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockDoor.java b/src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/basis/BlockDoor.java rename to src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java index f41ae172..c8dbe648 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockDoor.java +++ b/src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java @@ -18,8 +18,8 @@ import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockDoor extends DoorBlock implements IRenderTypeable, BlockPatterned { - public BlockDoor(Block block) { +public class EndDoorBlock extends DoorBlock implements IRenderTypeable, BlockPatterned { + public EndDoorBlock(Block block) { super(FabricBlockSettings.copy(block).nonOpaque()); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockFence.java b/src/main/java/ru/betterend/blocks/basis/EndFenceBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/basis/BlockFence.java rename to src/main/java/ru/betterend/blocks/basis/EndFenceBlock.java index 17b7d007..e2c87c5e 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockFence.java +++ b/src/main/java/ru/betterend/blocks/basis/EndFenceBlock.java @@ -15,11 +15,10 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockFence extends FenceBlock implements BlockPatterned { - +public class EndFenceBlock extends FenceBlock implements BlockPatterned { private final Block parent; - public BlockFence(Block source) { + public EndFenceBlock(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockGate.java b/src/main/java/ru/betterend/blocks/basis/EndGateBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/basis/BlockGate.java rename to src/main/java/ru/betterend/blocks/basis/EndGateBlock.java index 37cc1ecd..f7c8c240 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockGate.java +++ b/src/main/java/ru/betterend/blocks/basis/EndGateBlock.java @@ -15,11 +15,10 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockGate extends FenceGateBlock implements BlockPatterned { - +public class EndGateBlock extends FenceGateBlock implements BlockPatterned { private final Block parent; - public BlockGate(Block source) { + public EndGateBlock(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockLadder.java b/src/main/java/ru/betterend/blocks/basis/EndLadderBlock.java similarity index 94% rename from src/main/java/ru/betterend/blocks/basis/BlockLadder.java rename to src/main/java/ru/betterend/blocks/basis/EndLadderBlock.java index d5d5cba9..a7343275 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockLadder.java +++ b/src/main/java/ru/betterend/blocks/basis/EndLadderBlock.java @@ -31,7 +31,7 @@ import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; import ru.betterend.util.BlocksHelper; -public class BlockLadder extends BlockBaseNotFull implements IRenderTypeable, BlockPatterned { +public class EndLadderBlock extends BaseBlockNotFull implements IRenderTypeable, BlockPatterned { public static final DirectionProperty FACING = HorizontalFacingBlock.FACING; public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; protected static final VoxelShape EAST_SHAPE = Block.createCuboidShape(0.0D, 0.0D, 0.0D, 3.0D, 16.0D, 16.0D); @@ -39,7 +39,7 @@ public class BlockLadder extends BlockBaseNotFull implements IRenderTypeable, Bl protected static final VoxelShape SOUTH_SHAPE = Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, 3.0D); protected static final VoxelShape NORTH_SHAPE = Block.createCuboidShape(0.0D, 0.0D, 13.0D, 16.0D, 16.0D, 16.0D); - public BlockLadder(Block block) { + public EndLadderBlock(Block block) { super(FabricBlockSettings.copyOf(block).nonOpaque()); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockLantern.java b/src/main/java/ru/betterend/blocks/basis/EndLanternBlock.java similarity index 92% rename from src/main/java/ru/betterend/blocks/basis/BlockLantern.java rename to src/main/java/ru/betterend/blocks/basis/EndLanternBlock.java index 0448bfbc..cb72f15c 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockLantern.java +++ b/src/main/java/ru/betterend/blocks/basis/EndLanternBlock.java @@ -19,15 +19,15 @@ import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -public class BlockLantern extends BlockBaseNotFull implements Waterloggable, FluidFillable { +public class EndLanternBlock extends BaseBlockNotFull implements Waterloggable, FluidFillable { public static final BooleanProperty IS_FLOOR = BooleanProperty.of("is_floor"); public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; - public BlockLantern(Block source) { + public EndLanternBlock(Block source) { this(FabricBlockSettings.copyOf(source).luminance(15).nonOpaque()); } - public BlockLantern(FabricBlockSettings settings) { + public EndLanternBlock(FabricBlockSettings settings) { super(settings.nonOpaque()); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockLeaves.java b/src/main/java/ru/betterend/blocks/basis/EndLeavesBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/basis/BlockLeaves.java rename to src/main/java/ru/betterend/blocks/basis/EndLeavesBlock.java index a00e8f35..483b877c 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockLeaves.java +++ b/src/main/java/ru/betterend/blocks/basis/EndLeavesBlock.java @@ -26,10 +26,10 @@ import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; import ru.betterend.util.MHelper; -public class BlockLeaves extends LeavesBlock implements BlockPatterned, IRenderTypeable { +public class EndLeavesBlock extends LeavesBlock implements BlockPatterned, IRenderTypeable { private final Block sapling; - public BlockLeaves(Block sapling, MaterialColor color) { + public EndLeavesBlock(Block sapling, MaterialColor color) { super(FabricBlockSettings.copyOf(Blocks.OAK_LEAVES) .allowsSpawning((state, world, pos, type) -> { return false; }) .suffocates((state, world, pos) -> { return false; }) @@ -39,7 +39,7 @@ public class BlockLeaves extends LeavesBlock implements BlockPatterned, IRenderT this.sapling = sapling; } - public BlockLeaves(Block sapling, MaterialColor color, int light) { + public EndLeavesBlock(Block sapling, MaterialColor color, int light) { super(FabricBlockSettings.copyOf(Blocks.OAK_LEAVES) .allowsSpawning((state, world, pos, type) -> { return false; }) .suffocates((state, world, pos) -> { return false; }) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockOre.java b/src/main/java/ru/betterend/blocks/basis/EndOreBlock.java similarity index 92% rename from src/main/java/ru/betterend/blocks/basis/BlockOre.java rename to src/main/java/ru/betterend/blocks/basis/EndOreBlock.java index 0fc93d69..7ccab8b4 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockOre.java +++ b/src/main/java/ru/betterend/blocks/basis/EndOreBlock.java @@ -24,13 +24,13 @@ import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; import ru.betterend.util.MHelper; -public class BlockOre extends OreBlock implements BlockPatterned { +public class EndOreBlock extends OreBlock implements BlockPatterned { private final Item dropItem; private final int minCount; private final int maxCount; private final int expirience; - public BlockOre(Item drop, int minCount, int maxCount, int expirience) { + public EndOreBlock(Item drop, int minCount, int maxCount, int expirience) { super(FabricBlockSettings.of(Material.STONE, MaterialColor.SAND) .hardness(3F) .resistance(9F) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPillar.java b/src/main/java/ru/betterend/blocks/basis/EndPillarBlock.java similarity index 86% rename from src/main/java/ru/betterend/blocks/basis/BlockPillar.java rename to src/main/java/ru/betterend/blocks/basis/EndPillarBlock.java index 6f64faf9..04f9ff4d 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPillar.java +++ b/src/main/java/ru/betterend/blocks/basis/EndPillarBlock.java @@ -13,8 +13,8 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockPillar extends PillarBlock implements BlockPatterned { - public BlockPillar(Settings settings) { +public class EndPillarBlock extends PillarBlock implements BlockPatterned { + public EndPillarBlock(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPlant.java b/src/main/java/ru/betterend/blocks/basis/EndPlantBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockPlant.java rename to src/main/java/ru/betterend/blocks/basis/EndPlantBlock.java index 3cc74c74..136b7346 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPlant.java +++ b/src/main/java/ru/betterend/blocks/basis/EndPlantBlock.java @@ -34,18 +34,18 @@ import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndTags; -public class BlockPlant extends BlockBaseNotFull implements IRenderTypeable, Fertilizable { +public class EndPlantBlock extends BaseBlockNotFull implements IRenderTypeable, Fertilizable { private static final VoxelShape SHAPE = Block.createCuboidShape(4, 0, 4, 12, 14, 12); - public BlockPlant() { + public EndPlantBlock() { this(false); } - public BlockPlant(int light) { + public EndPlantBlock(int light) { this(false, light); } - public BlockPlant(boolean replaceable) { + public EndPlantBlock(boolean replaceable) { super(FabricBlockSettings.of(replaceable ? Material.REPLACEABLE_PLANT : Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) @@ -53,7 +53,7 @@ public class BlockPlant extends BlockBaseNotFull implements IRenderTypeable, Fer .noCollision()); } - public BlockPlant(boolean replaceable, int light) { + public EndPlantBlock(boolean replaceable, int light) { super(FabricBlockSettings.of(replaceable ? Material.REPLACEABLE_PLANT : Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) @@ -62,7 +62,7 @@ public class BlockPlant extends BlockBaseNotFull implements IRenderTypeable, Fer .noCollision()); } - public BlockPlant(Settings settings) { + public EndPlantBlock(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java b/src/main/java/ru/betterend/blocks/basis/EndPlateBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java rename to src/main/java/ru/betterend/blocks/basis/EndPlateBlock.java index 0bd66e41..955024b5 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPressurePlate.java +++ b/src/main/java/ru/betterend/blocks/basis/EndPlateBlock.java @@ -15,11 +15,10 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockPressurePlate extends PressurePlateBlock implements BlockPatterned { - +public class EndPlateBlock extends PressurePlateBlock implements BlockPatterned { private final Block parent; - public BlockPressurePlate(Block source) { + public EndPlateBlock(Block source) { super(ActivationRule.EVERYTHING, FabricBlockSettings.copyOf(source).nonOpaque()); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockSign.java b/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java similarity index 95% rename from src/main/java/ru/betterend/blocks/basis/BlockSign.java rename to src/main/java/ru/betterend/blocks/basis/EndSignBlock.java index 659b94ac..f0f9b0f2 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockSign.java +++ b/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java @@ -41,7 +41,7 @@ import ru.betterend.blocks.entities.ESignBlockEntity; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockSign extends AbstractSignBlock implements BlockPatterned { +public class EndSignBlock extends AbstractSignBlock implements BlockPatterned { public static final IntProperty ROTATION = Properties.ROTATION; public static final BooleanProperty FLOOR = BooleanProperty.of("floor"); private static final VoxelShape[] WALL_SHAPES = new VoxelShape[] { @@ -52,7 +52,7 @@ public class BlockSign extends AbstractSignBlock implements BlockPatterned { private final Block parent; - public BlockSign(Block source) { + public EndSignBlock(Block source) { super(FabricBlockSettings.copyOf(source).noCollision().nonOpaque(), SignType.OAK); this.setDefaultState(this.stateManager.getDefaultState().with(ROTATION, 0).with(FLOOR, true).with(WATERLOGGED, false)); this.parent = source; diff --git a/src/main/java/ru/betterend/blocks/basis/BlockSlab.java b/src/main/java/ru/betterend/blocks/basis/EndSlabBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockSlab.java rename to src/main/java/ru/betterend/blocks/basis/EndSlabBlock.java index d08a9c5e..102d6966 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockSlab.java +++ b/src/main/java/ru/betterend/blocks/basis/EndSlabBlock.java @@ -15,11 +15,10 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockSlab extends SlabBlock implements BlockPatterned { - +public class EndSlabBlock extends SlabBlock implements BlockPatterned { private final Block parent; - public BlockSlab(Block source) { + public EndSlabBlock(Block source) { super(FabricBlockSettings.copyOf(source)); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStairs.java b/src/main/java/ru/betterend/blocks/basis/EndStairsBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/basis/BlockStairs.java rename to src/main/java/ru/betterend/blocks/basis/EndStairsBlock.java index 3dc261fa..cbbaf6b0 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStairs.java +++ b/src/main/java/ru/betterend/blocks/basis/EndStairsBlock.java @@ -15,11 +15,11 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockStairs extends StairsBlock implements BlockPatterned { +public class EndStairsBlock extends StairsBlock implements BlockPatterned { private final Block parent; - public BlockStairs(Block source) { + public EndStairsBlock(Block source) { super(source.getDefaultState(), FabricBlockSettings.copyOf(source)); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java b/src/main/java/ru/betterend/blocks/basis/EndStoneButtonBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java rename to src/main/java/ru/betterend/blocks/basis/EndStoneButtonBlock.java index a7dd86e5..2476bd80 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStoneButton.java +++ b/src/main/java/ru/betterend/blocks/basis/EndStoneButtonBlock.java @@ -15,11 +15,10 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockStoneButton extends StoneButtonBlock implements BlockPatterned { - +public class EndStoneButtonBlock extends StoneButtonBlock implements BlockPatterned { private final Block parent; - public BlockStoneButton(Block source) { + public EndStoneButtonBlock(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java b/src/main/java/ru/betterend/blocks/basis/EndStonelateBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java rename to src/main/java/ru/betterend/blocks/basis/EndStonelateBlock.java index 8dce5c00..1ce22d37 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStonePressurePlate.java +++ b/src/main/java/ru/betterend/blocks/basis/EndStonelateBlock.java @@ -15,11 +15,10 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockStonePressurePlate extends PressurePlateBlock implements BlockPatterned { - +public class EndStonelateBlock extends PressurePlateBlock implements BlockPatterned { private final Block parent; - public BlockStonePressurePlate(Block source) { + public EndStonelateBlock(Block source) { super(ActivationRule.MOBS, FabricBlockSettings.copyOf(source).nonOpaque()); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockTrapdoor.java b/src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockTrapdoor.java rename to src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java index 08777a7c..0351e4de 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockTrapdoor.java +++ b/src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java @@ -18,8 +18,8 @@ import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockTrapdoor extends TrapdoorBlock implements IRenderTypeable, BlockPatterned { - public BlockTrapdoor(Block source) { +public class EndTrapdoorBlock extends TrapdoorBlock implements IRenderTypeable, BlockPatterned { + public EndTrapdoorBlock(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterWallPlant.java b/src/main/java/ru/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java similarity index 84% rename from src/main/java/ru/betterend/blocks/basis/BlockUnderwaterWallPlant.java rename to src/main/java/ru/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java index 2ea2bb31..3216584d 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterWallPlant.java +++ b/src/main/java/ru/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java @@ -14,9 +14,9 @@ import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -public class BlockUnderwaterWallPlant extends BlockWallPlant implements FluidFillable { +public class EndUnderwaterWallPlantBlock extends EndWallPlantBlock implements FluidFillable { - public BlockUnderwaterWallPlant() { + public EndUnderwaterWallPlantBlock() { super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) @@ -24,7 +24,7 @@ public class BlockUnderwaterWallPlant extends BlockWallPlant implements FluidFil .noCollision()); } - public BlockUnderwaterWallPlant(int light) { + public EndUnderwaterWallPlantBlock(int light) { super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) @@ -33,7 +33,7 @@ public class BlockUnderwaterWallPlant extends BlockWallPlant implements FluidFil .noCollision()); } - public BlockUnderwaterWallPlant(Settings settings) { + public EndUnderwaterWallPlantBlock(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWall.java b/src/main/java/ru/betterend/blocks/basis/EndWallBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/basis/BlockWall.java rename to src/main/java/ru/betterend/blocks/basis/EndWallBlock.java index 2010a583..3ce75cd6 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWall.java +++ b/src/main/java/ru/betterend/blocks/basis/EndWallBlock.java @@ -15,11 +15,11 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockWall extends WallBlock implements BlockPatterned { +public class EndWallBlock extends WallBlock implements BlockPatterned { private final Block parent; - public BlockWall(Block source) { + public EndWallBlock(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWallPlant.java b/src/main/java/ru/betterend/blocks/basis/EndWallPlantBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/basis/BlockWallPlant.java rename to src/main/java/ru/betterend/blocks/basis/EndWallPlantBlock.java index f2e1d94a..6de67ec3 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWallPlant.java +++ b/src/main/java/ru/betterend/blocks/basis/EndWallPlantBlock.java @@ -28,7 +28,7 @@ import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import ru.betterend.util.BlocksHelper; -public class BlockWallPlant extends BlockPlant { +public class EndWallPlantBlock extends EndPlantBlock { private static final EnumMap SHAPES = Maps.newEnumMap(ImmutableMap.of( Direction.NORTH, Block.createCuboidShape(1, 1, 8, 15, 15, 16), Direction.SOUTH, Block.createCuboidShape(1, 1, 0, 15, 15, 8), @@ -36,7 +36,7 @@ public class BlockWallPlant extends BlockPlant { Direction.EAST, Block.createCuboidShape(0, 1, 1, 8, 15, 15))); public static final DirectionProperty FACING = HorizontalFacingBlock.FACING; - public BlockWallPlant() { + public EndWallPlantBlock() { this(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) @@ -44,7 +44,7 @@ public class BlockWallPlant extends BlockPlant { .noCollision()); } - public BlockWallPlant(int light) { + public EndWallPlantBlock(int light) { this(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) @@ -53,7 +53,7 @@ public class BlockWallPlant extends BlockPlant { .noCollision()); } - public BlockWallPlant(Settings settings) { + public EndWallPlantBlock(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java b/src/main/java/ru/betterend/blocks/basis/EndWoodenButtonBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java rename to src/main/java/ru/betterend/blocks/basis/EndWoodenButtonBlock.java index 025569b3..97369b6c 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWoodenButton.java +++ b/src/main/java/ru/betterend/blocks/basis/EndWoodenButtonBlock.java @@ -15,11 +15,11 @@ import net.minecraft.util.registry.Registry; import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; -public class BlockWoodenButton extends WoodenButtonBlock implements BlockPatterned { +public class EndWoodenButtonBlock extends WoodenButtonBlock implements BlockPatterned { private final Block parent; - public BlockWoodenButton(Block source) { + public EndWoodenButtonBlock(Block source) { super(FabricBlockSettings.copyOf(source).nonOpaque()); this.parent = source; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java b/src/main/java/ru/betterend/blocks/basis/FeatureSaplingBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java rename to src/main/java/ru/betterend/blocks/basis/FeatureSaplingBlock.java index 1adad8e6..fd0b6ab5 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java +++ b/src/main/java/ru/betterend/blocks/basis/FeatureSaplingBlock.java @@ -27,10 +27,10 @@ import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.patterns.Patterns; import ru.betterend.registry.EndTags; -public abstract class BlockFeatureSapling extends BlockBaseNotFull implements Fertilizable, IRenderTypeable { +public abstract class FeatureSaplingBlock extends BaseBlockNotFull implements Fertilizable, IRenderTypeable { private static final VoxelShape SHAPE = Block.createCuboidShape(4, 0, 4, 12, 14, 12); - public BlockFeatureSapling() { + public FeatureSaplingBlock() { super(FabricBlockSettings.of(Material.PLANT) .breakByHand(true) .collidable(false) @@ -39,7 +39,7 @@ public abstract class BlockFeatureSapling extends BlockBaseNotFull implements Fe .ticksRandomly()); } - public BlockFeatureSapling(int light) { + public FeatureSaplingBlock(int light) { super(FabricBlockSettings.of(Material.PLANT) .breakByHand(true) .collidable(false) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockFur.java b/src/main/java/ru/betterend/blocks/basis/FurBlock.java similarity index 91% rename from src/main/java/ru/betterend/blocks/basis/BlockFur.java rename to src/main/java/ru/betterend/blocks/basis/FurBlock.java index 232b749f..4ccd3462 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockFur.java +++ b/src/main/java/ru/betterend/blocks/basis/FurBlock.java @@ -27,12 +27,12 @@ import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.util.MHelper; -public class BlockFur extends BlockAttached implements IRenderTypeable { +public class FurBlock extends AttachedBlock implements IRenderTypeable { private static final EnumMap BOUNDING_SHAPES = Maps.newEnumMap(Direction.class); private final ItemConvertible drop; private final int dropChance; - public BlockFur(ItemConvertible drop, int light, int dropChance) { + public FurBlock(ItemConvertible drop, int light, int dropChance) { super(FabricBlockSettings.of(Material.REPLACEABLE_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) @@ -43,7 +43,7 @@ public class BlockFur extends BlockAttached implements IRenderTypeable { this.dropChance = dropChance; } - public BlockFur(ItemConvertible drop, int dropChance) { + public FurBlock(ItemConvertible drop, int dropChance) { super(FabricBlockSettings.of(Material.REPLACEABLE_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java b/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java similarity index 92% rename from src/main/java/ru/betterend/blocks/basis/BlockPedestal.java rename to src/main/java/ru/betterend/blocks/basis/PedestalBlock.java index ad05a8f6..2214bf40 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java +++ b/src/main/java/ru/betterend/blocks/basis/PedestalBlock.java @@ -43,7 +43,7 @@ import ru.betterend.patterns.Patterns; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; -public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvider { +public class PedestalBlock extends BaseBlockNotFull implements BlockEntityProvider { public final static EnumProperty STATE = BlockProperties.PEDESTAL_STATE; public static final BooleanProperty HAS_ITEM = BlockProperties.HAS_ITEM; public static final BooleanProperty HAS_LIGHT = BlockProperties.HAS_LIGHT; @@ -64,7 +64,7 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid * @return new Pedestal block with Better End id. */ public static Block registerPedestal(String name, Block source) { - return EndBlocks.registerBlock(name, new BlockPedestal(source)); + return EndBlocks.registerBlock(name, new PedestalBlock(source)); } /** @@ -76,13 +76,13 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid * @return new Pedestal block with specified id. */ public static Block registerPedestal(Identifier id, Block source) { - return EndBlocks.registerBlock(id, new BlockPedestal(source)); + return EndBlocks.registerBlock(id, new PedestalBlock(source)); } protected final Block parent; protected float height = 1.0F; - public BlockPedestal(Block parent) { + public PedestalBlock(Block parent) { super(FabricBlockSettings.copyOf(parent).luminance(state -> { return state.get(HAS_LIGHT) ? 12 : 0; })); @@ -91,7 +91,7 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid } public float getHeight(BlockState state) { - if (state.getBlock() instanceof BlockPedestal && state.get(STATE) == PedestalState.PEDESTAL_TOP) { + if (state.getBlock() instanceof PedestalBlock && state.get(STATE) == PedestalState.PEDESTAL_TOP) { return this.height - 0.2F; } return this.height; @@ -131,8 +131,8 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid BlockState upState = world.getBlockState(pos.up()); BlockState downState = world.getBlockState(pos.down()); boolean upSideSolid = upState.isSideSolidFullSquare(world, pos.up(), Direction.DOWN) || upState.isIn(BlockTags.WALLS); - boolean hasPedestalOver = upState.getBlock() instanceof BlockPedestal; - boolean hasPedestalUnder = downState.getBlock() instanceof BlockPedestal; + boolean hasPedestalOver = upState.getBlock() instanceof PedestalBlock; + boolean hasPedestalUnder = downState.getBlock() instanceof PedestalBlock; if (!hasPedestalOver && hasPedestalUnder && upSideSolid) { return this.getDefaultState().with(STATE, PedestalState.COLUMN_TOP); } else if (!hasPedestalOver && !hasPedestalUnder && upSideSolid) { @@ -163,13 +163,13 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid BlockState upState = world.getBlockState(pos.up()); BlockState downState = world.getBlockState(pos.down()); boolean upSideSolid = upState.isSideSolidFullSquare(world, pos.up(), Direction.DOWN) || upState.isIn(BlockTags.WALLS); - boolean hasPedestalOver = upState.getBlock() instanceof BlockPedestal; - boolean hasPedestalUnder = downState.getBlock() instanceof BlockPedestal; + boolean hasPedestalOver = upState.getBlock() instanceof PedestalBlock; + boolean hasPedestalUnder = downState.getBlock() instanceof PedestalBlock; if (direction == Direction.UP) { upSideSolid = newState.isSideSolidFullSquare(world, posFrom, Direction.DOWN) || newState.isIn(BlockTags.WALLS); - hasPedestalOver = newState.getBlock() instanceof BlockPedestal; + hasPedestalOver = newState.getBlock() instanceof PedestalBlock; } else if (direction == Direction.DOWN) { - hasPedestalUnder = newState.getBlock() instanceof BlockPedestal; + hasPedestalUnder = newState.getBlock() instanceof PedestalBlock; } if (!hasPedestalOver && hasPedestalUnder && upSideSolid) { return state.with(STATE, PedestalState.COLUMN_TOP); @@ -309,7 +309,7 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid @Override public boolean hasComparatorOutput(BlockState state) { - return state.getBlock() instanceof BlockPedestal; + return state.getBlock() instanceof PedestalBlock; } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java b/src/main/java/ru/betterend/blocks/basis/PlantWithAgeBlock.java similarity index 88% rename from src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java rename to src/main/java/ru/betterend/blocks/basis/PlantWithAgeBlock.java index 2d13df0d..06047606 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java +++ b/src/main/java/ru/betterend/blocks/basis/PlantWithAgeBlock.java @@ -14,10 +14,10 @@ import net.minecraft.state.property.IntProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -public abstract class BlockPlantWithAge extends BlockPlant { +public abstract class PlantWithAgeBlock extends EndPlantBlock { public static final IntProperty AGE = IntProperty.of("age", 0, 3); - public BlockPlantWithAge() { + public PlantWithAgeBlock() { this(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) @@ -26,7 +26,7 @@ public abstract class BlockPlantWithAge extends BlockPlant { .noCollision()); } - public BlockPlantWithAge(FabricBlockSettings settings) { + public PlantWithAgeBlock(FabricBlockSettings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockSimpleLeaves.java b/src/main/java/ru/betterend/blocks/basis/SimpleLeavesBlock.java similarity index 88% rename from src/main/java/ru/betterend/blocks/basis/BlockSimpleLeaves.java rename to src/main/java/ru/betterend/blocks/basis/SimpleLeavesBlock.java index fa5bd33f..4161584a 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockSimpleLeaves.java +++ b/src/main/java/ru/betterend/blocks/basis/SimpleLeavesBlock.java @@ -12,8 +12,8 @@ import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.patterns.Patterns; -public class BlockSimpleLeaves extends BlockBaseNotFull implements IRenderTypeable { - public BlockSimpleLeaves(MaterialColor color) { +public class SimpleLeavesBlock extends BaseBlockNotFull implements IRenderTypeable { + public SimpleLeavesBlock(MaterialColor color) { super(FabricBlockSettings.of(Material.LEAVES) .strength(0.2F) .sounds(BlockSoundGroup.GRASS) @@ -24,7 +24,7 @@ public class BlockSimpleLeaves extends BlockBaseNotFull implements IRenderTypeab .materialColor(color)); } - public BlockSimpleLeaves(MaterialColor color, int light) { + public SimpleLeavesBlock(MaterialColor color, int light) { super(FabricBlockSettings.of(Material.LEAVES) .strength(0.2F) .sounds(BlockSoundGroup.GRASS) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStoneLantern.java b/src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java similarity index 92% rename from src/main/java/ru/betterend/blocks/basis/BlockStoneLantern.java rename to src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java index f5c61f1c..4eb82d08 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockStoneLantern.java +++ b/src/main/java/ru/betterend/blocks/basis/StoneLanternBlock.java @@ -20,12 +20,12 @@ import ru.betterend.interfaces.IColorProvider; import ru.betterend.patterns.Patterns; import ru.betterend.util.MHelper; -public class BlockStoneLantern extends BlockLantern implements IColorProvider { +public class StoneLanternBlock extends EndLanternBlock implements IColorProvider { private static final VoxelShape SHAPE_CEIL = Block.createCuboidShape(3, 1, 3, 13, 16, 13); private static final VoxelShape SHAPE_FLOOR = Block.createCuboidShape(3, 0, 3, 13, 15, 13); private static final Vec3i[] COLORS = AuroraCrystalBlock.COLORS; - public BlockStoneLantern(Block source) { + public StoneLanternBlock(Block source) { super(FabricBlockSettings.copyOf(source).luminance(15)); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockLogStripable.java b/src/main/java/ru/betterend/blocks/basis/StrippableBarkBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/basis/BlockLogStripable.java rename to src/main/java/ru/betterend/blocks/basis/StrippableBarkBlock.java index 11f90960..32d651a4 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockLogStripable.java +++ b/src/main/java/ru/betterend/blocks/basis/StrippableBarkBlock.java @@ -16,10 +16,10 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockLogStripable extends BlockPillar { +public class StrippableBarkBlock extends BarkBlock { private final Block striped; - public BlockLogStripable(MaterialColor color, Block striped) { + public StrippableBarkBlock(MaterialColor color, Block striped) { super(FabricBlockSettings.copyOf(striped).materialColor(color)); this.striped = striped; } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlant.java b/src/main/java/ru/betterend/blocks/basis/UnderwaterPlantBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlant.java rename to src/main/java/ru/betterend/blocks/basis/UnderwaterPlantBlock.java index 4c549a74..085118e7 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlant.java +++ b/src/main/java/ru/betterend/blocks/basis/UnderwaterPlantBlock.java @@ -39,10 +39,10 @@ import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; -public class BlockUnderwaterPlant extends BlockBaseNotFull implements IRenderTypeable, Fertilizable, FluidFillable { +public class UnderwaterPlantBlock extends BaseBlockNotFull implements IRenderTypeable, Fertilizable, FluidFillable { private static final VoxelShape SHAPE = Block.createCuboidShape(4, 0, 4, 12, 14, 12); - public BlockUnderwaterPlant() { + public UnderwaterPlantBlock() { super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) @@ -50,7 +50,7 @@ public class BlockUnderwaterPlant extends BlockBaseNotFull implements IRenderTyp .noCollision()); } - public BlockUnderwaterPlant(int light) { + public UnderwaterPlantBlock(int light) { super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) @@ -59,7 +59,7 @@ public class BlockUnderwaterPlant extends BlockBaseNotFull implements IRenderTyp .noCollision()); } - public BlockUnderwaterPlant(Settings settings) { + public UnderwaterPlantBlock(Settings settings) { super(settings); } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlantWithAge.java b/src/main/java/ru/betterend/blocks/basis/UnderwaterPlantWithAgeBlock.java similarity index 90% rename from src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlantWithAge.java rename to src/main/java/ru/betterend/blocks/basis/UnderwaterPlantWithAgeBlock.java index df166e16..363bad5e 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlantWithAge.java +++ b/src/main/java/ru/betterend/blocks/basis/UnderwaterPlantWithAgeBlock.java @@ -14,10 +14,10 @@ import net.minecraft.state.property.IntProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -public abstract class BlockUnderwaterPlantWithAge extends BlockUnderwaterPlant { +public abstract class UnderwaterPlantWithAgeBlock extends UnderwaterPlantBlock { public static final IntProperty AGE = IntProperty.of("age", 0, 3); - public BlockUnderwaterPlantWithAge() { + public UnderwaterPlantWithAgeBlock() { super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.WET_GRASS) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockUpDownPlant.java b/src/main/java/ru/betterend/blocks/basis/UpDownPlantBlock.java similarity index 94% rename from src/main/java/ru/betterend/blocks/basis/BlockUpDownPlant.java rename to src/main/java/ru/betterend/blocks/basis/UpDownPlantBlock.java index b66f805d..d7778163 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockUpDownPlant.java +++ b/src/main/java/ru/betterend/blocks/basis/UpDownPlantBlock.java @@ -30,10 +30,10 @@ import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndTags; -public class BlockUpDownPlant extends BlockBaseNotFull implements IRenderTypeable { +public class UpDownPlantBlock extends BaseBlockNotFull implements IRenderTypeable { private static final VoxelShape SHAPE = Block.createCuboidShape(4, 0, 4, 12, 16, 12); - public BlockUpDownPlant() { + public UpDownPlantBlock() { super(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockVine.java b/src/main/java/ru/betterend/blocks/basis/VineBlock.java similarity index 93% rename from src/main/java/ru/betterend/blocks/basis/BlockVine.java rename to src/main/java/ru/betterend/blocks/basis/VineBlock.java index 5ff39c4b..e6360b4d 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockVine.java +++ b/src/main/java/ru/betterend/blocks/basis/VineBlock.java @@ -38,19 +38,19 @@ import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.util.BlocksHelper; -public class BlockVine extends BlockBaseNotFull implements IRenderTypeable, Fertilizable { +public class VineBlock extends BaseBlockNotFull implements IRenderTypeable, Fertilizable { public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; private static final VoxelShape VOXEL_SHAPE = Block.createCuboidShape(2, 0, 2, 14, 16, 14); - public BlockVine() { + public VineBlock() { this(0, false); } - public BlockVine(int light) { + public VineBlock(int light) { this(light, false); } - public BlockVine(int light, boolean bottomOnly) { + public VineBlock(int light, boolean bottomOnly) { super(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWallMushroom.java b/src/main/java/ru/betterend/blocks/basis/WallMushroomBlock.java similarity index 89% rename from src/main/java/ru/betterend/blocks/basis/BlockWallMushroom.java rename to src/main/java/ru/betterend/blocks/basis/WallMushroomBlock.java index b2580ad7..8a3f7c87 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWallMushroom.java +++ b/src/main/java/ru/betterend/blocks/basis/WallMushroomBlock.java @@ -15,8 +15,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.WorldView; -public class BlockWallMushroom extends BlockWallPlant { - public BlockWallMushroom(int light) { +public class WallMushroomBlock extends EndWallPlantBlock { + public WallMushroomBlock(int light) { super(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.AXES) .sounds(BlockSoundGroup.GRASS) diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java index b3d05665..ffb43ed3 100644 --- a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -7,14 +7,14 @@ import net.minecraft.block.MaterialColor; import net.minecraft.tag.BlockTags; import net.minecraft.tag.ItemTags; import ru.betterend.blocks.EndPedestal; -import ru.betterend.blocks.basis.BlockBase; -import ru.betterend.blocks.basis.BlockPillar; -import ru.betterend.blocks.basis.BlockSlab; -import ru.betterend.blocks.basis.BlockStairs; -import ru.betterend.blocks.basis.BlockStoneButton; -import ru.betterend.blocks.basis.BlockStoneLantern; -import ru.betterend.blocks.basis.BlockStonePressurePlate; -import ru.betterend.blocks.basis.BlockWall; +import ru.betterend.blocks.basis.BaseBlock; +import ru.betterend.blocks.basis.EndPillarBlock; +import ru.betterend.blocks.basis.EndSlabBlock; +import ru.betterend.blocks.basis.EndStairsBlock; +import ru.betterend.blocks.basis.EndStoneButtonBlock; +import ru.betterend.blocks.basis.StoneLanternBlock; +import ru.betterend.blocks.basis.EndStonelateBlock; +import ru.betterend.blocks.basis.EndWallBlock; import ru.betterend.recipe.CraftingRecipes; import ru.betterend.recipe.builders.GridRecipe; import ru.betterend.registry.EndBlocks; @@ -44,22 +44,22 @@ public class StoneMaterial { public StoneMaterial(String name, MaterialColor color) { FabricBlockSettings material = FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color); - stone = EndBlocks.registerBlock(name, new BlockBase(material)); - polished = EndBlocks.registerBlock(name + "_polished", new BlockBase(material)); - tiles = EndBlocks.registerBlock(name + "_tiles", new BlockBase(material)); - pillar = EndBlocks.registerBlock(name + "_pillar", new BlockPillar(material)); - stairs = EndBlocks.registerBlock(name + "_stairs", new BlockStairs(stone)); - slab = EndBlocks.registerBlock(name + "_slab", new BlockSlab(stone)); - wall = EndBlocks.registerBlock(name + "_wall", new BlockWall(stone)); - button = EndBlocks.registerBlock(name + "_button", new BlockStoneButton(stone)); - pressure_plate = EndBlocks.registerBlock(name + "_plate", new BlockStonePressurePlate(stone)); + stone = EndBlocks.registerBlock(name, new BaseBlock(material)); + polished = EndBlocks.registerBlock(name + "_polished", new BaseBlock(material)); + tiles = EndBlocks.registerBlock(name + "_tiles", new BaseBlock(material)); + pillar = EndBlocks.registerBlock(name + "_pillar", new EndPillarBlock(material)); + stairs = EndBlocks.registerBlock(name + "_stairs", new EndStairsBlock(stone)); + slab = EndBlocks.registerBlock(name + "_slab", new EndSlabBlock(stone)); + wall = EndBlocks.registerBlock(name + "_wall", new EndWallBlock(stone)); + button = EndBlocks.registerBlock(name + "_button", new EndStoneButtonBlock(stone)); + pressure_plate = EndBlocks.registerBlock(name + "_plate", new EndStonelateBlock(stone)); pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(stone)); - lantern = EndBlocks.registerBlock(name + "_lantern", new BlockStoneLantern(stone)); + lantern = EndBlocks.registerBlock(name + "_lantern", new StoneLanternBlock(stone)); - bricks = EndBlocks.registerBlock(name + "_bricks", new BlockBase(material)); - brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BlockStairs(bricks)); - brick_slab = EndBlocks.registerBlock(name + "_bricks_slab", new BlockSlab(bricks)); - brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new BlockWall(bricks)); + bricks = EndBlocks.registerBlock(name + "_bricks", new BaseBlock(material)); + brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new EndStairsBlock(bricks)); + brick_slab = EndBlocks.registerBlock(name + "_bricks_slab", new EndSlabBlock(bricks)); + brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new EndWallBlock(bricks)); // Recipes // GridRecipe.make(name + "_bricks", bricks).setOutputCount(4).setShape("##", "##").addMaterial('#', stone).setGroup("end_bricks").build(); diff --git a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java index 520b6b1b..28c2c031 100644 --- a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java @@ -10,26 +10,26 @@ import net.minecraft.item.Items; import net.minecraft.tag.BlockTags; import net.minecraft.tag.ItemTags; import net.minecraft.tag.Tag; -import ru.betterend.blocks.basis.BlockBark; -import ru.betterend.blocks.basis.BlockBarkStripable; -import ru.betterend.blocks.basis.BlockBarrel; -import ru.betterend.blocks.basis.BlockBase; -import ru.betterend.blocks.basis.BlockBookshelf; -import ru.betterend.blocks.basis.BlockChest; -import ru.betterend.blocks.basis.BlockComposter; -import ru.betterend.blocks.basis.BlockCraftingTable; -import ru.betterend.blocks.basis.BlockDoor; -import ru.betterend.blocks.basis.BlockFence; -import ru.betterend.blocks.basis.BlockGate; -import ru.betterend.blocks.basis.BlockLadder; -import ru.betterend.blocks.basis.BlockLogStripable; -import ru.betterend.blocks.basis.BlockPillar; -import ru.betterend.blocks.basis.BlockPressurePlate; -import ru.betterend.blocks.basis.BlockSign; -import ru.betterend.blocks.basis.BlockSlab; -import ru.betterend.blocks.basis.BlockStairs; -import ru.betterend.blocks.basis.BlockTrapdoor; -import ru.betterend.blocks.basis.BlockWoodenButton; +import ru.betterend.blocks.basis.BarkBlock; +import ru.betterend.blocks.basis.StrippableBarkBlock; +import ru.betterend.blocks.basis.EndBarrelBlock; +import ru.betterend.blocks.basis.BaseBlock; +import ru.betterend.blocks.basis.EndBookshelfBlock; +import ru.betterend.blocks.basis.EndChestBlock; +import ru.betterend.blocks.basis.EndComposterBlock; +import ru.betterend.blocks.basis.EndCraftingTableBlock; +import ru.betterend.blocks.basis.EndDoorBlock; +import ru.betterend.blocks.basis.EndFenceBlock; +import ru.betterend.blocks.basis.EndGateBlock; +import ru.betterend.blocks.basis.EndLadderBlock; +import ru.betterend.blocks.basis.EndBlockStripableLogLog; +import ru.betterend.blocks.basis.EndPillarBlock; +import ru.betterend.blocks.basis.EndPlateBlock; +import ru.betterend.blocks.basis.EndSignBlock; +import ru.betterend.blocks.basis.EndSlabBlock; +import ru.betterend.blocks.basis.EndStairsBlock; +import ru.betterend.blocks.basis.EndTrapdoorBlock; +import ru.betterend.blocks.basis.EndWoodenButtonBlock; import ru.betterend.recipe.builders.GridRecipe; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; @@ -68,30 +68,30 @@ public class WoodenMaterial { public WoodenMaterial(String name, MaterialColor woodColor, MaterialColor planksColor) { FabricBlockSettings materialPlanks = FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).materialColor(planksColor); - log_stripped = EndBlocks.registerBlock(name + "_stripped_log", new BlockPillar(materialPlanks)); - bark_stripped = EndBlocks.registerBlock(name + "_stripped_bark", new BlockBark(materialPlanks)); + log_stripped = EndBlocks.registerBlock(name + "_stripped_log", new EndPillarBlock(materialPlanks)); + bark_stripped = EndBlocks.registerBlock(name + "_stripped_bark", new BarkBlock(materialPlanks)); - log = EndBlocks.registerBlock(name + "_log", new BlockLogStripable(woodColor, log_stripped)); - bark = EndBlocks.registerBlock(name + "_bark", new BlockBarkStripable(woodColor, bark_stripped)); + log = EndBlocks.registerBlock(name + "_log", new EndBlockStripableLogLog(woodColor, log_stripped)); + bark = EndBlocks.registerBlock(name + "_bark", new StrippableBarkBlock(woodColor, bark_stripped)); - planks = EndBlocks.registerBlock(name + "_planks", new BlockBase(materialPlanks)); - stairs = EndBlocks.registerBlock(name + "_stairs", new BlockStairs(planks)); - slab = EndBlocks.registerBlock(name + "_slab", new BlockSlab(planks)); - fence = EndBlocks.registerBlock(name + "_fence", new BlockFence(planks)); - gate = EndBlocks.registerBlock(name + "_gate", new BlockGate(planks)); - button = EndBlocks.registerBlock(name + "_button", new BlockWoodenButton(planks)); - pressurePlate = EndBlocks.registerBlock(name + "_plate", new BlockPressurePlate(planks)); - trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new BlockTrapdoor(planks)); - door = EndBlocks.registerBlock(name + "_door", new BlockDoor(planks)); + planks = EndBlocks.registerBlock(name + "_planks", new BaseBlock(materialPlanks)); + stairs = EndBlocks.registerBlock(name + "_stairs", new EndStairsBlock(planks)); + slab = EndBlocks.registerBlock(name + "_slab", new EndSlabBlock(planks)); + fence = EndBlocks.registerBlock(name + "_fence", new EndFenceBlock(planks)); + gate = EndBlocks.registerBlock(name + "_gate", new EndGateBlock(planks)); + button = EndBlocks.registerBlock(name + "_button", new EndWoodenButtonBlock(planks)); + pressurePlate = EndBlocks.registerBlock(name + "_plate", new EndPlateBlock(planks)); + trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new EndTrapdoorBlock(planks)); + door = EndBlocks.registerBlock(name + "_door", new EndDoorBlock(planks)); - craftingTable = EndBlocks.registerBlock(name + "_crafting_table", new BlockCraftingTable(planks)); - ladder = EndBlocks.registerBlock(name + "_ladder", new BlockLadder(planks)); - sign = EndBlocks.registerBlock(name + "_sign", new BlockSign(planks)); + craftingTable = EndBlocks.registerBlock(name + "_crafting_table", new EndCraftingTableBlock(planks)); + ladder = EndBlocks.registerBlock(name + "_ladder", new EndLadderBlock(planks)); + sign = EndBlocks.registerBlock(name + "_sign", new EndSignBlock(planks)); - chest = EndBlocks.registerBlock(name + "_chest", new BlockChest(planks)); - barrel = EndBlocks.registerBlock(name + "_barrel", new BlockBarrel(planks)); - shelf = EndBlocks.registerBlock(name + "_bookshelf", new BlockBookshelf(planks)); - composter = EndBlocks.registerBlock(name + "_composter", new BlockComposter(planks)); + chest = EndBlocks.registerBlock(name + "_chest", new EndChestBlock(planks)); + barrel = EndBlocks.registerBlock(name + "_barrel", new EndBarrelBlock(planks)); + shelf = EndBlocks.registerBlock(name + "_bookshelf", new EndBookshelfBlock(planks)); + composter = EndBlocks.registerBlock(name + "_composter", new EndComposterBlock(planks)); // Recipes // GridRecipe.make(name + "_planks", planks).setOutputCount(4).setList("#").addMaterial('#', log, bark, log_stripped, bark_stripped).setGroup("end_planks").build(); diff --git a/src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java b/src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java index 6508ad28..f8a2eb68 100644 --- a/src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java +++ b/src/main/java/ru/betterend/blocks/entities/BlockEntityHydrothermalVent.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.Tickable; -import ru.betterend.blocks.BlockHydrothermalVent; +import ru.betterend.blocks.HydrothermalVentBlock; import ru.betterend.registry.EndBlockEntities; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndParticles; @@ -21,8 +21,8 @@ public class BlockEntityHydrothermalVent extends BlockEntity implements Tickable double y = pos.getY() + 0.9 + world.random.nextDouble() * 0.3; double z = pos.getZ() + world.random.nextDouble(); BlockState state = getCachedState(); - if (state.isOf(EndBlocks.HYDROTHERMAL_VENT) && state.get(BlockHydrothermalVent.ACTIVATED)) { - if (state.get(BlockHydrothermalVent.WATERLOGGED)) { + if (state.isOf(EndBlocks.HYDROTHERMAL_VENT) && state.get(HydrothermalVentBlock.ACTIVATED)) { + if (state.get(HydrothermalVentBlock.WATERLOGGED)) { world.addParticle(EndParticles.GEYSER_PARTICLE, x, y, z, 0, 0, 0); } else { diff --git a/src/main/java/ru/betterend/blocks/entities/EBarrelBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/EBarrelBlockEntity.java index 6963f28c..ac9a35c2 100644 --- a/src/main/java/ru/betterend/blocks/entities/EBarrelBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/EBarrelBlockEntity.java @@ -20,7 +20,7 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3i; -import ru.betterend.blocks.basis.BlockBarrel; +import ru.betterend.blocks.basis.EndBarrelBlock; import ru.betterend.registry.EndBlockEntities; public class EBarrelBlockEntity extends LootableContainerBlockEntity { @@ -104,7 +104,7 @@ public class EBarrelBlockEntity extends LootableContainerBlockEntity { this.scheduleUpdate(); } else { BlockState blockState = this.getCachedState(); - if (!(blockState.getBlock() instanceof BlockBarrel)) { + if (!(blockState.getBlock() instanceof EndBarrelBlock)) { this.markRemoved(); return; } diff --git a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java index ead5d5b3..a731227a 100644 --- a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java @@ -10,7 +10,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.util.Tickable; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.registry.EndBlockEntities; import ru.betterend.registry.EndItems; @@ -76,8 +76,8 @@ public class PedestalBlockEntity extends BlockEntity implements Inventory, Ticka } public void removeStack(World world, BlockState state) { - world.setBlockState(pos, state.with(BlockPedestal.HAS_ITEM, false) - .with(BlockPedestal.HAS_LIGHT, false)); + world.setBlockState(pos, state.with(PedestalBlock.HAS_ITEM, false) + .with(PedestalBlock.HAS_LIGHT, false)); this.removeStack(0); } @@ -91,12 +91,12 @@ public class PedestalBlockEntity extends BlockEntity implements Inventory, Ticka public void markDirty() { if (world != null && !world.isClient) { BlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockPedestal) { - state = state.with(BlockPedestal.HAS_ITEM, !isEmpty()); + if (state.getBlock() instanceof PedestalBlock) { + state = state.with(PedestalBlock.HAS_ITEM, !isEmpty()); if (activeItem.getItem() == EndItems.ETERNAL_CRYSTAL) { - state = state.with(BlockPedestal.HAS_LIGHT, true); + state = state.with(PedestalBlock.HAS_LIGHT, true); } else { - state = state.with(BlockPedestal.HAS_LIGHT, false); + state = state.with(PedestalBlock.HAS_LIGHT, false); } world.setBlockState(pos, state); } diff --git a/src/main/java/ru/betterend/blocks/entities/render/EndChestBlockEntityRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/EndChestBlockEntityRenderer.java index 3b230002..2fdfed01 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/EndChestBlockEntityRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/EndChestBlockEntityRenderer.java @@ -31,7 +31,7 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import ru.betterend.BetterEnd; -import ru.betterend.blocks.basis.BlockChest; +import ru.betterend.blocks.basis.EndChestBlock; import ru.betterend.blocks.entities.EChestBlockEntity; import ru.betterend.registry.EndItems; @@ -165,7 +165,7 @@ public class EndChestBlockEntityRenderer extends BlockEntityRenderer { if (item instanceof BlockItem) { Block block = ((BlockItem) item).getBlock(); - if (block instanceof BlockChest) { + if (block instanceof EndChestBlock) { String name = Registry.BLOCK.getId(block).getPath(); LAYERS.put(block, new RenderLayer[] { RenderLayer.getEntityCutout(BetterEnd.makeID("textures/entity/chest/" + name + ".png")), diff --git a/src/main/java/ru/betterend/blocks/entities/render/EndSignBlockEntityRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/EndSignBlockEntityRenderer.java index 00b96787..10507336 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/EndSignBlockEntityRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/EndSignBlockEntityRenderer.java @@ -28,7 +28,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.SignType; import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; -import ru.betterend.blocks.basis.BlockSign; +import ru.betterend.blocks.basis.EndSignBlock; import ru.betterend.blocks.entities.ESignBlockEntity; import ru.betterend.registry.EndItems; @@ -50,7 +50,7 @@ public class EndSignBlockEntityRenderer extends BlockEntityRenderer { if (item instanceof BlockItem) { Block block = ((BlockItem) item).getBlock(); - if (block instanceof BlockSign) { + if (block instanceof EndSignBlock) { String name = Registry.BLOCK.getId(block).getPath(); RenderLayer layer = RenderLayer.getEntitySolid(BetterEnd.makeID("textures/entity/sign/" + name + ".png")); LAYERS.put(block, layer); diff --git a/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java index e65761ca..19ca2f88 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java @@ -16,7 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.math.MathHelper; import ru.betterend.blocks.EternalPedestal; -import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.basis.PedestalBlock; import ru.betterend.blocks.entities.PedestalBlockEntity; import ru.betterend.client.render.BeamRenderer; import ru.betterend.client.render.EndCrystalRenderer; @@ -38,14 +38,14 @@ public class PedestalItemRenderer extends BlockEn if (blockEntity.isEmpty()) return; BlockState state = blockEntity.getWorld().getBlockState(blockEntity.getPos()); - if (!(state.getBlock() instanceof BlockPedestal)) return; + if (!(state.getBlock() instanceof PedestalBlock)) return; ItemStack activeItem = blockEntity.getStack(0); matrices.push(); MinecraftClient minecraft = MinecraftClient.getInstance(); BakedModel model = minecraft.getItemRenderer().getHeldItemModel(activeItem, blockEntity.getWorld(), null); Vector3f translate = model.getTransformation().ground.translation; - BlockPedestal pedestal = (BlockPedestal) state.getBlock(); + PedestalBlock pedestal = (PedestalBlock) state.getBlock(); matrices.translate(translate.getX(), translate.getY(), translate.getZ()); matrices.translate(0.5, pedestal.getHeight(state), 0.5); if (activeItem.getItem() instanceof BlockItem) { diff --git a/src/main/java/ru/betterend/client/gui/BlockSignEditScreen.java b/src/main/java/ru/betterend/client/gui/BlockSignEditScreen.java index 46eddd32..bc394dba 100644 --- a/src/main/java/ru/betterend/client/gui/BlockSignEditScreen.java +++ b/src/main/java/ru/betterend/client/gui/BlockSignEditScreen.java @@ -29,7 +29,7 @@ import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; import net.minecraft.util.Util; import net.minecraft.util.math.Matrix4f; -import ru.betterend.blocks.basis.BlockSign; +import ru.betterend.blocks.basis.EndSignBlock; import ru.betterend.blocks.entities.ESignBlockEntity; import ru.betterend.blocks.entities.render.EndSignBlockEntityRenderer; @@ -124,7 +124,7 @@ public class BlockSignEditScreen extends Screen { matrices.scale(93.75F, -93.75F, 93.75F); matrices.translate(0.0D, -1.3125D, 0.0D); BlockState blockState = this.sign.getCachedState(); - boolean bl = blockState.get(BlockSign.FLOOR); + boolean bl = blockState.get(EndSignBlock.FLOOR); if (!bl) { matrices.translate(0.0D, -0.3125D, 0.0D); diff --git a/src/main/java/ru/betterend/integration/byg/BYGBlocks.java b/src/main/java/ru/betterend/integration/byg/BYGBlocks.java index bb811560..93e16e8c 100644 --- a/src/main/java/ru/betterend/integration/byg/BYGBlocks.java +++ b/src/main/java/ru/betterend/integration/byg/BYGBlocks.java @@ -1,13 +1,13 @@ package ru.betterend.integration.byg; import net.minecraft.block.Block; -import ru.betterend.blocks.basis.BlockVine; -import ru.betterend.blocks.basis.BlockWallPlant; +import ru.betterend.blocks.basis.VineBlock; +import ru.betterend.blocks.basis.EndWallPlantBlock; import ru.betterend.registry.EndBlocks; public class BYGBlocks { - public static final Block IVIS_MOSS = EndBlocks.registerBlock("ivis_moss", new BlockWallPlant()); - public static final Block IVIS_VINE = EndBlocks.registerBlock("ivis_vine", new BlockVine()); + public static final Block IVIS_MOSS = EndBlocks.registerBlock("ivis_moss", new EndWallPlantBlock()); + public static final Block IVIS_VINE = EndBlocks.registerBlock("ivis_vine", new VineBlock()); public static void register() {} } diff --git a/src/main/java/ru/betterend/registry/EndBlockEntities.java b/src/main/java/ru/betterend/registry/EndBlockEntities.java index 38e9f40c..47fb5a14 100644 --- a/src/main/java/ru/betterend/registry/EndBlockEntities.java +++ b/src/main/java/ru/betterend/registry/EndBlockEntities.java @@ -13,10 +13,10 @@ import ru.betterend.BetterEnd; import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.InfusionPedestal; -import ru.betterend.blocks.basis.BlockBarrel; -import ru.betterend.blocks.basis.BlockChest; -import ru.betterend.blocks.basis.BlockPedestal; -import ru.betterend.blocks.basis.BlockSign; +import ru.betterend.blocks.basis.EndBarrelBlock; +import ru.betterend.blocks.basis.EndChestBlock; +import ru.betterend.blocks.basis.PedestalBlock; +import ru.betterend.blocks.basis.EndSignBlock; import ru.betterend.blocks.entities.BlockEntityHydrothermalVent; import ru.betterend.blocks.entities.EBarrelBlockEntity; import ru.betterend.blocks.entities.EChestBlockEntity; @@ -55,7 +55,7 @@ public class EndBlockEntities { EndItems.getModBlocks().forEach((item) -> { if (item instanceof BlockItem) { Block block = ((BlockItem) item).getBlock(); - if (block instanceof BlockChest) { + if (block instanceof EndChestBlock) { result.add(block); } } @@ -68,7 +68,7 @@ public class EndBlockEntities { EndItems.getModBlocks().forEach((item) -> { if (item instanceof BlockItem) { Block block = ((BlockItem) item).getBlock(); - if (block instanceof BlockBarrel) { + if (block instanceof EndBarrelBlock) { result.add(block); } } @@ -81,7 +81,7 @@ public class EndBlockEntities { EndItems.getModBlocks().forEach((item) -> { if (item instanceof BlockItem) { Block block = ((BlockItem) item).getBlock(); - if (block instanceof BlockSign) { + if (block instanceof EndSignBlock) { result.add(block); } } @@ -96,7 +96,7 @@ public class EndBlockEntities { Block block = ((BlockItem) item).getBlock(); if (block instanceof EternalPedestal || block instanceof InfusionPedestal) return; - if (block instanceof BlockPedestal) { + if (block instanceof PedestalBlock) { result.add(block); } } diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 68e0a8cb..49c79e41 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -9,71 +9,73 @@ import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; import ru.betterend.blocks.AeterniumBlock; import ru.betterend.blocks.AuroraCrystalBlock; -import ru.betterend.blocks.BlockAmber; -import ru.betterend.blocks.BlockAncientEmeraldIce; -import ru.betterend.blocks.BlockBlueVine; -import ru.betterend.blocks.BlockBlueVineLantern; -import ru.betterend.blocks.BlockBlueVineSeed; -import ru.betterend.blocks.BlockBrimstone; -import ru.betterend.blocks.BlockBubbleCoral; -import ru.betterend.blocks.BlockBulbVine; -import ru.betterend.blocks.BlockBulbVineSeed; -import ru.betterend.blocks.BlockCharnia; -import ru.betterend.blocks.BlockChorusGrass; -import ru.betterend.blocks.BlockDenseEmeraldIce; -import ru.betterend.blocks.BlockDenseSnow; -import ru.betterend.blocks.BlockDragonTreeSapling; -import ru.betterend.blocks.BlockEmeraldIce; -import ru.betterend.blocks.BlockEndLily; -import ru.betterend.blocks.BlockEndLilySeed; -import ru.betterend.blocks.BlockEndLotusFlower; -import ru.betterend.blocks.BlockEndLotusLeaf; -import ru.betterend.blocks.BlockEndLotusSeed; -import ru.betterend.blocks.BlockEndLotusStem; -import ru.betterend.blocks.BlockEndstoneDust; -import ru.betterend.blocks.BlockGlowingMoss; -import ru.betterend.blocks.BlockGlowingPillarLuminophor; -import ru.betterend.blocks.BlockGlowingPillarRoots; -import ru.betterend.blocks.BlockGlowingPillarSeed; -import ru.betterend.blocks.BlockHelixTreeLeaves; -import ru.betterend.blocks.BlockHelixTreeSapling; -import ru.betterend.blocks.BlockHydralux; -import ru.betterend.blocks.BlockHydraluxPetal; -import ru.betterend.blocks.BlockHydraluxPetalColored; -import ru.betterend.blocks.BlockHydraluxSapling; -import ru.betterend.blocks.BlockHydrothermalVent; -import ru.betterend.blocks.BlockJellyshroomCap; -import ru.betterend.blocks.BlockLacugroveSapling; -import ru.betterend.blocks.BlockLanceleaf; -import ru.betterend.blocks.BlockLanceleafSeed; -import ru.betterend.blocks.BlockMengerSponge; -import ru.betterend.blocks.BlockMengerSpongeWet; -import ru.betterend.blocks.BlockMossyGlowshroomCap; -import ru.betterend.blocks.BlockMossyGlowshroomHymenophore; -import ru.betterend.blocks.BlockMossyGlowshroomSapling; -import ru.betterend.blocks.BlockMurkweed; -import ru.betterend.blocks.BlockNeedlegrass; -import ru.betterend.blocks.BlockPath; -import ru.betterend.blocks.BlockPythadendronSapling; -import ru.betterend.blocks.BlockRespawnObelisk; -import ru.betterend.blocks.BlockShadowBerry; -import ru.betterend.blocks.BlockShadowGrass; -import ru.betterend.blocks.BlockSilkMothNest; -import ru.betterend.blocks.BlockSmallJellyshroom; -import ru.betterend.blocks.BlockSulphurCrystal; -import ru.betterend.blocks.BlockTenaneaFlowers; -import ru.betterend.blocks.BlockTenaneaSapling; -import ru.betterend.blocks.BlockTerrain; -import ru.betterend.blocks.BlockTerrainPlant; -import ru.betterend.blocks.BlockTwistedUmbrellaMoss; -import ru.betterend.blocks.BlockTwistedUmbrellaMossTall; -import ru.betterend.blocks.BlockUmbrellaMoss; -import ru.betterend.blocks.BlockUmbrellaMossTall; -import ru.betterend.blocks.BlockUmbrellaTreeCluster; -import ru.betterend.blocks.BlockUmbrellaTreeClusterEmpty; -import ru.betterend.blocks.BlockUmbrellaTreeMembrane; -import ru.betterend.blocks.BlockUmbrellaTreeSapling; -import ru.betterend.blocks.BlockVentBubbleColumn; +import ru.betterend.blocks.AmberBlock; +import ru.betterend.blocks.AncientEmeraldIceBlock; +import ru.betterend.blocks.BlueVineBlock; +import ru.betterend.blocks.BlueVineLanternBlock; +import ru.betterend.blocks.BlueVineSeedBlock; +import ru.betterend.blocks.BrimstoneBlock; +import ru.betterend.blocks.BubbleCoralBlock; +import ru.betterend.blocks.BulbVineBlock; +import ru.betterend.blocks.BulbVineLanternBlock; +import ru.betterend.blocks.BulbVineLanternColoredBlock; +import ru.betterend.blocks.BulbVineSeedBlock; +import ru.betterend.blocks.CharniaBlock; +import ru.betterend.blocks.ChorusGrassBlock; +import ru.betterend.blocks.DenseEmeraldIceBlock; +import ru.betterend.blocks.DenseSnowBlock; +import ru.betterend.blocks.DragonTreeSaplingBlock; +import ru.betterend.blocks.EmeraldIceBlock; +import ru.betterend.blocks.EndLilyBlock; +import ru.betterend.blocks.EndLilySeedBlock; +import ru.betterend.blocks.EndLotusFlowerBlock; +import ru.betterend.blocks.EndLotusLeafBlock; +import ru.betterend.blocks.EndLotusSeedBlock; +import ru.betterend.blocks.EndLotusStemBlock; +import ru.betterend.blocks.EndstoneDustBlock; +import ru.betterend.blocks.GlowingMossBlock; +import ru.betterend.blocks.GlowingPillarLuminophorBlock; +import ru.betterend.blocks.GlowingPillarRootsBlock; +import ru.betterend.blocks.GlowingPillarSeedBlock; +import ru.betterend.blocks.HelixTreeLeavesBlock; +import ru.betterend.blocks.HelixTreeSaplingBlock; +import ru.betterend.blocks.HydraluxBlock; +import ru.betterend.blocks.HydraluxPetalBlock; +import ru.betterend.blocks.HydraluxPetalColoredBlock; +import ru.betterend.blocks.HydraluxSaplingBlock; +import ru.betterend.blocks.HydrothermalVentBlock; +import ru.betterend.blocks.JellyshroomCapBlock; +import ru.betterend.blocks.LacugroveSaplingBlock; +import ru.betterend.blocks.LanceleafBlock; +import ru.betterend.blocks.LanceleafSeedBlock; +import ru.betterend.blocks.MengerSpongeBlock; +import ru.betterend.blocks.MengerSpongeWetBlock; +import ru.betterend.blocks.MossyGlowshroomCapBlock; +import ru.betterend.blocks.MossyGlowshroomHymenophoreBlock; +import ru.betterend.blocks.MossyGlowshroomSaplingBlock; +import ru.betterend.blocks.MurkweedBlock; +import ru.betterend.blocks.NeedlegrassBlock; +import ru.betterend.blocks.EndPathBlock; +import ru.betterend.blocks.PythadendronSaplingBlock; +import ru.betterend.blocks.RespawnObeliskBlock; +import ru.betterend.blocks.ShadowBerryBlock; +import ru.betterend.blocks.ShadowGrassBlock; +import ru.betterend.blocks.SilkMothNestBlock; +import ru.betterend.blocks.SmallJellyshroomBlock; +import ru.betterend.blocks.SulphurCrystalBlock; +import ru.betterend.blocks.TenaneaFlowersBlock; +import ru.betterend.blocks.TenaneaSaplingBlock; +import ru.betterend.blocks.EndTerrainBlock; +import ru.betterend.blocks.TerrainPlantBlock; +import ru.betterend.blocks.TwistedUmbrellaMossBlock; +import ru.betterend.blocks.TwistedUmbrellaMossTallBlock; +import ru.betterend.blocks.UmbrellaMossBlock; +import ru.betterend.blocks.UmbrellaMossTallBlock; +import ru.betterend.blocks.UmbrellaTreeClusterBlock; +import ru.betterend.blocks.UmbrellaTreeClusterEmptyBlock; +import ru.betterend.blocks.UmbrellaTreeMembraneBlock; +import ru.betterend.blocks.UmbrellaTreeSaplingBlock; +import ru.betterend.blocks.VentBubbleColumnBlock; import ru.betterend.blocks.EndPortalBlock; import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.EnderBlock; @@ -83,17 +85,15 @@ import ru.betterend.blocks.InfusionPedestal; import ru.betterend.blocks.PedestalVanilla; import ru.betterend.blocks.RunedFlavolite; import ru.betterend.blocks.TerminiteBlock; -import ru.betterend.blocks.basis.BlockBulbVineLantern; -import ru.betterend.blocks.basis.BlockBulbVineLanternColored; -import ru.betterend.blocks.basis.BlockFur; -import ru.betterend.blocks.basis.BlockLeaves; -import ru.betterend.blocks.basis.BlockOre; -import ru.betterend.blocks.basis.BlockSimpleLeaves; -import ru.betterend.blocks.basis.BlockStoneLantern; -import ru.betterend.blocks.basis.BlockUnderwaterWallPlant; -import ru.betterend.blocks.basis.BlockVine; -import ru.betterend.blocks.basis.BlockWallMushroom; -import ru.betterend.blocks.basis.BlockWallPlant; +import ru.betterend.blocks.basis.FurBlock; +import ru.betterend.blocks.basis.EndLeavesBlock; +import ru.betterend.blocks.basis.EndOreBlock; +import ru.betterend.blocks.basis.SimpleLeavesBlock; +import ru.betterend.blocks.basis.StoneLanternBlock; +import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock; +import ru.betterend.blocks.basis.VineBlock; +import ru.betterend.blocks.basis.WallMushroomBlock; +import ru.betterend.blocks.basis.EndWallPlantBlock; import ru.betterend.blocks.complex.ColoredMaterial; import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.blocks.complex.WoodenMaterial; @@ -101,34 +101,34 @@ import ru.betterend.config.Configs; public class EndBlocks { // Terrain // - public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new BlockEndstoneDust()); - public static final Block END_MYCELIUM = registerBlock("end_mycelium", new BlockTerrain(MaterialColor.LIGHT_BLUE)); - public static final Block END_MOSS = registerBlock("end_moss", new BlockTerrain(MaterialColor.CYAN)); - public static final Block CHORUS_NYLIUM = registerBlock("chorus_nylium", new BlockTerrain(MaterialColor.MAGENTA)); - public static final Block CAVE_MOSS = registerBlock("cave_moss", new BlockTerrain(MaterialColor.PURPLE)); - public static final Block CRYSTAL_MOSS = registerBlock("crystal_moss", new BlockTerrain(MaterialColor.PINK)); - public static final Block SHADOW_GRASS = registerBlock("shadow_grass", new BlockShadowGrass()); - public static final Block PINK_MOSS = registerBlock("pink_moss", new BlockTerrain(MaterialColor.PINK)); - public static final Block AMBER_MOSS = registerBlock("amber_moss", new BlockTerrain(MaterialColor.ORANGE)); - public static final Block JUNGLE_MOSS = registerBlock("jungle_moss", new BlockTerrain(MaterialColor.ORANGE)); + public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new EndstoneDustBlock()); + public static final Block END_MYCELIUM = registerBlock("end_mycelium", new EndTerrainBlock(MaterialColor.LIGHT_BLUE)); + public static final Block END_MOSS = registerBlock("end_moss", new EndTerrainBlock(MaterialColor.CYAN)); + public static final Block CHORUS_NYLIUM = registerBlock("chorus_nylium", new EndTerrainBlock(MaterialColor.MAGENTA)); + public static final Block CAVE_MOSS = registerBlock("cave_moss", new EndTerrainBlock(MaterialColor.PURPLE)); + public static final Block CRYSTAL_MOSS = registerBlock("crystal_moss", new EndTerrainBlock(MaterialColor.PINK)); + public static final Block SHADOW_GRASS = registerBlock("shadow_grass", new ShadowGrassBlock()); + public static final Block PINK_MOSS = registerBlock("pink_moss", new EndTerrainBlock(MaterialColor.PINK)); + public static final Block AMBER_MOSS = registerBlock("amber_moss", new EndTerrainBlock(MaterialColor.ORANGE)); + public static final Block JUNGLE_MOSS = registerBlock("jungle_moss", new EndTerrainBlock(MaterialColor.ORANGE)); // Roads // - public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new BlockPath(END_MYCELIUM)); - public static final Block END_MOSS_PATH = registerBlock("end_moss_path", new BlockPath(END_MOSS)); - public static final Block CHORUS_NYLIUM_PATH = registerBlock("chorus_nylium_path", new BlockPath(CHORUS_NYLIUM)); - public static final Block CAVE_MOSS_PATH = registerBlock("cave_moss_path", new BlockPath(CAVE_MOSS)); - public static final Block CRYSTAL_MOSS_PATH = registerBlock("crystal_moss_path", new BlockPath(CRYSTAL_MOSS)); - public static final Block SHADOW_GRASS_PATH = registerBlock("shadow_grass_path", new BlockPath(SHADOW_GRASS)); - public static final Block PINK_MOSS_PATH = registerBlock("pink_moss_path", new BlockPath(PINK_MOSS)); - public static final Block AMBER_MOSS_PATH = registerBlock("amber_moss_path", new BlockPath(AMBER_MOSS)); - public static final Block JUNGLE_MOSS_PATH = registerBlock("jungle_moss_path", new BlockPath(JUNGLE_MOSS)); + public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new EndPathBlock(END_MYCELIUM)); + public static final Block END_MOSS_PATH = registerBlock("end_moss_path", new EndPathBlock(END_MOSS)); + public static final Block CHORUS_NYLIUM_PATH = registerBlock("chorus_nylium_path", new EndPathBlock(CHORUS_NYLIUM)); + public static final Block CAVE_MOSS_PATH = registerBlock("cave_moss_path", new EndPathBlock(CAVE_MOSS)); + public static final Block CRYSTAL_MOSS_PATH = registerBlock("crystal_moss_path", new EndPathBlock(CRYSTAL_MOSS)); + public static final Block SHADOW_GRASS_PATH = registerBlock("shadow_grass_path", new EndPathBlock(SHADOW_GRASS)); + public static final Block PINK_MOSS_PATH = registerBlock("pink_moss_path", new EndPathBlock(PINK_MOSS)); + public static final Block AMBER_MOSS_PATH = registerBlock("amber_moss_path", new EndPathBlock(AMBER_MOSS)); + public static final Block JUNGLE_MOSS_PATH = registerBlock("jungle_moss_path", new EndPathBlock(JUNGLE_MOSS)); // Rocks // public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND); public static final StoneMaterial VIOLECITE = new StoneMaterial("violecite", MaterialColor.PURPLE); public static final StoneMaterial SULPHURIC_ROCK = new StoneMaterial("sulphuric_rock", MaterialColor.BROWN); - public static final Block BRIMSTONE = registerBlock("brimstone", new BlockBrimstone()); - public static final Block SULPHUR_CRYSTAL = registerBlock("sulphur_crystal", new BlockSulphurCrystal()); + public static final Block BRIMSTONE = registerBlock("brimstone", new BrimstoneBlock()); + public static final Block SULPHUR_CRYSTAL = registerBlock("sulphur_crystal", new SulphurCrystalBlock()); public static final Block FLAVOLITE_RUNED = registerBlock("flavolite_runed", new RunedFlavolite()); public static final Block FLAVOLITE_RUNED_ETERNAL = registerBlock("flavolite_runed_eternal", new EternalRunedFlavolite()); @@ -139,157 +139,157 @@ public class EndBlocks { public static final Block QUARTZ_PEDESTAL = registerBlock("quartz_pedestal", new PedestalVanilla(Blocks.QUARTZ_BLOCK)); public static final Block PURPUR_PEDESTAL = registerBlock("purpur_pedestal", new PedestalVanilla(Blocks.PURPUR_BLOCK)); - public static final Block HYDROTHERMAL_VENT = registerBlock("hydrothermal_vent", new BlockHydrothermalVent()); - public static final Block VENT_BUBBLE_COLUMN = registerBlockNI("vent_bubble_column", new BlockVentBubbleColumn()); + public static final Block HYDROTHERMAL_VENT = registerBlock("hydrothermal_vent", new HydrothermalVentBlock()); + public static final Block VENT_BUBBLE_COLUMN = registerBlockNI("vent_bubble_column", new VentBubbleColumnBlock()); - public static final Block DENSE_SNOW = registerBlock("dense_snow", new BlockDenseSnow()); - public static final Block EMERALD_ICE = registerBlock("emerald_ice", new BlockEmeraldIce()); - public static final Block DENSE_EMERALD_ICE = registerBlock("dense_emerald_ice", new BlockDenseEmeraldIce()); - public static final Block ANCIENT_EMERALD_ICE = registerBlock("ancient_emerald_ice", new BlockAncientEmeraldIce()); + public static final Block DENSE_SNOW = registerBlock("dense_snow", new DenseSnowBlock()); + public static final Block EMERALD_ICE = registerBlock("emerald_ice", new EmeraldIceBlock()); + public static final Block DENSE_EMERALD_ICE = registerBlock("dense_emerald_ice", new DenseEmeraldIceBlock()); + public static final Block ANCIENT_EMERALD_ICE = registerBlock("ancient_emerald_ice", new AncientEmeraldIceBlock()); // Wooden Materials And Trees // - public static final Block MOSSY_GLOWSHROOM_SAPLING = registerBlock("mossy_glowshroom_sapling", new BlockMossyGlowshroomSapling()); - public static final Block MOSSY_GLOWSHROOM_CAP = registerBlock("mossy_glowshroom_cap", new BlockMossyGlowshroomCap()); - public static final Block MOSSY_GLOWSHROOM_HYMENOPHORE = registerBlock("mossy_glowshroom_hymenophore", new BlockMossyGlowshroomHymenophore()); - public static final Block MOSSY_GLOWSHROOM_FUR = registerBlock("mossy_glowshroom_fur", new BlockFur(MOSSY_GLOWSHROOM_SAPLING, 15, 16)); + public static final Block MOSSY_GLOWSHROOM_SAPLING = registerBlock("mossy_glowshroom_sapling", new MossyGlowshroomSaplingBlock()); + public static final Block MOSSY_GLOWSHROOM_CAP = registerBlock("mossy_glowshroom_cap", new MossyGlowshroomCapBlock()); + public static final Block MOSSY_GLOWSHROOM_HYMENOPHORE = registerBlock("mossy_glowshroom_hymenophore", new MossyGlowshroomHymenophoreBlock()); + public static final Block MOSSY_GLOWSHROOM_FUR = registerBlock("mossy_glowshroom_fur", new FurBlock(MOSSY_GLOWSHROOM_SAPLING, 15, 16)); public static final WoodenMaterial MOSSY_GLOWSHROOM = new WoodenMaterial("mossy_glowshroom", MaterialColor.GRAY, MaterialColor.WOOD); - public static final Block PYTHADENDRON_SAPLING = registerBlock("pythadendron_sapling", new BlockPythadendronSapling()); - public static final Block PYTHADENDRON_LEAVES = registerBlock("pythadendron_leaves", new BlockLeaves(PYTHADENDRON_SAPLING, MaterialColor.MAGENTA)); + public static final Block PYTHADENDRON_SAPLING = registerBlock("pythadendron_sapling", new PythadendronSaplingBlock()); + public static final Block PYTHADENDRON_LEAVES = registerBlock("pythadendron_leaves", new EndLeavesBlock(PYTHADENDRON_SAPLING, MaterialColor.MAGENTA)); public static final WoodenMaterial PYTHADENDRON = new WoodenMaterial("pythadendron", MaterialColor.MAGENTA, MaterialColor.PURPLE); - public static final Block END_LOTUS_SEED = registerBlock("end_lotus_seed", new BlockEndLotusSeed()); - public static final Block END_LOTUS_STEM = registerBlock("end_lotus_stem", new BlockEndLotusStem()); - public static final Block END_LOTUS_LEAF = registerBlockNI("end_lotus_leaf", new BlockEndLotusLeaf()); - public static final Block END_LOTUS_FLOWER = registerBlockNI("end_lotus_flower", new BlockEndLotusFlower()); + public static final Block END_LOTUS_SEED = registerBlock("end_lotus_seed", new EndLotusSeedBlock()); + public static final Block END_LOTUS_STEM = registerBlock("end_lotus_stem", new EndLotusStemBlock()); + public static final Block END_LOTUS_LEAF = registerBlockNI("end_lotus_leaf", new EndLotusLeafBlock()); + public static final Block END_LOTUS_FLOWER = registerBlockNI("end_lotus_flower", new EndLotusFlowerBlock()); public static final WoodenMaterial END_LOTUS = new WoodenMaterial("end_lotus", MaterialColor.LIGHT_BLUE, MaterialColor.CYAN); - public static final Block LACUGROVE_SAPLING = registerBlock("lacugrove_sapling", new BlockLacugroveSapling()); - public static final Block LACUGROVE_LEAVES = registerBlock("lacugrove_leaves", new BlockLeaves(LACUGROVE_SAPLING, MaterialColor.CYAN)); + public static final Block LACUGROVE_SAPLING = registerBlock("lacugrove_sapling", new LacugroveSaplingBlock()); + public static final Block LACUGROVE_LEAVES = registerBlock("lacugrove_leaves", new EndLeavesBlock(LACUGROVE_SAPLING, MaterialColor.CYAN)); public static final WoodenMaterial LACUGROVE = new WoodenMaterial("lacugrove", MaterialColor.BROWN, MaterialColor.YELLOW); - public static final Block DRAGON_TREE_SAPLING = registerBlock("dragon_tree_sapling", new BlockDragonTreeSapling()); - public static final Block DRAGON_TREE_LEAVES = registerBlock("dragon_tree_leaves", new BlockLeaves(DRAGON_TREE_SAPLING, MaterialColor.MAGENTA)); + public static final Block DRAGON_TREE_SAPLING = registerBlock("dragon_tree_sapling", new DragonTreeSaplingBlock()); + public static final Block DRAGON_TREE_LEAVES = registerBlock("dragon_tree_leaves", new EndLeavesBlock(DRAGON_TREE_SAPLING, MaterialColor.MAGENTA)); public static final WoodenMaterial DRAGON_TREE = new WoodenMaterial("dragon_tree", MaterialColor.BLACK, MaterialColor.MAGENTA); - public static final Block TENANEA_SAPLING = registerBlock("tenanea_sapling", new BlockTenaneaSapling()); - public static final Block TENANEA_LEAVES = registerBlock("tenanea_leaves", new BlockLeaves(TENANEA_SAPLING, MaterialColor.PINK)); - public static final Block TENANEA_FLOWERS = registerBlock("tenanea_flowers", new BlockTenaneaFlowers()); - public static final Block TENANEA_OUTER_LEAVES = registerBlock("tenanea_outer_leaves", new BlockFur(TENANEA_SAPLING, 32)); + public static final Block TENANEA_SAPLING = registerBlock("tenanea_sapling", new TenaneaSaplingBlock()); + public static final Block TENANEA_LEAVES = registerBlock("tenanea_leaves", new EndLeavesBlock(TENANEA_SAPLING, MaterialColor.PINK)); + public static final Block TENANEA_FLOWERS = registerBlock("tenanea_flowers", new TenaneaFlowersBlock()); + public static final Block TENANEA_OUTER_LEAVES = registerBlock("tenanea_outer_leaves", new FurBlock(TENANEA_SAPLING, 32)); public static final WoodenMaterial TENANEA = new WoodenMaterial("tenanea", MaterialColor.BROWN, MaterialColor.PINK); - public static final Block HELIX_TREE_SAPLING = registerBlock("helix_tree_sapling", new BlockHelixTreeSapling()); - public static final Block HELIX_TREE_LEAVES = registerBlock("helix_tree_leaves", new BlockHelixTreeLeaves()); + public static final Block HELIX_TREE_SAPLING = registerBlock("helix_tree_sapling", new HelixTreeSaplingBlock()); + public static final Block HELIX_TREE_LEAVES = registerBlock("helix_tree_leaves", new HelixTreeLeavesBlock()); public static final WoodenMaterial HELIX_TREE = new WoodenMaterial("helix_tree", MaterialColor.GRAY, MaterialColor.ORANGE); - public static final Block UMBRELLA_TREE_SAPLING = registerBlock("umbrella_tree_sapling", new BlockUmbrellaTreeSapling()); - public static final Block UMBRELLA_TREE_MEMBRANE = registerBlock("umbrella_tree_membrane", new BlockUmbrellaTreeMembrane()); - public static final Block UMBRELLA_TREE_CLUSTER = registerBlock("umbrella_tree_cluster", new BlockUmbrellaTreeCluster()); - public static final Block UMBRELLA_TREE_CLUSTER_EMPTY = registerBlock("umbrella_tree_cluster_empty", new BlockUmbrellaTreeClusterEmpty()); + public static final Block UMBRELLA_TREE_SAPLING = registerBlock("umbrella_tree_sapling", new UmbrellaTreeSaplingBlock()); + public static final Block UMBRELLA_TREE_MEMBRANE = registerBlock("umbrella_tree_membrane", new UmbrellaTreeMembraneBlock()); + public static final Block UMBRELLA_TREE_CLUSTER = registerBlock("umbrella_tree_cluster", new UmbrellaTreeClusterBlock()); + public static final Block UMBRELLA_TREE_CLUSTER_EMPTY = registerBlock("umbrella_tree_cluster_empty", new UmbrellaTreeClusterEmptyBlock()); public static final WoodenMaterial UMBRELLA_TREE = new WoodenMaterial("umbrella_tree", MaterialColor.BLUE, MaterialColor.GREEN); - public static final Block JELLYSHROOM_CAP_PURPLE = registerBlock("jellyshroom_cap_purple", new BlockJellyshroomCap(217, 142, 255, 164, 0, 255)); + public static final Block JELLYSHROOM_CAP_PURPLE = registerBlock("jellyshroom_cap_purple", new JellyshroomCapBlock(217, 142, 255, 164, 0, 255)); public static final WoodenMaterial JELLYSHROOM = new WoodenMaterial("jellyshroom", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE); // Small Plants // - public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new BlockUmbrellaMoss()); - public static final Block UMBRELLA_MOSS_TALL = registerBlock("umbrella_moss_tall", new BlockUmbrellaMossTall()); - public static final Block CREEPING_MOSS = registerBlock("creeping_moss", new BlockGlowingMoss(11)); - public static final Block CHORUS_GRASS = registerBlock("chorus_grass", new BlockChorusGrass()); - public static final Block CAVE_GRASS = registerBlock("cave_grass", new BlockTerrainPlant(CAVE_MOSS)); - public static final Block CRYSTAL_GRASS = registerBlock("crystal_grass", new BlockTerrainPlant(CRYSTAL_MOSS)); - public static final Block SHADOW_PLANT = registerBlock("shadow_plant", new BlockTerrainPlant(SHADOW_GRASS)); - public static final Block BUSHY_GRASS = registerBlock("bushy_grass", new BlockTerrainPlant(PINK_MOSS)); - public static final Block AMBER_GRASS = registerBlock("amber_grass", new BlockTerrainPlant(AMBER_MOSS)); - public static final Block TWISTED_UMBRELLA_MOSS = registerBlock("twisted_umbrella_moss", new BlockTwistedUmbrellaMoss()); - public static final Block TWISTED_UMBRELLA_MOSS_TALL = registerBlock("twisted_umbrella_moss_tall", new BlockTwistedUmbrellaMossTall()); - public static final Block JUNGLE_GRASS = registerBlock("jungle_grass", new BlockTerrainPlant(JUNGLE_MOSS)); + public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new UmbrellaMossBlock()); + public static final Block UMBRELLA_MOSS_TALL = registerBlock("umbrella_moss_tall", new UmbrellaMossTallBlock()); + public static final Block CREEPING_MOSS = registerBlock("creeping_moss", new GlowingMossBlock(11)); + public static final Block CHORUS_GRASS = registerBlock("chorus_grass", new ChorusGrassBlock()); + public static final Block CAVE_GRASS = registerBlock("cave_grass", new TerrainPlantBlock(CAVE_MOSS)); + public static final Block CRYSTAL_GRASS = registerBlock("crystal_grass", new TerrainPlantBlock(CRYSTAL_MOSS)); + public static final Block SHADOW_PLANT = registerBlock("shadow_plant", new TerrainPlantBlock(SHADOW_GRASS)); + public static final Block BUSHY_GRASS = registerBlock("bushy_grass", new TerrainPlantBlock(PINK_MOSS)); + public static final Block AMBER_GRASS = registerBlock("amber_grass", new TerrainPlantBlock(AMBER_MOSS)); + public static final Block TWISTED_UMBRELLA_MOSS = registerBlock("twisted_umbrella_moss", new TwistedUmbrellaMossBlock()); + public static final Block TWISTED_UMBRELLA_MOSS_TALL = registerBlock("twisted_umbrella_moss_tall", new TwistedUmbrellaMossTallBlock()); + public static final Block JUNGLE_GRASS = registerBlock("jungle_grass", new TerrainPlantBlock(JUNGLE_MOSS)); - public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlockBlueVineSeed()); - public static final Block BLUE_VINE = registerBlockNI("blue_vine", new BlockBlueVine()); - public static final Block BLUE_VINE_LANTERN = registerBlock("blue_vine_lantern", new BlockBlueVineLantern()); - public static final Block BLUE_VINE_FUR = registerBlock("blue_vine_fur", new BlockFur(BLUE_VINE_SEED, 15, 3)); + public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlueVineSeedBlock()); + public static final Block BLUE_VINE = registerBlockNI("blue_vine", new BlueVineBlock()); + public static final Block BLUE_VINE_LANTERN = registerBlock("blue_vine_lantern", new BlueVineLanternBlock()); + public static final Block BLUE_VINE_FUR = registerBlock("blue_vine_fur", new FurBlock(BLUE_VINE_SEED, 15, 3)); - public static final Block LANCELEAF_SEED = registerBlock("lanceleaf_seed", new BlockLanceleafSeed()); - public static final Block LANCELEAF = registerBlockNI("lanceleaf", new BlockLanceleaf()); + public static final Block LANCELEAF_SEED = registerBlock("lanceleaf_seed", new LanceleafSeedBlock()); + public static final Block LANCELEAF = registerBlockNI("lanceleaf", new LanceleafBlock()); - public static final Block GLOWING_PILLAR_SEED = registerBlock("glowing_pillar_seed", new BlockGlowingPillarSeed()); - public static final Block GLOWING_PILLAR_ROOTS = registerBlockNI("glowing_pillar_roots", new BlockGlowingPillarRoots()); - public static final Block GLOWING_PILLAR_LUMINOPHOR = registerBlock("glowing_pillar_luminophor", new BlockGlowingPillarLuminophor()); - public static final Block GLOWING_PILLAR_LEAVES = registerBlock("glowing_pillar_leaves", new BlockFur(GLOWING_PILLAR_SEED, 15, 3)); + public static final Block GLOWING_PILLAR_SEED = registerBlock("glowing_pillar_seed", new GlowingPillarSeedBlock()); + public static final Block GLOWING_PILLAR_ROOTS = registerBlockNI("glowing_pillar_roots", new GlowingPillarRootsBlock()); + public static final Block GLOWING_PILLAR_LUMINOPHOR = registerBlock("glowing_pillar_luminophor", new GlowingPillarLuminophorBlock()); + public static final Block GLOWING_PILLAR_LEAVES = registerBlock("glowing_pillar_leaves", new FurBlock(GLOWING_PILLAR_SEED, 15, 3)); - public static final Block SMALL_JELLYSHROOM = registerBlock("small_jellyshroom", new BlockSmallJellyshroom()); + public static final Block SMALL_JELLYSHROOM = registerBlock("small_jellyshroom", new SmallJellyshroomBlock()); // Water plants - public static final Block BUBBLE_CORAL = registerBlock("bubble_coral", new BlockBubbleCoral()); - public static final Block MENGER_SPONGE = registerBlock("menger_sponge", new BlockMengerSponge()); - public static final Block MENGER_SPONGE_WET = registerBlock("menger_sponge_wet", new BlockMengerSpongeWet()); - public static final Block CHARNIA_RED = registerBlock("charnia_red", new BlockCharnia()); - public static final Block CHARNIA_PURPLE = registerBlock("charnia_purple", new BlockCharnia()); - public static final Block CHARNIA_ORANGE = registerBlock("charnia_orange", new BlockCharnia()); - public static final Block CHARNIA_LIGHT_BLUE = registerBlock("charnia_light_blue", new BlockCharnia()); - public static final Block CHARNIA_CYAN = registerBlock("charnia_cyan", new BlockCharnia()); - public static final Block CHARNIA_GREEN = registerBlock("charnia_green", new BlockCharnia()); + public static final Block BUBBLE_CORAL = registerBlock("bubble_coral", new BubbleCoralBlock()); + public static final Block MENGER_SPONGE = registerBlock("menger_sponge", new MengerSpongeBlock()); + public static final Block MENGER_SPONGE_WET = registerBlock("menger_sponge_wet", new MengerSpongeWetBlock()); + public static final Block CHARNIA_RED = registerBlock("charnia_red", new CharniaBlock()); + public static final Block CHARNIA_PURPLE = registerBlock("charnia_purple", new CharniaBlock()); + public static final Block CHARNIA_ORANGE = registerBlock("charnia_orange", new CharniaBlock()); + public static final Block CHARNIA_LIGHT_BLUE = registerBlock("charnia_light_blue", new CharniaBlock()); + public static final Block CHARNIA_CYAN = registerBlock("charnia_cyan", new CharniaBlock()); + public static final Block CHARNIA_GREEN = registerBlock("charnia_green", new CharniaBlock()); - public static final Block END_LILY = registerBlockNI("end_lily", new BlockEndLily()); - public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new BlockEndLilySeed()); + public static final Block END_LILY = registerBlockNI("end_lily", new EndLilyBlock()); + public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new EndLilySeedBlock()); - public static final Block HYDRALUX_SAPLING = registerBlock("hydralux_sapling", new BlockHydraluxSapling()); - public static final Block HYDRALUX = registerBlockNI("hydralux", new BlockHydralux()); - public static final Block HYDRALUX_PETAL_BLOCK = registerBlock("hydralux_petal_block", new BlockHydraluxPetal()); - public static final ColoredMaterial HYDRALUX_PETAL_BLOCK_COLORED = new ColoredMaterial(BlockHydraluxPetalColored::new, HYDRALUX_PETAL_BLOCK, true); + public static final Block HYDRALUX_SAPLING = registerBlock("hydralux_sapling", new HydraluxSaplingBlock()); + public static final Block HYDRALUX = registerBlockNI("hydralux", new HydraluxBlock()); + public static final Block HYDRALUX_PETAL_BLOCK = registerBlock("hydralux_petal_block", new HydraluxPetalBlock()); + public static final ColoredMaterial HYDRALUX_PETAL_BLOCK_COLORED = new ColoredMaterial(HydraluxPetalColoredBlock::new, HYDRALUX_PETAL_BLOCK, true); - public static final Block CAVE_BUSH = registerBlock("cave_bush", new BlockSimpleLeaves(MaterialColor.MAGENTA)); + public static final Block CAVE_BUSH = registerBlock("cave_bush", new SimpleLeavesBlock(MaterialColor.MAGENTA)); - public static final Block MURKWEED = registerBlock("murkweed", new BlockMurkweed()); - public static final Block NEEDLEGRASS = registerBlock("needlegrass", new BlockNeedlegrass()); + public static final Block MURKWEED = registerBlock("murkweed", new MurkweedBlock()); + public static final Block NEEDLEGRASS = registerBlock("needlegrass", new NeedlegrassBlock()); // Wall Plants // - public static final Block PURPLE_POLYPORE = registerBlock("purple_polypore", new BlockWallMushroom(13)); - public static final Block TAIL_MOSS = registerBlock("tail_moss", new BlockWallPlant()); - public static final Block CYAN_MOSS = registerBlock("cyan_moss", new BlockWallPlant()); - public static final Block TWISTED_MOSS = registerBlock("twisted_moss", new BlockWallPlant()); - public static final Block TUBE_WORM = registerBlock("tube_worm", new BlockUnderwaterWallPlant()); - public static final Block BULB_MOSS = registerBlock("bulb_moss", new BlockWallPlant(12)); - public static final Block JUNGLE_FERN = registerBlock("jungle_fern", new BlockWallPlant()); + public static final Block PURPLE_POLYPORE = registerBlock("purple_polypore", new WallMushroomBlock(13)); + public static final Block TAIL_MOSS = registerBlock("tail_moss", new EndWallPlantBlock()); + public static final Block CYAN_MOSS = registerBlock("cyan_moss", new EndWallPlantBlock()); + public static final Block TWISTED_MOSS = registerBlock("twisted_moss", new EndWallPlantBlock()); + public static final Block TUBE_WORM = registerBlock("tube_worm", new EndUnderwaterWallPlantBlock()); + public static final Block BULB_MOSS = registerBlock("bulb_moss", new EndWallPlantBlock(12)); + public static final Block JUNGLE_FERN = registerBlock("jungle_fern", new EndWallPlantBlock()); // Crops // - public static final Block SHADOW_BERRY = registerBlock("shadow_berry", new BlockShadowBerry()); + public static final Block SHADOW_BERRY = registerBlock("shadow_berry", new ShadowBerryBlock()); // Vines // - public static final Block DENSE_VINE = registerBlock("dense_vine", new BlockVine(15, true)); - public static final Block TWISTED_VINE = registerBlock("twisted_vine", new BlockVine()); - public static final Block BULB_VINE_SEED = registerBlock("bulb_vine_seed", new BlockBulbVineSeed()); - public static final Block BULB_VINE = registerBlock("bulb_vine", new BlockBulbVine()); - public static final Block JUNGLE_VINE = registerBlock("jungle_vine", new BlockVine()); + public static final Block DENSE_VINE = registerBlock("dense_vine", new VineBlock(15, true)); + public static final Block TWISTED_VINE = registerBlock("twisted_vine", new VineBlock()); + public static final Block BULB_VINE_SEED = registerBlock("bulb_vine_seed", new BulbVineSeedBlock()); + public static final Block BULB_VINE = registerBlock("bulb_vine", new BulbVineBlock()); + public static final Block JUNGLE_VINE = registerBlock("jungle_vine", new VineBlock()); // Mob-Related - public static final Block SILK_MOTH_NEST = registerBlock("silk_moth_nest", new BlockSilkMothNest()); + public static final Block SILK_MOTH_NEST = registerBlock("silk_moth_nest", new SilkMothNestBlock()); // Ores // - public static final Block ENDER_ORE = registerBlock("ender_ore", new BlockOre(EndItems.ENDER_SHARD, 1, 3, 5)); - public static final Block AMBER_ORE = registerBlock("amber_ore", new BlockOre(EndItems.RAW_AMBER, 1, 2, 4)); + public static final Block ENDER_ORE = registerBlock("ender_ore", new EndOreBlock(EndItems.ENDER_SHARD, 1, 3, 5)); + public static final Block AMBER_ORE = registerBlock("amber_ore", new EndOreBlock(EndItems.RAW_AMBER, 1, 2, 4)); // Materials // public static final Block TERMINITE_BLOCK = registerBlock("terminite_block", new TerminiteBlock()); public static final Block AETERNIUM_BLOCK = registerBlock("aeternium_block", new AeterniumBlock()); public static final Block ENDER_BLOCK = registerBlock("ender_block", new EnderBlock()); public static final Block AURORA_CRYSTAL = registerBlock("aurora_crystal", new AuroraCrystalBlock()); - public static final Block AMBER_BLOCK = registerBlock("amber_block", new BlockAmber()); + public static final Block AMBER_BLOCK = registerBlock("amber_block", new AmberBlock()); - public static final Block RESPAWN_OBELISK = registerBlock("respawn_obelisk", new BlockRespawnObelisk()); + public static final Block RESPAWN_OBELISK = registerBlock("respawn_obelisk", new RespawnObeliskBlock()); // Lanterns - public static final Block ANDESITE_LANTERN = registerBlock("andesite_lantern", new BlockStoneLantern(Blocks.ANDESITE)); - public static final Block DIORITE_LANTERN = registerBlock("diorite_lantern", new BlockStoneLantern(Blocks.DIORITE)); - public static final Block GRANITE_LANTERN = registerBlock("granite_lantern", new BlockStoneLantern(Blocks.GRANITE)); - public static final Block QUARTZ_LANTERN = registerBlock("quartz_lantern", new BlockStoneLantern(Blocks.QUARTZ_BLOCK)); - public static final Block PURPUR_LANTERN = registerBlock("purpur_lantern", new BlockStoneLantern(Blocks.PURPUR_BLOCK)); - public static final Block END_STONE_LANTERN = registerBlock("end_stone_lantern", new BlockStoneLantern(Blocks.END_STONE)); - public static final Block BLACKSTONE_LANTERN = registerBlock("blackstone_lantern", new BlockStoneLantern(Blocks.BLACKSTONE)); + public static final Block ANDESITE_LANTERN = registerBlock("andesite_lantern", new StoneLanternBlock(Blocks.ANDESITE)); + public static final Block DIORITE_LANTERN = registerBlock("diorite_lantern", new StoneLanternBlock(Blocks.DIORITE)); + public static final Block GRANITE_LANTERN = registerBlock("granite_lantern", new StoneLanternBlock(Blocks.GRANITE)); + public static final Block QUARTZ_LANTERN = registerBlock("quartz_lantern", new StoneLanternBlock(Blocks.QUARTZ_BLOCK)); + public static final Block PURPUR_LANTERN = registerBlock("purpur_lantern", new StoneLanternBlock(Blocks.PURPUR_BLOCK)); + public static final Block END_STONE_LANTERN = registerBlock("end_stone_lantern", new StoneLanternBlock(Blocks.END_STONE)); + public static final Block BLACKSTONE_LANTERN = registerBlock("blackstone_lantern", new StoneLanternBlock(Blocks.BLACKSTONE)); - public static final Block BULB_LANTERN = registerBlock("bulb_lantern", new BlockBulbVineLantern()); - public static final ColoredMaterial BULB_LANTERN_COLORED = new ColoredMaterial(BlockBulbVineLanternColored::new, BULB_LANTERN, false); + public static final Block BULB_LANTERN = registerBlock("bulb_lantern", new BulbVineLanternBlock()); + public static final ColoredMaterial BULB_LANTERN_COLORED = new ColoredMaterial(BulbVineLanternColoredBlock::new, BULB_LANTERN, false); // Blocks With Entity // public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter()); diff --git a/src/main/java/ru/betterend/registry/EndTags.java b/src/main/java/ru/betterend/registry/EndTags.java index 0a3e3d00..30b0650e 100644 --- a/src/main/java/ru/betterend/registry/EndTags.java +++ b/src/main/java/ru/betterend/registry/EndTags.java @@ -22,10 +22,10 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome.Category; import net.minecraft.world.gen.surfacebuilder.SurfaceConfig; import ru.betterend.BetterEnd; -import ru.betterend.blocks.BlockTerrain; -import ru.betterend.blocks.basis.BlockPedestal; -import ru.betterend.blocks.basis.BlockSimpleLeaves; -import ru.betterend.blocks.basis.BlockVine; +import ru.betterend.blocks.EndTerrainBlock; +import ru.betterend.blocks.basis.PedestalBlock; +import ru.betterend.blocks.basis.SimpleLeavesBlock; +import ru.betterend.blocks.basis.VineBlock; import ru.betterend.mixin.common.ComposterBlockAccessor; import ru.betterend.util.TagHelper; @@ -72,18 +72,18 @@ public class EndTags { EndItems.getModBlocks().forEach((item) -> { Block block = ((BlockItem) item).getBlock(); - if (block instanceof BlockTerrain) { + if (block instanceof EndTerrainBlock) { addSurfaceBlock(block); TagHelper.addTag(BlockTags.NYLIUM, block); } - else if (block instanceof LeavesBlock || block instanceof BlockSimpleLeaves) { + else if (block instanceof LeavesBlock || block instanceof SimpleLeavesBlock) { TagHelper.addTag(BlockTags.LEAVES, block); ComposterBlockAccessor.callRegisterCompostableItem(0.3F, block); } - else if (block instanceof BlockVine) { + else if (block instanceof VineBlock) { TagHelper.addTag(BlockTags.CLIMBABLE, block); } - else if (block instanceof BlockPedestal) { + else if (block instanceof PedestalBlock) { TagHelper.addTag(PEDESTALS, block); } if (block.getDefaultState().getMaterial().equals(Material.PLANT)) { diff --git a/src/main/java/ru/betterend/util/BlocksHelper.java b/src/main/java/ru/betterend/util/BlocksHelper.java index f49c5c21..89006734 100644 --- a/src/main/java/ru/betterend/util/BlocksHelper.java +++ b/src/main/java/ru/betterend/util/BlocksHelper.java @@ -21,10 +21,10 @@ import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3i; import net.minecraft.world.WorldAccess; -import ru.betterend.blocks.BlockBlueVine; -import ru.betterend.blocks.basis.BlockDoublePlant; -import ru.betterend.blocks.basis.BlockFur; -import ru.betterend.blocks.basis.BlockVine; +import ru.betterend.blocks.BlueVineBlock; +import ru.betterend.blocks.basis.DoublePlantBlock; +import ru.betterend.blocks.basis.FurBlock; +import ru.betterend.blocks.basis.VineBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; @@ -164,7 +164,7 @@ public class BlocksHelper { POS.setY(y); state = world.getBlockState(POS); - if (state.getBlock() instanceof BlockFur) { + if (state.getBlock() instanceof FurBlock) { doubleCheck.add(POS.toImmutable()); } // Liquids @@ -225,8 +225,8 @@ public class BlocksHelper { } } // Vines - else if (state.getBlock() instanceof BlockVine) { - while (world.getBlockState(POS).getBlock() instanceof BlockVine) { + else if (state.getBlock() instanceof VineBlock) { + while (world.getBlockState(POS).getBlock() instanceof VineBlock) { setWithoutUpdate(world, POS, AIR); POS.setY(POS.getY() - 1); } @@ -265,7 +265,7 @@ public class BlocksHelper { // Blocks without support else { // Blue Vine - if (state.getBlock() instanceof BlockBlueVine) { + if (state.getBlock() instanceof BlueVineBlock) { while (state.isOf(EndBlocks.BLUE_VINE) || state.isOf(EndBlocks.BLUE_VINE_LANTERN) || state.isOf(EndBlocks.BLUE_VINE_FUR)) { BlocksHelper.setWithoutUpdate(world, POS, AIR); POS.setY(POS.getY() + 1); @@ -273,7 +273,7 @@ public class BlocksHelper { } } // Double plants - if (state.getBlock() instanceof BlockDoublePlant) { + if (state.getBlock() instanceof DoublePlantBlock) { BlocksHelper.setWithoutUpdate(world, POS, AIR); POS.setY(POS.getY() + 1); BlocksHelper.setWithoutUpdate(world, POS, AIR); diff --git a/src/main/java/ru/betterend/world/features/BlueVineFeature.java b/src/main/java/ru/betterend/world/features/BlueVineFeature.java index 79aa63ca..d5c6b019 100644 --- a/src/main/java/ru/betterend/world/features/BlueVineFeature.java +++ b/src/main/java/ru/betterend/world/features/BlueVineFeature.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; @@ -26,10 +26,10 @@ public class BlueVineFeature extends ScatterFeature { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { if (small) { - BlocksHelper.setWithoutUpdate(world, blockPos, EndBlocks.BLUE_VINE_SEED.getDefaultState().with(BlockPlantWithAge.AGE, random.nextInt(4))); + BlocksHelper.setWithoutUpdate(world, blockPos, EndBlocks.BLUE_VINE_SEED.getDefaultState().with(PlantWithAgeBlock.AGE, random.nextInt(4))); } else { - BlockPlantWithAge seed = ((BlockPlantWithAge) EndBlocks.BLUE_VINE_SEED); + PlantWithAgeBlock seed = ((PlantWithAgeBlock) EndBlocks.BLUE_VINE_SEED); seed.growAdult(world, random, blockPos); } } diff --git a/src/main/java/ru/betterend/world/features/DoublePlantFeature.java b/src/main/java/ru/betterend/world/features/DoublePlantFeature.java index a88fbcb4..310ecf4b 100644 --- a/src/main/java/ru/betterend/world/features/DoublePlantFeature.java +++ b/src/main/java/ru/betterend/world/features/DoublePlantFeature.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.basis.BlockDoublePlant; +import ru.betterend.blocks.basis.DoublePlantBlock; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; @@ -30,11 +30,11 @@ public class DoublePlantFeature extends ScatterFeature { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { - if (plant instanceof BlockDoublePlant) { + if (plant instanceof DoublePlantBlock) { int rot = random.nextInt(4); - BlockState state = plant.getDefaultState().with(BlockDoublePlant.ROTATION, rot); + BlockState state = plant.getDefaultState().with(DoublePlantBlock.ROTATION, rot); BlocksHelper.setWithoutUpdate(world, blockPos, state); - BlocksHelper.setWithoutUpdate(world, blockPos.up(), state.with(BlockDoublePlant.TOP, true)); + BlocksHelper.setWithoutUpdate(world, blockPos.up(), state.with(DoublePlantBlock.TOP, true)); } else { BlocksHelper.setWithoutUpdate(world, blockPos, plant); diff --git a/src/main/java/ru/betterend/world/features/EndLilyFeature.java b/src/main/java/ru/betterend/world/features/EndLilyFeature.java index 8f5614c0..e2556204 100644 --- a/src/main/java/ru/betterend/world/features/EndLilyFeature.java +++ b/src/main/java/ru/betterend/world/features/EndLilyFeature.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.BlockEndLilySeed; +import ru.betterend.blocks.EndLilySeedBlock; import ru.betterend.registry.EndBlocks; public class EndLilyFeature extends UnderwaterPlantScatter { @@ -14,7 +14,7 @@ public class EndLilyFeature extends UnderwaterPlantScatter { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { - BlockEndLilySeed seed = (BlockEndLilySeed) EndBlocks.END_LILY_SEED; + EndLilySeedBlock seed = (EndLilySeedBlock) EndBlocks.END_LILY_SEED; seed.grow(world, random, blockPos); } diff --git a/src/main/java/ru/betterend/world/features/EndLotusFeature.java b/src/main/java/ru/betterend/world/features/EndLotusFeature.java index af29b267..ffa327a4 100644 --- a/src/main/java/ru/betterend/world/features/EndLotusFeature.java +++ b/src/main/java/ru/betterend/world/features/EndLotusFeature.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.BlockEndLotusSeed; +import ru.betterend.blocks.EndLotusSeedBlock; import ru.betterend.registry.EndBlocks; public class EndLotusFeature extends UnderwaterPlantScatter { @@ -14,7 +14,7 @@ public class EndLotusFeature extends UnderwaterPlantScatter { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { - BlockEndLotusSeed seed = (BlockEndLotusSeed) EndBlocks.END_LOTUS_SEED; + EndLotusSeedBlock seed = (EndLotusSeedBlock) EndBlocks.END_LOTUS_SEED; seed.grow(world, random, blockPos); } diff --git a/src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java b/src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java index abd4f05e..116cbbdb 100644 --- a/src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java +++ b/src/main/java/ru/betterend/world/features/EndLotusLeafFeature.java @@ -8,7 +8,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.BlockEndLotusLeaf; +import ru.betterend.blocks.EndLotusLeafBlock; import ru.betterend.blocks.BlockProperties.TripleShape; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; @@ -38,14 +38,14 @@ public class EndLotusLeafFeature extends ScatterFeature { private void generateLeaf(StructureWorldAccess world, BlockPos pos) { Mutable p = new Mutable(); BlockState leaf = EndBlocks.END_LOTUS_LEAF.getDefaultState(); - BlocksHelper.setWithoutUpdate(world, pos, leaf.with(BlockEndLotusLeaf.SHAPE, TripleShape.BOTTOM)); + BlocksHelper.setWithoutUpdate(world, pos, leaf.with(EndLotusLeafBlock.SHAPE, TripleShape.BOTTOM)); for (Direction move: BlocksHelper.HORIZONTAL) { - BlocksHelper.setWithoutUpdate(world, p.set(pos).move(move), leaf.with(BlockEndLotusLeaf.HORIZONTAL_FACING, move).with(BlockEndLotusLeaf.SHAPE, TripleShape.MIDDLE)); + BlocksHelper.setWithoutUpdate(world, p.set(pos).move(move), leaf.with(EndLotusLeafBlock.HORIZONTAL_FACING, move).with(EndLotusLeafBlock.SHAPE, TripleShape.MIDDLE)); } for (int i = 0; i < 4; i ++) { Direction d1 = BlocksHelper.HORIZONTAL[i]; Direction d2 = BlocksHelper.HORIZONTAL[(i + 1) & 3]; - BlocksHelper.setWithoutUpdate(world, p.set(pos).move(d1).move(d2), leaf.with(BlockEndLotusLeaf.HORIZONTAL_FACING, d1).with(BlockEndLotusLeaf.SHAPE, TripleShape.TOP)); + BlocksHelper.setWithoutUpdate(world, p.set(pos).move(d1).move(d2), leaf.with(EndLotusLeafBlock.HORIZONTAL_FACING, d1).with(EndLotusLeafBlock.SHAPE, TripleShape.TOP)); } } diff --git a/src/main/java/ru/betterend/world/features/GlowPillarFeature.java b/src/main/java/ru/betterend/world/features/GlowPillarFeature.java index c14f5833..1b51b7e7 100644 --- a/src/main/java/ru/betterend/world/features/GlowPillarFeature.java +++ b/src/main/java/ru/betterend/world/features/GlowPillarFeature.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.registry.EndBlocks; public class GlowPillarFeature extends ScatterFeature { @@ -19,7 +19,7 @@ public class GlowPillarFeature extends ScatterFeature { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { - BlockPlantWithAge seed = ((BlockPlantWithAge) EndBlocks.GLOWING_PILLAR_SEED); + PlantWithAgeBlock seed = ((PlantWithAgeBlock) EndBlocks.GLOWING_PILLAR_SEED); seed.growAdult(world, random, blockPos); } diff --git a/src/main/java/ru/betterend/world/features/HydraluxFeature.java b/src/main/java/ru/betterend/world/features/HydraluxFeature.java index 48f4e46f..3aad5755 100644 --- a/src/main/java/ru/betterend/world/features/HydraluxFeature.java +++ b/src/main/java/ru/betterend/world/features/HydraluxFeature.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.BlockHydraluxSapling; +import ru.betterend.blocks.HydraluxSaplingBlock; import ru.betterend.registry.EndBlocks; public class HydraluxFeature extends UnderwaterPlantScatter { @@ -14,7 +14,7 @@ public class HydraluxFeature extends UnderwaterPlantScatter { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { - BlockHydraluxSapling seed = (BlockHydraluxSapling) EndBlocks.HYDRALUX_SAPLING; + HydraluxSaplingBlock seed = (HydraluxSaplingBlock) EndBlocks.HYDRALUX_SAPLING; seed.grow(world, random, blockPos); } diff --git a/src/main/java/ru/betterend/world/features/LanceleafFeature.java b/src/main/java/ru/betterend/world/features/LanceleafFeature.java index 0fdb99a6..c2d3a388 100644 --- a/src/main/java/ru/betterend/world/features/LanceleafFeature.java +++ b/src/main/java/ru/betterend/world/features/LanceleafFeature.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.registry.EndBlocks; public class LanceleafFeature extends ScatterFeature { @@ -19,7 +19,7 @@ public class LanceleafFeature extends ScatterFeature { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { - BlockPlantWithAge seed = ((BlockPlantWithAge) EndBlocks.LANCELEAF_SEED); + PlantWithAgeBlock seed = ((PlantWithAgeBlock) EndBlocks.LANCELEAF_SEED); seed.growAdult(world, random, blockPos); } diff --git a/src/main/java/ru/betterend/world/features/SingleInvertedScatterFeature.java b/src/main/java/ru/betterend/world/features/SingleInvertedScatterFeature.java index 18e7c812..82316fd6 100644 --- a/src/main/java/ru/betterend/world/features/SingleInvertedScatterFeature.java +++ b/src/main/java/ru/betterend/world/features/SingleInvertedScatterFeature.java @@ -8,7 +8,7 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.basis.BlockAttached; +import ru.betterend.blocks.basis.AttachedBlock; import ru.betterend.util.BlocksHelper; public class SingleInvertedScatterFeature extends InvertedScatterFeature { @@ -25,7 +25,7 @@ public class SingleInvertedScatterFeature extends InvertedScatterFeature { return false; } BlockState state = block.getDefaultState(); - if (block instanceof BlockAttached) { + if (block instanceof AttachedBlock) { state = state.with(Properties.FACING, Direction.DOWN); } return state.canPlaceAt(world, blockPos); @@ -34,7 +34,7 @@ public class SingleInvertedScatterFeature extends InvertedScatterFeature { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { BlockState state = block.getDefaultState(); - if (block instanceof BlockAttached) { + if (block instanceof AttachedBlock) { state = state.with(Properties.FACING, Direction.DOWN); } BlocksHelper.setWithoutUpdate(world, blockPos, state); diff --git a/src/main/java/ru/betterend/world/features/SinglePlantFeature.java b/src/main/java/ru/betterend/world/features/SinglePlantFeature.java index 89033266..84fbe992 100644 --- a/src/main/java/ru/betterend/world/features/SinglePlantFeature.java +++ b/src/main/java/ru/betterend/world/features/SinglePlantFeature.java @@ -6,8 +6,8 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.basis.BlockDoublePlant; -import ru.betterend.blocks.basis.BlockPlantWithAge; +import ru.betterend.blocks.basis.DoublePlantBlock; +import ru.betterend.blocks.basis.PlantWithAgeBlock; import ru.betterend.util.BlocksHelper; public class SinglePlantFeature extends ScatterFeature { @@ -50,15 +50,15 @@ public class SinglePlantFeature extends ScatterFeature { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { - if (plant instanceof BlockDoublePlant) { + if (plant instanceof DoublePlantBlock) { int rot = random.nextInt(4); - BlockState state = plant.getDefaultState().with(BlockDoublePlant.ROTATION, rot); + BlockState state = plant.getDefaultState().with(DoublePlantBlock.ROTATION, rot); BlocksHelper.setWithoutUpdate(world, blockPos, state); - BlocksHelper.setWithoutUpdate(world, blockPos.up(), state.with(BlockDoublePlant.TOP, true)); + BlocksHelper.setWithoutUpdate(world, blockPos.up(), state.with(DoublePlantBlock.TOP, true)); } - else if (plant instanceof BlockPlantWithAge) { + else if (plant instanceof PlantWithAgeBlock) { int age = random.nextInt(4); - BlockState state = plant.getDefaultState().with(BlockPlantWithAge.AGE, age); + BlockState state = plant.getDefaultState().with(PlantWithAgeBlock.AGE, age); BlocksHelper.setWithoutUpdate(world, blockPos, state); } else { diff --git a/src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java b/src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java index b24d94bd..5013d22c 100644 --- a/src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java +++ b/src/main/java/ru/betterend/world/features/UnderwaterPlantFeature.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.basis.BlockDoublePlant; +import ru.betterend.blocks.basis.DoublePlantBlock; import ru.betterend.util.BlocksHelper; public class UnderwaterPlantFeature extends UnderwaterPlantScatter { @@ -24,11 +24,11 @@ public class UnderwaterPlantFeature extends UnderwaterPlantScatter { @Override public void generate(StructureWorldAccess world, Random random, BlockPos blockPos) { - if (plant instanceof BlockDoublePlant) { + if (plant instanceof DoublePlantBlock) { int rot = random.nextInt(4); - BlockState state = plant.getDefaultState().with(BlockDoublePlant.ROTATION, rot); + BlockState state = plant.getDefaultState().with(DoublePlantBlock.ROTATION, rot); BlocksHelper.setWithoutUpdate(world, blockPos, state); - BlocksHelper.setWithoutUpdate(world, blockPos.up(), state.with(BlockDoublePlant.TOP, true)); + BlocksHelper.setWithoutUpdate(world, blockPos.up(), state.with(DoublePlantBlock.TOP, true)); } else { BlocksHelper.setWithoutUpdate(world, blockPos, plant); diff --git a/src/main/java/ru/betterend/world/features/WallPlantFeature.java b/src/main/java/ru/betterend/world/features/WallPlantFeature.java index dc72aeab..7faadad5 100644 --- a/src/main/java/ru/betterend/world/features/WallPlantFeature.java +++ b/src/main/java/ru/betterend/world/features/WallPlantFeature.java @@ -8,8 +8,8 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; -import ru.betterend.blocks.basis.BlockAttached; -import ru.betterend.blocks.basis.BlockWallPlant; +import ru.betterend.blocks.basis.AttachedBlock; +import ru.betterend.blocks.basis.EndWallPlantBlock; import ru.betterend.util.BlocksHelper; public class WallPlantFeature extends WallScatterFeature { @@ -22,11 +22,11 @@ public class WallPlantFeature extends WallScatterFeature { @Override public boolean canGenerate(StructureWorldAccess world, Random random, BlockPos pos, Direction dir) { - if (block instanceof BlockWallPlant) { - BlockState state = block.getDefaultState().with(BlockWallPlant.FACING, dir); + if (block instanceof EndWallPlantBlock) { + BlockState state = block.getDefaultState().with(EndWallPlantBlock.FACING, dir); return block.canPlaceAt(state, world, pos); } - else if (block instanceof BlockAttached) { + else if (block instanceof AttachedBlock) { BlockState state = block.getDefaultState().with(Properties.FACING, dir); return block.canPlaceAt(state, world, pos); } @@ -36,10 +36,10 @@ public class WallPlantFeature extends WallScatterFeature { @Override public void generate(StructureWorldAccess world, Random random, BlockPos pos, Direction dir) { BlockState state = block.getDefaultState(); - if (block instanceof BlockWallPlant) { - state = state.with(BlockWallPlant.FACING, dir); + if (block instanceof EndWallPlantBlock) { + state = state.with(EndWallPlantBlock.FACING, dir); } - else if (block instanceof BlockAttached) { + else if (block instanceof AttachedBlock) { state = state.with(Properties.FACING, dir); } BlocksHelper.setWithoutUpdate(world, pos, state); diff --git a/src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java b/src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java index f6134344..3fbd6742 100644 --- a/src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java +++ b/src/main/java/ru/betterend/world/features/bushes/TenaneaBushFeature.java @@ -17,7 +17,7 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import ru.betterend.blocks.BlockProperties; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockFur; +import ru.betterend.blocks.basis.FurBlock; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; @@ -63,7 +63,7 @@ public class TenaneaBushFeature extends DefaultFeature { MHelper.shuffle(DIRECTIONS, random); for (Direction d: DIRECTIONS) { if (info.getState(d).isAir()) { - info.setBlockPos(info.getPos().offset(d), EndBlocks.TENANEA_OUTER_LEAVES.getDefaultState().with(BlockFur.FACING, d)); + info.setBlockPos(info.getPos().offset(d), EndBlocks.TENANEA_OUTER_LEAVES.getDefaultState().with(FurBlock.FACING, d)); } } diff --git a/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java b/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java index 1b5ac0b2..2868079e 100644 --- a/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/GeyserFeature.java @@ -15,7 +15,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import ru.betterend.blocks.BlockHydrothermalVent; +import ru.betterend.blocks.HydrothermalVentBlock; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; @@ -173,7 +173,7 @@ public class GeyserFeature extends DefaultFeature { } mut.setY(mut.getY() + 1); } - state = EndBlocks.HYDROTHERMAL_VENT.getDefaultState().with(BlockHydrothermalVent.ACTIVATED, distRaw < 2); + state = EndBlocks.HYDROTHERMAL_VENT.getDefaultState().with(HydrothermalVentBlock.ACTIVATED, distRaw < 2); BlocksHelper.setWithoutUpdate(world, mut, state); mut.setY(mut.getY() + 1); state = world.getBlockState(mut); @@ -201,7 +201,7 @@ public class GeyserFeature extends DefaultFeature { BlocksHelper.setWithoutUpdate(world, mut, EndBlocks.SULPHURIC_ROCK.stone); mut.setY(mut.getY() + 1); } - state = EndBlocks.HYDROTHERMAL_VENT.getDefaultState().with(BlockHydrothermalVent.ACTIVATED, distRaw < 2); + state = EndBlocks.HYDROTHERMAL_VENT.getDefaultState().with(HydrothermalVentBlock.ACTIVATED, distRaw < 2); BlocksHelper.setWithoutUpdate(world, mut, state); mut.setY(mut.getY() + 1); state = world.getBlockState(mut); diff --git a/src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java b/src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java index de611ef1..c132e1da 100644 --- a/src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/SulphuricCaveFeature.java @@ -17,7 +17,7 @@ import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import ru.betterend.blocks.BlockProperties; -import ru.betterend.blocks.BlockSulphurCrystal; +import ru.betterend.blocks.SulphurCrystalBlock; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; @@ -175,9 +175,9 @@ public class SulphuricCaveFeature extends DefaultFeature { BlockPos side; if (random.nextInt(16) == 0 && world.getBlockState((side = pos.offset(dir))).isOf(Blocks.WATER)) { BlockState state = EndBlocks.SULPHUR_CRYSTAL.getDefaultState() - .with(BlockSulphurCrystal.WATERLOGGED, true) - .with(BlockSulphurCrystal.FACING, dir) - .with(BlockSulphurCrystal.AGE, random.nextInt(3)); + .with(SulphurCrystalBlock.WATERLOGGED, true) + .with(SulphurCrystalBlock.FACING, dir) + .with(SulphurCrystalBlock.AGE, random.nextInt(3)); BlocksHelper.setWithoutUpdate(world, side, state); } } diff --git a/src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java b/src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java index b368a575..bd388e81 100644 --- a/src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/SulphuricLakeFeature.java @@ -15,7 +15,7 @@ import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import ru.betterend.blocks.BlockProperties; -import ru.betterend.blocks.BlockSulphurCrystal; +import ru.betterend.blocks.SulphurCrystalBlock; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; @@ -195,9 +195,9 @@ public class SulphuricLakeFeature extends DefaultFeature { BlockPos side; if (random.nextInt(16) == 0 && world.getBlockState((side = pos.offset(dir))).isOf(Blocks.WATER)) { BlockState state = EndBlocks.SULPHUR_CRYSTAL.getDefaultState() - .with(BlockSulphurCrystal.WATERLOGGED, true) - .with(BlockSulphurCrystal.FACING, dir) - .with(BlockSulphurCrystal.AGE, random.nextInt(3)); + .with(SulphurCrystalBlock.WATERLOGGED, true) + .with(SulphurCrystalBlock.FACING, dir) + .with(SulphurCrystalBlock.AGE, random.nextInt(3)); BlocksHelper.setWithoutUpdate(world, side, state); } } diff --git a/src/main/java/ru/betterend/world/features/terrain/SurfaceVentFeature.java b/src/main/java/ru/betterend/world/features/terrain/SurfaceVentFeature.java index 413d0b6c..01829f90 100644 --- a/src/main/java/ru/betterend/world/features/terrain/SurfaceVentFeature.java +++ b/src/main/java/ru/betterend/world/features/terrain/SurfaceVentFeature.java @@ -8,7 +8,7 @@ import net.minecraft.util.math.BlockPos.Mutable; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import ru.betterend.blocks.BlockHydrothermalVent; +import ru.betterend.blocks.HydrothermalVentBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; import ru.betterend.util.BlocksHelper; @@ -25,7 +25,7 @@ public class SurfaceVentFeature extends DefaultFeature { Mutable mut = new Mutable(); int count = MHelper.randRange(15, 30, random); - BlockState vent = EndBlocks.HYDROTHERMAL_VENT.getDefaultState().with(BlockHydrothermalVent.WATERLOGGED, false); + BlockState vent = EndBlocks.HYDROTHERMAL_VENT.getDefaultState().with(HydrothermalVentBlock.WATERLOGGED, false); for (int i = 0; i < count; i++) { mut.set(pos).move(MHelper.floor(random.nextGaussian() * 2 + 0.5), 5, MHelper.floor(random.nextGaussian() * 2 + 0.5)); int dist = MHelper.floor(2 - MHelper.length(mut.getX() - pos.getX(), mut.getZ() - pos.getZ())) + random.nextInt(2); diff --git a/src/main/java/ru/betterend/world/features/trees/HelixTreeFeature.java b/src/main/java/ru/betterend/world/features/trees/HelixTreeFeature.java index 8cbfa954..4a9496cb 100644 --- a/src/main/java/ru/betterend/world/features/trees/HelixTreeFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/HelixTreeFeature.java @@ -14,7 +14,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import ru.betterend.blocks.BlockHelixTreeLeaves; +import ru.betterend.blocks.HelixTreeLeavesBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; import ru.betterend.util.BlocksHelper; @@ -121,7 +121,7 @@ public class HelixTreeFeature extends DefaultFeature { lastPoint = point; } - leaf = leaf.with(BlockHelixTreeLeaves.COLOR, 7); + leaf = leaf.with(HelixTreeLeavesBlock.COLOR, 7); leafStart = leafStart.add(0, lastPoint.getY(), 0); if (world.getBlockState(leafStart).isAir()) { BlocksHelper.setWithoutUpdate(world, leafStart, leaf); @@ -157,7 +157,7 @@ public class HelixTreeFeature extends DefaultFeature { int color = MHelper.floor((float) i / (float) count * 7F + 0.5F) + offset; color = MathHelper.clamp(color, 0, 7); if (world.getBlockState(bPos).getMaterial().isReplaceable()) { - BlocksHelper.setWithoutUpdate(world, bPos, state.with(BlockHelixTreeLeaves.COLOR, color)); + BlocksHelper.setWithoutUpdate(world, bPos, state.with(HelixTreeLeavesBlock.COLOR, color)); } x += dx; y += dy; @@ -165,7 +165,7 @@ public class HelixTreeFeature extends DefaultFeature { } bPos.set(end.getX() + pos.getX(), end.getY() + pos.getY(), end.getZ() + pos.getZ()); if (world.getBlockState(bPos).getMaterial().isReplaceable()) { - BlocksHelper.setWithoutUpdate(world, bPos, state.with(BlockHelixTreeLeaves.COLOR, 7)); + BlocksHelper.setWithoutUpdate(world, bPos, state.with(HelixTreeLeavesBlock.COLOR, 7)); } } diff --git a/src/main/java/ru/betterend/world/features/trees/JellyshroomFeature.java b/src/main/java/ru/betterend/world/features/trees/JellyshroomFeature.java index ffd6ee32..4539d4d5 100644 --- a/src/main/java/ru/betterend/world/features/trees/JellyshroomFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/JellyshroomFeature.java @@ -14,7 +14,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import ru.betterend.blocks.BlockJellyshroomCap; +import ru.betterend.blocks.JellyshroomCapBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; import ru.betterend.util.MHelper; @@ -67,7 +67,7 @@ public class JellyshroomFeature extends DefaultFeature { float dz = info.getPos().getZ() - pos.getZ() - last.getZ(); float distance = MHelper.length(dx, dz) / membraneRadius * 7F; int color = MathHelper.clamp(MHelper.floor(distance), 0, 7); - return info.getState().with(BlockJellyshroomCap.COLOR, color); + return info.getState().with(JellyshroomCapBlock.COLOR, color); } return info.getState(); }).fillRecursive(world, pos); diff --git a/src/main/java/ru/betterend/world/features/trees/MossyGlowshroomFeature.java b/src/main/java/ru/betterend/world/features/trees/MossyGlowshroomFeature.java index 180ecf2e..ee8a8f50 100644 --- a/src/main/java/ru/betterend/world/features/trees/MossyGlowshroomFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/MossyGlowshroomFeature.java @@ -12,8 +12,8 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import ru.betterend.blocks.BlockMossyGlowshroomCap; -import ru.betterend.blocks.basis.BlockFur; +import ru.betterend.blocks.MossyGlowshroomCapBlock; +import ru.betterend.blocks.basis.FurBlock; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; @@ -83,7 +83,7 @@ public class MossyGlowshroomFeature extends DefaultFeature { .setPostProcess((info) -> { if (EndBlocks.MOSSY_GLOWSHROOM.isTreeLog(info.getState())) { if (random.nextBoolean() && info.getStateUp().getBlock() == EndBlocks.MOSSY_GLOWSHROOM_CAP) { - info.setState(EndBlocks.MOSSY_GLOWSHROOM_CAP.getDefaultState().with(BlockMossyGlowshroomCap.TRANSITION, true)); + info.setState(EndBlocks.MOSSY_GLOWSHROOM_CAP.getDefaultState().with(MossyGlowshroomCapBlock.TRANSITION, true)); return info.getState(); } else if (!EndBlocks.MOSSY_GLOWSHROOM.isTreeLog(info.getStateUp()) || !EndBlocks.MOSSY_GLOWSHROOM.isTreeLog(info.getStateDown())) { @@ -93,7 +93,7 @@ public class MossyGlowshroomFeature extends DefaultFeature { } else if (info.getState().getBlock() == EndBlocks.MOSSY_GLOWSHROOM_CAP) { if (EndBlocks.MOSSY_GLOWSHROOM.isTreeLog(info.getStateDown().getBlock())) { - info.setState(EndBlocks.MOSSY_GLOWSHROOM_CAP.getDefaultState().with(BlockMossyGlowshroomCap.TRANSITION, true)); + info.setState(EndBlocks.MOSSY_GLOWSHROOM_CAP.getDefaultState().with(MossyGlowshroomCapBlock.TRANSITION, true)); return info.getState(); } @@ -103,12 +103,12 @@ public class MossyGlowshroomFeature extends DefaultFeature { else if (info.getState().getBlock() == EndBlocks.MOSSY_GLOWSHROOM_HYMENOPHORE) { for (Direction dir: BlocksHelper.HORIZONTAL) { if (info.getState(dir) == AIR) { - info.setBlockPos(info.getPos().offset(dir), EndBlocks.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(BlockFur.FACING, dir)); + info.setBlockPos(info.getPos().offset(dir), EndBlocks.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(FurBlock.FACING, dir)); } } if (info.getStateDown().getBlock() != EndBlocks.MOSSY_GLOWSHROOM_HYMENOPHORE) { - info.setBlockPos(info.getPos().down(), EndBlocks.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(BlockFur.FACING, Direction.DOWN)); + info.setBlockPos(info.getPos().down(), EndBlocks.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(FurBlock.FACING, Direction.DOWN)); } } return info.getState(); diff --git a/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java b/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java index 298e8960..807da9f7 100644 --- a/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/TenaneaFeature.java @@ -18,7 +18,7 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import ru.betterend.blocks.BlockProperties; import ru.betterend.blocks.BlockProperties.TripleShape; -import ru.betterend.blocks.basis.BlockFur; +import ru.betterend.blocks.basis.FurBlock; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; @@ -107,7 +107,7 @@ public class TenaneaFeature extends DefaultFeature { MHelper.shuffle(DIRECTIONS, random); for (Direction d: DIRECTIONS) { if (info.getState(d).isAir()) { - info.setBlockPos(info.getPos().offset(d), outer.with(BlockFur.FACING, d)); + info.setBlockPos(info.getPos().offset(d), outer.with(FurBlock.FACING, d)); } } diff --git a/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java b/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java index 62afa027..dd066c5d 100644 --- a/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java @@ -16,8 +16,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import ru.betterend.blocks.BlockUmbrellaTreeCluster; -import ru.betterend.blocks.BlockUmbrellaTreeMembrane; +import ru.betterend.blocks.UmbrellaTreeClusterBlock; +import ru.betterend.blocks.UmbrellaTreeMembraneBlock; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndTags; import ru.betterend.util.BlocksHelper; @@ -44,9 +44,9 @@ public class UmbrellaTreeFeature extends DefaultFeature { if (!world.getBlockState(pos.down()).getBlock().isIn(EndTags.END_GROUND)) return false; BlockState wood = EndBlocks.UMBRELLA_TREE.bark.getDefaultState(); - BlockState membrane = EndBlocks.UMBRELLA_TREE_MEMBRANE.getDefaultState().with(BlockUmbrellaTreeMembrane.COLOR, 1); - BlockState center = EndBlocks.UMBRELLA_TREE_MEMBRANE.getDefaultState().with(BlockUmbrellaTreeMembrane.COLOR, 0); - BlockState fruit = EndBlocks.UMBRELLA_TREE_CLUSTER.getDefaultState().with(BlockUmbrellaTreeCluster.NATURAL, true); + BlockState membrane = EndBlocks.UMBRELLA_TREE_MEMBRANE.getDefaultState().with(UmbrellaTreeMembraneBlock.COLOR, 1); + BlockState center = EndBlocks.UMBRELLA_TREE_MEMBRANE.getDefaultState().with(UmbrellaTreeMembraneBlock.COLOR, 0); + BlockState fruit = EndBlocks.UMBRELLA_TREE_CLUSTER.getDefaultState().with(UmbrellaTreeClusterBlock.NATURAL, true); float size = MHelper.randRange(10, 20, random); int count = (int) (size * 0.15F); @@ -117,7 +117,7 @@ public class UmbrellaTreeFeature extends DefaultFeature { } int color = MHelper.floor(d / min.radius * 7); color = MathHelper.clamp(color, 1, 7); - return info.getState().with(BlockUmbrellaTreeMembrane.COLOR, color); + return info.getState().with(UmbrellaTreeMembraneBlock.COLOR, color); } return info.getState(); }).fillRecursive(world, pos); @@ -182,7 +182,7 @@ public class UmbrellaTreeFeature extends DefaultFeature { mut.move(Direction.DOWN); if (world.isAir(mut)) { BlockState state = world.getBlockState(mut.up()); - if (state.isOf(EndBlocks.UMBRELLA_TREE_MEMBRANE) && state.get(BlockUmbrellaTreeMembrane.COLOR) < 2) { + if (state.isOf(EndBlocks.UMBRELLA_TREE_MEMBRANE) && state.get(UmbrellaTreeMembraneBlock.COLOR) < 2) { BlocksHelper.setWithoutUpdate(world, mut, fruit); } break; diff --git a/src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java b/src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java index 5c90977f..86c781e3 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java +++ b/src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java @@ -6,8 +6,8 @@ import java.util.Random; import net.minecraft.client.util.math.Vector3f; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import ru.betterend.blocks.BlockMossyGlowshroomCap; -import ru.betterend.blocks.basis.BlockFur; +import ru.betterend.blocks.MossyGlowshroomCapBlock; +import ru.betterend.blocks.basis.FurBlock; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; @@ -91,7 +91,7 @@ public class StructureGiantMossyGlowshroom extends SDFStructureFeature { .setPostProcess((info) -> { if (EndBlocks.MOSSY_GLOWSHROOM.isTreeLog(info.getState())) { if (random.nextBoolean() && info.getStateUp().getBlock() == EndBlocks.MOSSY_GLOWSHROOM_CAP) { - info.setState(EndBlocks.MOSSY_GLOWSHROOM_CAP.getDefaultState().with(BlockMossyGlowshroomCap.TRANSITION, true)); + info.setState(EndBlocks.MOSSY_GLOWSHROOM_CAP.getDefaultState().with(MossyGlowshroomCapBlock.TRANSITION, true)); return info.getState(); } else if (!EndBlocks.MOSSY_GLOWSHROOM.isTreeLog(info.getStateUp()) || !EndBlocks.MOSSY_GLOWSHROOM.isTreeLog(info.getStateDown())) { @@ -101,7 +101,7 @@ public class StructureGiantMossyGlowshroom extends SDFStructureFeature { } else if (info.getState().getBlock() == EndBlocks.MOSSY_GLOWSHROOM_CAP) { if (EndBlocks.MOSSY_GLOWSHROOM.isTreeLog(info.getStateDown().getBlock())) { - info.setState(EndBlocks.MOSSY_GLOWSHROOM_CAP.getDefaultState().with(BlockMossyGlowshroomCap.TRANSITION, true)); + info.setState(EndBlocks.MOSSY_GLOWSHROOM_CAP.getDefaultState().with(MossyGlowshroomCapBlock.TRANSITION, true)); return info.getState(); } @@ -111,12 +111,12 @@ public class StructureGiantMossyGlowshroom extends SDFStructureFeature { else if (info.getState().getBlock() == EndBlocks.MOSSY_GLOWSHROOM_HYMENOPHORE) { for (Direction dir: BlocksHelper.HORIZONTAL) { if (info.getState(dir) == AIR) { - info.setBlockPos(info.getPos().offset(dir), EndBlocks.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(BlockFur.FACING, dir)); + info.setBlockPos(info.getPos().offset(dir), EndBlocks.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(FurBlock.FACING, dir)); } } if (info.getStateDown().getBlock() != EndBlocks.MOSSY_GLOWSHROOM_HYMENOPHORE) { - info.setBlockPos(info.getPos().down(), EndBlocks.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(BlockFur.FACING, Direction.DOWN)); + info.setBlockPos(info.getPos().down(), EndBlocks.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(FurBlock.FACING, Direction.DOWN)); } } return info.getState();