From 23fcd4a6511c23eda46e329ae85928c36a0b75f1 Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 17 Dec 2021 08:38:28 -0700 Subject: [PATCH] getBlockData -> getBlockState --- .../dfsek/terra/addons/flora/flora/gen/TerraFlora.java | 2 +- .../com/dfsek/terra/addons/ore/ores/VanillaOre.java | 2 +- .../terra/addons/generation/feature/ColumnImpl.java | 2 +- .../terrascript/buffer/items/BufferedPulledBlock.java | 2 +- .../script/functions/CheckBlockFunction.java | 2 +- .../api/structure/buffer/items/BufferedBlock.java | 2 +- .../java/com/dfsek/terra/api/world/ReadableWorld.java | 10 +++++----- .../com/dfsek/terra/bukkit/world/BukkitProtoWorld.java | 2 +- .../dfsek/terra/bukkit/world/BukkitServerWorld.java | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) 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 f1f6eb9ce..4ea18d9f3 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 @@ -58,7 +58,7 @@ public class TerraFlora implements Structure { private void test(EnumSet 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); } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java index 8c3cb1395..0d5e8c137 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java +++ b/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()); } diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java index da8b0d6e6..3c3cd81df 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java @@ -38,7 +38,7 @@ public class ColumnImpl implements Column { @Override public BlockState getBlock(int y) { - return world.getBlockData(x, y, z); + return world.getBlockState(x, y, z); } @Override diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java index 50b234f80..46563b3d0 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java +++ b/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; } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java index eb34df297..488a76446 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java +++ b/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 { RotationUtil.rotateVector(xz, arguments.getRotation()); String data = arguments.getWorld() - .getBlockData(arguments.getBuffer() + .getBlockState(arguments.getBuffer() .getOrigin() .clone() .add(new Vector3(FastMath.roundToInt(xz.getX()), diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java index fbbbe0488..0035d989d 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java +++ b/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); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/ReadableWorld.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/ReadableWorld.java index a7107c239..ce38f4c9e 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/ReadableWorld.java +++ b/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) { - return getBlockData(position.getBlockX(), position.getBlockY(), position.getBlockZ()); + default BlockState getBlockState(Vector3 position) { + return getBlockState(position.getBlockX(), position.getBlockY(), position.getBlockZ()); } - default BlockState getBlockData(Vector3Int position) { - return getBlockData(position.getX(), position.getY(), position.getZ()); + default BlockState getBlockState(Vector3Int position) { + return getBlockState(position.getX(), position.getY(), position.getZ()); } BlockEntity getBlockEntity(int x, int y, int z); diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java index ed8257f9c..e8684b42c 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java +++ b/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)); } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java index a226abcbe..dcb73d478 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java +++ b/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()); }