getBlockData -> getBlockState

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java

@@ -58,7 +58,7 @@ public class TerraFlora implements Structure {
     
     private void test(EnumSet<Direction> faces, Direction f, Vector3 b, WritableWorld world) {
         if(testRotation.contains(
-                world.getBlockData(b.getBlockX() + f.getModX(), b.getBlockY() + f.getModY(), b.getBlockZ() + f.getModZ()).getBlockType()))
+                world.getBlockState(b.getBlockX() + f.getModX(), b.getBlockY() + f.getModY(), b.getBlockZ() + f.getModZ()).getBlockType()))
             faces.add(f);
     }
     

common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java

@@ -104,7 +104,7 @@ public class VanillaOre implements Structure {
                             for(int z = zStart; z <= zEnd; z++) {
                                 double d15 = (z + 0.5D - (d3 + (d4 - d3) * iFactor)) / (d11 / 2.0D);
                                 if(y >= world.getMaxHeight() || y < world.getMinHeight()) continue;
-                                BlockType block = world.getBlockData(x, y, z).getBlockType();
+                                BlockType block = world.getBlockState(x, y, z).getBlockType();
                                 if((d13 * d13 + d14 * d14 + d15 * d15 < 1.0D) && getReplaceable().contains(block)) {
                                     world.setBlockData(x, y, z, getMaterial(block), isApplyGravity());
                                 }

common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java

@@ -38,7 +38,7 @@ public class ColumnImpl<T extends WritableWorld> implements Column<T> {
     
     @Override
     public BlockState getBlock(int y) {
-        return world.getBlockData(x, y, z);
+        return world.getBlockState(x, y, z);
     }
     
     @Override

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java

@@ -24,7 +24,7 @@ public class BufferedPulledBlock implements BufferedItem {
     public void paste(Vector3 origin, WritableWorld world) {
         Vector3 mutable = origin.clone();
         while(mutable.getY() > world.getMinHeight()) {
-            if(!world.getBlockData(mutable).isAir()) {
+            if(!world.getBlockState(mutable).isAir()) {
                 world.setBlockData(mutable, data);
                 break;
             }

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java

@@ -44,7 +44,7 @@ public class CheckBlockFunction implements Function<String> {
         RotationUtil.rotateVector(xz, arguments.getRotation());
         
         String data = arguments.getWorld()
-                               .getBlockData(arguments.getBuffer()
+                               .getBlockState(arguments.getBuffer()
                                                       .getOrigin()
                                                       .clone()
                                                       .add(new Vector3(FastMath.roundToInt(xz.getX()),

common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java

@@ -38,7 +38,7 @@ public class BufferedBlock implements BufferedItem {
     @Override
     public void paste(Vector3 origin, WritableWorld world) {
         try {
-            BlockState current = world.getBlockData(origin);
+            BlockState current = world.getBlockState(origin);
             if(overwrite || current.isAir()) {
                 if(waterlog && current.has(Properties.WATERLOGGED) && current.getBlockType().isWater()) {
                     current.set(Properties.WATERLOGGED, true);

common/api/core/src/main/java/com/dfsek/terra/api/world/ReadableWorld.java

@@ -7,14 +7,14 @@ import com.dfsek.terra.api.util.vector.integer.Vector3Int;
 
 
 public interface ReadableWorld extends World {
-    BlockState getBlockData(int x, int y, int z);
+    BlockState getBlockState(int x, int y, int z);
     
-    default BlockState getBlockData(Vector3 position) {
+    default BlockState getBlockState(Vector3 position) {
-        return getBlockData(position.getBlockX(), position.getBlockY(), position.getBlockZ());
+        return getBlockState(position.getBlockX(), position.getBlockY(), position.getBlockZ());
     }
     
-    default BlockState getBlockData(Vector3Int position) {
+    default BlockState getBlockState(Vector3Int position) {
-        return getBlockData(position.getX(), position.getY(), position.getZ());
+        return getBlockState(position.getX(), position.getY(), position.getZ());
     }
     
     BlockEntity getBlockEntity(int x, int y, int z);

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java

@@ -48,7 +48,7 @@ public class BukkitProtoWorld implements ProtoWorld {
     }
     
     @Override
-    public BlockState getBlockData(int x, int y, int z) {
+    public BlockState getBlockState(int x, int y, int z) {
         return BukkitBlockState.newInstance(delegate.getBlockData(x, y, z));
     }
     

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java

@@ -68,7 +68,7 @@ public class BukkitServerWorld implements ServerWorld {
     }
     
     @Override
-    public BlockState getBlockData(int x, int y, int z) {
+    public BlockState getBlockState(int x, int y, int z) {
         return BukkitAdapter.adapt(delegate.getBlockAt(x, y, z).getBlockData());
     }