mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-18 06:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

BlockData -> BlockState

Browse Source
This commit is contained in:
dfsek
2021-06-25 19:13:42 -07:00
parent 002c7037f1
commit a3cbf9a945
90 changed files with 318 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platforms/sponge/src/main/java/com/dfsek/terra/sponge/SpongeAdapter.java
View File

@@ -1,15 +1,14 @@
package com.dfsek.terra.sponge;
import com.dfsek.terra.api.block.BlockData;
import com.dfsek.terra.sponge.world.block.data.SpongeBlockData;
import org.spongepowered.api.block.BlockState;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.sponge.world.block.data.SpongeBlockState;
public final class SpongeAdapter {
public static BlockData adapt(BlockState state) {
return new SpongeBlockData(state);
public static BlockState adapt(org.spongepowered.api.block.BlockState state) {
return new SpongeBlockState(state);
}
public static BlockState adapt(BlockData data) {
return ((SpongeBlockData) data).getHandle();
public static org.spongepowered.api.block.BlockState adapt(BlockState data) {
return ((SpongeBlockState) data).getHandle();
}
}

7
platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/SpongeWorldHandle.java
View File

@@ -1,16 +1,15 @@
package com.dfsek.terra.sponge.world;
import com.dfsek.terra.api.block.BlockData;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.sponge.SpongeAdapter;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.block.BlockState;
public class SpongeWorldHandle implements WorldHandle {
@Override
public BlockData createBlockData(String data) {
return SpongeAdapter.adapt(Sponge.getRegistry().getType(BlockState.class, data).orElseThrow(() -> new IllegalArgumentException("Invalid block data \"" + data + "\"")));
public BlockState createBlockData(String data) {
return SpongeAdapter.adapt(Sponge.getRegistry().getType(org.spongepowered.api.block.BlockState.class, data).orElseThrow(() -> new IllegalArgumentException("Invalid block data \"" + data + "\"")));
}
@Override

15
platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/block/data/SpongeBlockData.java → platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/block/data/SpongeBlockState.java
View File

@@ -1,18 +1,17 @@
package com.dfsek.terra.sponge.world.block.data;
import com.dfsek.terra.api.block.BlockData;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.BlockType;
import org.spongepowered.api.block.BlockState;
public class SpongeBlockData implements BlockData {
private final BlockState delegate;
public class SpongeBlockState implements BlockState {
private final org.spongepowered.api.block.BlockState delegate;
public SpongeBlockData(BlockState delegate) {
public SpongeBlockState(org.spongepowered.api.block.BlockState delegate) {
this.delegate = delegate;
}
@Override
public BlockState getHandle() {
public org.spongepowered.api.block.BlockState getHandle() {
return delegate;
}
@@ -22,12 +21,12 @@ public class SpongeBlockData implements BlockData {
}
@Override
public boolean matches(BlockData other) {
public boolean matches(BlockState other) {
return false;
}
@Override
public BlockData clone() {
public BlockState clone() {
return null;
}