mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2025-06-12 20:43:54 +00:00
Feature/1.17 (#1120)
* start v6 * Update classes to v6 method signatures * change rootVersion to signify p2v6 compat * Use 16 as toolchain version but target 11 for build output * add minimessage as api * Require v6 and don't attempt to "setup" hook from FAWE * Address comments * *address /all/ comments * FAWE classes should only act as a delegate * Uppercase logger * Settings for v6-hook have moved to P2-v6, remove unneeded if statements * Rename classes to Delegate * add whenDone task to setCuboids * Remove bad spaces * Fix plot swap * Initial work on 1.17 support * Remove data versions from the Bukkit adapters (#1507) * Remove data versions from the Bukkit adapters * Don't allow saving schematics without an adapter in place on Bukkit. * Removed confusing line (cherry picked from commit 2056218b4a8644836b1d127105dfa289e9cdbc1c) * More progress * Fix chunk sending * Repackage from com.boydti to com.fastasyncworldedit.<module> (#1119) * Preliminary work on repackaging * Rename build artifacts matching our pattern * Finish up repackaging * Fix a few field accesses and old imports * Dirty fix for chunks container ChunkSections outside of 0-15 * Correctly read from NibbleArrays for lighting * Fix getSections and BlockMaterial for 1.17 * Fix writing blocks to the world. - The issue isn't the presence of a "-1" chunk, it's the constructor for ChunkSection requiring the layer (0 to 15) rather than the y chord * Fix more field accesses * More work towards 1.17 * Update Upstream a57f66f Fix watchdog, add negative y support. (1782) * Add azalea tree to `/tool tree` * Don't define toolchain twice * Repackage GriefDefender * Relocate under new namespace * Bye bye ecma left overs * Add 1.17 to issue templates and instructions * Move to adventure-nbt (#918) * Initial work for adventure-nbt * Some more FAWE specific stuff * Fix erroneous deprecation check * Workflow change * Continued merging all adventure NBT related changes * Continued merging all adventure NBT related changes * Made a constructor public again This needs to be public for BlockTransformExtent.java * Finished converting all NBT data to adventure. * Make this compile * Fix conflicts Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> * Update adapters to 1.17 * Change build prefix to 1.17 * Move more nms classes to adapters * Move left over nms classes * Move Spigot 1.17 class * Remove unneeded adapter loader code The loader will find the appropriate class now itself * Update adapters * Update adapters * Lazy fix tests * Update adapters * Update Upstream 43da91a Remove method reflection for getMinHeight in BukkitWorld. (1796) * Relocate adventure-nbt under proper namespace * Add LazyCompoundTag as a non-version-specific class to be used by adapters * Better integration between old NBT and Adventure NBT - begin fixing the issues seen recently * Correctly NBT conversion method * LazyCompoundTags should actually be overriding and correctly returning a CompoundBinaryTag. * Update worldedit-adapters Fixes #1141 * Remove unnecessary massive lag machine * Refactor apply to applyBlock in subclasses * applyBlock should be overriden by all subclasses. Default apply to applyBlock * Closes #1130 Closes #1132 * Squashed commit of the following: commit a9bfa1a07c77083c844a0c3ba62f4bd94bed107c Author: NotMyFault <mc.cache@web.de> Date: Sun Jun 27 21:53:21 2021 +0200 [ci skip] Update gradle wrapper validation commit aa7471f95317d28a16f62e4b200de8d0fea2fa95 Author: Matthew Miller <mnmiller1@me.com> Date: Sat Oct 10 15:49:13 2020 +1000 Add ^x,y,z relative offset support to the offset parser (#1545) * Add ^x,y,z relative offset support to the offset parser * Wrap in a try-catch (cherry picked from commit 28bdf7ff9254bbc85bb4f5f792b303943a3930a8) * Add `fawe.error.schematic.not.found` translation key * Update Upstream 728a152 Skip notify if chunk section doesn't exist (1794) * Fixed #1157 * Add a null check to prevent NPE in nbt code * Update adapters * Update Upstream fbb047a Optimize legacy schematic loading (1808) * Hurr durr I don't want to update Java * Update Upstream 0790e6e Fix CLI Mess (1811) * Fixes #1160 * Expose minimessage transitively thru PlotSquared Touches #32 * [ci skip] Remove unneeded maven repository * Steal tab completion from PlotSquared for P2 related commands * Don't error on startup when building locally Co-Authored-By: goldfishapp <8278196+goldfishapp@users.noreply.github.com> * [ci skip] Update gh actions to Java 16 * Update textures to grab 1.17 jar Co-authored-by: NotMyFault <mc.cache@web.de> Co-authored-by: SirYwell <hannesgreule@outlook.de> Co-authored-by: Matthew Miller <mnmiller1@me.com> Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com> Co-authored-by: goldfishapp <8278196+goldfishapp@users.noreply.github.com>
This commit is contained in:
dordsor21
GitHub
@ -1,8 +0,0 @@
|
||||
package com.boydti.fawe.beta;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
|
||||
|
||||
public interface FilterBlockMask {
|
||||
|
||||
boolean applyBlock(FilterBlock block);
|
||||
}
|
||||
@ -1,219 +0,0 @@
|
||||
package com.boydti.fawe.beta.implementation.blocks;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.IBlocks;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
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.CuboidRegion;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
public class FallbackChunkGet implements IChunkGet {
|
||||
private final int bx;
|
||||
private final int bz;
|
||||
private final Extent extent;
|
||||
|
||||
public FallbackChunkGet(Extent extent, int chunkX, int chunkZ) {
|
||||
this.extent = extent;
|
||||
this.bx = chunkX << 4;
|
||||
this.bz = chunkZ << 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseBlock getFullBlock(int x, int y, int z) {
|
||||
return extent.getFullBlock(bx + x, y, bz + z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BiomeType getBiomeType(int x, int y, int z) {
|
||||
return extent.getBiomeType(bx + x, y, bz + z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeSectionLighting(int layer, boolean sky) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState getBlock(int x, int y, int z) {
|
||||
return extent.getBlock(bx + x, y, bz + z);
|
||||
}
|
||||
|
||||
@Override public int getSkyLight(int x, int y, int z) {
|
||||
return extent.getSkyLight(bx + x, y, bz + z);
|
||||
}
|
||||
|
||||
@Override public int[] getHeightMap(HeightMapType type) {
|
||||
return extent.getHeightMap(type);
|
||||
}
|
||||
|
||||
@Override public int getEmmittedLight(int x, int y, int z) {
|
||||
return extent.getEmmittedLight(bx + x, y, bz + z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompoundTag getTile(int x, int y, int z) {
|
||||
return extent.getFullBlock(bx + x, y, bz + z).getNbtData();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<BlockVector3, CompoundTag> getTiles() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<CompoundTag> getEntities() {
|
||||
List<? extends Entity> result = extent.getEntities(new CuboidRegion(BlockVector3.at(bx, 0, bz), BlockVector3.at(bx + 15, 255, bz + 15)));
|
||||
if (result.isEmpty()) {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
HashSet<CompoundTag> set = new HashSet<>(result.size());
|
||||
for (Entity entity : result) {
|
||||
set.add(entity.getState().getNbtData());
|
||||
}
|
||||
return set;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompoundTag getEntity(UUID uuid) {
|
||||
long checkMost = uuid.getMostSignificantBits();
|
||||
long checkLeast = uuid.getLeastSignificantBits();
|
||||
for (CompoundTag entityTag : getEntities()) {
|
||||
long entMost = entityTag.getLong("UUIDMost");
|
||||
if (entMost == checkMost) {
|
||||
long entLeast = entityTag.getLong("UUIDLeast");
|
||||
if (entLeast == checkLeast) {
|
||||
return entityTag;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override public void setCreateCopy(boolean createCopy) {}
|
||||
|
||||
@Override public boolean isCreateCopy() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLightingToGet(char[][] lighting) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSkyLightingToGet(char[][] lighting) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setHeightmapToGet(HeightMapType type, int[] data) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean trim(boolean aggressive) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean trim(boolean aggressive, int layer) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends Future<T>> T call(IChunkSet set, Runnable finalize) {
|
||||
for (int layer = 0; layer < 16; layer++) {
|
||||
if (set.hasSection(layer)) {
|
||||
char[] arr = set.load(layer);
|
||||
int by = layer << 4;
|
||||
for (int y = 0, i = 0; y < 16; y++) {
|
||||
for (int z = 0; z < 16; z++) {
|
||||
for (int x = 0; x < 16; x++, i++) {
|
||||
char ordinal = arr[i];
|
||||
if (ordinal != 0) {
|
||||
BlockState block = BlockState.getFromOrdinal(ordinal);
|
||||
extent.setBlock(bx + x, by + y, bz + z, block);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Map<BlockVector3, CompoundTag> tiles = set.getTiles();
|
||||
if (!tiles.isEmpty()) {
|
||||
for (Map.Entry<BlockVector3, CompoundTag> entry : tiles.entrySet()) {
|
||||
BlockVector3 pos = entry.getKey();
|
||||
extent.setTile(bx + pos.getX(), pos.getY(), bz + pos.getZ(), entry.getValue());
|
||||
}
|
||||
|
||||
}
|
||||
Set<CompoundTag> spawns = set.getEntities();
|
||||
if (!spawns.isEmpty()) {
|
||||
for (CompoundTag spawn : spawns) {
|
||||
BaseEntity ent = new BaseEntity(spawn);
|
||||
extent.createEntity(ent.getLocation(extent), ent);
|
||||
}
|
||||
}
|
||||
Set<UUID> kills = set.getEntityRemoves();
|
||||
if (!kills.isEmpty()) {
|
||||
for (UUID kill : kills) {
|
||||
extent.removeEntity(0, 0, 0, kill);
|
||||
}
|
||||
}
|
||||
BiomeType[] biomes = set.getBiomes();
|
||||
if (biomes != null) {
|
||||
for (int y = 0, i = 0; y < 64; y++) {
|
||||
for (int z = 0; z < 4; z++) {
|
||||
for (int x = 0; x < 4; x++, i++) {
|
||||
BiomeType biome = biomes[i];
|
||||
if (biome != null) {
|
||||
extent.setBiome(bx + (x << 2), y << 2, bz + (z << 2), biome);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public char[] load(int layer) {
|
||||
char[] arr = FaweCache.IMP.SECTION_BITS_TO_CHAR.get();
|
||||
int by = layer << 4;
|
||||
for (int y = 0, i = 0; y < 16; y++) {
|
||||
for (int z = 0; z < 16; z++) {
|
||||
for (int x = 0; x < 16; x++, i++) {
|
||||
arr[i] = getBlock(bx + x, by + y, bz + z).getOrdinalChar();
|
||||
}
|
||||
}
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasSection(int layer) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlocks reset() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
package com.boydti.fawe.object.collection;
|
||||
|
||||
import com.boydti.fawe.object.change.StreamChange;
|
||||
|
||||
public interface DifferentialCollection<T> extends StreamChange {
|
||||
public T get();
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
package com.boydti.fawe.object.mask;
|
||||
|
||||
import com.boydti.fawe.Resettable;
|
||||
|
||||
public interface ResettableMask extends Resettable {
|
||||
|
||||
@Override
|
||||
void reset();
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
package com.boydti.fawe.object.pattern;
|
||||
|
||||
import com.boydti.fawe.Resettable;
|
||||
|
||||
public interface ResettablePattern extends Resettable {
|
||||
|
||||
@Override
|
||||
void reset();
|
||||
}
|
||||
@ -1,132 +0,0 @@
|
||||
package com.boydti.fawe.web;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.exception.FaweException;
|
||||
import com.boydti.fawe.util.MainUtil;
|
||||
import com.sk89q.worldedit.LocalConfiguration;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.command.UtilityCommands;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.ServerSocket;
|
||||
import java.net.Socket;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
public class SchemSync implements Runnable {
|
||||
|
||||
private static final char PORT = 62522;
|
||||
|
||||
private final File tokensFile;
|
||||
private final WorldEdit worldEdit;
|
||||
private final File working;
|
||||
private Map<UUID, UUID> tokens;
|
||||
|
||||
private ServerSocket serverSocket;
|
||||
private Socket clientSocket;
|
||||
|
||||
private enum Error {
|
||||
INVALID_HEADER_LENGTH,
|
||||
TOKEN_REJECTED,
|
||||
FILE_NOT_EXIST,
|
||||
NO_FILE_PERMISSIONS;
|
||||
|
||||
}
|
||||
|
||||
public SchemSync() {
|
||||
this.tokensFile = MainUtil
|
||||
.getFile(Fawe.imp().getDirectory(), Settings.IMP.PATHS.TOKENS, "tokens.txt");
|
||||
this.worldEdit = WorldEdit.getInstance();
|
||||
LocalConfiguration config = worldEdit.getConfiguration();
|
||||
this.working = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile();
|
||||
}
|
||||
|
||||
private void loadTokens() {
|
||||
if (tokens == null) {
|
||||
String tokensDir = Settings.IMP.PATHS.TOKENS;
|
||||
tokens = new HashMap<>();
|
||||
}
|
||||
}
|
||||
|
||||
private void close(Error error) throws IOException {
|
||||
this.clientSocket.getOutputStream().write(error.ordinal());
|
||||
throw FaweCache.MANUAL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void run() {
|
||||
try {
|
||||
byte[] header = new byte[32];
|
||||
try (ServerSocket serverSocket = this.serverSocket = new ServerSocket(PORT)) {
|
||||
while (!Thread.interrupted()) {
|
||||
try (Socket clientSocket = this.clientSocket = serverSocket
|
||||
.accept(); InputStream in = clientSocket.getInputStream()) {
|
||||
int read = in.read(header);
|
||||
if (read != header.length) {
|
||||
close(Error.INVALID_HEADER_LENGTH);
|
||||
}
|
||||
|
||||
ByteBuffer buf = ByteBuffer.wrap(header);
|
||||
UUID uuid = new UUID(buf.getLong(), buf.getLong());
|
||||
UUID expectedToken = tokens.get(uuid);
|
||||
if (expectedToken == null) {
|
||||
close(Error.TOKEN_REJECTED);
|
||||
}
|
||||
|
||||
UUID receivedToken = new UUID(buf.getLong(), buf.getLong());
|
||||
if (!receivedToken.equals(expectedToken)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
File dir = new File(working, uuid.toString());
|
||||
try (DataInputStream dis = new DataInputStream(in)) {
|
||||
int data = dis.readByte() & 0xFF;
|
||||
switch (data) {
|
||||
case 0: // list
|
||||
try (DataOutputStream out = new DataOutputStream(
|
||||
clientSocket.getOutputStream())) {
|
||||
out.write(1);
|
||||
UtilityCommands.allFiles(dir.listFiles(), true,
|
||||
file -> {
|
||||
try {
|
||||
String path = dir.toURI()
|
||||
.relativize(file.toURI()).getPath();
|
||||
out.writeUTF(path);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
break;
|
||||
case 1: // get
|
||||
String input = dis.readUTF();
|
||||
File file = new File(dir, input);
|
||||
if (!MainUtil.isInSubDirectory(dir, file)) {
|
||||
close(Error.NO_FILE_PERMISSIONS);
|
||||
}
|
||||
if (!file.exists()) {
|
||||
close(Error.FILE_NOT_EXIST);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
// todo send file
|
||||
}
|
||||
}
|
||||
} catch (FaweException ignored) {
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe;
|
||||
package com.fastasyncworldedit.core;
|
||||
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
|
||||
public interface FAWEPlatformAdapterImpl {
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
package com.boydti.fawe;
|
||||
package com.fastasyncworldedit.core;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.queue.QueueHandler;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.util.CachedTextureUtil;
|
||||
import com.boydti.fawe.util.CleanTextureUtil;
|
||||
import com.boydti.fawe.util.FaweTimer;
|
||||
import com.boydti.fawe.util.MainUtil;
|
||||
import com.boydti.fawe.util.MemUtil;
|
||||
import com.boydti.fawe.util.RandomTextureUtil;
|
||||
import com.boydti.fawe.util.TaskManager;
|
||||
import com.boydti.fawe.util.TextureUtil;
|
||||
import com.boydti.fawe.util.WEManager;
|
||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.util.CachedTextureUtil;
|
||||
import com.fastasyncworldedit.core.util.CleanTextureUtil;
|
||||
import com.fastasyncworldedit.core.util.FaweTimer;
|
||||
import com.fastasyncworldedit.core.util.MainUtil;
|
||||
import com.fastasyncworldedit.core.util.MemUtil;
|
||||
import com.fastasyncworldedit.core.util.RandomTextureUtil;
|
||||
import com.fastasyncworldedit.core.util.TaskManager;
|
||||
import com.fastasyncworldedit.core.util.TextureUtil;
|
||||
import com.fastasyncworldedit.core.util.WEManager;
|
||||
import com.github.luben.zstd.util.Native;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||
@ -233,7 +233,7 @@ public class Fawe {
|
||||
br.close();
|
||||
this.version = FaweVersion.tryParse(versionString, commitString, dateString);
|
||||
Settings.IMP.DATE = new Date(100 + version.year, version.month, version.day).toString();
|
||||
Settings.IMP.BUILD = "https://ci.athion.net/job/FastAsyncWorldEdit-1.16/" + version.build;
|
||||
Settings.IMP.BUILD = "https://ci.athion.net/job/FastAsyncWorldEdit-1.17/" + version.build;
|
||||
Settings.IMP.COMMIT = "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/" + Integer.toHexString(version.hash);
|
||||
} catch (Throwable ignored) {
|
||||
}
|
||||
@ -1,22 +1,22 @@
|
||||
package com.boydti.fawe;
|
||||
package com.fastasyncworldedit.core;
|
||||
|
||||
import com.boydti.fawe.beta.IQueueChunk;
|
||||
import com.boydti.fawe.beta.IQueueExtent;
|
||||
import com.boydti.fawe.beta.implementation.lighting.Relighter;
|
||||
import com.boydti.fawe.beta.implementation.queue.ParallelQueueExtent;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.RegionWrapper;
|
||||
import com.boydti.fawe.object.RelightMode;
|
||||
import com.boydti.fawe.object.changeset.DiskStorageHistory;
|
||||
import com.boydti.fawe.object.changeset.SimpleChangeSetSummary;
|
||||
import com.boydti.fawe.object.exception.FaweException;
|
||||
import com.boydti.fawe.regions.FaweMaskManager;
|
||||
import com.boydti.fawe.util.EditSessionBuilder;
|
||||
import com.boydti.fawe.util.MainUtil;
|
||||
import com.boydti.fawe.util.MemUtil;
|
||||
import com.boydti.fawe.util.TaskManager;
|
||||
import com.boydti.fawe.util.WEManager;
|
||||
import com.boydti.fawe.wrappers.WorldWrapper;
|
||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.Relighter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.queue.ParallelQueueExtent;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.object.RegionWrapper;
|
||||
import com.fastasyncworldedit.core.object.RelightMode;
|
||||
import com.fastasyncworldedit.core.object.changeset.DiskStorageHistory;
|
||||
import com.fastasyncworldedit.core.object.changeset.SimpleChangeSetSummary;
|
||||
import com.fastasyncworldedit.core.object.exception.FaweException;
|
||||
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
||||
import com.fastasyncworldedit.core.util.EditSessionBuilder;
|
||||
import com.fastasyncworldedit.core.util.MainUtil;
|
||||
import com.fastasyncworldedit.core.util.MemUtil;
|
||||
import com.fastasyncworldedit.core.util.TaskManager;
|
||||
import com.fastasyncworldedit.core.util.WEManager;
|
||||
import com.fastasyncworldedit.core.wrappers.WorldWrapper;
|
||||
import com.google.common.collect.Sets;
|
||||
import com.sk89q.worldedit.EditSession;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
@ -1,18 +1,18 @@
|
||||
package com.boydti.fawe;
|
||||
package com.fastasyncworldedit.core;
|
||||
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.Trimable;
|
||||
import com.boydti.fawe.beta.implementation.queue.Pool;
|
||||
import com.boydti.fawe.beta.implementation.queue.QueuePool;
|
||||
import com.boydti.fawe.config.Caption;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.collection.BitArray;
|
||||
import com.boydti.fawe.object.collection.BitArrayUnstretched;
|
||||
import com.boydti.fawe.object.collection.CleanableThreadLocal;
|
||||
import com.boydti.fawe.object.exception.FaweBlockBagException;
|
||||
import com.boydti.fawe.object.exception.FaweChunkLoadException;
|
||||
import com.boydti.fawe.object.exception.FaweException;
|
||||
import com.boydti.fawe.util.MathMan;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.Trimable;
|
||||
import com.fastasyncworldedit.core.beta.implementation.queue.Pool;
|
||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueuePool;
|
||||
import com.fastasyncworldedit.core.configuration.Caption;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.object.collection.BitArray;
|
||||
import com.fastasyncworldedit.core.object.collection.BitArrayUnstretched;
|
||||
import com.fastasyncworldedit.core.object.collection.CleanableThreadLocal;
|
||||
import com.fastasyncworldedit.core.object.exception.FaweBlockBagException;
|
||||
import com.fastasyncworldedit.core.object.exception.FaweChunkLoadException;
|
||||
import com.fastasyncworldedit.core.object.exception.FaweException;
|
||||
import com.fastasyncworldedit.core.util.MathMan;
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import com.google.common.cache.LoadingCache;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe;
|
||||
package com.fastasyncworldedit.core;
|
||||
|
||||
/** An internal FAWE class not meant for public use. **/
|
||||
public class FaweVersion {
|
||||
@ -18,7 +18,12 @@ public class FaweVersion {
|
||||
|
||||
public FaweVersion(String version, String commit, String date) {
|
||||
String[] split = version.substring(version.indexOf('=') + 1).split("-");
|
||||
this.build = Integer.parseInt(split[1]);
|
||||
int build = 0;
|
||||
try {
|
||||
build = Integer.parseInt(split[1]);
|
||||
} catch (NumberFormatException ignored) {
|
||||
}
|
||||
this.build = build;
|
||||
this.hash = Integer.parseInt(commit.substring(commit.indexOf('=') + 1), 16);
|
||||
String[] split1 = date.substring(date.indexOf('=') + 1).split("\\.");
|
||||
this.year = Integer.parseInt(split1[0]);
|
||||
@ -37,9 +42,9 @@ public class FaweVersion {
|
||||
|
||||
@Override public String toString() {
|
||||
if (hash == 0 && build == 0) {
|
||||
return "FastAsyncWorldEdit-1.16-NoVer-SNAPSHOT";
|
||||
return "FastAsyncWorldEdit-1.17-NoVer-SNAPSHOT";
|
||||
} else {
|
||||
return "FastAsyncWorldEdit-1.16" + build;
|
||||
return "FastAsyncWorldEdit-1.17" + build;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
package com.boydti.fawe;
|
||||
package com.fastasyncworldedit.core;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.cache.preloader.Preloader;
|
||||
import com.boydti.fawe.beta.implementation.queue.QueueHandler;
|
||||
import com.boydti.fawe.regions.FaweMaskManager;
|
||||
import com.boydti.fawe.util.TaskManager;
|
||||
import com.boydti.fawe.util.image.ImageViewer;
|
||||
import com.fastasyncworldedit.core.beta.implementation.preloader.Preloader;
|
||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
|
||||
import com.fastasyncworldedit.core.regions.FaweMaskManager;
|
||||
import com.fastasyncworldedit.core.util.TaskManager;
|
||||
import com.fastasyncworldedit.core.util.image.ImageViewer;
|
||||
import com.sk89q.worldedit.entity.Player;
|
||||
|
||||
import java.io.File;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe;
|
||||
package com.fastasyncworldedit.core;
|
||||
|
||||
public interface Resettable {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
public interface DirectionMask {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
import org.jetbrains.annotations.Range;
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
||||
|
||||
public interface FilterBlockMask {
|
||||
|
||||
boolean applyBlock(FilterBlock block);
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.beta.implementation.queue.QueueHandler;
|
||||
import com.boydti.fawe.util.MathMan;
|
||||
import com.fastasyncworldedit.core.Fawe;
|
||||
import com.fastasyncworldedit.core.beta.implementation.queue.QueueHandler;
|
||||
import com.fastasyncworldedit.core.util.MathMan;
|
||||
import com.sk89q.worldedit.util.Direction;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
|
||||
@ -1,9 +1,9 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.implementation.processors.EmptyBatchProcessor;
|
||||
import com.boydti.fawe.beta.implementation.processors.MultiBatchProcessor;
|
||||
import com.boydti.fawe.beta.implementation.processors.ProcessorScope;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.EmptyBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.MultiBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.ProcessorScope;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.object.FaweOutputStream;
|
||||
import com.boydti.fawe.object.io.FastByteArrayOutputStream;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.object.FaweOutputStream;
|
||||
import com.fastasyncworldedit.core.object.io.FastByteArrayOutputStream;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.extension.platform.Capability;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
import org.jetbrains.annotations.Range;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import org.jetbrains.annotations.Range;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.HeightMapType;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.extent.InputExtent;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.HeightMapType;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.extent.OutputExtent;
|
||||
import com.sk89q.worldedit.function.operation.Operation;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
@ -1,9 +1,8 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.implementation.IChunkExtent;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.boydti.fawe.beta.implementation.processors.IBatchProcessorHolder;
|
||||
import com.fastasyncworldedit.core.beta.implementation.IChunkExtent;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.IBatchProcessorHolder;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import com.sk89q.worldedit.function.operation.Operation;
|
||||
import com.sk89q.worldedit.math.BlockVector2;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
public interface IQueueWrapper {
|
||||
default IQueueExtent<IQueueChunk> wrapQueue(IQueueExtent<IQueueChunk> queue) {
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta;
|
||||
package com.fastasyncworldedit.core.beta;
|
||||
|
||||
/**
|
||||
* Interface for objects that can be trimmed (memory related). Trimming will reduce its memory
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta.implementation;
|
||||
package com.fastasyncworldedit.core.beta.implementation;
|
||||
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.jnbt.DoubleTag;
|
||||
import com.sk89q.jnbt.IntArrayTag;
|
||||
@ -1,9 +1,9 @@
|
||||
package com.boydti.fawe.beta.implementation.blocks;
|
||||
package com.fastasyncworldedit.core.beta.implementation.blocks;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.boydti.fawe.object.collection.MemBlockSet;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.HeightMapType;
|
||||
import com.fastasyncworldedit.core.object.collection.MemBlockSet;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta.implementation.blocks;
|
||||
package com.fastasyncworldedit.core.beta.implementation.blocks;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.beta.IBlocks;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.Fawe;
|
||||
import com.fastasyncworldedit.core.beta.IBlocks;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
||||
@ -1,7 +1,7 @@
|
||||
package com.boydti.fawe.beta.implementation.blocks;
|
||||
package com.fastasyncworldedit.core.beta.implementation.blocks;
|
||||
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
||||
@ -1,11 +1,11 @@
|
||||
package com.boydti.fawe.beta.implementation.blocks;
|
||||
package com.fastasyncworldedit.core.beta.implementation.blocks;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.boydti.fawe.beta.implementation.queue.Pool;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.collection.BlockVector3ChunkMap;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.HeightMapType;
|
||||
import com.fastasyncworldedit.core.beta.implementation.queue.Pool;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.object.collection.BlockVector3ChunkMap;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.WorldEditException;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
@ -1,10 +1,10 @@
|
||||
package com.boydti.fawe.beta.implementation.blocks;
|
||||
package com.fastasyncworldedit.core.beta.implementation.blocks;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.IBlocks;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.IBlocks;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.HeightMapType;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta.implementation.cache;
|
||||
package com.fastasyncworldedit.core.beta.implementation.chunk;
|
||||
|
||||
import com.boydti.fawe.beta.IChunkCache;
|
||||
import com.boydti.fawe.beta.Trimable;
|
||||
import com.boydti.fawe.util.MathMan;
|
||||
import com.fastasyncworldedit.core.beta.IChunkCache;
|
||||
import com.fastasyncworldedit.core.beta.Trimable;
|
||||
import com.fastasyncworldedit.core.util.MathMan;
|
||||
import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
|
||||
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectIterator;
|
||||
@ -1,17 +1,17 @@
|
||||
package com.boydti.fawe.beta.implementation.chunk;
|
||||
package com.fastasyncworldedit.core.beta.implementation.chunk;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.IQueueChunk;
|
||||
import com.boydti.fawe.beta.IQueueExtent;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.boydti.fawe.beta.implementation.processors.EmptyBatchProcessor;
|
||||
import com.boydti.fawe.beta.implementation.queue.Pool;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.HeightMapType;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.EmptyBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.implementation.queue.Pool;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
@ -1,10 +1,10 @@
|
||||
package com.boydti.fawe.beta.implementation.chunk;
|
||||
package com.fastasyncworldedit.core.beta.implementation.chunk;
|
||||
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.IQueueChunk;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.HeightMapType;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
@ -1,7 +1,7 @@
|
||||
package com.boydti.fawe.beta.implementation.filter;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter;
|
||||
|
||||
import com.boydti.fawe.beta.FilterBlockMask;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.FilterBlockMask;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
||||
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta.implementation.filter;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
||||
|
||||
public class CountFilter extends ForkedFilter<CountFilter> {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta.implementation.filter;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter;
|
||||
|
||||
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
||||
import com.sk89q.worldedit.extension.platform.Actor;
|
||||
import com.sk89q.worldedit.function.mask.ABlockMask;
|
||||
import com.sk89q.worldedit.util.Countable;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.beta.implementation.filter;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter;
|
||||
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta.implementation.filter;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter;
|
||||
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.DelegateFilter;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.DelegateFilter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
||||
|
||||
/**
|
||||
* Filter which links two Filters together for single-filter-input operations.
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta.implementation.filter;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter;
|
||||
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.DelegateFilter;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.FilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.DelegateFilter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.FilterBlock;
|
||||
import com.sk89q.worldedit.function.mask.AbstractExtentMask;
|
||||
import com.sk89q.worldedit.function.mask.Mask;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.WorldEditException;
|
||||
@ -66,12 +66,12 @@ public abstract class AbstractFilterBlock extends FilterBlock {
|
||||
|
||||
@Override
|
||||
public BlockVector3 getMinimumPoint() {
|
||||
return BlockVector3.at(getX(), getY(), getZ());
|
||||
return at(getX(), getY(), getZ());
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockVector3 getMaximumPoint() {
|
||||
return BlockVector3.at(getX(), getY(), getZ());
|
||||
return at(getX(), getY(), getZ());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.WorldEditException;
|
||||
@ -67,12 +67,12 @@ public abstract class AbstractSingleFilterBlock extends FilterBlock {
|
||||
|
||||
@Override
|
||||
public BlockVector3 getMinimumPoint() {
|
||||
return BlockVector3.at(getX(), getY(), getZ());
|
||||
return at(getX(), getY(), getZ());
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockVector3 getMaximumPoint() {
|
||||
return BlockVector3.at(getX(), getY(), getZ());
|
||||
return at(getX(), getY(), getZ());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.WorldEditException;
|
||||
@ -1,13 +1,13 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.FilterBlockMask;
|
||||
import com.boydti.fawe.beta.Flood;
|
||||
import com.boydti.fawe.beta.IBlocks;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.implementation.blocks.CharGetBlocks;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.FilterBlockMask;
|
||||
import com.fastasyncworldedit.core.beta.Flood;
|
||||
import com.fastasyncworldedit.core.beta.IBlocks;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.implementation.blocks.CharGetBlocks;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.WorldEditException;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
@ -1,12 +1,12 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.FilterBlockMask;
|
||||
import com.boydti.fawe.beta.Flood;
|
||||
import com.boydti.fawe.beta.IBlocks;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.FilterBlockMask;
|
||||
import com.fastasyncworldedit.core.beta.Flood;
|
||||
import com.fastasyncworldedit.core.beta.IBlocks;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.IDelegateFilter;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.IDelegateFilter;
|
||||
|
||||
public abstract class DelegateFilter<T extends Filter> implements IDelegateFilter {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.WorldEditException;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.filter.block;
|
||||
package com.fastasyncworldedit.core.beta.implementation.filter.block;
|
||||
|
||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.lighting;
|
||||
package com.fastasyncworldedit.core.beta.implementation.lighting;
|
||||
|
||||
import com.sk89q.worldedit.registry.state.Property;
|
||||
import com.sk89q.worldedit.registry.state.PropertyKey;
|
||||
@ -1,15 +1,15 @@
|
||||
package com.boydti.fawe.beta.implementation.lighting;
|
||||
package com.fastasyncworldedit.core.beta.implementation.lighting;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.beta.IQueueChunk;
|
||||
import com.boydti.fawe.beta.IQueueExtent;
|
||||
import com.boydti.fawe.beta.implementation.chunk.ChunkHolder;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.RelightMode;
|
||||
import com.boydti.fawe.object.RunnableVal;
|
||||
import com.boydti.fawe.object.collection.BlockVectorSet;
|
||||
import com.boydti.fawe.util.MathMan;
|
||||
import com.boydti.fawe.util.TaskManager;
|
||||
import com.fastasyncworldedit.core.Fawe;
|
||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
||||
import com.fastasyncworldedit.core.beta.implementation.chunk.ChunkHolder;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.object.RelightMode;
|
||||
import com.fastasyncworldedit.core.object.RunnableVal;
|
||||
import com.fastasyncworldedit.core.object.collection.BlockVectorSet;
|
||||
import com.fastasyncworldedit.core.util.MathMan;
|
||||
import com.fastasyncworldedit.core.util.TaskManager;
|
||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||
import com.sk89q.worldedit.math.MutableBlockVector3;
|
||||
import com.sk89q.worldedit.registry.state.DirectionalProperty;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.lighting;
|
||||
package com.fastasyncworldedit.core.beta.implementation.lighting;
|
||||
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
package com.boydti.fawe.beta.implementation.lighting;
|
||||
package com.fastasyncworldedit.core.beta.implementation.lighting;
|
||||
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.implementation.processors.ProcessorScope;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.ProcessorScope;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.lighting;
|
||||
package com.fastasyncworldedit.core.beta.implementation.lighting;
|
||||
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta.implementation.lighting;
|
||||
package com.fastasyncworldedit.core.beta.implementation.lighting;
|
||||
|
||||
import com.boydti.fawe.beta.IQueueChunk;
|
||||
import com.boydti.fawe.beta.IQueueExtent;
|
||||
import com.boydti.fawe.object.RelightMode;
|
||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
||||
import com.fastasyncworldedit.core.object.RelightMode;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
package com.boydti.fawe.beta.implementation.packet;
|
||||
package com.fastasyncworldedit.core.beta.implementation.packet;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.IBlocks;
|
||||
import com.boydti.fawe.object.FaweOutputStream;
|
||||
import com.boydti.fawe.object.io.FastByteArrayOutputStream;
|
||||
import com.fastasyncworldedit.core.Fawe;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.IBlocks;
|
||||
import com.fastasyncworldedit.core.object.FaweOutputStream;
|
||||
import com.fastasyncworldedit.core.object.io.FastByteArrayOutputStream;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
|
||||
import java.util.HashMap;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta.implementation.cache.preloader;
|
||||
package com.fastasyncworldedit.core.beta.implementation.preloader;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.object.collection.MutablePair;
|
||||
import com.boydti.fawe.util.FaweTimer;
|
||||
import com.fastasyncworldedit.core.Fawe;
|
||||
import com.fastasyncworldedit.core.object.collection.MutablePair;
|
||||
import com.fastasyncworldedit.core.util.FaweTimer;
|
||||
import com.sk89q.worldedit.IncompleteRegionException;
|
||||
import com.sk89q.worldedit.LocalSession;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.cache.preloader;
|
||||
package com.fastasyncworldedit.core.beta.implementation.preloader;
|
||||
|
||||
import com.sk89q.worldedit.entity.Player;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.changeset.AbstractChangeSet;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.object.changeset.AbstractChangeSet;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
|
||||
public abstract class ExtentBatchProcessorHolder extends BatchProcessorHolder implements Extent {
|
||||
@ -1,10 +1,10 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.implementation.lighting.HeightMapType;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.implementation.lighting.HeightMapType;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
@ -1,9 +1,9 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
|
||||
import java.util.concurrent.Future;
|
||||
@ -1,10 +1,10 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.ExtentFilterBlock;
|
||||
import com.boydti.fawe.object.FaweLimit;
|
||||
import com.boydti.fawe.object.exception.FaweException;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.ExtentFilterBlock;
|
||||
import com.fastasyncworldedit.core.object.FaweLimit;
|
||||
import com.fastasyncworldedit.core.object.exception.FaweException;
|
||||
import com.sk89q.jnbt.CompoundTag;
|
||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||
import com.sk89q.worldedit.WorldEditException;
|
||||
@ -1,12 +1,12 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.util.StringMan;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.util.StringMan;
|
||||
import com.google.common.cache.LoadingCache;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
@ -1,9 +1,9 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import com.sk89q.worldedit.extent.NullExtent;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.processors;
|
||||
package com.fastasyncworldedit.core.beta.implementation.processors;
|
||||
|
||||
/**
|
||||
* The scope of a processor.
|
||||
@ -1,18 +1,18 @@
|
||||
package com.boydti.fawe.beta.implementation.queue;
|
||||
package com.fastasyncworldedit.core.beta.implementation.queue;
|
||||
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.Filter;
|
||||
import com.boydti.fawe.beta.IQueueChunk;
|
||||
import com.boydti.fawe.beta.IQueueExtent;
|
||||
import com.boydti.fawe.beta.IQueueWrapper;
|
||||
import com.boydti.fawe.beta.implementation.filter.CountFilter;
|
||||
import com.boydti.fawe.beta.implementation.filter.DistrFilter;
|
||||
import com.boydti.fawe.beta.implementation.filter.LinkedFilter;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.boydti.fawe.beta.implementation.processors.BatchProcessorHolder;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.clipboard.WorldCopyClipboard;
|
||||
import com.boydti.fawe.object.extent.NullExtent;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.Filter;
|
||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
||||
import com.fastasyncworldedit.core.beta.IQueueWrapper;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.CountFilter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.DistrFilter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.LinkedFilter;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.BatchProcessorHolder;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.object.clipboard.WorldCopyClipboard;
|
||||
import com.fastasyncworldedit.core.object.extent.NullExtent;
|
||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||
import com.sk89q.worldedit.extent.PassthroughExtent;
|
||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.queue;
|
||||
package com.fastasyncworldedit.core.beta.implementation.queue;
|
||||
|
||||
@FunctionalInterface
|
||||
public interface Pool<T> {
|
||||
@ -1,20 +1,20 @@
|
||||
package com.boydti.fawe.beta.implementation.queue;
|
||||
package com.fastasyncworldedit.core.beta.implementation.queue;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.FaweCache;
|
||||
import com.boydti.fawe.beta.IBatchProcessor;
|
||||
import com.boydti.fawe.beta.IChunkCache;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.IQueueChunk;
|
||||
import com.boydti.fawe.beta.IQueueExtent;
|
||||
import com.boydti.fawe.beta.Trimable;
|
||||
import com.boydti.fawe.beta.implementation.cache.ChunkCache;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.collection.CleanableThreadLocal;
|
||||
import com.boydti.fawe.util.MemUtil;
|
||||
import com.boydti.fawe.util.TaskManager;
|
||||
import com.boydti.fawe.wrappers.WorldWrapper;
|
||||
import com.fastasyncworldedit.core.Fawe;
|
||||
import com.fastasyncworldedit.core.FaweCache;
|
||||
import com.fastasyncworldedit.core.beta.IBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.IChunkCache;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
||||
import com.fastasyncworldedit.core.beta.Trimable;
|
||||
import com.fastasyncworldedit.core.beta.implementation.chunk.ChunkCache;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.object.collection.CleanableThreadLocal;
|
||||
import com.fastasyncworldedit.core.util.MemUtil;
|
||||
import com.fastasyncworldedit.core.util.TaskManager;
|
||||
import com.fastasyncworldedit.core.wrappers.WorldWrapper;
|
||||
import com.google.common.util.concurrent.Futures;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.beta.implementation.queue;
|
||||
package com.fastasyncworldedit.core.beta.implementation.queue;
|
||||
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
import java.util.function.Supplier;
|
||||
@ -1,24 +1,24 @@
|
||||
package com.boydti.fawe.beta.implementation.queue;
|
||||
package com.fastasyncworldedit.core.beta.implementation.queue;
|
||||
|
||||
import com.boydti.fawe.Fawe;
|
||||
import com.boydti.fawe.beta.IChunk;
|
||||
import com.boydti.fawe.beta.IChunkCache;
|
||||
import com.boydti.fawe.beta.IChunkGet;
|
||||
import com.boydti.fawe.beta.IChunkSet;
|
||||
import com.boydti.fawe.beta.IQueueChunk;
|
||||
import com.boydti.fawe.beta.IQueueExtent;
|
||||
import com.boydti.fawe.beta.implementation.blocks.CharSetBlocks;
|
||||
import com.boydti.fawe.beta.implementation.chunk.ChunkHolder;
|
||||
import com.boydti.fawe.beta.implementation.chunk.NullChunk;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.CharFilterBlock;
|
||||
import com.boydti.fawe.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.boydti.fawe.beta.implementation.processors.EmptyBatchProcessor;
|
||||
import com.boydti.fawe.beta.implementation.processors.ExtentBatchProcessorHolder;
|
||||
import com.boydti.fawe.beta.implementation.processors.ProcessorScope;
|
||||
import com.boydti.fawe.config.Settings;
|
||||
import com.boydti.fawe.object.exception.FaweException;
|
||||
import com.boydti.fawe.util.MathMan;
|
||||
import com.boydti.fawe.util.MemUtil;
|
||||
import com.fastasyncworldedit.core.Fawe;
|
||||
import com.fastasyncworldedit.core.beta.IChunk;
|
||||
import com.fastasyncworldedit.core.beta.IChunkCache;
|
||||
import com.fastasyncworldedit.core.beta.IChunkGet;
|
||||
import com.fastasyncworldedit.core.beta.IChunkSet;
|
||||
import com.fastasyncworldedit.core.beta.IQueueChunk;
|
||||
import com.fastasyncworldedit.core.beta.IQueueExtent;
|
||||
import com.fastasyncworldedit.core.beta.implementation.blocks.CharSetBlocks;
|
||||
import com.fastasyncworldedit.core.beta.implementation.chunk.ChunkHolder;
|
||||
import com.fastasyncworldedit.core.beta.implementation.chunk.NullChunk;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.CharFilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.filter.block.ChunkFilterBlock;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.EmptyBatchProcessor;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.ExtentBatchProcessorHolder;
|
||||
import com.fastasyncworldedit.core.beta.implementation.processors.ProcessorScope;
|
||||
import com.fastasyncworldedit.core.configuration.Settings;
|
||||
import com.fastasyncworldedit.core.object.exception.FaweException;
|
||||
import com.fastasyncworldedit.core.util.MathMan;
|
||||
import com.fastasyncworldedit.core.util.MemUtil;
|
||||
import com.google.common.util.concurrent.Futures;
|
||||
import com.sk89q.worldedit.extent.Extent;
|
||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.command;
|
||||
package com.fastasyncworldedit.core.command;
|
||||
|
||||
import com.sk89q.worldedit.EditSession;
|
||||
import com.sk89q.worldedit.LocalSession;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.command;
|
||||
package com.fastasyncworldedit.core.command;
|
||||
|
||||
import com.sk89q.worldedit.extension.input.InputParseException;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.config;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.util.formatting.WorldEditText;
|
||||
@ -1,8 +1,7 @@
|
||||
package com.boydti.fawe.config;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import com.boydti.fawe.configuration.MemorySection;
|
||||
import com.boydti.fawe.configuration.file.YamlConfiguration;
|
||||
import com.boydti.fawe.util.StringMan;
|
||||
import com.fastasyncworldedit.core.configuration.file.YamlConfiguration;
|
||||
import com.fastasyncworldedit.core.util.StringMan;
|
||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.configuration;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.configuration;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
/**
|
||||
* Various settings for controlling the input and output of a {@link
|
||||
* com.boydti.fawe.configuration.Configuration}
|
||||
* Configuration}
|
||||
*/
|
||||
public class ConfigurationOptions {
|
||||
private char pathSeparator = '.';
|
||||
@ -14,7 +14,7 @@ public class ConfigurationOptions {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the {@link com.boydti.fawe.configuration.Configuration} that this object is responsible for.
|
||||
* Returns the {@link Configuration} that this object is responsible for.
|
||||
*
|
||||
* @return Parent configuration
|
||||
*/
|
||||
@ -24,9 +24,9 @@ public class ConfigurationOptions {
|
||||
|
||||
/**
|
||||
* Gets the char that will be used to separate {@link
|
||||
* com.boydti.fawe.configuration.ConfigurationSection}s
|
||||
* ConfigurationSection}s
|
||||
* <p>
|
||||
* This value does not affect how the {@link com.boydti.fawe.configuration.Configuration} is stored,
|
||||
* This value does not affect how the {@link Configuration} is stored,
|
||||
* only in how you access the data. The default value is '.'.
|
||||
*
|
||||
* @return Path separator
|
||||
@ -37,29 +37,29 @@ public class ConfigurationOptions {
|
||||
|
||||
/**
|
||||
* Sets the char that will be used to separate {@link
|
||||
* com.boydti.fawe.configuration.ConfigurationSection}s
|
||||
* ConfigurationSection}s
|
||||
* <p>
|
||||
* This value does not affect how the {@link com.boydti.fawe.configuration.Configuration} is stored,
|
||||
* This value does not affect how the {@link Configuration} is stored,
|
||||
* only in how you access the data. The default value is '.'.
|
||||
*
|
||||
* @param value Path separator
|
||||
* @return This object, for chaining
|
||||
*/
|
||||
public com.boydti.fawe.configuration.ConfigurationOptions pathSeparator(final char value) {
|
||||
public ConfigurationOptions pathSeparator(final char value) {
|
||||
pathSeparator = value;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the {@link com.boydti.fawe.configuration.Configuration} should copy values from its default
|
||||
* {@link com.boydti.fawe.configuration.Configuration} directly.
|
||||
* Checks if the {@link Configuration} should copy values from its default
|
||||
* {@link Configuration} directly.
|
||||
* <p>
|
||||
* If this is true, all values in the default Configuration will be
|
||||
* directly copied, making it impossible to distinguish between values
|
||||
* that were set and values that are provided by default. As a result,
|
||||
* {@link com.boydti.fawe.configuration.ConfigurationSection#contains(String)} will always
|
||||
* {@link ConfigurationSection#contains(String)} will always
|
||||
* return the same value as {@link
|
||||
* com.boydti.fawe.configuration.ConfigurationSection#isSet(String)}. The default value is
|
||||
* ConfigurationSection#isSet(String)}. The default value is
|
||||
* false.
|
||||
*
|
||||
* @return Whether or not defaults are directly copied
|
||||
@ -69,21 +69,21 @@ public class ConfigurationOptions {
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets if the {@link com.boydti.fawe.configuration.Configuration} should copy values from its default
|
||||
* {@link com.boydti.fawe.configuration.Configuration} directly.
|
||||
* Sets if the {@link Configuration} should copy values from its default
|
||||
* {@link Configuration} directly.
|
||||
* <p>
|
||||
* If this is true, all values in the default Configuration will be
|
||||
* directly copied, making it impossible to distinguish between values
|
||||
* that were set and values that are provided by default. As a result,
|
||||
* {@link com.boydti.fawe.configuration.ConfigurationSection#contains(String)} will always
|
||||
* {@link ConfigurationSection#contains(String)} will always
|
||||
* return the same value as {@link
|
||||
* com.boydti.fawe.configuration.ConfigurationSection#isSet(String)}. The default value is
|
||||
* ConfigurationSection#isSet(String)}. The default value is
|
||||
* false.
|
||||
*
|
||||
* @param value Whether or not defaults are directly copied
|
||||
* @return This object, for chaining
|
||||
*/
|
||||
public com.boydti.fawe.configuration.ConfigurationOptions copyDefaults(final boolean value) {
|
||||
public ConfigurationOptions copyDefaults(final boolean value) {
|
||||
copyDefaults = value;
|
||||
return this;
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.configuration;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -1,7 +1,7 @@
|
||||
package com.boydti.fawe.configuration;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
/**
|
||||
* Exception thrown when attempting to load an invalid {@link com.boydti.fawe.configuration.Configuration}
|
||||
* Exception thrown when attempting to load an invalid {@link Configuration}
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public class InvalidConfigurationException extends Exception {
|
||||
@ -1,9 +1,9 @@
|
||||
package com.boydti.fawe.configuration;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* This is a {@link com.boydti.fawe.configuration.Configuration} implementation that does not save or load
|
||||
* This is a {@link Configuration} implementation that does not save or load
|
||||
* from any source, and stores all values in memory only.
|
||||
* This is useful for temporary Configurations for providing defaults.
|
||||
*/
|
||||
@ -12,14 +12,14 @@ public class MemoryConfiguration extends MemorySection implements Configuration
|
||||
protected MemoryConfigurationOptions options;
|
||||
|
||||
/**
|
||||
* Creates an empty {@link com.boydti.fawe.configuration.MemoryConfiguration} with no default values.
|
||||
* Creates an empty {@link MemoryConfiguration} with no default values.
|
||||
*/
|
||||
public MemoryConfiguration() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an empty {@link com.boydti.fawe.configuration.MemoryConfiguration} using the specified {@link
|
||||
* com.boydti.fawe.configuration.Configuration} as a source for all default values.
|
||||
* Creates an empty {@link MemoryConfiguration} using the specified {@link
|
||||
* Configuration} as a source for all default values.
|
||||
*
|
||||
* @param defaults Default value provider
|
||||
* @throws IllegalArgumentException Thrown if defaults is null
|
||||
@ -34,7 +34,7 @@ public class MemoryConfiguration extends MemorySection implements Configuration
|
||||
throw new NullPointerException("Path may not be null");
|
||||
}
|
||||
if (defaults == null) {
|
||||
defaults = new com.boydti.fawe.configuration.MemoryConfiguration();
|
||||
defaults = new MemoryConfiguration();
|
||||
}
|
||||
|
||||
defaults.set(path, value);
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.configuration;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
/**
|
||||
* Various settings for controlling the input and output of a {@link
|
||||
* com.boydti.fawe.configuration.MemoryConfiguration}
|
||||
* MemoryConfiguration}
|
||||
*/
|
||||
public class MemoryConfigurationOptions extends ConfigurationOptions {
|
||||
protected MemoryConfigurationOptions(final MemoryConfiguration configuration) {
|
||||
@ -15,13 +15,13 @@ public class MemoryConfigurationOptions extends ConfigurationOptions {
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.MemoryConfigurationOptions copyDefaults(final boolean value) {
|
||||
public MemoryConfigurationOptions copyDefaults(final boolean value) {
|
||||
super.copyDefaults(value);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.MemoryConfigurationOptions pathSeparator(final char value) {
|
||||
public MemoryConfigurationOptions pathSeparator(final char value) {
|
||||
super.pathSeparator(value);
|
||||
return this;
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.configuration;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
@ -8,25 +8,25 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* A type of {@link com.boydti.fawe.configuration.ConfigurationSection} that is stored in memory.
|
||||
* A type of {@link ConfigurationSection} that is stored in memory.
|
||||
*/
|
||||
public class MemorySection implements com.boydti.fawe.configuration.ConfigurationSection {
|
||||
public class MemorySection implements ConfigurationSection {
|
||||
|
||||
protected final Map<String, Object> map = new LinkedHashMap<>();
|
||||
private final Configuration root;
|
||||
private final com.boydti.fawe.configuration.ConfigurationSection parent;
|
||||
private final ConfigurationSection parent;
|
||||
private final String path;
|
||||
private final String fullPath;
|
||||
|
||||
/**
|
||||
* Creates an empty MemorySection for use as a root {@link com.boydti.fawe.configuration.Configuration}
|
||||
* Creates an empty MemorySection for use as a root {@link Configuration}
|
||||
* section.
|
||||
* <p>
|
||||
* Note that calling this without being yourself a {@link com.boydti.fawe.configuration.Configuration}
|
||||
* Note that calling this without being yourself a {@link Configuration}
|
||||
* will throw an exception!
|
||||
*
|
||||
* @throws IllegalStateException Thrown if this is not a {@link
|
||||
* com.boydti.fawe.configuration.Configuration} root.
|
||||
* Configuration} root.
|
||||
*/
|
||||
protected MemorySection() {
|
||||
if (!(this instanceof Configuration)) {
|
||||
@ -44,11 +44,11 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
*
|
||||
* @param parent Parent section that contains this own section.
|
||||
* @param path Path that you may access this section from via the root
|
||||
* {@link com.boydti.fawe.configuration.Configuration}.
|
||||
* {@link Configuration}.
|
||||
* @throws IllegalArgumentException Thrown is parent or path is null, or
|
||||
* if parent contains no root Configuration.
|
||||
*/
|
||||
protected MemorySection(com.boydti.fawe.configuration.ConfigurationSection parent, String path) {
|
||||
protected MemorySection(ConfigurationSection parent, String path) {
|
||||
if (parent == null) {
|
||||
throw new NullPointerException("Parent may not be null");
|
||||
}
|
||||
@ -122,33 +122,33 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a full path to the given {@link com.boydti.fawe.configuration.ConfigurationSection} from its
|
||||
* root {@link com.boydti.fawe.configuration.Configuration}.
|
||||
* Creates a full path to the given {@link ConfigurationSection} from its
|
||||
* root {@link Configuration}.
|
||||
* <p>
|
||||
* You may use this method for any given {@link com.boydti.fawe.configuration.ConfigurationSection}, not
|
||||
* only {@link com.boydti.fawe.configuration.MemorySection}.
|
||||
* You may use this method for any given {@link ConfigurationSection}, not
|
||||
* only {@link MemorySection}.
|
||||
*
|
||||
* @param section Section to create a path for.
|
||||
* @param key Name of the specified section.
|
||||
* @return Full path of the section from its root.
|
||||
*/
|
||||
public static String createPath(com.boydti.fawe.configuration.ConfigurationSection section, String key) {
|
||||
public static String createPath(ConfigurationSection section, String key) {
|
||||
return createPath(section, key, (section == null) ? null : section.getRoot());
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a relative path to the given {@link com.boydti.fawe.configuration.ConfigurationSection} from
|
||||
* Creates a relative path to the given {@link ConfigurationSection} from
|
||||
* the given relative section.
|
||||
* <p>
|
||||
* You may use this method for any given {@link com.boydti.fawe.configuration.ConfigurationSection}, not
|
||||
* only {@link com.boydti.fawe.configuration.MemorySection}.
|
||||
* You may use this method for any given {@link ConfigurationSection}, not
|
||||
* only {@link MemorySection}.
|
||||
*
|
||||
* @param section Section to create a path for.
|
||||
* @param key Name of the specified section.
|
||||
* @param relativeTo Section to create the path relative to.
|
||||
* @return Full path of the section from its root.
|
||||
*/
|
||||
public static String createPath(com.boydti.fawe.configuration.ConfigurationSection section, String key, com.boydti.fawe.configuration.ConfigurationSection relativeTo) {
|
||||
public static String createPath(ConfigurationSection section, String key, ConfigurationSection relativeTo) {
|
||||
if (section == null) {
|
||||
throw new NullPointerException("Cannot create path without a section");
|
||||
}
|
||||
@ -159,7 +159,7 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
char separator = root.options().pathSeparator();
|
||||
|
||||
StringBuilder builder = new StringBuilder();
|
||||
for (com.boydti.fawe.configuration.ConfigurationSection parent = section; (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
|
||||
for (ConfigurationSection parent = section; (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
|
||||
if (builder.length() > 0) {
|
||||
builder.insert(0, separator);
|
||||
}
|
||||
@ -184,7 +184,7 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
|
||||
Configuration root = getRoot();
|
||||
if ((root != null) && root.options().copyDefaults()) {
|
||||
com.boydti.fawe.configuration.ConfigurationSection defaults = getDefaultSection();
|
||||
ConfigurationSection defaults = getDefaultSection();
|
||||
|
||||
if (defaults != null) {
|
||||
result.addAll(defaults.getKeys(deep));
|
||||
@ -202,7 +202,7 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
|
||||
Configuration root = getRoot();
|
||||
if ((root != null) && root.options().copyDefaults()) {
|
||||
com.boydti.fawe.configuration.ConfigurationSection defaults = getDefaultSection();
|
||||
ConfigurationSection defaults = getDefaultSection();
|
||||
|
||||
if (defaults != null) {
|
||||
result.putAll(defaults.getValues(deep));
|
||||
@ -247,7 +247,7 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.ConfigurationSection getParent() {
|
||||
public ConfigurationSection getParent() {
|
||||
return this.parent;
|
||||
}
|
||||
|
||||
@ -268,7 +268,7 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.ConfigurationSection getDefaultSection() {
|
||||
public ConfigurationSection getDefaultSection() {
|
||||
Configuration root = getRoot();
|
||||
Configuration defaults = root == null ? null : root.getDefaults();
|
||||
|
||||
@ -297,10 +297,10 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
// i2 is the trailing (lower) index
|
||||
int i1 = -1;
|
||||
int i2;
|
||||
com.boydti.fawe.configuration.ConfigurationSection section = this;
|
||||
ConfigurationSection section = this;
|
||||
while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
|
||||
String node = path.substring(i2, i1);
|
||||
com.boydti.fawe.configuration.ConfigurationSection subSection = section.getConfigurationSection(node);
|
||||
ConfigurationSection subSection = section.getConfigurationSection(node);
|
||||
if (subSection == null) {
|
||||
section = section.createSection(node);
|
||||
} else {
|
||||
@ -345,7 +345,7 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
// i2 is the trailing (lower) index
|
||||
int i1 = -1;
|
||||
int i2;
|
||||
com.boydti.fawe.configuration.ConfigurationSection section = this;
|
||||
ConfigurationSection section = this;
|
||||
while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
|
||||
section = section.getConfigurationSection(path.substring(i2, i1));
|
||||
if (section == null) {
|
||||
@ -366,7 +366,7 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.ConfigurationSection createSection(String path) {
|
||||
public ConfigurationSection createSection(String path) {
|
||||
if (path == null) {
|
||||
throw new NullPointerException("Cannot create section at empty path");
|
||||
}
|
||||
@ -380,10 +380,10 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
// i2 is the trailing (lower) index
|
||||
int i1 = -1;
|
||||
int i2;
|
||||
com.boydti.fawe.configuration.ConfigurationSection section = this;
|
||||
ConfigurationSection section = this;
|
||||
while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
|
||||
String node = path.substring(i2, i1);
|
||||
com.boydti.fawe.configuration.ConfigurationSection subSection = section.getConfigurationSection(node);
|
||||
ConfigurationSection subSection = section.getConfigurationSection(node);
|
||||
if (subSection == null) {
|
||||
section = section.createSection(node);
|
||||
} else {
|
||||
@ -393,7 +393,7 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
|
||||
String key = path.substring(i2);
|
||||
if (section == this) {
|
||||
com.boydti.fawe.configuration.ConfigurationSection result = new com.boydti.fawe.configuration.MemorySection(this, key);
|
||||
ConfigurationSection result = new MemorySection(this, key);
|
||||
this.map.put(key, result);
|
||||
return result;
|
||||
}
|
||||
@ -401,8 +401,8 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.ConfigurationSection createSection(String path, Map<?, ?> map) {
|
||||
com.boydti.fawe.configuration.ConfigurationSection section = createSection(path);
|
||||
public ConfigurationSection createSection(String path, Map<?, ?> map) {
|
||||
ConfigurationSection section = createSection(path);
|
||||
|
||||
for (Map.Entry<?, ?> entry : map.entrySet()) {
|
||||
if (entry.getValue() instanceof Map) {
|
||||
@ -759,20 +759,20 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.ConfigurationSection getConfigurationSection(String path) {
|
||||
public ConfigurationSection getConfigurationSection(String path) {
|
||||
Object val = get(path, null);
|
||||
if (val != null) {
|
||||
return (val instanceof com.boydti.fawe.configuration.ConfigurationSection) ? (com.boydti.fawe.configuration.ConfigurationSection) val : null;
|
||||
return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
|
||||
}
|
||||
|
||||
val = get(path, getDefault(path));
|
||||
return (val instanceof com.boydti.fawe.configuration.ConfigurationSection) ? createSection(path) : null;
|
||||
return (val instanceof ConfigurationSection) ? createSection(path) : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isConfigurationSection(String path) {
|
||||
Object val = get(path);
|
||||
return val instanceof com.boydti.fawe.configuration.ConfigurationSection;
|
||||
return val instanceof ConfigurationSection;
|
||||
}
|
||||
|
||||
protected boolean isPrimitiveWrapper(Object input) {
|
||||
@ -796,15 +796,15 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
return (defaults == null) ? null : defaults.get(createPath(this, path));
|
||||
}
|
||||
|
||||
protected void mapChildrenKeys(Set<String> output, com.boydti.fawe.configuration.ConfigurationSection section, boolean deep) {
|
||||
if (section instanceof com.boydti.fawe.configuration.MemorySection) {
|
||||
com.boydti.fawe.configuration.MemorySection sec = (com.boydti.fawe.configuration.MemorySection) section;
|
||||
protected void mapChildrenKeys(Set<String> output, ConfigurationSection section, boolean deep) {
|
||||
if (section instanceof MemorySection) {
|
||||
MemorySection sec = (MemorySection) section;
|
||||
|
||||
for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
|
||||
output.add(createPath(section, entry.getKey(), this));
|
||||
|
||||
if (deep && (entry.getValue() instanceof com.boydti.fawe.configuration.ConfigurationSection)) {
|
||||
com.boydti.fawe.configuration.ConfigurationSection subsection = (com.boydti.fawe.configuration.ConfigurationSection) entry.getValue();
|
||||
if (deep && (entry.getValue() instanceof ConfigurationSection)) {
|
||||
ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
|
||||
mapChildrenKeys(output, subsection, deep);
|
||||
}
|
||||
}
|
||||
@ -817,14 +817,14 @@ public class MemorySection implements com.boydti.fawe.configuration.Configuratio
|
||||
}
|
||||
}
|
||||
|
||||
protected void mapChildrenValues(Map<String, Object> output, com.boydti.fawe.configuration.ConfigurationSection section, boolean deep) {
|
||||
if (section instanceof com.boydti.fawe.configuration.MemorySection) {
|
||||
com.boydti.fawe.configuration.MemorySection sec = (com.boydti.fawe.configuration.MemorySection) section;
|
||||
protected void mapChildrenValues(Map<String, Object> output, ConfigurationSection section, boolean deep) {
|
||||
if (section instanceof MemorySection) {
|
||||
MemorySection sec = (MemorySection) section;
|
||||
|
||||
for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
|
||||
output.put(createPath(section, entry.getKey(), this), entry.getValue());
|
||||
|
||||
if (entry.getValue() instanceof com.boydti.fawe.configuration.ConfigurationSection) {
|
||||
if (entry.getValue() instanceof ConfigurationSection) {
|
||||
if (deep) {
|
||||
mapChildrenValues(output, (ConfigurationSection) entry.getValue(), deep);
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.config;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import com.boydti.fawe.object.FaweLimit;
|
||||
import com.fastasyncworldedit.core.object.FaweLimit;
|
||||
import com.sk89q.worldedit.extension.platform.Actor;
|
||||
|
||||
import java.io.File;
|
||||
@ -75,14 +75,14 @@ public class Settings extends Config {
|
||||
public boolean COMMANDS = true;
|
||||
@Comment({
|
||||
"Disable the FAWE-PlotSquared hook to take over most intense P2 queueing",
|
||||
"Specific aspects can be turned on and off further below"
|
||||
"Specific aspects can be turned on and off further below",
|
||||
"Only disables/enables the hook with v4. For v6, see PlotSquared settings.yml"
|
||||
})
|
||||
public boolean PLOTSQUARED_HOOK = true;
|
||||
public boolean PLOTSQUARED_v4_HOOK = true;
|
||||
}
|
||||
|
||||
@Comment("Paths for various directories")
|
||||
public static final class PATHS {
|
||||
public String TOKENS = "tokens";
|
||||
@Comment({
|
||||
"Put any minecraft or mod jars for FAWE to be aware of block textures",
|
||||
})
|
||||
@ -96,7 +96,6 @@ public class Settings extends Config {
|
||||
public String CLIPBOARD = "clipboard";
|
||||
@Comment("Each player has his or her own sub directory for schematics")
|
||||
public boolean PER_PLAYER_SCHEMATICS = true;
|
||||
public String COMMANDS = "commands";
|
||||
}
|
||||
|
||||
@Comment("Region restriction settings")
|
||||
@ -402,10 +401,12 @@ public class Settings extends Config {
|
||||
}
|
||||
|
||||
public static class PLOTSQUARED_INTEGRATION {
|
||||
@Comment({
|
||||
"Only disables/enables the components with PlotSquared v4.",
|
||||
"For v6, see PlotSquared settings.yml"
|
||||
})
|
||||
public boolean CLEAR = true;
|
||||
public boolean CUBOIDS = true;
|
||||
public boolean COPY_AND_SWAP = true;
|
||||
public boolean SET_BIOME = true;
|
||||
}
|
||||
|
||||
public static class WEB {
|
||||
@ -1,4 +1,4 @@
|
||||
package org.yaml.snakeyaml;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import org.yaml.snakeyaml.nodes.Tag;
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package org.yaml.snakeyaml;
|
||||
package com.fastasyncworldedit.core.configuration;
|
||||
|
||||
import org.yaml.snakeyaml.DumperOptions;
|
||||
import org.yaml.snakeyaml.DumperOptions.FlowStyle;
|
||||
import org.yaml.snakeyaml.composer.Composer;
|
||||
import org.yaml.snakeyaml.constructor.BaseConstructor;
|
||||
@ -1,8 +1,8 @@
|
||||
package com.boydti.fawe.configuration.file;
|
||||
package com.fastasyncworldedit.core.configuration.file;
|
||||
|
||||
import com.boydti.fawe.configuration.Configuration;
|
||||
import com.boydti.fawe.configuration.InvalidConfigurationException;
|
||||
import com.boydti.fawe.configuration.MemoryConfiguration;
|
||||
import com.fastasyncworldedit.core.configuration.Configuration;
|
||||
import com.fastasyncworldedit.core.configuration.InvalidConfigurationException;
|
||||
import com.fastasyncworldedit.core.configuration.MemoryConfiguration;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
@ -17,19 +17,19 @@ import java.nio.charset.StandardCharsets;
|
||||
|
||||
/**
|
||||
* This is a base class for all File based implementations of {@link
|
||||
* com.boydti.fawe.configuration.Configuration}
|
||||
* Configuration}
|
||||
*/
|
||||
public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
|
||||
/**
|
||||
* Creates an empty {@link com.boydti.fawe.configuration.file.FileConfiguration} with no default values.
|
||||
* Creates an empty {@link FileConfiguration} with no default values.
|
||||
*/
|
||||
public FileConfiguration() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an empty {@link com.boydti.fawe.configuration.file.FileConfiguration} using the specified {@link
|
||||
* com.boydti.fawe.configuration.Configuration} as a source for all default values.
|
||||
* Creates an empty {@link FileConfiguration} using the specified {@link
|
||||
* Configuration} as a source for all default values.
|
||||
*
|
||||
* @param defaults Default value provider
|
||||
*/
|
||||
@ -38,7 +38,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves this {@link com.boydti.fawe.configuration.file.FileConfiguration} to the specified location.
|
||||
* Saves this {@link FileConfiguration} to the specified location.
|
||||
* <p>
|
||||
* If the file does not exist, it will be created. If already exists, it
|
||||
* will be overwritten. If it cannot be overwritten or created, an
|
||||
@ -66,7 +66,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves this {@link com.boydti.fawe.configuration.file.FileConfiguration} to the specified location.
|
||||
* Saves this {@link FileConfiguration} to the specified location.
|
||||
* <p>
|
||||
* If the file does not exist, it will be created. If already exists, it
|
||||
* will be overwritten. If it cannot be overwritten or created, an
|
||||
@ -89,14 +89,14 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves this {@link com.boydti.fawe.configuration.file.FileConfiguration} to a string, and returns it.
|
||||
* Saves this {@link FileConfiguration} to a string, and returns it.
|
||||
*
|
||||
* @return String containing this configuration.
|
||||
*/
|
||||
public abstract String saveToString();
|
||||
|
||||
/**
|
||||
* Loads this {@link com.boydti.fawe.configuration.file.FileConfiguration} from the specified location.
|
||||
* Loads this {@link FileConfiguration} from the specified location.
|
||||
* <p>
|
||||
* All the values contained within this configuration will be removed,
|
||||
* leaving only settings and defaults, and the new values will be loaded
|
||||
@ -110,7 +110,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
* @throws java.io.FileNotFoundException Thrown when the given file cannot be
|
||||
* opened.
|
||||
* @throws java.io.IOException Thrown when the given file cannot be read.
|
||||
* @throws com.boydti.fawe.configuration.InvalidConfigurationException Thrown when the given file is not
|
||||
* @throws InvalidConfigurationException Thrown when the given file is not
|
||||
* a valid Configuration.
|
||||
* @throws IllegalArgumentException Thrown when file is null.
|
||||
*/
|
||||
@ -125,7 +125,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads this {@link com.boydti.fawe.configuration.file.FileConfiguration} from the specified reader.
|
||||
* Loads this {@link FileConfiguration} from the specified reader.
|
||||
* <p>
|
||||
* All the values contained within this configuration will be removed,
|
||||
* leaving only settings and defaults, and the new values will be loaded
|
||||
@ -133,7 +133,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
*
|
||||
* @param reader the reader to load from
|
||||
* @throws java.io.IOException thrown when underlying reader throws an IOException
|
||||
* @throws com.boydti.fawe.configuration.InvalidConfigurationException thrown when the reader does not
|
||||
* @throws InvalidConfigurationException thrown when the reader does not
|
||||
* represent a valid Configuration
|
||||
* @throws IllegalArgumentException thrown when reader is null
|
||||
*/
|
||||
@ -154,7 +154,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads this {@link com.boydti.fawe.configuration.file.FileConfiguration} from the specified location.
|
||||
* Loads this {@link FileConfiguration} from the specified location.
|
||||
* <p>
|
||||
* All the values contained within this configuration will be removed,
|
||||
* leaving only settings and defaults, and the new values will be loaded
|
||||
@ -167,7 +167,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
* @throws java.io.FileNotFoundException Thrown when the given file cannot be
|
||||
* opened.
|
||||
* @throws java.io.IOException Thrown when the given file cannot be read.
|
||||
* @throws com.boydti.fawe.configuration.InvalidConfigurationException Thrown when the given file is not
|
||||
* @throws InvalidConfigurationException Thrown when the given file is not
|
||||
* a valid Configuration.
|
||||
* @throws IllegalArgumentException Thrown when file is null.
|
||||
*/
|
||||
@ -180,7 +180,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads this {@link com.boydti.fawe.configuration.file.FileConfiguration} from the specified string, as
|
||||
* Loads this {@link FileConfiguration} from the specified string, as
|
||||
* opposed to from file.
|
||||
* <p>
|
||||
* All the values contained within this configuration will be removed,
|
||||
@ -190,19 +190,19 @@ public abstract class FileConfiguration extends MemoryConfiguration {
|
||||
* If the string is invalid in any way, an exception will be thrown.
|
||||
*
|
||||
* @param contents Contents of a Configuration to load.
|
||||
* @throws com.boydti.fawe.configuration.InvalidConfigurationException Thrown if the specified string is
|
||||
* @throws InvalidConfigurationException Thrown if the specified string is
|
||||
* invalid.
|
||||
* @throws IllegalArgumentException Thrown if contents is null.
|
||||
*/
|
||||
public abstract void loadFromString(String contents) throws InvalidConfigurationException;
|
||||
|
||||
/**
|
||||
* Compiles the header for this {@link com.boydti.fawe.configuration.file.FileConfiguration} and returns the
|
||||
* Compiles the header for this {@link FileConfiguration} and returns the
|
||||
* result.
|
||||
* <p>
|
||||
* This will use the header from {@link #options()} -> {@link
|
||||
* com.boydti.fawe.configuration.file.FileConfigurationOptions#header()}, respecting the rules of {@link
|
||||
* com.boydti.fawe.configuration.file.FileConfigurationOptions#copyHeader()} if set.
|
||||
* FileConfigurationOptions#header()}, respecting the rules of {@link
|
||||
* FileConfigurationOptions#copyHeader()} if set.
|
||||
*
|
||||
* @return Compiled header
|
||||
*/
|
||||
@ -1,11 +1,12 @@
|
||||
package com.boydti.fawe.configuration.file;
|
||||
package com.fastasyncworldedit.core.configuration.file;
|
||||
|
||||
import com.boydti.fawe.configuration.MemoryConfiguration;
|
||||
import com.boydti.fawe.configuration.MemoryConfigurationOptions;
|
||||
import com.fastasyncworldedit.core.configuration.MemoryConfiguration;
|
||||
import com.fastasyncworldedit.core.configuration.MemoryConfigurationOptions;
|
||||
import com.fastasyncworldedit.core.configuration.Configuration;
|
||||
|
||||
/**
|
||||
* Various settings for controlling the input and output of a {@link
|
||||
* com.boydti.fawe.configuration.file.FileConfiguration}
|
||||
* FileConfiguration}
|
||||
*/
|
||||
public class FileConfigurationOptions extends MemoryConfigurationOptions {
|
||||
private String header = null;
|
||||
@ -16,18 +17,18 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.file.FileConfiguration configuration() {
|
||||
return (com.boydti.fawe.configuration.file.FileConfiguration) super.configuration();
|
||||
public FileConfiguration configuration() {
|
||||
return (FileConfiguration) super.configuration();
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.file.FileConfigurationOptions copyDefaults(final boolean value) {
|
||||
public FileConfigurationOptions copyDefaults(final boolean value) {
|
||||
super.copyDefaults(value);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.file.FileConfigurationOptions pathSeparator(final char value) {
|
||||
public FileConfigurationOptions pathSeparator(final char value) {
|
||||
super.pathSeparator(value);
|
||||
return this;
|
||||
}
|
||||
@ -36,7 +37,7 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
|
||||
* Gets the header that will be applied to the top of the saved output.
|
||||
* <p>
|
||||
* This header will be commented out and applied directly at the top of
|
||||
* the generated output of the {@link com.boydti.fawe.configuration.file.FileConfiguration}. It is not
|
||||
* the generated output of the {@link FileConfiguration}. It is not
|
||||
* required to include a newline at the end of the header as it will
|
||||
* automatically be applied, but you may include one if you wish for extra
|
||||
* spacing.
|
||||
@ -54,7 +55,7 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
|
||||
* Sets the header that will be applied to the top of the saved output.
|
||||
* <p>
|
||||
* This header will be commented out and applied directly at the top of
|
||||
* the generated output of the {@link com.boydti.fawe.configuration.file.FileConfiguration}. It is not
|
||||
* the generated output of the {@link FileConfiguration}. It is not
|
||||
* required to include a newline at the end of the header as it will
|
||||
* automatically be applied, but you may include one if you wish for extra
|
||||
* spacing.
|
||||
@ -65,7 +66,7 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
|
||||
* @param value New header
|
||||
* @return This object, for chaining
|
||||
*/
|
||||
public com.boydti.fawe.configuration.file.FileConfigurationOptions header(final String value) {
|
||||
public FileConfigurationOptions header(final String value) {
|
||||
header = value;
|
||||
return this;
|
||||
}
|
||||
@ -73,9 +74,9 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
|
||||
/**
|
||||
* Gets whether or not the header should be copied from a default source.
|
||||
* <p>
|
||||
* If this is true, if a default {@link com.boydti.fawe.configuration.file.FileConfiguration} is passed to
|
||||
* If this is true, if a default {@link FileConfiguration} is passed to
|
||||
* {@link
|
||||
* com.boydti.fawe.configuration.file.FileConfiguration#setDefaults(com.boydti.fawe.configuration.Configuration)}
|
||||
* FileConfiguration#setDefaults(Configuration)}
|
||||
* then upon saving it will use the header from that config, instead of
|
||||
* the one provided here.
|
||||
* <p>
|
||||
@ -95,9 +96,9 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
|
||||
/**
|
||||
* Sets whether or not the header should be copied from a default source.
|
||||
* <p>
|
||||
* If this is true, if a default {@link com.boydti.fawe.configuration.file.FileConfiguration} is passed to
|
||||
* If this is true, if a default {@link FileConfiguration} is passed to
|
||||
* {@link
|
||||
* com.boydti.fawe.configuration.file.FileConfiguration#setDefaults(com.boydti.fawe.configuration.Configuration)}
|
||||
* FileConfiguration#setDefaults(Configuration)}
|
||||
* then upon saving it will use the header from that config, instead of
|
||||
* the one provided here.
|
||||
* <p>
|
||||
@ -111,7 +112,7 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
|
||||
* @param value Whether or not to copy the header
|
||||
* @return This object, for chaining
|
||||
*/
|
||||
public com.boydti.fawe.configuration.file.FileConfigurationOptions copyHeader(final boolean value) {
|
||||
public FileConfigurationOptions copyHeader(final boolean value) {
|
||||
copyHeader = value;
|
||||
|
||||
return this;
|
||||
@ -1,12 +1,12 @@
|
||||
package com.boydti.fawe.configuration.file;
|
||||
package com.fastasyncworldedit.core.configuration.file;
|
||||
|
||||
import com.boydti.fawe.configuration.Configuration;
|
||||
import com.boydti.fawe.configuration.ConfigurationSection;
|
||||
import com.boydti.fawe.configuration.InvalidConfigurationException;
|
||||
import com.fastasyncworldedit.core.configuration.Configuration;
|
||||
import com.fastasyncworldedit.core.configuration.ConfigurationSection;
|
||||
import com.fastasyncworldedit.core.configuration.InvalidConfigurationException;
|
||||
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.yaml.snakeyaml.DumperOptions;
|
||||
import org.yaml.snakeyaml.Yaml;
|
||||
import com.fastasyncworldedit.core.configuration.Yaml;
|
||||
import org.yaml.snakeyaml.error.YAMLException;
|
||||
import org.yaml.snakeyaml.representer.Representer;
|
||||
|
||||
@ -18,7 +18,7 @@ import java.nio.file.StandardCopyOption;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* An implementation of {@link com.boydti.fawe.configuration.Configuration} which saves all files in Yaml.
|
||||
* An implementation of {@link Configuration} which saves all files in Yaml.
|
||||
* Note that this implementation is not synchronized.
|
||||
*/
|
||||
public class YamlConfiguration extends FileConfiguration {
|
||||
@ -1,4 +1,4 @@
|
||||
package com.boydti.fawe.configuration.file;
|
||||
package com.fastasyncworldedit.core.configuration.file;
|
||||
|
||||
/**
|
||||
* Various settings for controlling the input and output of a {@link YamlConfiguration}.
|
||||
@ -16,25 +16,25 @@ public class YamlConfigurationOptions extends FileConfigurationOptions {
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.file.YamlConfigurationOptions copyDefaults(final boolean value) {
|
||||
public YamlConfigurationOptions copyDefaults(final boolean value) {
|
||||
super.copyDefaults(value);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.file.YamlConfigurationOptions pathSeparator(final char value) {
|
||||
public YamlConfigurationOptions pathSeparator(final char value) {
|
||||
super.pathSeparator(value);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.file.YamlConfigurationOptions header(final String value) {
|
||||
public YamlConfigurationOptions header(final String value) {
|
||||
super.header(value);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public com.boydti.fawe.configuration.file.YamlConfigurationOptions copyHeader(final boolean value) {
|
||||
public YamlConfigurationOptions copyHeader(final boolean value) {
|
||||
super.copyHeader(value);
|
||||
return this;
|
||||
}
|
||||
@ -61,7 +61,7 @@ public class YamlConfigurationOptions extends FileConfigurationOptions {
|
||||
* @param value New indent
|
||||
* @return This object, for chaining
|
||||
*/
|
||||
public com.boydti.fawe.configuration.file.YamlConfigurationOptions indent(final int value) {
|
||||
public YamlConfigurationOptions indent(final int value) {
|
||||
if (value < 2) {
|
||||
throw new IllegalArgumentException("Indent must be at least 2 characters");
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
package com.boydti.fawe.configuration.file;
|
||||
package com.fastasyncworldedit.core.configuration.file;
|
||||
|
||||
import com.boydti.fawe.configuration.serialization.ConfigurationSerialization;
|
||||
import com.fastasyncworldedit.core.configuration.serialization.ConfigurationSerialization;
|
||||
import org.yaml.snakeyaml.constructor.SafeConstructor;
|
||||
import org.yaml.snakeyaml.error.YAMLException;
|
||||
import org.yaml.snakeyaml.nodes.Node;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user