Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 20:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some more upstream merge

Browse Source
This commit is contained in:
Jesse Boyd
2019-04-04 21:28:41 +11:00
parent 8897109dc4
commit 1beea3cd22
40 changed files with 222 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-core/src/main/java/com/boydti/fawe/example/IntFaweChunk.java
View File

@ -5,6 +5,7 @@ import com.boydti.fawe.object.FaweChunk;
import com.boydti.fawe.object.FaweQueue;
import com.boydti.fawe.util.MathMan;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.*;
@ -16,7 +17,7 @@ public abstract class IntFaweChunk<T, V extends FaweQueue> extends FaweChunk<T>
public final short[] air;
public final byte[] heightMap;
public byte[] biomes;
public BiomeType[] biomes;
public HashMap<Short, CompoundTag> tiles;
public HashSet<CompoundTag> entities;
public HashSet<UUID> entityRemoves;
@ -129,7 +130,7 @@ public abstract class IntFaweChunk<T, V extends FaweQueue> extends FaweChunk<T>
}
@Override
public byte[] getBiomeArray() {
public BiomeType[] getBiomeArray() {
return this.biomes;
}
@ -216,11 +217,10 @@ public abstract class IntFaweChunk<T, V extends FaweQueue> extends FaweChunk<T>
}
@Override
public void setBiome(final int x, final int z, byte biome) {
public void setBiome(final int x, final int z, BiomeType biome) {
if (this.biomes == null) {
this.biomes = new byte[256];
this.biomes = new BiomeType[256];
}
if (biome == 0) biome = -1;
biomes[((z & 15) << 4) + (x & 15)] = biome;
}

8
worldedit-core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java
View File

@ -385,7 +385,7 @@ public abstract class MappedFaweQueue<WORLD, CHUNK, CHUNKSECTIONS, SECTION> impl
return getCombinedId4Data(lastSection, x, y, z);
}
public abstract int getBiome(CHUNK chunk, int x, int z);
public abstract BiomeType getBiome(CHUNK chunk, int x, int z);
public abstract CompoundTag getTileEntity(CHUNK chunk, int x, int y, int z);
@ -765,12 +765,12 @@ public abstract class MappedFaweQueue<WORLD, CHUNK, CHUNKSECTIONS, SECTION> impl
lastChunkSections = getSections(lastChunk);
} else {
lastChunkSections = null;
return 0;
return null;
}
} else if (lastChunk == null) {
return 0;
return null;
}
return getBiome(lastChunk, x, z) & 0xFF;
return getBiome(lastChunk, x, z);
}
@Override

9
worldedit-core/src/main/java/com/boydti/fawe/example/NullFaweChunk.java
View File

