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

fix bukkit impl

Browse Source
This commit is contained in:
dfsek
2021-06-25 06:30:29 -07:00
parent da0fb7dd15
commit cbb746c752
7 changed files with 40 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java
View File

@@ -10,6 +10,7 @@ import com.dfsek.terra.api.world.Tree;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.vector.LocationImpl;
import com.dfsek.terra.vector.Vector3Impl;
import org.bukkit.Material;
import org.bukkit.TreeType;
import org.bukkit.block.Block;
@@ -54,7 +55,7 @@ public class CommonListener implements Listener {
block.setType(Material.AIR);
Tree tree = c.getRegistry(Tree.class).get(TREE_TYPE_STRING_TRANSFORMER.translate(e.getSpecies()));
org.bukkit.Location location = e.getLocation();
if(!tree.plant(new LocationImpl(bukkit, location.getX(), location.getY(), location.getZ()), , new FastRandom()))
if(!tree.plant(new Vector3Impl(location.getX(), location.getY(), location.getZ()), BukkitAdapter.adapt(e.getWorld()), new FastRandom()))
block.setBlockData(data);
}
}

14
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java
View File

@@ -1,10 +1,8 @@
package com.dfsek.terra.bukkit.world;
import com.dfsek.terra.api.block.Block;
import com.dfsek.terra.api.block.BlockData;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.bukkit.world.block.BukkitBlock;
import org.jetbrains.annotations.NotNull;
public class BukkitChunk implements Chunk {
@@ -29,11 +27,6 @@ public class BukkitChunk implements Chunk {
return BukkitAdapter.adapt(delegate.getWorld());
}
@Override
public Block getBlock(int x, int y, int z) {
return new BukkitBlock(delegate.getBlock(x, y, z));
}
@Override
public org.bukkit.Chunk getHandle() {
return delegate;
@@ -46,6 +39,11 @@ public class BukkitChunk implements Chunk {
@Override
public @NotNull BlockData getBlock(int x, int y, int z) {
return getBlock(x, y, z).getBlockData();
return BukkitAdapter.adapt(delegate.getBlock(x, y, z).getBlockData());
}
@Override
public void setBlock(int x, int y, int z, BlockData data, boolean physics) {
delegate.getBlock(x, y, z).setBlockData(BukkitAdapter.adapt(data), physics);
}
}

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

@@ -46,7 +46,7 @@ public class BukkitTree implements Tree {
@SuppressWarnings("try")
public boolean plant(Vector3 l, World world, Random r) {
try(ProfileFrame ignore = main.getProfiler().profile("bukkit_tree:" + delegate.toString().toLowerCase(Locale.ROOT))) {
return ((BukkitWorld) l.getWorld()).getHandle().generateTree(BukkitAdapter.adapt(l), delegate);
return BukkitAdapter.adapt(world).generateTree(BukkitAdapter.adapt(l).toLocation(BukkitAdapter.adapt(world)), delegate);
}
}

23
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java
View File

@@ -1,6 +1,7 @@
package com.dfsek.terra.bukkit.world;
import com.dfsek.terra.api.block.Block;
import com.dfsek.terra.api.block.BlockData;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.entity.Entity;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Location;
@@ -9,7 +10,7 @@ import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.generator.ChunkGenerator;
import com.dfsek.terra.bukkit.BukkitEntity;
import com.dfsek.terra.bukkit.generator.BukkitChunkGenerator;
import com.dfsek.terra.bukkit.world.block.BukkitBlock;
import com.dfsek.terra.bukkit.world.block.state.BukkitBlockState;
import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
import java.io.File;
@@ -54,13 +55,23 @@ public class BukkitWorld implements World {
return BukkitAdapter.adapt(delegate.getChunkAt(x, z));
}
public File getWorldFolder() {
return delegate.getWorldFolder();
@Override
public BlockData getBlockData(int x, int y, int z) {
return BukkitAdapter.adapt(delegate.getBlockAt(x, y, z).getBlockData());
}
@Override
public Block getBlockAt(int x, int y, int z) {
return new BukkitBlock(delegate.getBlockAt(x, y, z));
public void setBlockData(int x, int y, int z, BlockData data, boolean physics) {
delegate.getBlockAt(x, y, z).setBlockData(BukkitAdapter.adapt(data), physics);
}
@Override
public BlockState getBlockState(int x, int y, int z) {
return BukkitBlockState.newInstance(delegate.getBlockAt(x, y, z).getState());
}
public File getWorldFolder() {
return delegate.getWorldFolder();
}
@Override

84
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
View File

@@ -1,84 +0,0 @@
package com.dfsek.terra.bukkit.world.block;
import com.dfsek.terra.api.block.Block;
import com.dfsek.terra.api.block.BlockData;
import com.dfsek.terra.api.block.BlockFace;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
import com.dfsek.terra.bukkit.world.block.state.BukkitBlockState;
import com.dfsek.terra.vector.LocationImpl;
public class BukkitBlock implements Block {
private final org.bukkit.block.Block delegate;
public BukkitBlock(org.bukkit.block.Block delegate) {
this.delegate = delegate;
}
@Override
public void setBlockData(BlockData data, boolean physics) {
delegate.setBlockData(((BukkitBlockData) data).getHandle(), physics);
}
@Override
public BlockData getBlockData() {
return BukkitBlockData.newInstance(delegate.getBlockData());
}
@Override
public BlockState getState() {
return BukkitBlockState.newInstance(delegate.getState());
}
@Override
public Block getRelative(BlockFace face) {
return new BukkitBlock(delegate.getRelative(BukkitAdapter.adapt(face)));
}
@Override
public Block getRelative(BlockFace face, int len) {
return new BukkitBlock(delegate.getRelative(BukkitAdapter.adapt(face), len));
}
@Override
public boolean isEmpty() {
return delegate.isEmpty();
}
@Override
public LocationImpl getLocation() {
return BukkitAdapter.adapt(delegate.getLocation());
}
@Override
public BlockType getType() {
return BukkitAdapter.adapt(delegate.getType());
}
@Override
public int getX() {
return delegate.getX();
}
@Override
public int getZ() {
return delegate.getZ();
}
@Override
public int getY() {
return delegate.getY();
}
@Override
public boolean isPassable() {
return delegate.isPassable();
}
@Override
public org.bukkit.block.Block getHandle() {
return delegate;
}
}

8
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockState.java
View File

@@ -1,9 +1,9 @@
package com.dfsek.terra.bukkit.world.block.state;
import com.dfsek.terra.api.block.Block;
import com.dfsek.terra.api.block.BlockData;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.bukkit.world.block.BukkitBlock;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
import org.bukkit.block.Container;
import org.bukkit.block.CreatureSpawner;
@@ -29,8 +29,8 @@ public class BukkitBlockState implements BlockState {
}
@Override
public Block getBlock() {
return new BukkitBlock(delegate.getBlock());
public Vector3 getPosition() {
return BukkitAdapter.adapt(delegate.getBlock().getLocation().toVector());
}
@Override