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 4ea18d9f3..1fd9daa95 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 @@ -113,7 +113,7 @@ public class TerraFlora implements Structure { .setIfPresent(Properties.EAST, faces.contains(Direction.EAST)) .setIfPresent(Properties.WEST, faces.contains(Direction.WEST)); } - world.setBlockData(location.clone().add(0, i + c, 0), data, physics); + world.setBlockState(location.clone().add(0, i + c, 0), data, physics); } return true; } 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 0d5e8c137..53a74bd10 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 @@ -106,7 +106,7 @@ public class VanillaOre implements Structure { if(y >= world.getMaxHeight() || y < world.getMinHeight()) continue; 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()); + world.setBlockState(x, y, z, getMaterial(block), isApplyGravity()); } } } diff --git a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java index 040f381f3..6aa90e10c 100644 --- a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java +++ b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java @@ -52,7 +52,7 @@ public class SpongeStructure implements Structure { for(int y = 0; y < blocks[z].length; y++) { BlockState state = blocks[x][z][y]; if(state == null) continue; - world.setBlockData(bX + rX, bY + y, bZ + rZ, state); + world.setBlockState(bX + rX, bY + y, bZ + rZ, state); } } } @@ -89,7 +89,7 @@ public class SpongeStructure implements Structure { for(int y = 0; y < blocks[z].length; y++) { BlockState state = blocks[x][z][y]; if(state == null) continue; - world.setBlockData(bX + rX, bY + y, bZ + rZ, state); + world.setBlockState(bX + rX, bY + y, bZ + rZ, state); } } } 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 46563b3d0..de8c9e468 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 @@ -25,7 +25,7 @@ public class BufferedPulledBlock implements BufferedItem { Vector3 mutable = origin.clone(); while(mutable.getY() > world.getMinHeight()) { if(!world.getBlockState(mutable).isAir()) { - world.setBlockData(mutable, data); + world.setBlockState(mutable, data); break; } mutable.subtract(0, 1, 0); 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 0035d989d..e1dd23e8d 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 @@ -43,7 +43,7 @@ public class BufferedBlock implements BufferedItem { if(waterlog && current.has(Properties.WATERLOGGED) && current.getBlockType().isWater()) { current.set(Properties.WATERLOGGED, true); } - world.setBlockData(origin, data); + world.setBlockState(origin, data); } } catch(RuntimeException e) { logger.error("Failed to place block at location {}", origin, e); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/WritableWorld.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/WritableWorld.java index 3e3aaa77a..b385e64ba 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/WritableWorld.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/WritableWorld.java @@ -7,19 +7,19 @@ import com.dfsek.terra.api.util.vector.Vector3; public interface WritableWorld extends ReadableWorld { - default void setBlockData(Vector3 position, BlockState data, boolean physics) { - setBlockData(position.getBlockX(), position.getBlockY(), position.getBlockZ(), data, physics); + default void setBlockState(Vector3 position, BlockState data, boolean physics) { + setBlockState(position.getBlockX(), position.getBlockY(), position.getBlockZ(), data, physics); } - default void setBlockData(Vector3 position, BlockState data) { - setBlockData(position, data, false); + default void setBlockState(Vector3 position, BlockState data) { + setBlockState(position, data, false); } - default void setBlockData(int x, int y, int z, BlockState data) { - setBlockData(x, y, z, data, false); + default void setBlockState(int x, int y, int z, BlockState data) { + setBlockState(x, y, z, data, false); } - void setBlockData(int x, int y, int z, BlockState data, boolean physics); + void setBlockState(int x, int y, int z, BlockState data, boolean physics); default Entity spawnEntity(Vector3 location, EntityType entityType) { 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 e8684b42c..973b2674e 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 @@ -30,7 +30,7 @@ public class BukkitProtoWorld implements ProtoWorld { } @Override - public void setBlockData(int x, int y, int z, BlockState data, boolean physics) { + public void setBlockState(int x, int y, int z, BlockState data, boolean physics) { delegate.setBlockData(x, y, z, BukkitAdapter.adapt(data)); if(physics) { delegate.scheduleBlockUpdate(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 dcb73d478..b7923ee26 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 @@ -48,7 +48,7 @@ public class BukkitServerWorld implements ServerWorld { } @Override - public void setBlockData(int x, int y, int z, BlockState data, boolean physics) { + public void setBlockState(int x, int y, int z, BlockState data, boolean physics) { delegate.getBlockAt(x, y, z).setBlockData(BukkitAdapter.adapt(data), physics); }