@ -37,8 +37,8 @@ public class NullFaweChunk extends FaweChunk<Void> {
}
@Override
public byte[] getBiomeArray() {
return new byte[256];
public BiomeType[] getBiomeArray() {
return new BiomeType[256];
}
@Override
@ -101,11 +101,6 @@ public class NullFaweChunk extends FaweChunk<Void> {
}
@Override
public void setBiome(int x, int z, byte biome) {
}
@Override
public FaweChunk<Void> copy(boolean shallow) {
return this;

3
worldedit-core/src/main/java/com/boydti/fawe/jnbt/SchematicStreamer.java
View File

@ -22,6 +22,7 @@ import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.registry.state.PropertyKey;
import com.sk89q.worldedit.util.Direction;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import com.sk89q.worldedit.world.block.*;
import com.sk89q.worldedit.world.entity.EntityType;
import com.sk89q.worldedit.world.entity.EntityTypes;
@ -118,7 +119,7 @@ public class SchematicStreamer extends NBTStreamer {
ByteReader biomeReader = new ByteReader() {
@Override
public void run(int index, int value) {
fc.setBiome(index, value);
fc.setBiome(index, BiomeTypes.get(value));
}
};
NBTStreamReader<Integer, Integer> initializer23 = new NBTStreamReader<Integer, Integer>() {

4
worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java
View File

@ -923,7 +923,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr
public BiomeType getBiomeType(int x, int z) throws FaweException.FaweChunkLoadException {
int index = z * getWidth() + x;
if (index < 0 || index >= getArea()) index = Math.floorMod(index, getArea());
return biomes.getByte(index) & 0xFF;
return BiomeTypes.get(biomes.getByte(index));
}
@Override
@ -1011,7 +1011,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr
@Override
public BiomeType getBiome(BlockVector2 position) {
return BiomeTypes.get(getBiomeType(position.getBlockX(), position.getBlockZ()));
return getBiomeType(position.getBlockX(), position.getBlockZ());
}
@Override

14
worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAChunk.java
View File

@ -11,6 +11,8 @@ import com.boydti.fawe.util.MainUtil;
import com.boydti.fawe.util.MathMan;
import com.boydti.fawe.util.ReflectionUtils;
import com.sk89q.jnbt.*;
import com.sk89q.worldedit.world.biome.BiomeType;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
@ -590,9 +592,9 @@ public class MCAChunk extends FaweChunk<Void> {
}
@Override
public void setBiome(int x, int z, byte biome) {
public void setBiome(int x, int z, BiomeType biome) {
setModified();
biomes[x + (z << 4)] = biome;
biomes[x + (z << 4)] = (byte) biome.getInternalId();
}
@Override
@ -644,8 +646,8 @@ public class MCAChunk extends FaweChunk<Void> {
}
@Override
public byte[] getBiomeArray() {
return this.biomes;
public BiomeType[] getBiomeArray() {
return null;
}
@Override
@ -771,8 +773,8 @@ public class MCAChunk extends FaweChunk<Void> {
}
@Override
public void setBiome(byte biome) {
Arrays.fill(biomes, biome);
public void setBiome(BiomeType biome) {
Arrays.fill(biomes, (byte) biome.getInternalId());
}
@Override

4
worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAQueue.java
View File

@ -86,13 +86,13 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
}
@Override
public int getBiome(FaweChunk faweChunk, int x, int z) {
public BiomeType getBiome(FaweChunk faweChunk, int x, int z) {
if (faweChunk instanceof MCAChunk) {
return ((MCAChunk) faweChunk).getBiomeArray()[((z & 0xF) << 4 | x & 0xF)];
} else if (parent != null) {
return parent.getBiomeType(x, z);
} else {
return 0;
return null;
}
}

8
worldedit-core/src/main/java/com/boydti/fawe/object/FaweChunk.java
View File

@ -289,13 +289,9 @@ public abstract class FaweChunk<T> implements Callable<FaweChunk> {
*/
public abstract CompoundTag getTile(int x, int y, int z);
public void setBiome(final int x, final int z, final BiomeType biome) {
setBiome(x, z, biome);
}
public abstract void setBiome(final int x, final int z, final BiomeType biome);
public abstract void setBiome(final int x, final int z, final byte biome);
public void setBiome(final byte biome) {
public void setBiome(final BiomeType biome) {
for (int z = 0; z < 16; z++) {
for (int x = 0; x < 16; x++) {
setBiome(x, z, biome);

7
worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualChunk.java
View File

@ -5,6 +5,7 @@ import com.boydti.fawe.object.collection.SparseBitSet;
import com.boydti.fawe.object.visitor.FaweChunkVisitor;
import com.boydti.fawe.util.MathMan;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
@ -87,8 +88,8 @@ public class VisualChunk extends FaweChunk<FaweChunk> {
}
@Override
public byte[] getBiomeArray() {
return new byte[256];
public BiomeType[] getBiomeArray() {
return new BiomeType[256];
}
@Override
@ -154,7 +155,7 @@ public class VisualChunk extends FaweChunk<FaweChunk> {
}
@Override
public void setBiome(int x, int z, byte biome) {
public void setBiome(int x, int z, BiomeType biome) {
// Unsupported
}

4
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/AbstractDelegateFaweClipboard.java
View File

@ -42,7 +42,7 @@ public class AbstractDelegateFaweClipboard extends FaweClipboard {
}
@Override
public boolean setBiome(int x, int z, int biome) {
public boolean setBiome(int x, int z, BiomeType biome) {
return parent.setBiome(x, z, biome);
}
@ -62,7 +62,7 @@ public class AbstractDelegateFaweClipboard extends FaweClipboard {
}
@Override
public void setBiome(int index, int biome) {
public void setBiome(int index, BiomeType biome) {
parent.setBiome(index, biome);
}

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

@ -59,7 +59,7 @@ public class CPUOptimizedClipboard extends FaweClipboard {
}
@Override
public boolean setBiome(int x, int z, int biome) {
public boolean setBiome(int x, int z, BiomeType biome) {
setBiome(getIndex(x, 0, z), biome);
return true;
}
@ -78,7 +78,7 @@ public class CPUOptimizedClipboard extends FaweClipboard {
int index = 0;
for (int z = 0; z < length; z++) {
for (int x = 0; x < width; x++, index++) {
task.run(index, biomes[index] & 0xFF);
task.run(index, biomes[index].getInternalId());
}
}
}

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

@ -11,6 +11,7 @@ import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.IntTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.entity.BaseEntity;
@ -127,15 +128,15 @@ public class DiskOptimizedClipboard extends FaweClipboard implements Closeable {
}
@Override
public boolean setBiome(int x, int z, int biome) {
public boolean setBiome(int x, int z, BiomeType biome) {
setBiome(getIndex(x, 0, z), biome);
return true;
}
@Override
public void setBiome(int index, int biome) {
public void setBiome(int index, BiomeType biome) {
if (initBiome()) {
mbb.put(HEADER_SIZE + (volume << 2) + index, (byte) biome);
mbb.put(HEADER_SIZE + (volume << 2) + index, (byte) biome.getInternalId());
}
}
@ -145,7 +146,7 @@ public class DiskOptimizedClipboard extends FaweClipboard implements Closeable {
return null;
}
int biomeId = mbb.get(HEADER_SIZE + (volume << 2) + index) & 0xFF;
return FaweCache.CACHE_BIOME[biomeId];
return BiomeTypes.get(biomeId);
}
@Override

4
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/FaweClipboard.java
View File

@ -33,7 +33,7 @@ public abstract class FaweClipboard {
public abstract boolean hasBiomes();
public abstract boolean setBiome(int x, int z, int biome);
public abstract boolean setBiome(int x, int z, BiomeType biome);
public abstract BiomeType getBiome(int x, int z);
@ -41,7 +41,7 @@ public abstract class FaweClipboard {
public abstract BaseBlock getBlock(int index);
public abstract void setBiome(int index, int biome);
public abstract void setBiome(int index, BiomeType biome);
public abstract boolean setTile(int x, int y, int z, CompoundTag tag);

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

@ -10,6 +10,7 @@ import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.IntTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.entity.BaseEntity;
@ -92,17 +93,17 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
}
@Override
public boolean setBiome(int x, int z, int biome) {
public boolean setBiome(int x, int z, BiomeType biome) {
setBiome(getIndex(x, 0, z), biome);
return true;
}
@Override
public void setBiome(int index, int biome) {
public void setBiome(int index, BiomeType biome) {
if (biomes == null) {
biomes = new byte[area];
}
biomes[index] = (byte) biome;
biomes[index] = (byte) biome.getInternalId();
}
@Override
@ -121,7 +122,7 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
if (!hasBiomes()) {
return null;
}
return FaweCache.CACHE_BIOME[biomes[index] & 0xFF];
return BiomeTypes.get(biomes[index]);
}
@Override

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

@ -56,12 +56,12 @@ public abstract class ReadOnlyClipboard extends FaweClipboard {
}
@Override
public boolean setBiome(int x, int z, int biome) {
public boolean setBiome(int x, int z, BiomeType biome) {
throw new UnsupportedOperationException("Clipboard is immutable");
}
@Override
public void setBiome(int index, int biome) {
public void setBiome(int index, BiomeType biome) {
throw new UnsupportedOperationException("Clipboard is immutable");
}
@ -71,7 +71,7 @@ public abstract class ReadOnlyClipboard extends FaweClipboard {
int index = 0;
for (int z = 0; z <= dim.getBlockZ(); z++) {
for (int x = 0; x <= dim.getBlockX(); x++, index++) {
task.run(index, getBiome(x, z));
task.run(index, getBiome(x, z).getInternalId());
}
}
}

2
worldedit-core/src/main/java/com/boydti/fawe/object/extent/FastWorldEditExtent.java
View File

@ -105,7 +105,7 @@ public class FastWorldEditExtent extends AbstractDelegateExtent implements HasFa
@Override
public BiomeType getBiome(final BlockVector2 position) {
return BiomeTypes.get(queue.getBiomeType(position.getBlockX(), position.getBlockZ()));
return queue.getBiomeType(position.getBlockX(), position.getBlockZ());
}
@Override

9
worldedit-core/src/main/java/com/boydti/fawe/object/queue/LazyFaweChunk.java
View File

@ -91,7 +91,7 @@ public abstract class LazyFaweChunk<T extends FaweChunk> extends FaweChunk {
}
@Override
public byte[] getBiomeArray() {
public BiomeType[] getBiomeArray() {
return internalGetOrCacheChunk().getBiomeArray();
}
@ -176,12 +176,7 @@ public abstract class LazyFaweChunk<T extends FaweChunk> extends FaweChunk {
}
@Override
public void setBiome(int x, int z, byte biome) {
internalGetOrCacheChunk().setBiome(x, z, biome);
}
@Override
public void setBiome(byte biome) {
public void setBiome(BiomeType biome) {
internalGetOrCacheChunk().setBiome(biome);
}

2
worldedit-core/src/main/java/com/boydti/fawe/object/queue/NullFaweQueue.java
View File

@ -184,7 +184,7 @@ public class NullFaweQueue implements FaweQueue {
@Override
public BiomeType getBiomeType(int x, int z) throws FaweException.FaweChunkLoadException {
return 0;
return null;
}
@Override

3
worldedit-core/src/main/java/com/boydti/fawe/object/schematic/visualizer/SchemVis.java
View File

@ -33,6 +33,7 @@ import com.sk89q.worldedit.session.ClipboardHolder;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.TargetBlock;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
@ -580,7 +581,7 @@ public class SchemVis extends ImmutableVirtualWorld {
@Override
public BiomeType getBiomeType(int x, int z) throws FaweException.FaweChunkLoadException {
// TODO later (currently not used)
return 0;
return BiomeTypes.FOREST;
}
@Override

3
worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java
View File

@ -24,6 +24,7 @@ import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import com.sk89q.worldedit.world.biome.Biomes;
import com.sk89q.worldedit.world.registry.BiomeRegistry;
import java.util.HashSet;
@ -55,7 +56,7 @@ public class PlotSetBiome extends Command {
checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
final HashSet<RegionWrapper> regions = plot.getRegions();
BiomeRegistry biomeRegistry = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS).getRegistries().getBiomeRegistry();
List<BiomeType> knownBiomes = biomeRegistry.getBiomes();
List<BiomeType> knownBiomes = BiomeTypes.values();
final BiomeType biome = Biomes.findBiomeByName(knownBiomes, args[0], biomeRegistry);
if (biome == null) {
String biomes = StringMan.join(WorldUtil.IMP.getBiomeList(), Captions.BLOCK_LIST_SEPARATER.s());