annotate WorldHandle methods with nullability and contract

This commit is contained in:
dfsek
2021-12-01 08:29:14 -07:00
parent 65d8dc803d
commit 2d7cf5151f
4 changed files with 25 additions and 42 deletions

View File

@@ -23,14 +23,14 @@ import org.bukkit.Material;
import java.util.Locale;
import com.dfsek.terra.api.block.entity.BlockEntity;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
import org.jetbrains.annotations.NotNull;
public class BukkitWorldHandle implements WorldHandle {
private final BlockState air;
@@ -40,23 +40,18 @@ public class BukkitWorldHandle implements WorldHandle {
}
@Override
public BlockState createBlockData(String data) {
public @NotNull BlockState createBlockData(@NotNull String data) {
org.bukkit.block.data.BlockData bukkitData = Bukkit.createBlockData(data);
return BukkitBlockState.newInstance(bukkitData);
}
@Override
public BlockState air() {
public @NotNull BlockState air() {
return air;
}
@Override
public BlockEntity createBlockEntity(Vector3 location, BlockState block, String snbt) {
return null;
}
@Override
public EntityType getEntity(String id) {
public @NotNull EntityType getEntity(String id) {
if(!id.startsWith("minecraft:")) throw new LoadException("Invalid entity identifier " + id);
return new BukkitEntityType(org.bukkit.entity.EntityType.valueOf(id.toUpperCase(Locale.ROOT).substring(10)));
}