refactor block state package

common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.api.block;
 
 import com.dfsek.terra.api.Handle;
+import com.dfsek.terra.api.block.state.BlockState;
 
 public interface BlockType extends Handle {
     BlockState getDefaultData();

common/api/src/main/java/com/dfsek/terra/api/block/data/AnaloguePowerable.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 
 public interface AnaloguePowerable extends BlockState {
     int getMaximumPower();

common/api/src/main/java/com/dfsek/terra/api/block/data/Bisected.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 
 public interface Bisected extends BlockState {
     Half getHalf();

common/api/src/main/java/com/dfsek/terra/api/block/data/Directional.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockFace;
 
 public interface Directional extends BlockState {

common/api/src/main/java/com/dfsek/terra/api/block/data/MultipleFacing.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockFace;
 
 import java.util.Set;

common/api/src/main/java/com/dfsek/terra/api/block/data/Orientable.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.data.properties.enums.Axis;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.properties.enums.Axis;
+import com.dfsek.terra.api.block.state.BlockState;
 
 import java.util.Set;
 

common/api/src/main/java/com/dfsek/terra/api/block/data/Rail.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
-import com.dfsek.terra.api.block.data.properties.enums.RailShape;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.block.state.properties.enums.RailShape;
 
 public interface Rail extends BlockState {
     RailShape getShape();

common/api/src/main/java/com/dfsek/terra/api/block/data/RedstoneWire.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockFace;
 
 import java.util.Set;

common/api/src/main/java/com/dfsek/terra/api/block/data/Rotatable.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockFace;
 
 public interface Rotatable extends BlockState {

common/api/src/main/java/com/dfsek/terra/api/block/data/Wall.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockFace;
 
 public interface Wall extends BlockState, Waterlogged {

common/api/src/main/java/com/dfsek/terra/api/block/data/Waterlogged.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 
 public interface Waterlogged extends BlockState {
     boolean isWaterlogged();

common/api/src/main/java/com/dfsek/terra/api/block/data/properties/enums/Axis.java

@@ -1,5 +0,0 @@
-package com.dfsek.terra.api.block.data.properties.enums;
-
-public enum Axis {
-    X, Y, Z
-}

common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.block.entity;
 
 import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.vector.Vector3;
 
 public interface BlockEntity extends Handle {

common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java

@@ -1,7 +1,8 @@
-package com.dfsek.terra.api.block;
+package com.dfsek.terra.api.block.state;
 
 import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.block.data.properties.Property;
+import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.block.state.properties.Property;
 
 public interface BlockState extends Cloneable, Handle {
 

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.block.data.properties;
+package com.dfsek.terra.api.block.state.properties;
 
 import java.util.Collection;
 

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.block.data.properties.base;
+package com.dfsek.terra.api.block.state.properties.base;
 
-import com.dfsek.terra.api.block.data.properties.Property;
+import com.dfsek.terra.api.block.state.properties.Property;
 
 import java.util.Arrays;
 import java.util.Collection;

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.block.data.properties.base;
+package com.dfsek.terra.api.block.state.properties.base;
 
-import com.dfsek.terra.api.block.data.properties.Property;
+import com.dfsek.terra.api.block.state.properties.Property;
 import com.dfsek.terra.api.util.generic.Lazy;
 
 import java.util.Arrays;

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.block.data.properties.base;
+package com.dfsek.terra.api.block.state.properties.base;
 
-import com.dfsek.terra.api.block.data.properties.Property;
+import com.dfsek.terra.api.block.state.properties.Property;
 import com.dfsek.terra.api.util.generic.Construct;
 
 import java.util.ArrayList;

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.block.data.properties.base;
+package com.dfsek.terra.api.block.state.properties.base;
 
-import com.dfsek.terra.api.block.data.properties.enums.Direction;
-import com.dfsek.terra.api.block.data.properties.enums.RailShape;
+import com.dfsek.terra.api.block.state.properties.enums.Direction;
+import com.dfsek.terra.api.block.state.properties.enums.RailShape;
 
 public final class Properties {
     public static final EnumProperty<Direction> DIRECTION = EnumProperty.of("facing", Direction.class);

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java

@@ -0,0 +1,5 @@
+package com.dfsek.terra.api.block.state.properties.enums;
+
+public enum Axis {
+    X, Y, Z
+}

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.block.data.properties.enums;
+package com.dfsek.terra.api.block.state.properties.enums;
 
 public enum Direction {
     NORTH,SOUTH,EAST,WEST,UP,DOWN

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.block.data.properties.enums;
+package com.dfsek.terra.api.block.state.properties.enums;
 
 public enum RailShape {
     ASCENDING_EAST,

common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.handle;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.util.generic.pair.Pair;

common/api/src/main/java/com/dfsek/terra/api/world/Chunk.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 
 public interface Chunk extends ChunkAccess {
     int getX();

common/api/src/main/java/com/dfsek/terra/api/world/ChunkAccess.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world;
 
 import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
 
 public interface ChunkAccess extends Handle {

common/api/src/main/java/com/dfsek/terra/api/world/TerraWorld.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.WorldConfig;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

common/api/src/main/java/com/dfsek/terra/api/world/World.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world;
 
 import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;

common/api/src/main/java/com/dfsek/terra/api/world/generator/Palette.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.generator;
 
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;