diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java index 99acf5fcb..31fbf1558 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.Random; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.block.state.properties.base.Properties; import com.dfsek.terra.api.block.state.properties.enums.Direction; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.structure.Structure; @@ -90,12 +89,6 @@ public class TerraFlora implements Structure { if(doRotation) { Direction oneFace = new ArrayList<>(faces).get( new Random(location.getX() ^ location.getZ()).nextInt(faces.size())); // Get random face. - - data = data.setIfPresent(Properties.DIRECTION, oneFace.opposite()) - .setIfPresent(Properties.NORTH, faces.contains(Direction.NORTH)) - .setIfPresent(Properties.SOUTH, faces.contains(Direction.SOUTH)) - .setIfPresent(Properties.EAST, faces.contains(Direction.EAST)) - .setIfPresent(Properties.WEST, faces.contains(Direction.WEST)); } world.setBlockState(location.mutable().add(0, i + c, 0).immutable(), data, physics); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index 677b6bc20..63d754975 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -23,7 +23,6 @@ import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.block.state.properties.base.Properties; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.vector.Vector2; import com.dfsek.terra.api.util.vector.Vector3; diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java deleted file mode 100644 index c1f173d9e..000000000 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2020-2021 Polyhedral Development - * - * The Terra API is licensed under the terms of the MIT License. For more details, - * reference the LICENSE file in the common/api directory. - */ - -package com.dfsek.terra.api.block.state.properties.base; - -import com.dfsek.terra.api.block.state.properties.enums.Axis; -import com.dfsek.terra.api.block.state.properties.enums.Direction; -import com.dfsek.terra.api.block.state.properties.enums.Half; -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); - - public static final BooleanProperty NORTH = BooleanProperty.of("north"); - public static final BooleanProperty SOUTH = BooleanProperty.of("south"); - public static final BooleanProperty EAST = BooleanProperty.of("east"); - public static final BooleanProperty WEST = BooleanProperty.of("west"); - - public static final EnumProperty NORTH_HEIGHT = EnumProperty.of("north", WallHeight.class); - public static final EnumProperty SOUTH_HEIGHT = EnumProperty.of("south", WallHeight.class); - public static final EnumProperty EAST_HEIGHT = EnumProperty.of("east", WallHeight.class); - public static final EnumProperty WEST_HEIGHT = EnumProperty.of("west", WallHeight.class); - - public static final EnumProperty NORTH_CONNECTION = EnumProperty.of("north", RedstoneConnection.class); - public static final EnumProperty SOUTH_CONNECTION = EnumProperty.of("south", RedstoneConnection.class); - public static final EnumProperty EAST_CONNECTION = EnumProperty.of("east", RedstoneConnection.class); - public static final EnumProperty WEST_CONNECTION = EnumProperty.of("west", RedstoneConnection.class); - - - public static final EnumProperty RAIL_SHAPE = EnumProperty.of("shape", RailShape.class); - public static final EnumProperty HALF = EnumProperty.of("half", Half.class); - - public static final IntProperty ROTATION = IntProperty.of("rotation", 0, 15); - - public static final BooleanProperty WATERLOGGED = BooleanProperty.of("waterlogged"); -} diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java index e2500efb6..6f9fb8048 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java @@ -7,14 +7,6 @@ package com.dfsek.terra.api.util; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.block.state.properties.base.BooleanProperty; -import com.dfsek.terra.api.block.state.properties.base.EnumProperty; -import com.dfsek.terra.api.block.state.properties.base.Properties; -import com.dfsek.terra.api.block.state.properties.enums.Axis; -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; import com.dfsek.terra.api.util.vector.Vector2; import com.dfsek.terra.api.util.vector.Vector2.Mutable;