Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-06-30 22:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement getBiome(BlockVector3)

Browse Source 
fixes #622
This commit is contained in:
dordsor21 2020-09-18 11:52:49 +01:00
parent 2e73746abe
commit 7375827844
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
10 changed files with 96 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/boydti/fawe/beta/IChunkGet.java
View File

@ -3,6 +3,7 @@ package com.boydti.fawe.beta;
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.extent.InputExtent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
@ -21,6 +22,11 @@ public interface IChunkGet extends IBlocks, Trimable, InputExtent, ITileInput {
@Override
BiomeType getBiomeType(int x, int y, int z);
@Override
default BiomeType getBiome(BlockVector3 position) {
return getBiomeType(position.getX(), position.getY(), position.getZ());
}
@Override
BlockState getBlock(int x, int y, int z);

6
worldedit-core/src/main/java/com/boydti/fawe/beta/IChunkSet.java
View File

@ -4,6 +4,7 @@ import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.extent.OutputExtent;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockStateHolder;
@ -21,6 +22,11 @@ public interface IChunkSet extends IBlocks, OutputExtent {
@Override
boolean setBiome(int x, int y, int z, BiomeType biome);
@Override
default boolean setBiome(BlockVector3 position, BiomeType biome) {
return setBiome(position.getX(), position.getY(), position.getZ(), biome);
}
@Override
<T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T holder);

13
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/IChunkExtent.java
View File

@ -12,6 +12,7 @@ import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
@ -52,6 +53,12 @@ public interface IChunkExtent<T extends IChunk> extends Extent {
return chunk.setBiome(x & 15, y, z & 15, biome);
}
@Override
default boolean setBiome(BlockVector3 position, BiomeType biome) {
final IChunk chunk = getOrCreateChunk(position.getX() >> 4, position.getZ() >> 4);
return chunk.setBiome(position.getX() & 15, position.getY(), position.getZ() & 15, biome);
}
@Override
default BlockState getBlock(int x, int y, int z) {
final IChunk chunk = getOrCreateChunk(x >> 4, z >> 4);
@ -70,6 +77,12 @@ public interface IChunkExtent<T extends IChunk> extends Extent {
return chunk.getBiomeType(x & 15, y, z & 15);
}
@Override
default BiomeType getBiome(BlockVector3 position) {
final IChunk chunk = getOrCreateChunk(position.getX() >> 4, position.getZ() >> 4);
return chunk.getBiomeType(position.getX() & 15, position.getY(), position.getZ() & 15);
}
@Override
default void setSkyLight(int x, int y, int z, int value) {
final IChunk chunk = getOrCreateChunk(x >> 4, z >> 4);

10
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/filter/block/FilterBlock.java
View File

@ -184,4 +184,14 @@ public abstract class FilterBlock extends BlockVector3 implements Extent, TileEn
public BlockState getStateRelativeY(Extent orDefault, int y) {
return getBlockRelativeY(y);
}
@Override @Nullable
public BiomeType getBiome(BlockVector3 position) {
return null;
}
@Override
public boolean setBiome(BlockVector3 position, BiomeType biome) {
return setBiome(position.getX(), position.getY(), position.getZ(), biome);
}
}

13
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/CPUOptimizedClipboard.java
View File

@ -8,6 +8,7 @@ import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.biome.BiomeType;
@ -15,13 +16,13 @@ import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nullable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
public class CPUOptimizedClipboard extends LinearClipboard {
@ -44,6 +45,11 @@ public class CPUOptimizedClipboard extends LinearClipboard {
return biomes != null;
}
@Override
public boolean setBiome(BlockVector3 position, BiomeType biome) {
return setBiome(position.getX(), position.getY(), position.getZ(), biome);
}
@Override
public boolean setBiome(int x, int y, int z, BiomeType biome) {
setBiome(getIndex(x, 0, z), biome);
@ -87,6 +93,11 @@ public class CPUOptimizedClipboard extends LinearClipboard {
return getBiome(getIndex(x, 0, z));
}
@Override
public BiomeType getBiome(BlockVector3 position) {
return getBiome(getIndex(position.getX(), 0, position.getZ()));
}
public void convertTilesToIndex() {
if (nbtMapLoc.isEmpty()) {
return;

10
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java
View File

@ -178,6 +178,11 @@ public class DiskOptimizedClipboard extends LinearClipboard implements Closeable
return hasBiomes;
}
@Override
public boolean setBiome(BlockVector3 position, BiomeType biome) {
return setBiome(position.getX(), position.getY(), position.getZ(), biome);
}
@Override
public boolean setBiome(int x, int y, int z, BiomeType biome) {
setBiome(getIndex(x, y, z), biome);
@ -223,6 +228,11 @@ public class DiskOptimizedClipboard extends LinearClipboard implements Closeable
return getBiome(getIndex(x, 0, z));
}
@Override
public BiomeType getBiome(BlockVector3 position) {
return getBiome(getIndex(position.getX(), 0, position.getZ()));
}
public BlockArrayClipboard toClipboard() {
try {
CuboidRegion region = new CuboidRegion(BlockVector3.at(0, 0, 0), BlockVector3.at(getWidth() - 1, getHeight() - 1, getLength() - 1));

11
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/MemoryOptimizedClipboard.java
View File

@ -11,6 +11,7 @@ import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard.ClipboardEntity;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.biome.BiomeType;
@ -69,6 +70,11 @@ public class MemoryOptimizedClipboard extends LinearClipboard {
return biomes != null;
}
@Override
public boolean setBiome(BlockVector3 position, BiomeType biome) {
return setBiome(position.getX(), position.getY(), position.getZ(), biome);
}
@Override
public boolean setBiome(int x, int y, int z, BiomeType biome) {
setBiome(getIndex(x, 0, z), biome);
@ -112,6 +118,11 @@ public class MemoryOptimizedClipboard extends LinearClipboard {
return getBiome(getIndex(x, 0, z));
}
@Override
public BiomeType getBiome(BlockVector3 position) {
return getBiome(getIndex(position.getX(), 0, position.getZ()));
}
public int getOrdinal(int index) {
int i = index >> BLOCK_SHIFT;
int li = (index & BLOCK_MASK) << 1;

6
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/ReadOnlyClipboard.java
View File

@ -6,6 +6,7 @@ import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.session.request.Request;
import com.sk89q.worldedit.util.Location;
@ -78,6 +79,11 @@ public abstract class ReadOnlyClipboard extends SimpleClipboard {
throw new UnsupportedOperationException("Clipboard is immutable");
}
@Override
public boolean setBiome(BlockVector3 position, BiomeType biome) {
throw new UnsupportedOperationException("Clipboard is immutable");
}
@Override
public abstract List<? extends Entity> getEntities();

6
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/WorldCopyClipboard.java
View File

@ -2,6 +2,7 @@ package com.boydti.fawe.object.clipboard;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
@ -53,6 +54,11 @@ public class WorldCopyClipboard extends ReadOnlyClipboard {
return getExtent().getBiomeType(x, y, z);
}
@Override
public BiomeType getBiome(BlockVector3 position) {
return getExtent().getBiomeType(position.getX(), position.getY(), position.getZ());
}
@Override
public List<? extends Entity> getEntities() {
if (!hasEntities) return new ArrayList<>();

16
worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
View File

@ -40,6 +40,7 @@ import com.sk89q.worldedit.util.Direction;
import com.sk89q.worldedit.util.SideEffect;
import com.sk89q.worldedit.util.SideEffectSet;
import com.sk89q.worldedit.util.TreeGenerator;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType;
@ -346,4 +347,19 @@ public interface World extends Extent, Keyed, IChunkCache<IChunkGet> {
* @param packet the chunk packet
*/
void sendFakeChunk(@Nullable Player player, ChunkPacket packet);
@Override @Nullable
default BiomeType getBiome(BlockVector3 position) {
return null;
}
@Override
default boolean setBiome(int x, int y, int z, BiomeType biome) {
return false;
}
@Override
default boolean setBiome(BlockVector3 position, BiomeType biome) {
return false;
}
}