From 1a1016bdf80e60edfe3d283665bec3e9f6f35db8 Mon Sep 17 00:00:00 2001 From: dfsek Date: Tue, 21 Dec 2021 11:43:08 -0700 Subject: [PATCH] mark Properties as deprecated --- .../java/com/dfsek/terra/api/block/state/BlockState.java | 2 -- .../api/block/state/properties/base/Properties.java | 2 +- .../terra/bukkit/world/block/data/BukkitBlockState.java | 9 +-------- .../com/dfsek/terra/fabric/block/FabricBlockState.java | 8 +------- .../com/dfsek/terra/sponge/block/SpongeBlockState.java | 5 ----- 5 files changed, 3 insertions(+), 23 deletions(-) diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/block/state/BlockState.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/BlockState.java index 56e5d18d2..cdfba3c93 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/block/state/BlockState.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/BlockState.java @@ -41,6 +41,4 @@ public interface BlockState extends Cloneable, Handle { String getAsString(); boolean isAir(); - - boolean isStructureVoid(); } diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java index e7623ad68..1bbc7a6e9 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.block.state.properties.enums.RailShape; import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection; import com.dfsek.terra.api.block.state.properties.enums.WallHeight; - +@Deprecated public final class Properties { public static final EnumProperty DIRECTION = EnumProperty.of("facing", Direction.class); public static final EnumProperty AXIS = EnumProperty.of("axis", Axis.class); diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java index b4cf0b988..90d58b10d 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java @@ -17,8 +17,6 @@ package com.dfsek.terra.bukkit.world.block.data; -import org.bukkit.Material; - import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.properties.Property; @@ -76,12 +74,7 @@ public class BukkitBlockState implements BlockState { public boolean isAir() { return delegate.getMaterial().isAir(); } - - @Override - public boolean isStructureVoid() { - return delegate.getMaterial() == Material.STRUCTURE_VOID; - } - + @Override public BukkitBlockState clone() { try { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java index 3f512445c..7ac47e46f 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java @@ -17,7 +17,6 @@ package com.dfsek.terra.fabric.block; -import net.minecraft.block.Blocks; import net.minecraft.block.enums.BlockHalf; import net.minecraft.block.enums.RailShape; import net.minecraft.block.enums.WallShape; @@ -141,12 +140,7 @@ public class FabricBlockState implements BlockState { public boolean isAir() { return delegate.isAir(); } - - @Override - public boolean isStructureVoid() { - return delegate.getBlock() == Blocks.STRUCTURE_VOID; - } - + @Override public BlockState clone() { try { diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/block/SpongeBlockState.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/block/SpongeBlockState.java index 71915b40a..5181d8504 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/block/SpongeBlockState.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/block/SpongeBlockState.java @@ -71,11 +71,6 @@ public class SpongeBlockState implements BlockState { return delegate.type().equals(BlockTypes.AIR.get()); } - @Override - public boolean isStructureVoid() { - return delegate.type().equals(BlockTypes.STRUCTURE_VOID.get()); - } - @Override public BlockState clone() { return this;