mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-06-24 05:21:16 +00:00
start working on error handling stuff
This commit is contained in:
@@ -36,7 +36,7 @@ public class MinestomAddon implements BaseAddon {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Version getVersion() { return VERSION; }
|
||||
public Version version() { return VERSION; }
|
||||
|
||||
@Override
|
||||
public String getID() { return "terra-minestom"; }
|
||||
|
||||
+3
-3
@@ -114,12 +114,12 @@ public record MinestomBlockState(Block block) implements BlockState {
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockType getBlockType() {
|
||||
public BlockType blockType() {
|
||||
return new MinestomBlockType(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAsString(boolean properties) {
|
||||
public String asString(boolean properties) {
|
||||
String name = block.key().asString();
|
||||
if(!properties || block.properties().isEmpty()) {
|
||||
return name;
|
||||
@@ -132,7 +132,7 @@ public record MinestomBlockState(Block block) implements BlockState {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAir() {
|
||||
public boolean air() {
|
||||
return block.isAir();
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -14,17 +14,17 @@ public class MinestomBlockType implements BlockType {
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState getDefaultState() {
|
||||
public BlockState defaultState() {
|
||||
return new MinestomBlockState(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSolid() {
|
||||
public boolean solid() {
|
||||
return block.isSolid();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isWater() {
|
||||
public boolean water() {
|
||||
return block.isLiquid();
|
||||
}
|
||||
|
||||
|
||||
+9
-2
@@ -1,5 +1,8 @@
|
||||
package com.dfsek.terra.minestom.world;
|
||||
|
||||
import com.dfsek.terra.api.error.Invalid;
|
||||
import com.dfsek.terra.api.error.InvalidBlockStateError;
|
||||
import com.dfsek.terra.api.util.generic.data.types.Either;
|
||||
import net.minestom.server.instance.block.Block;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -14,8 +17,12 @@ public class MinestomWorldHandle implements WorldHandle {
|
||||
private static final MinestomBlockState AIR = new MinestomBlockState(Block.AIR);
|
||||
|
||||
@Override
|
||||
public @NotNull BlockState createBlockState(@NotNull String data) {
|
||||
return MinestomBlockState.fromStateId(data);
|
||||
public @NotNull Either<Invalid, BlockState> createBlockState(@NotNull String data) {
|
||||
try {
|
||||
return Either.right(MinestomBlockState.fromStateId(data));
|
||||
} catch(Exception e) {
|
||||
return new InvalidBlockStateError(e).left();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user