mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

getBlockState -> getBlockEntity

Browse Source
This commit is contained in:
dfsek 2021-12-17 08:37:51 -07:00
parent 5401917703
commit 7da87c27ee
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java
View File

@ -38,7 +38,7 @@ public class BufferedLootApplication implements BufferedItem {
@Override @Override
public void paste(Vector3 origin, WritableWorld world) { public void paste(Vector3 origin, WritableWorld world) {
try { try {
BlockEntity data = world.getBlockState(origin); BlockEntity data = world.getBlockEntity(origin);
if(!(data instanceof Container container)) { if(!(data instanceof Container container)) {
LOGGER.error("Failed to place loot at {}; block {} is not a container", origin, data); LOGGER.error("Failed to place loot at {}; block {} is not a container", origin, data);
return; return;

2
common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java
View File

@ -27,7 +27,7 @@ public class BufferedStateManipulator implements BufferedItem {
@Override @Override
public void paste(Vector3 origin, WritableWorld world) { public void paste(Vector3 origin, WritableWorld world) {
try { try {
BlockEntity state = world.getBlockState(origin); BlockEntity state = world.getBlockEntity(origin);
state.applyState(data); state.applyState(data);
state.update(false); state.update(false);
} catch(Exception e) { } catch(Exception e) {

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

@ -17,13 +17,13 @@ public interface ReadableWorld extends World {
return getBlockData(position.getX(), position.getY(), position.getZ()); return getBlockData(position.getX(), position.getY(), position.getZ());
} }
BlockEntity getBlockState(int x, int y, int z); BlockEntity getBlockEntity(int x, int y, int z);
default BlockEntity getBlockState(Vector3 position) { default BlockEntity getBlockEntity(Vector3 position) {
return getBlockState(position.getBlockX(), position.getBlockY(), position.getBlockZ()); return getBlockEntity(position.getBlockX(), position.getBlockY(), position.getBlockZ());
} }
default BlockEntity getBlockState(Vector3Int position) { default BlockEntity getBlockEntity(Vector3Int position) {
return getBlockState(position.getX(), position.getY(), position.getZ()); return getBlockEntity(position.getX(), position.getY(), position.getZ());
} }
} }

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

@ -53,7 +53,7 @@ public class BukkitProtoWorld implements ProtoWorld {
} }
@Override @Override
public BlockEntity getBlockState(int x, int y, int z) { public BlockEntity getBlockEntity(int x, int y, int z) {
return BukkitBlockEntity.newInstance(delegate.getBlockState(x, y, z)); return BukkitBlockEntity.newInstance(delegate.getBlockState(x, y, z));
} }

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

@ -73,7 +73,7 @@ public class BukkitServerWorld implements ServerWorld {
} }
@Override @Override
public BlockEntity getBlockState(int x, int y, int z) { public BlockEntity getBlockEntity(int x, int y, int z) {
return BukkitBlockEntity.newInstance(delegate.getBlockAt(x, y, z).getState()); return BukkitBlockEntity.newInstance(delegate.getBlockAt(x, y, z).getState());
} }