From afc3d1e7958618f02cb03b6511c2d902e0590533 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 14 Jun 2023 13:14:13 +0200 Subject: [PATCH] Fixed Survives On handling --- .../betterx/betterend/blocks/BlueVineSeedBlock.java | 6 ++++++ .../betterx/betterend/blocks/BoluxMushroomBlock.java | 5 +++++ .../org/betterx/betterend/blocks/BubbleCoralBlock.java | 8 +++++++- .../betterx/betterend/blocks/BulbVineSeedBlock.java | 5 +++++ .../betterx/betterend/blocks/CavePumpkinVineBlock.java | 5 +++++ .../org/betterx/betterend/blocks/ChorusGrassBlock.java | 6 ++++++ .../org/betterx/betterend/blocks/EndLilyBlock.java | 8 +++++++- .../org/betterx/betterend/blocks/FlamaeaBlock.java | 5 +++++ .../org/betterx/betterend/blocks/FlammalixBlock.java | 5 +++++ .../org/betterx/betterend/blocks/GlowingMossBlock.java | 6 ++++++ .../betterend/blocks/GlowingPillarSeedBlock.java | 5 +++++ .../org/betterx/betterend/blocks/LanceleafBlock.java | 5 +++++ .../betterx/betterend/blocks/LanceleafSeedBlock.java | 5 +++++ .../betterx/betterend/blocks/LargeAmaranitaBlock.java | 5 +++++ .../betterx/betterend/blocks/LumecornSeedBlock.java | 6 ++++++ .../org/betterx/betterend/blocks/MurkweedBlock.java | 5 +++++ .../org/betterx/betterend/blocks/NeedlegrassBlock.java | 5 +++++ .../org/betterx/betterend/blocks/PondAnemoneBlock.java | 8 +++++++- .../betterx/betterend/blocks/SmallAmaranitaBlock.java | 5 +++++ .../betterx/betterend/blocks/TerrainPlantBlock.java | 6 ++++++ .../betterend/blocks/TwistedUmbrellaMossBlock.java | 5 +++++ .../betterx/betterend/blocks/UmbrellaMossBlock.java | 5 +++++ .../betterx/betterend/blocks/basis/EndPlantBlock.java | 6 ------ .../betterend/blocks/basis/EndPlantWithAgeBlock.java | 9 --------- .../blocks/basis/EndUnderwaterPlantBlock.java | 10 +--------- .../blocks/basis/EndUnderwaterWallPlantBlock.java | 1 - .../betterend/blocks/basis/EndWallMushroom.java | 8 ++++---- 27 files changed, 126 insertions(+), 32 deletions(-) diff --git a/src/main/java/org/betterx/betterend/blocks/BlueVineSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/BlueVineSeedBlock.java index 486393c8..eb91bed8 100644 --- a/src/main/java/org/betterx/betterend/blocks/BlueVineSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/BlueVineSeedBlock.java @@ -14,6 +14,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; public class BlueVineSeedBlock extends EndPlantWithAgeBlock implements SurvivesOnMossOrMycelium, BehaviourSeed { @@ -75,4 +76,9 @@ public class BlueVineSeedBlock extends EndPlantWithAgeBlock implements SurvivesO ); } } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnMossOrMycelium.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/BoluxMushroomBlock.java b/src/main/java/org/betterx/betterend/blocks/BoluxMushroomBlock.java index 093ec84d..d9c4c22f 100644 --- a/src/main/java/org/betterx/betterend/blocks/BoluxMushroomBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/BoluxMushroomBlock.java @@ -54,4 +54,9 @@ public class BoluxMushroomBlock extends EndPlantBlock implements SurvivesOnRutis public List getDrops(BlockState state, LootParams.Builder builder) { return Lists.newArrayList(new ItemStack(this)); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnRutiscus.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/BubbleCoralBlock.java b/src/main/java/org/betterx/betterend/blocks/BubbleCoralBlock.java index 0361a77d..37fafb84 100644 --- a/src/main/java/org/betterx/betterend/blocks/BubbleCoralBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/BubbleCoralBlock.java @@ -4,6 +4,7 @@ import org.betterx.bclib.behaviours.BehaviourBuilders; import org.betterx.bclib.behaviours.interfaces.BehaviourWaterPlant; import org.betterx.bclib.interfaces.tools.AddMineableShears; import org.betterx.betterend.blocks.basis.EndUnderwaterPlantBlock; +import org.betterx.betterend.interfaces.survives.SurvivesOnEndStone; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; @@ -21,7 +22,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -public class BubbleCoralBlock extends EndUnderwaterPlantBlock implements BehaviourWaterPlant, AddMineableShears { +public class BubbleCoralBlock extends EndUnderwaterPlantBlock implements BehaviourWaterPlant, AddMineableShears, SurvivesOnEndStone { private static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 14, 16); @@ -55,4 +56,9 @@ public class BubbleCoralBlock extends EndUnderwaterPlantBlock implements Behavio public boolean isBonemealSuccess(Level world, RandomSource random, BlockPos pos, BlockState state) { return false; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnEndStone.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java index bcfd6e92..255459f4 100644 --- a/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/BulbVineSeedBlock.java @@ -50,4 +50,9 @@ public class BulbVineSeedBlock extends EndPlantWithAgeBlock implements Behaviour ); } } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnEndStoneOrTrees.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/CavePumpkinVineBlock.java b/src/main/java/org/betterx/betterend/blocks/CavePumpkinVineBlock.java index e17ede7b..99d4e946 100644 --- a/src/main/java/org/betterx/betterend/blocks/CavePumpkinVineBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/CavePumpkinVineBlock.java @@ -79,4 +79,9 @@ public class CavePumpkinVineBlock extends EndPlantWithAgeBlock implements Surviv public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { return SHAPE; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnEndStone.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/ChorusGrassBlock.java b/src/main/java/org/betterx/betterend/blocks/ChorusGrassBlock.java index eb7bd9a4..c130395f 100644 --- a/src/main/java/org/betterx/betterend/blocks/ChorusGrassBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/ChorusGrassBlock.java @@ -5,10 +5,16 @@ import org.betterx.bclib.behaviours.interfaces.BehaviourPlant; import org.betterx.betterend.blocks.basis.EndPlantBlock; import org.betterx.betterend.interfaces.survives.SurvivesOnChorusNylium; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; public class ChorusGrassBlock extends EndPlantBlock implements SurvivesOnChorusNylium, BehaviourPlant { public ChorusGrassBlock() { super(BehaviourBuilders.createGrass(MapColor.COLOR_PURPLE).replaceable()); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnChorusNylium.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/EndLilyBlock.java b/src/main/java/org/betterx/betterend/blocks/EndLilyBlock.java index 67778c65..2d9427f0 100644 --- a/src/main/java/org/betterx/betterend/blocks/EndLilyBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/EndLilyBlock.java @@ -7,6 +7,7 @@ import org.betterx.bclib.blocks.BlockProperties.TripleShape; import org.betterx.bclib.interfaces.tools.AddMineableShears; import org.betterx.bclib.util.MHelper; import org.betterx.betterend.blocks.basis.EndUnderwaterPlantBlock; +import org.betterx.betterend.interfaces.survives.SurvivesOnEndStone; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; @@ -38,7 +39,7 @@ import com.google.common.collect.Lists; import java.util.Collections; import java.util.List; -public class EndLilyBlock extends EndUnderwaterPlantBlock implements BehaviourWaterPlant, AddMineableShears { +public class EndLilyBlock extends EndUnderwaterPlantBlock implements BehaviourWaterPlant, AddMineableShears, SurvivesOnEndStone { public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; private static final VoxelShape SHAPE_BOTTOM = Block.box(4, 0, 4, 12, 16, 12); private static final VoxelShape SHAPE_TOP = Block.box(2, 0, 2, 14, 6, 14); @@ -125,4 +126,9 @@ public class EndLilyBlock extends EndUnderwaterPlantBlock implements BehaviourWa public boolean isBonemealSuccess(Level world, RandomSource random, BlockPos pos, BlockState state) { return false; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnEndStone.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java b/src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java index 87120769..29053d12 100644 --- a/src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/FlamaeaBlock.java @@ -54,4 +54,9 @@ public class FlamaeaBlock extends EndPlantBlock implements CustomItemProvider, B public BlockItem getCustomItem(ResourceLocation resourceLocation, Item.Properties itemSettings) { return new PlaceOnWaterBlockItem(this, itemSettings); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnWater.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/FlammalixBlock.java b/src/main/java/org/betterx/betterend/blocks/FlammalixBlock.java index acf159ea..d9e642c9 100644 --- a/src/main/java/org/betterx/betterend/blocks/FlammalixBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/FlammalixBlock.java @@ -36,4 +36,9 @@ public class FlammalixBlock extends EndPlantBlock implements BehaviourPlant, Sur public BlockModel getItemModel(ResourceLocation resourceLocation) { return ModelsHelper.createItemModel(resourceLocation); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvicesOnPallidium.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/GlowingMossBlock.java b/src/main/java/org/betterx/betterend/blocks/GlowingMossBlock.java index f26a700b..f3390312 100644 --- a/src/main/java/org/betterx/betterend/blocks/GlowingMossBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/GlowingMossBlock.java @@ -7,6 +7,7 @@ import org.betterx.betterend.interfaces.survives.SurvivesOnMossOrMycelium; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; import net.fabricmc.api.EnvType; @@ -31,4 +32,9 @@ public class GlowingMossBlock extends EndPlantBlock implements SurvivesOnMossOrM public float getAmbientOcclusionLightLevel(BlockGetter world, BlockPos pos) { return 1F; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnMossOrMycelium.super.isTerrain(state); + } } \ No newline at end of file diff --git a/src/main/java/org/betterx/betterend/blocks/GlowingPillarSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/GlowingPillarSeedBlock.java index 514fd63e..3d08e02e 100644 --- a/src/main/java/org/betterx/betterend/blocks/GlowingPillarSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/GlowingPillarSeedBlock.java @@ -76,4 +76,9 @@ public class GlowingPillarSeedBlock extends EndPlantWithAgeBlock implements AddM ); } } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnAmberMoss.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/LanceleafBlock.java b/src/main/java/org/betterx/betterend/blocks/LanceleafBlock.java index f361576e..5e172c2b 100644 --- a/src/main/java/org/betterx/betterend/blocks/LanceleafBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/LanceleafBlock.java @@ -76,4 +76,9 @@ public class LanceleafBlock extends EndPlantBlock implements SurvivesOnAmberMoss return MHelper.RANDOM.nextBoolean() ? Collections.emptyList() : Collections.singletonList(new ItemStack( EndBlocks.LANCELEAF_SEED)); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnAmberMoss.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/LanceleafSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/LanceleafSeedBlock.java index 3e1546f6..7d26efd0 100644 --- a/src/main/java/org/betterx/betterend/blocks/LanceleafSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/LanceleafSeedBlock.java @@ -57,4 +57,9 @@ public class LanceleafSeedBlock extends EndPlantWithAgeBlock implements Survives plant.setValue(BlockProperties.PENTA_SHAPE, PentaShape.TOP) ); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnAmberMoss.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/LargeAmaranitaBlock.java b/src/main/java/org/betterx/betterend/blocks/LargeAmaranitaBlock.java index 019dc6d3..03b556a4 100644 --- a/src/main/java/org/betterx/betterend/blocks/LargeAmaranitaBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/LargeAmaranitaBlock.java @@ -65,4 +65,9 @@ public class LargeAmaranitaBlock extends EndPlantBlock implements BehaviourPlant public boolean isBonemealSuccess(Level world, RandomSource random, BlockPos pos, BlockState state) { return false; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnEndBone.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/LumecornSeedBlock.java b/src/main/java/org/betterx/betterend/blocks/LumecornSeedBlock.java index e32a5a2f..91bbab0d 100644 --- a/src/main/java/org/betterx/betterend/blocks/LumecornSeedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/LumecornSeedBlock.java @@ -9,6 +9,7 @@ import org.betterx.betterend.registry.EndFeatures; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; @@ -33,4 +34,9 @@ public class LumecornSeedBlock extends EndPlantWithAgeBlock implements Behaviour null )); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnEndMoss.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/MurkweedBlock.java b/src/main/java/org/betterx/betterend/blocks/MurkweedBlock.java index 417f949a..4ef48993 100644 --- a/src/main/java/org/betterx/betterend/blocks/MurkweedBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/MurkweedBlock.java @@ -50,4 +50,9 @@ public class MurkweedBlock extends EndPlantBlock implements SurvivesOnShadowGras public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) { return false; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnShadowGrass.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/NeedlegrassBlock.java b/src/main/java/org/betterx/betterend/blocks/NeedlegrassBlock.java index 671ba076..156053bb 100644 --- a/src/main/java/org/betterx/betterend/blocks/NeedlegrassBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/NeedlegrassBlock.java @@ -60,4 +60,9 @@ public class NeedlegrassBlock extends EndPlantBlock implements SurvivesOnShadowG public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) { return false; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnShadowGrass.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/PondAnemoneBlock.java b/src/main/java/org/betterx/betterend/blocks/PondAnemoneBlock.java index e4f3166e..14954075 100644 --- a/src/main/java/org/betterx/betterend/blocks/PondAnemoneBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/PondAnemoneBlock.java @@ -4,6 +4,7 @@ import org.betterx.bclib.behaviours.BehaviourBuilders; import org.betterx.bclib.behaviours.interfaces.BehaviourWaterPlant; import org.betterx.bclib.interfaces.tools.AddMineableShears; import org.betterx.betterend.blocks.basis.EndUnderwaterPlantBlock; +import org.betterx.betterend.interfaces.survives.SurvivesOnEndStone; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; @@ -20,7 +21,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -public class PondAnemoneBlock extends EndUnderwaterPlantBlock implements BehaviourWaterPlant, AddMineableShears { +public class PondAnemoneBlock extends EndUnderwaterPlantBlock implements BehaviourWaterPlant, AddMineableShears, SurvivesOnEndStone { private static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 14, 14); public PondAnemoneBlock() { @@ -55,4 +56,9 @@ public class PondAnemoneBlock extends EndUnderwaterPlantBlock implements Behavio public boolean isBonemealSuccess(Level world, RandomSource random, BlockPos pos, BlockState state) { return false; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnEndStone.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/SmallAmaranitaBlock.java b/src/main/java/org/betterx/betterend/blocks/SmallAmaranitaBlock.java index ba1e1fc8..ca6b753f 100644 --- a/src/main/java/org/betterx/betterend/blocks/SmallAmaranitaBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/SmallAmaranitaBlock.java @@ -99,4 +99,9 @@ public class SmallAmaranitaBlock extends EndPlantBlock implements SurvivesOnEndB public boolean isBonemealSuccess(Level world, RandomSource random, BlockPos pos, BlockState state) { return random.nextInt(8) == 0; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnEndBone.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/TerrainPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/TerrainPlantBlock.java index b8a82021..b71c4ab5 100644 --- a/src/main/java/org/betterx/betterend/blocks/TerrainPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/TerrainPlantBlock.java @@ -6,6 +6,7 @@ import org.betterx.bclib.interfaces.SurvivesOnBlocks; import org.betterx.betterend.blocks.basis.EndPlantBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; import java.util.List; @@ -25,4 +26,9 @@ public class TerrainPlantBlock extends EndPlantBlock implements SurvivesOnBlocks public List getSurvivableBlocks() { return ground; } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnBlocks.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/TwistedUmbrellaMossBlock.java b/src/main/java/org/betterx/betterend/blocks/TwistedUmbrellaMossBlock.java index 35bf47cb..0c7d035e 100644 --- a/src/main/java/org/betterx/betterend/blocks/TwistedUmbrellaMossBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/TwistedUmbrellaMossBlock.java @@ -47,4 +47,9 @@ public class TwistedUmbrellaMossBlock extends EndPlantBlock implements Behaviour BlocksHelper.setWithoutUpdate(world, pos, bs); BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(BaseDoublePlantBlock.TOP, true)); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnJungleMossOrMycelium.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/UmbrellaMossBlock.java b/src/main/java/org/betterx/betterend/blocks/UmbrellaMossBlock.java index 06ff271c..6a48b2f5 100644 --- a/src/main/java/org/betterx/betterend/blocks/UmbrellaMossBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/UmbrellaMossBlock.java @@ -46,4 +46,9 @@ public class UmbrellaMossBlock extends EndPlantBlock implements BehaviourPlant, BlocksHelper.setWithoutUpdate(world, pos, bs); BlocksHelper.setWithoutUpdate(world, pos.above(), bs.setValue(BaseDoublePlantBlock.TOP, true)); } + + @Override + public boolean isTerrain(BlockState state) { + return SurvivesOnJungleMossOrMycelium.super.isTerrain(state); + } } diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java index 5d3091f3..de5f7efa 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantBlock.java @@ -2,20 +2,14 @@ package org.betterx.betterend.blocks.basis; import org.betterx.bclib.blocks.BasePlantBlock; import org.betterx.betterend.interfaces.PottablePlant; -import org.betterx.worlds.together.tag.v3.CommonBlockTags; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; public abstract class EndPlantBlock extends BasePlantBlock implements PottablePlant { protected EndPlantBlock(Properties props) { super(props); } - @Override - public boolean isTerrain(BlockState state) { - return state.is(CommonBlockTags.END_STONES); - } @Override public boolean canPlantOn(Block block) { diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java index a1b84404..503268cd 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndPlantWithAgeBlock.java @@ -1,18 +1,9 @@ package org.betterx.betterend.blocks.basis; import org.betterx.bclib.blocks.BasePlantWithAgeBlock; -import org.betterx.worlds.together.tag.v3.CommonBlockTags; - -import net.minecraft.world.level.block.state.BlockState; public abstract class EndPlantWithAgeBlock extends BasePlantWithAgeBlock { - public EndPlantWithAgeBlock(Properties settings) { super(settings); } - - @Override - public boolean isTerrain(BlockState state) { - return state.is(CommonBlockTags.END_STONES); - } } diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java index 5dba9815..3a29ca49 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterPlantBlock.java @@ -1,17 +1,9 @@ package org.betterx.betterend.blocks.basis; import org.betterx.bclib.blocks.UnderwaterPlantBlock; -import org.betterx.worlds.together.tag.v3.CommonBlockTags; -import net.minecraft.world.level.block.state.BlockState; - -public class EndUnderwaterPlantBlock extends UnderwaterPlantBlock { +public abstract class EndUnderwaterPlantBlock extends UnderwaterPlantBlock { public EndUnderwaterPlantBlock(Properties settings) { super(settings); } - - @Override - protected boolean isTerrain(BlockState state) { - return state.is(CommonBlockTags.END_STONES); - } } diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java index 2f262c4f..10783c55 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndUnderwaterWallPlantBlock.java @@ -13,7 +13,6 @@ public class EndUnderwaterWallPlantBlock extends BaseUnderwaterWallPlantBlock im super(BehaviourBuilders.createWaterPlant(color)); } - @Override public boolean isTerrain(BlockState state) { return SurvivesOnEndStone.super.isTerrain(state); diff --git a/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java b/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java index c57b47b6..c91b8ffd 100644 --- a/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java +++ b/src/main/java/org/betterx/betterend/blocks/basis/EndWallMushroom.java @@ -1,18 +1,18 @@ package org.betterx.betterend.blocks.basis; import org.betterx.bclib.blocks.WallMushroomBlock; -import org.betterx.worlds.together.tag.v3.CommonBlockTags; +import org.betterx.betterend.interfaces.survives.SurvivesOnEndStone; import net.minecraft.world.level.block.state.BlockState; -public class EndWallMushroom extends WallMushroomBlock { +public class EndWallMushroom extends WallMushroomBlock implements SurvivesOnEndStone { public EndWallMushroom(int light) { super(light); } @Override - protected boolean isTerrain(BlockState state) { - return state.is(CommonBlockTags.END_STONES); + public boolean isTerrain(BlockState state) { + return SurvivesOnEndStone.super.isTerrain(state); } }