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

Part 1 of upstream merge and format

Browse Source
This commit is contained in:
MattBDev
2020-07-13 22:50:59 -04:00
parent 79771e83e0
commit 3bc692ff11
576 changed files with 3979 additions and 3421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
worldedit-core/src/main/java/com/sk89q/worldedit/world/AbstractWorld.java
View File

@ -20,12 +20,10 @@
package com.sk89q.worldedit.world;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.mask.BlockMask;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.function.mask.BlockMaskBuilder;
import com.sk89q.worldedit.function.mask.BlockTypeMask;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.math.BlockVector2;
@ -34,14 +32,14 @@ import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.util.Direction;
import com.sk89q.worldedit.util.SideEffectSet;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.weather.WeatherType;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.weather.WeatherType;
import com.sk89q.worldedit.world.weather.WeatherTypes;
import java.nio.file.Path;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.weather.WeatherTypes;
import javax.annotation.Nullable;
import java.util.PriorityQueue;
import javax.annotation.Nullable;
/**
* An abstract implementation of {@link World}.
@ -106,7 +104,9 @@ public abstract class AbstractWorld implements World {
taskId = server.schedule(0, 1, () -> {
int max = Math.max(1, Math.min(30, effectQueue.size() / 3));
for (int i = 0; i < max; ++i) {
if (effectQueue.isEmpty()) return;
if (effectQueue.isEmpty()) {
return;
}
effectQueue.poll().play();
}

6
worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
View File

@ -20,10 +20,10 @@
package com.sk89q.worldedit.world;
import com.boydti.fawe.beta.IChunkGet;
import com.boydti.fawe.beta.implementation.packet.ChunkPacket;
import com.boydti.fawe.beta.implementation.blocks.NullChunkGet;
import com.sk89q.jnbt.CompoundTag;
import com.boydti.fawe.beta.implementation.packet.ChunkPacket;
import com.google.common.collect.ImmutableSet;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.WorldEditException;
@ -48,10 +48,10 @@ import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.weather.WeatherType;
import com.sk89q.worldedit.world.weather.WeatherTypes;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
/**
* A null implementation of {@link World} that drops all changes and

3
worldedit-core/src/main/java/com/sk89q/worldedit/world/SimpleWorld.java
View File

@ -39,9 +39,10 @@ import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.weather.WeatherType;
import com.sk89q.worldedit.world.weather.WeatherTypes;
import javax.annotation.Nullable;
import java.nio.file.Path;
import java.util.function.Supplier;
import javax.annotation.Nullable;
/**
* An abstract implementation of {@link World}.

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

@ -19,9 +19,9 @@
package com.sk89q.worldedit.world;
import com.boydti.fawe.beta.IChunkCache;
import com.boydti.fawe.beta.IChunkGet;
import com.boydti.fawe.beta.implementation.packet.ChunkPacket;
import com.boydti.fawe.beta.IChunkCache;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.WorldEditException;
@ -48,7 +48,6 @@ import com.sk89q.worldedit.world.weather.WeatherType;
import java.nio.file.Path;
import java.util.Locale;
import java.util.Set;
import javax.annotation.Nullable;
/**

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeName.java
View File

@ -19,13 +19,13 @@
package com.sk89q.worldedit.world.biome;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
import com.sk89q.worldedit.world.registry.BiomeRegistry;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Returns the name of a biome using a given {@code BiomeRegistry}.
*

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeTypes.java
View File

@ -19,8 +19,8 @@
package com.sk89q.worldedit.world.biome;
import javax.annotation.Nullable;
import java.util.Collection;
import javax.annotation.Nullable;
/**
* Stores a list of common Biome String IDs.

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/Biomes.java
View File

@ -19,8 +19,6 @@
package com.sk89q.worldedit.world.biome;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Functions;
import com.sk89q.worldedit.util.WeightedChoice;
import com.sk89q.worldedit.util.WeightedChoice.Choice;
@ -30,9 +28,10 @@ import com.sk89q.worldedit.world.registry.BiomeRegistry;
import java.util.Collection;
import java.util.Optional;
import java.util.function.Function;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Utility methods related to biomes.
*

6
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java
View File

@ -19,8 +19,6 @@
package com.sk89q.worldedit.world.block;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag;
@ -33,11 +31,13 @@ import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.registry.state.PropertyKey;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Represents a "snapshot" of a block with NBT Data.
*

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategories.java
View File

@ -81,6 +81,7 @@ public final class BlockCategories {
public static final BlockCategory WOODEN_STAIRS = get("minecraft:wooden_stairs");
public static final BlockCategory WOODEN_TRAPDOORS = get("minecraft:wooden_trapdoors");
public static final BlockCategory WOOL = get("minecraft:wool");
public static final BlockCategory FIRE = get("minecraft:fire");
private BlockCategories() {
}

6
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -42,10 +42,12 @@ import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.registry.state.PropertyKey;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import javax.annotation.Nullable;
import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nullable;
/**
* An immutable class that represents the state a block can be in.

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
View File

@ -23,17 +23,16 @@ import com.boydti.fawe.beta.ITileInput;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.blocks.TileEntityBlock;
import com.sk89q.worldedit.extent.OutputExtent;
import com.sk89q.worldedit.function.pattern.Pattern;
import java.util.Locale;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.registry.state.PropertyKey;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import javax.annotation.Nullable;
import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
public interface BlockStateHolder<B extends BlockStateHolder<B>> extends TileEntityBlock, Pattern {

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
View File

@ -38,14 +38,14 @@ import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import java.util.function.Function;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkArgument;

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypeSwitch.java
View File

@ -1,8 +1,6 @@
package com.sk89q.worldedit.world.block;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
public class BlockTypeSwitch<T> implements Function<BlockType, T> {
private final T[] tasks;

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypeUtil.java
View File

@ -21,8 +21,6 @@ package com.sk89q.worldedit.world.block;
import com.sk89q.worldedit.registry.state.PropertyGroup;
import com.sk89q.worldedit.registry.state.PropertyKey;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import static com.google.common.base.Preconditions.checkNotNull;
@ -211,4 +209,4 @@ public class BlockTypeUtil {
}
}
}
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
View File

@ -25,12 +25,12 @@ import com.boydti.fawe.util.StringMan;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.util.Locale;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nullable;
/**
* Stores a list of common Block String IDs.

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/ImmutableBaseBlock.java
View File

@ -1,6 +1,5 @@
package com.sk89q.worldedit.world.block;
import com.boydti.fawe.beta.ITileInput;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extent.Extent;

43
worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk.java
View File

@ -35,21 +35,21 @@ import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import com.sk89q.worldedit.world.storage.InvalidFormatException;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
public class AnvilChunk implements Chunk {
private CompoundTag rootTag;
private byte[][] blocks;
private byte[][] blocksAdd;
private byte[][] data;
private int rootX;
private int rootZ;
private final CompoundTag rootTag;
private final byte[][] blocks;
private final byte[][] blocksAdd;
private final byte[][] data;
private final int rootX;
private final int rootZ;
private Map<BlockVector3, Map<String,Tag>> tileEntities;
private Map<BlockVector3, Map<String, Tag>> tileEntities;
/**
* Construct the chunk with a compound tag.
@ -85,14 +85,14 @@ public class AnvilChunk implements Chunk {
}
blocks[y] = NBTUtils.getChildTag(sectionTag.getValue(),
"Blocks", ByteArrayTag.class).getValue();
"Blocks", ByteArrayTag.class).getValue();
data[y] = NBTUtils.getChildTag(sectionTag.getValue(), "Data",
ByteArrayTag.class).getValue();
ByteArrayTag.class).getValue();
// 4096 ID block support
if (sectionTag.getValue().containsKey("Add")) {
blocksAdd[y] = NBTUtils.getChildTag(sectionTag.getValue(),
"Add", ByteArrayTag.class).getValue();
"Add", ByteArrayTag.class).getValue();
}
}
@ -100,17 +100,16 @@ public class AnvilChunk implements Chunk {
for (byte[] block : blocks) {
if (block.length != sectionsize) {
throw new InvalidFormatException(
"Chunk blocks byte array expected " + "to be "
+ sectionsize + " bytes; found "
+ block.length);
"Chunk blocks byte array expected " + "to be " + sectionsize + " bytes; found "
+ block.length);
}
}
for (byte[] aData : data) {
if (aData.length != (sectionsize / 2)) {
throw new InvalidFormatException("Chunk block data byte array "
+ "expected to be " + sectionsize + " bytes; found "
+ aData.length);
throw new InvalidFormatException(
"Chunk block data byte array " + "expected to be " + sectionsize
+ " bytes; found " + aData.length);
}
}
}
@ -177,12 +176,9 @@ public class AnvilChunk implements Chunk {
/**
* Used to load the tile entities.
*
* @throws DataException
*/
private void populateTileEntities() throws DataException {
List<Tag> tags = NBTUtils.getChildTag(rootTag.getValue(),
"TileEntities", ListTag.class).getValue();
List<Tag> tags = NBTUtils.getChildTag(rootTag.getValue(), "TileEntities", ListTag.class).getValue();
tileEntities = new HashMap<>();
@ -216,6 +212,8 @@ public class AnvilChunk implements Chunk {
z = ((IntTag) entry.getValue()).getValue();
}
break;
default:
break;
}
values.put(entry.getKey(), entry.getValue());
@ -256,7 +254,8 @@ public class AnvilChunk implements Chunk {
BlockState state = LegacyMapper.getInstance().getBlockFromLegacy(id, data);
if (state == null) {
WorldEdit.logger.warn("Unknown legacy block " + id + ":" + data + " found when loading legacy anvil chunk.");
WorldEdit.logger.warn("Unknown legacy block " + id + ":" + data
+ " found when loading legacy anvil chunk.");
return BlockTypes.AIR.getDefaultState().toBaseBlock();
}
CompoundTag tileEntity = getBlockTileEntity(position);

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java
View File

@ -35,10 +35,10 @@ import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.storage.InvalidFormatException;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
/**
* The chunk format for Minecraft 1.13 and newer

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityType.java
View File

@ -20,8 +20,8 @@
package com.sk89q.worldedit.world.entity;
import com.sk89q.worldedit.registry.Keyed;
import com.sk89q.worldedit.registry.RegistryItem;
import com.sk89q.worldedit.registry.NamespacedRegistry;
import com.sk89q.worldedit.registry.RegistryItem;
public class EntityType implements RegistryItem, Keyed {

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java
View File

@ -19,8 +19,8 @@
package com.sk89q.worldedit.world.entity;
import javax.annotation.Nullable;
import java.util.Locale;
import javax.annotation.Nullable;
public class EntityTypes {

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
View File

@ -29,7 +29,6 @@ import com.sk89q.worldedit.registry.RegistryItem;
import com.sk89q.worldedit.util.concurrency.LazyReference;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.world.registry.ItemMaterial;
import javax.annotation.Nullable;

7
worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java
View File

@ -20,17 +20,13 @@
package com.sk89q.worldedit.world.item;
import com.boydti.fawe.object.string.JoinedCharSequence;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.block.BlockTypesCache;
import com.sk89q.worldedit.world.block.ItemTypesCache;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.Optional;
import java.util.Locale;
import javax.annotation.Nullable;
public final class ItemTypes {
@ -588,6 +584,7 @@ public final class ItemTypes {
@Nullable public static final ItemType NETHER_STAR = init();
@Nullable public static final ItemType NETHER_WART = init();
@Nullable public static final ItemType NETHER_WART_BLOCK = init();
@Nullable public static final ItemType NETHERITE_PICKAXE = init();
@Nullable public static final ItemType NETHERRACK = init();
@Nullable public static final ItemType NOTE_BLOCK = init();
@Nullable public static final ItemType OAK_BOAT = init();

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java
View File

@ -23,11 +23,11 @@ import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockType;
import javax.annotation.Nullable;
import java.util.OptionalInt;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.OptionalInt;
import javax.annotation.Nullable;
/**
* Provides information on blocks and provides methods to create them.

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
View File

@ -33,13 +33,13 @@ import com.sk89q.worldedit.util.io.ResourceLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.io.IOException;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
/**
* Provides block data based on the built-in block database that is bundled

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java
View File

@ -26,7 +26,6 @@ import com.sk89q.worldedit.world.block.BlockType;
import java.util.Collections;
import java.util.Map;
import java.util.OptionalInt;
import javax.annotation.Nullable;
/**

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java
View File

@ -31,13 +31,13 @@ import com.sk89q.worldedit.util.io.ResourceLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.io.IOException;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
/**
* Provides item data based on the built-in item database that is bundled

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/EntityRegistry.java
View File

@ -23,9 +23,9 @@ import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.world.entity.EntityType;
import com.sk89q.worldedit.world.entity.EntityTypes;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
import javax.annotation.Nullable;
/**
* Provides information on entities.

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/ItemRegistry.java
View File

@ -21,9 +21,9 @@ package com.sk89q.worldedit.world.registry;
import com.sk89q.worldedit.world.item.ItemType;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
import javax.annotation.Nullable;
public interface ItemRegistry {

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java
View File

@ -46,12 +46,12 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.io.IOException;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nullable;
public final class LegacyMapper {

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/PassthroughItemMaterial.java
View File

@ -19,10 +19,10 @@
package com.sk89q.worldedit.world.registry;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
import javax.annotation.Nullable;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
public class PassthroughItemMaterial implements ItemMaterial {
private static final ItemMaterial DEFAULT_MATERIAL = new SimpleItemMaterial(0, 0);

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotDateParser.java
View File

@ -21,7 +21,6 @@ package com.sk89q.worldedit.world.snapshot;
import java.io.File;
import java.util.Calendar;
import javax.annotation.Nullable;
/**

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRepository.java
View File

@ -23,7 +23,6 @@ package com.sk89q.worldedit.world.snapshot;
import com.sk89q.worldedit.world.storage.MissingWorldException;
import javax.annotation.Nullable;
import java.io.File;
import java.io.FilenameFilter;
import java.time.ZoneOffset;
@ -33,6 +32,7 @@ import java.util.Calendar;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import javax.annotation.Nullable;
/**
* A repository contains zero or more snapshots.

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/experimental/fs/FileSystemSnapshotDatabase.java
View File

@ -35,7 +35,6 @@ import com.sk89q.worldedit.world.snapshot.experimental.Snapshot;
import com.sk89q.worldedit.world.snapshot.experimental.SnapshotDatabase;
import com.sk89q.worldedit.world.snapshot.experimental.SnapshotInfo;
import javax.annotation.Nullable;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
@ -47,6 +46,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.ServiceLoader;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkArgument;

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/experimental/fs/FolderSnapshot.java
View File

@ -32,7 +32,6 @@ import com.sk89q.worldedit.world.storage.McRegionChunkStore;
import com.sk89q.worldedit.world.storage.McRegionReader;
import com.sk89q.worldedit.world.storage.MissingChunkException;
import javax.annotation.Nullable;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
@ -41,6 +40,7 @@ import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Stream;
import java.util.zip.GZIPInputStream;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkState;

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/NBTConversions.java
View File

@ -19,12 +19,12 @@
package com.sk89q.worldedit.world.storage;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.jnbt.ListTag;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.util.Location;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* Utility methods for working with NBT data used in Minecraft.
*/

8
worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/ZippedLegacyChunkStore.java
View File

@ -35,7 +35,7 @@ import java.util.zip.ZipFile;
*/
public class ZippedLegacyChunkStore extends LegacyChunkStore {
private ZipFile zip;
private final ZipFile zip;
private String folder;
/**
@ -45,8 +45,6 @@ public class ZippedLegacyChunkStore extends LegacyChunkStore {
*
* @param zipFile the zip file
* @param folder the folder
* @throws IOException
* @throws ZipException
*/
public ZippedLegacyChunkStore(File zipFile, String folder) throws IOException, ZipException {
this.folder = folder;
@ -59,8 +57,6 @@ public class ZippedLegacyChunkStore extends LegacyChunkStore {
* be detected.
*
* @param zipFile the zip file
* @throws IOException
* @throws ZipException
*/
public ZippedLegacyChunkStore(File zipFile) throws IOException, ZipException {
zip = new ZipFile(zipFile);
@ -73,8 +69,6 @@ public class ZippedLegacyChunkStore extends LegacyChunkStore {
* @param f2 the second part of the path
* @param name the name of the file
* @return an input stream
* @throws IOException
* @throws DataException
*/
@Override
protected InputStream getInputStream(String f1, String f2, String name) throws IOException, DataException {

8
worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/ZippedMcRegionChunkStore.java
View File

@ -48,8 +48,6 @@ public class ZippedMcRegionChunkStore extends McRegionChunkStore {
*
* @param zipFile the ZIP file
* @param folder the folder
* @throws IOException
* @throws ZipException
*/
public ZippedMcRegionChunkStore(File zipFile, String folder) throws IOException, ZipException {
this.zipFile = zipFile;
@ -63,8 +61,6 @@ public class ZippedMcRegionChunkStore extends McRegionChunkStore {
* be detected.
*
* @param zipFile the ZIP file
* @throws IOException
* @throws ZipException
*/
public ZippedMcRegionChunkStore(File zipFile) throws IOException, ZipException {
this.zipFile = zipFile;
@ -87,7 +83,9 @@ public class ZippedMcRegionChunkStore extends McRegionChunkStore {
if (testEntry.getName().startsWith(worldName + "/")) {
if (pattern.matcher(testEntry.getName()).matches()) { // does entry end in .mca
folder = testEntry.getName().substring(0, testEntry.getName().lastIndexOf('/'));
if (folder.endsWith("poi")) continue;
if (folder.endsWith("poi")) {
continue;
}
name = folder + "/" + name;
break;
}