3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-12-25 02:20:07 +01:00

Merge pull request #24 from Combustible/upstream_formatting_changes

Restore the formatting of many things to upstream WorldEdit - no code changes
Dieser Commit ist enthalten in:
NotMyFault 2018-12-20 21:23:59 +01:00 committet von GitHub
Commit 0a28059792
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
167 geänderte Dateien mit 616 neuen und 534 gelöschten Zeilen

Datei anzeigen

@ -1,6 +1,6 @@
#Thu Jul 26 14:29:48 AEST 2018 #Thu Jul 26 14:29:48 AEST 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

Datei anzeigen

@ -38,4 +38,5 @@ public class FallbackRegistrationListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
} }
}
}

Datei anzeigen

@ -19,16 +19,16 @@
package com.sk89q.wepif; package com.sk89q.wepif;
import com.sk89q.util.yaml.YAMLNode;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.OfflinePlayer;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.sk89q.util.yaml.YAMLNode;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.OfflinePlayer;
public class ConfigurationPermissionsResolver implements PermissionsResolver { public class ConfigurationPermissionsResolver implements PermissionsResolver {
private YAMLProcessor config; private YAMLProcessor config;
private Map<String, Set<String>> userPermissionsCache; private Map<String, Set<String>> userPermissionsCache;

Datei anzeigen

@ -19,6 +19,7 @@
package com.sk89q.wepif; package com.sk89q.wepif;
import com.nijikokun.bukkit.Permissions.Permissions;
import com.sk89q.util.yaml.YAMLProcessor; import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -27,7 +28,6 @@ import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import com.nijikokun.bukkit.Permissions.Permissions;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;

Datei anzeigen

@ -21,7 +21,6 @@ package com.sk89q.wepif;
import com.sk89q.util.yaml.YAMLFormat; import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor; import com.sk89q.util.yaml.YAMLProcessor;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -103,6 +102,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
protected PermissionsResolverManager(Plugin plugin) { protected PermissionsResolverManager(Plugin plugin) {
this.server = plugin.getServer(); this.server = plugin.getServer();
(new ServerListener()).register(plugin); // Register the events (new ServerListener()).register(plugin); // Register the events
loadConfig(new File("wepif.yml")); loadConfig(new File("wepif.yml"));
findResolver(); findResolver();
} }

Datei anzeigen

@ -25,11 +25,12 @@ import com.sk89q.worldedit.world.biome.BiomeData;
import com.sk89q.worldedit.world.registry.BiomeRegistry; import com.sk89q.worldedit.world.registry.BiomeRegistry;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.annotation.Nullable;
/** /**
* A biome registry for Bukkit. * A biome registry for Bukkit.
*/ */

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.bukkit; package com.sk89q.worldedit.bukkit;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.bukkit.util.CommandInspector; import com.sk89q.bukkit.util.CommandInspector;
import com.sk89q.minecraft.util.commands.CommandLocals; import com.sk89q.minecraft.util.commands.CommandLocals;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
@ -30,8 +32,6 @@ import org.bukkit.command.CommandSender;
import java.util.logging.Logger; import java.util.logging.Logger;
import static com.google.common.base.Preconditions.checkNotNull;
class BukkitCommandInspector implements CommandInspector { class BukkitCommandInspector implements CommandInspector {
private static final Logger logger = Logger.getLogger(BukkitCommandInspector.class.getCanonicalName()); private static final Logger logger = Logger.getLogger(BukkitCommandInspector.class.getCanonicalName());

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.bukkit; package com.sk89q.worldedit.bukkit;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter; import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
@ -28,10 +30,9 @@ import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.NullWorld; import com.sk89q.worldedit.world.NullWorld;
import javax.annotation.Nullable;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import static com.google.common.base.Preconditions.checkNotNull; import javax.annotation.Nullable;
/** /**
* An adapter to adapt a Bukkit entity into a WorldEdit one. * An adapter to adapt a Bukkit entity into a WorldEdit one.

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.bukkit; package com.sk89q.worldedit.bukkit;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.entity.metadata.EntityProperties; import com.sk89q.worldedit.entity.metadata.EntityProperties;
import org.bukkit.entity.Ambient; import org.bukkit.entity.Ambient;
import org.bukkit.entity.Animals; import org.bukkit.entity.Animals;
@ -42,8 +44,6 @@ import org.bukkit.entity.Tameable;
import org.bukkit.entity.Villager; import org.bukkit.entity.Villager;
import org.bukkit.entity.minecart.ExplosiveMinecart; import org.bukkit.entity.minecart.ExplosiveMinecart;
import static com.google.common.base.Preconditions.checkNotNull;
class BukkitEntityProperties implements EntityProperties { class BukkitEntityProperties implements EntityProperties {
private final Entity entity; private final Entity entity;

Datei anzeigen

@ -21,7 +21,11 @@ package com.sk89q.worldedit.bukkit;
import com.sk89q.worldedit.blocks.BaseItem; import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.extent.inventory.*; import com.sk89q.worldedit.extent.inventory.BlockBag;
import com.sk89q.worldedit.extent.inventory.BlockBagException;
import com.sk89q.worldedit.extent.inventory.OutOfBlocksException;
import com.sk89q.worldedit.extent.inventory.OutOfSpaceException;
import com.sk89q.worldedit.extent.inventory.SlottableBlockBag;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

Datei anzeigen

@ -19,13 +19,15 @@
package com.sk89q.wepif; package com.sk89q.wepif;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
public class DinnerPermsResolverTest { public class DinnerPermsResolverTest {
private DinnerPermsResolver resolver; private DinnerPermsResolver resolver;

Datei anzeigen

@ -28,7 +28,11 @@ import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import java.util.*; import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
public class TestOfflinePermissible implements OfflinePlayer, Permissible { public class TestOfflinePermissible implements OfflinePlayer, Permissible {
private boolean op; private boolean op;

Datei anzeigen

@ -25,8 +25,8 @@ import com.sk89q.jnbt.NBTUtils;
import com.sk89q.jnbt.ShortTag; import com.sk89q.jnbt.ShortTag;
import com.sk89q.jnbt.StringTag; import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag; import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.storage.InvalidFormatException; import com.sk89q.worldedit.world.storage.InvalidFormatException;
import java.util.HashMap; import java.util.HashMap;

Datei anzeigen

@ -22,9 +22,9 @@ package com.sk89q.worldedit.blocks;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag; import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag; import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.util.gson.GsonUtil; import com.sk89q.worldedit.util.gson.GsonUtil;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

Datei anzeigen

@ -22,8 +22,8 @@ package com.sk89q.worldedit.blocks;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.StringTag; import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag; import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -114,4 +114,4 @@ public class SkullBlock extends BaseBlock {
owner = ((StringTag) t).getValue(); owner = ((StringTag) t).getValue();
} }
} }
} }

Datei anzeigen

@ -1,6 +1,24 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.jnbt; package com.sk89q.jnbt;
import com.sk89q.worldedit.function.entity.ExtentEntityCopy;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -12,6 +30,7 @@ import java.util.Map;
public final class CompoundTag extends Tag { public final class CompoundTag extends Tag {
private final Map<String, Tag> value; private final Map<String, Tag> value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -425,5 +444,4 @@ public final class CompoundTag extends Tag {
return bldr.toString(); return bldr.toString();
} }
} }

Datei anzeigen

@ -19,11 +19,11 @@
package com.sk89q.jnbt; package com.sk89q.jnbt;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Helps create compound tags. * Helps create compound tags.
*/ */
@ -145,14 +145,14 @@ public class CompoundTagBuilder {
return put(key, new LongArrayTag(value)); return put(key, new LongArrayTag(value));
} }
/** /**
* Put the given key and value into the compound tag as a * Put the given key and value into the compound tag as a
* {@code LongTag}. * {@code LongTag}.
* *
* @param key they key * @param key they key
* @param value the value * @param value the value
* @return this object * @return this object
*/ */
public CompoundTagBuilder putLong(String key, long value) { public CompoundTagBuilder putLong(String key, long value) {
return put(key, new LongTag(value)); return put(key, new LongTag(value));
} }
@ -213,5 +213,4 @@ public class CompoundTagBuilder {
return new CompoundTagBuilder(); return new CompoundTagBuilder();
} }
} }

Datei anzeigen

@ -1,12 +1,13 @@
package com.sk89q.jnbt; package com.sk89q.jnbt;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.ArrayList; import java.util.ArrayList;
import javax.annotation.Nullable;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import static com.google.common.base.Preconditions.checkNotNull; import javax.annotation.Nullable;
/** /**
* The {@code TAG_List} tag. * The {@code TAG_List} tag.
@ -64,7 +65,7 @@ public final class ListTag<T extends Tag> extends Tag {
/** /**
* Get the tag if it exists at the given index. * Get the tag if it exists at the given index.
* *
* @param index the index * @param index the index
* @return the tag or null * @return the tag or null
*/ */
@ -419,6 +420,4 @@ public final class ListTag<T extends Tag> extends Tag {
return bldr.toString(); return bldr.toString();
} }
} }

Datei anzeigen

@ -19,13 +19,13 @@
package com.sk89q.jnbt; package com.sk89q.jnbt;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Helps create list tags. * Helps create list tags.
*/ */

Datei anzeigen

@ -16,13 +16,18 @@
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.sk89q.jnbt; package com.sk89q.jnbt;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* The {@code TAG_Long_Array} tag. * The {@code TAG_Long_Array} tag.
*/ */
public class LongArrayTag extends Tag { public class LongArrayTag extends Tag {
private final long[] value; private final long[] value;
/** /**
* Creates the tag with an empty name. * Creates the tag with an empty name.
* *
@ -33,10 +38,12 @@ public class LongArrayTag extends Tag {
checkNotNull(value); checkNotNull(value);
this.value = value; this.value = value;
} }
@Override @Override
public long[] getValue() { public long[] getValue() {
return value; return value;
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder hex = new StringBuilder(); StringBuilder hex = new StringBuilder();
@ -49,4 +56,5 @@ public class LongArrayTag extends Tag {
} }
return "TAG_Long_Array(" + hex + ")"; return "TAG_Long_Array(" + hex + ")";
} }
}
}

Datei anzeigen

@ -37,7 +37,7 @@ import java.util.function.Function;
* This class reads <strong>NBT</strong>, or <strong>Named Binary Tag</strong> * This class reads <strong>NBT</strong>, or <strong>Named Binary Tag</strong>
* streams, and produces an object graph of subclasses of the {@code Tag} * streams, and produces an object graph of subclasses of the {@code Tag}
* object. * object.
* <p> *
* <p>The NBT format was created by Markus Persson, and the specification may be * <p>The NBT format was created by Markus Persson, and the specification may be
* found at <a href="http://www.minecraft.net/docs/NBT.txt"> * found at <a href="http://www.minecraft.net/docs/NBT.txt">
* http://www.minecraft.net/docs/NBT.txt</a>.</p> * http://www.minecraft.net/docs/NBT.txt</a>.</p>
@ -49,7 +49,7 @@ public final class NBTInputStream implements Closeable {
/** /**
* Creates a new {@code NBTInputStream}, which will source its data * Creates a new {@code NBTInputStream}, which will source its data
* from the specified input stream. * from the specified input stream.
* *
* @param is the input stream * @param is the input stream
* @throws IOException if an I/O error occurs * @throws IOException if an I/O error occurs
*/ */
@ -67,7 +67,7 @@ public final class NBTInputStream implements Closeable {
/** /**
* Reads an NBT tag from the stream. * Reads an NBT tag from the stream.
* *
* @return The tag that was read. * @return The tag that was read.
* @throws IOException if an I/O error occurs. * @throws IOException if an I/O error occurs.
*/ */
@ -87,7 +87,7 @@ public final class NBTInputStream implements Closeable {
/** /**
* Reads an NBT from the stream. * Reads an NBT from the stream.
* *
* @param depth the depth of this tag * @param depth the depth of this tag
* @return The tag that was read. * @return The tag that was read.
* @throws IOException if an I/O error occurs. * @throws IOException if an I/O error occurs.
@ -519,8 +519,8 @@ public final class NBTInputStream implements Closeable {
/** /**
* Reads the payload of a tag given the type. * Reads the payload of a tag given the type.
* *
* @param type the type * @param type the type
* @param depth the depth * @param depth the depth
* @return the tag * @return the tag
* @throws IOException if an I/O error occurs. * @throws IOException if an I/O error occurs.
@ -617,5 +617,4 @@ public final class NBTInputStream implements Closeable {
} }
} }
} }

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.jnbt; package com.sk89q.jnbt;
import static com.google.common.base.Preconditions.checkNotNull;
import com.boydti.fawe.object.io.LittleEndianOutputStream; import com.boydti.fawe.object.io.LittleEndianOutputStream;
import java.io.Closeable; import java.io.Closeable;
import java.io.DataOutput; import java.io.DataOutput;
@ -29,13 +31,10 @@ import java.io.OutputStream;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* This class writes <strong>NBT</strong>, or <strong>Named Binary Tag</strong> * This class writes <strong>NBT</strong>, or <strong>Named Binary Tag</strong>
* {@code Tag} objects to an underlying {@code OutputStream}. * {@code Tag} objects to an underlying {@code OutputStream}.
* <p> *
* <p>The NBT format was created by Markus Persson, and the specification may be * <p>The NBT format was created by Markus Persson, and the specification may be
* found at <a href="http://www.minecraft.net/docs/NBT.txt"> * found at <a href="http://www.minecraft.net/docs/NBT.txt">
* http://www.minecraft.net/docs/NBT.txt</a>.</p> * http://www.minecraft.net/docs/NBT.txt</a>.</p>
@ -50,9 +49,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Creates a new {@code NBTOutputStream}, which will write data to the * Creates a new {@code NBTOutputStream}, which will write data to the
* specified underlying output stream. * specified underlying output stream.
* *
* @param os The output stream. * @param os
* @throws IOException if an I/O error occurs. * The output stream.
* @throws IOException
* if an I/O error occurs.
*/ */
public NBTOutputStream(OutputStream os) throws IOException { public NBTOutputStream(OutputStream os) throws IOException {
this.os = new DataOutputStream(os); this.os = new DataOutputStream(os);
@ -74,13 +75,16 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a tag. * Writes a tag.
* *
* @param tag The tag to write. * @param tag
* @throws IOException if an I/O error occurs. * The tag to write.
* @throws IOException
* if an I/O error occurs.
*/ */
public void writeNamedTag(String name, Tag tag) throws IOException { public void writeNamedTag(String name, Tag tag) throws IOException {
checkNotNull(name); checkNotNull(name);
checkNotNull(tag); checkNotNull(tag);
int type = NBTUtils.getTypeCode(tag.getClass()); int type = NBTUtils.getTypeCode(tag.getClass());
writeNamedTagName(name, type); writeNamedTagName(name, type);
if (type == NBTConstants.TYPE_END) { if (type == NBTConstants.TYPE_END) {
@ -197,62 +201,66 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes tag payload. * Writes tag payload.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
public void writeTagPayload(Tag tag) throws IOException { public void writeTagPayload(Tag tag) throws IOException {
int type = NBTUtils.getTypeCode(tag.getClass()); int type = NBTUtils.getTypeCode(tag.getClass());
switch (type) { switch (type) {
case NBTConstants.TYPE_END: case NBTConstants.TYPE_END:
writeEndTagPayload((EndTag) tag); writeEndTagPayload((EndTag) tag);
break; break;
case NBTConstants.TYPE_BYTE: case NBTConstants.TYPE_BYTE:
writeByteTagPayload((ByteTag) tag); writeByteTagPayload((ByteTag) tag);
break; break;
case NBTConstants.TYPE_SHORT: case NBTConstants.TYPE_SHORT:
writeShortTagPayload((ShortTag) tag); writeShortTagPayload((ShortTag) tag);
break; break;
case NBTConstants.TYPE_INT: case NBTConstants.TYPE_INT:
writeIntTagPayload((IntTag) tag); writeIntTagPayload((IntTag) tag);
break; break;
case NBTConstants.TYPE_LONG: case NBTConstants.TYPE_LONG:
writeLongTagPayload((LongTag) tag); writeLongTagPayload((LongTag) tag);
break; break;
case NBTConstants.TYPE_FLOAT: case NBTConstants.TYPE_FLOAT:
writeFloatTagPayload((FloatTag) tag); writeFloatTagPayload((FloatTag) tag);
break; break;
case NBTConstants.TYPE_DOUBLE: case NBTConstants.TYPE_DOUBLE:
writeDoubleTagPayload((DoubleTag) tag); writeDoubleTagPayload((DoubleTag) tag);
break; break;
case NBTConstants.TYPE_BYTE_ARRAY: case NBTConstants.TYPE_BYTE_ARRAY:
writeByteArrayTagPayload((ByteArrayTag) tag); writeByteArrayTagPayload((ByteArrayTag) tag);
break; break;
case NBTConstants.TYPE_STRING: case NBTConstants.TYPE_STRING:
writeStringTagPayload((StringTag) tag); writeStringTagPayload((StringTag) tag);
break; break;
case NBTConstants.TYPE_LIST: case NBTConstants.TYPE_LIST:
writeListTagPayload((ListTag) tag); writeListTagPayload((ListTag) tag);
break; break;
case NBTConstants.TYPE_COMPOUND: case NBTConstants.TYPE_COMPOUND:
writeCompoundTagPayload((CompoundTag) tag); writeCompoundTagPayload((CompoundTag) tag);
break; break;
case NBTConstants.TYPE_INT_ARRAY: case NBTConstants.TYPE_INT_ARRAY:
writeIntArrayTagPayload((IntArrayTag) tag); writeIntArrayTagPayload((IntArrayTag) tag);
break; break;
case NBTConstants.TYPE_LONG_ARRAY: case NBTConstants.TYPE_LONG_ARRAY:
writeLongArrayTagPayload((LongArrayTag) tag); writeLongArrayTagPayload((LongArrayTag) tag);
break; break;
default: default:
throw new IOException("Invalid tag type: " + type + "."); throw new IOException("Invalid tag type: " + type + ".");
} }
} }
/** /**
* Writes a {@code TAG_Byte} tag. * Writes a {@code TAG_Byte} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeByteTagPayload(ByteTag tag) throws IOException { private void writeByteTagPayload(ByteTag tag) throws IOException {
os.writeByte(tag.getValue()); os.writeByte(tag.getValue());
@ -260,9 +268,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_Byte_Array} tag. * Writes a {@code TAG_Byte_Array} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeByteArrayTagPayload(ByteArrayTag tag) throws IOException { private void writeByteArrayTagPayload(ByteArrayTag tag) throws IOException {
byte[] bytes = tag.getValue(); byte[] bytes = tag.getValue();
@ -272,9 +282,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_Compound} tag. * Writes a {@code TAG_Compound} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeCompoundTagPayload(CompoundTag tag) throws IOException { private void writeCompoundTagPayload(CompoundTag tag) throws IOException {
for (Map.Entry<String, Tag> entry : tag.getValue().entrySet()) { for (Map.Entry<String, Tag> entry : tag.getValue().entrySet()) {
@ -285,9 +297,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_List} tag. * Writes a {@code TAG_List} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeListTagPayload(ListTag tag) throws IOException { private void writeListTagPayload(ListTag tag) throws IOException {
Class<? extends Tag> clazz = tag.getType(); Class<? extends Tag> clazz = tag.getType();
@ -310,9 +324,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_String} tag. * Writes a {@code TAG_String} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeStringTagPayload(StringTag tag) throws IOException { private void writeStringTagPayload(StringTag tag) throws IOException {
byte[] bytes = tag.getValue().getBytes(NBTConstants.CHARSET); byte[] bytes = tag.getValue().getBytes(NBTConstants.CHARSET);
@ -322,9 +338,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_Double} tag. * Writes a {@code TAG_Double} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeDoubleTagPayload(DoubleTag tag) throws IOException { private void writeDoubleTagPayload(DoubleTag tag) throws IOException {
os.writeDouble(tag.getValue()); os.writeDouble(tag.getValue());
@ -332,9 +350,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_Float} tag. * Writes a {@code TAG_Float} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeFloatTagPayload(FloatTag tag) throws IOException { private void writeFloatTagPayload(FloatTag tag) throws IOException {
os.writeFloat(tag.getValue()); os.writeFloat(tag.getValue());
@ -342,9 +362,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_Long} tag. * Writes a {@code TAG_Long} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeLongTagPayload(LongTag tag) throws IOException { private void writeLongTagPayload(LongTag tag) throws IOException {
os.writeLong(tag.getValue()); os.writeLong(tag.getValue());
@ -352,9 +374,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_Int} tag. * Writes a {@code TAG_Int} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeIntTagPayload(IntTag tag) throws IOException { private void writeIntTagPayload(IntTag tag) throws IOException {
os.writeInt(tag.getValue()); os.writeInt(tag.getValue());
@ -362,9 +386,11 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_Short} tag. * Writes a {@code TAG_Short} tag.
* *
* @param tag The tag. * @param tag
* @throws IOException if an I/O error occurs. * The tag.
* @throws IOException
* if an I/O error occurs.
*/ */
private void writeShortTagPayload(ShortTag tag) throws IOException { private void writeShortTagPayload(ShortTag tag) throws IOException {
os.writeShort(tag.getValue()); os.writeShort(tag.getValue());
@ -372,19 +398,19 @@ public final class NBTOutputStream implements Closeable {
/** /**
* Writes a {@code TAG_Empty} tag. * Writes a {@code TAG_Empty} tag.
* *
* @param tag the tag * @param tag the tag
*/ */
private void writeEndTagPayload(EndTag tag) { private void writeEndTagPayload(EndTag tag) {
/* empty */ /* empty */
} }
private void writeIntArrayTagPayload(IntArrayTag tag) throws IOException { private void writeIntArrayTagPayload(IntArrayTag tag) throws IOException {
int[] data = tag.getValue(); int[] data = tag.getValue();
os.writeInt(data.length); os.writeInt(data.length);
for (int aData : data) { for (int aData : data) {
os.writeInt(aData); os.writeInt(aData);
} }
} }
private void writeLongArrayTagPayload(LongArrayTag tag) throws IOException { private void writeLongArrayTagPayload(LongArrayTag tag) throws IOException {

Datei anzeigen

@ -19,13 +19,13 @@
package com.sk89q.jnbt; package com.sk89q.jnbt;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.world.storage.InvalidFormatException; import com.sk89q.worldedit.world.storage.InvalidFormatException;
import java.util.Map; import java.util.Map;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* A class which contains NBT-related utility methods. * A class which contains NBT-related utility methods.
* *

Datei anzeigen

@ -26,7 +26,7 @@ public abstract class Tag {
/** /**
* Gets the value of this tag. * Gets the value of this tag.
* *
* @return the value * @return the value
*/ */
public abstract Object getValue(); public abstract Object getValue();
@ -34,8 +34,4 @@ public abstract class Tag {
public Object getRaw() { public Object getRaw() {
return getValue(); return getValue();
} }
} }

Datei anzeigen

@ -19,12 +19,13 @@
package com.sk89q.minecraft.util.commands; package com.sk89q.minecraft.util.commands;
import javax.annotation.Nullable; import static com.google.common.base.Preconditions.checkNotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import static com.google.common.base.Preconditions.checkNotNull; import javax.annotation.Nullable;
public class CommandException extends Exception { public class CommandException extends Exception {

Datei anzeigen

@ -28,7 +28,8 @@ import java.util.*;
public final class ReflectionUtil { public final class ReflectionUtil {
private ReflectionUtil() {} private ReflectionUtil() {
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> T getField(Object from, String name) { public static <T> T getField(Object from, String name) {
@ -50,4 +51,5 @@ public final class ReflectionUtil {
} while (checkClass.getSuperclass() != Object.class && ((checkClass = checkClass.getSuperclass()) != null)); } while (checkClass.getSuperclass() != Object.class && ((checkClass = checkClass.getSuperclass()) != null));
return null; return null;
} }
} }

Datei anzeigen

@ -34,7 +34,7 @@ public final class StringUtil {
/** /**
* Trim a string if it is longer than a certain length. * Trim a string if it is longer than a certain length.
* *
* @param str the stirng * @param str the stirng
* @param len the length to trim to * @param len the length to trim to
* @return a new string * @return a new string
@ -49,7 +49,7 @@ public final class StringUtil {
/** /**
* Join an array of strings into a string. * Join an array of strings into a string.
* *
* @param str the string array * @param str the string array
* @param delimiter the delimiter * @param delimiter the delimiter
* @param initialIndex the initial index to start form * @param initialIndex the initial index to start form
@ -68,7 +68,7 @@ public final class StringUtil {
/** /**
* Join an array of strings into a string. * Join an array of strings into a string.
* *
* @param str the string array * @param str the string array
* @param delimiter the delimiter * @param delimiter the delimiter
* @param initialIndex the initial index to start form * @param initialIndex the initial index to start form
@ -76,7 +76,7 @@ public final class StringUtil {
* @return a new string * @return a new string
*/ */
public static String joinQuotedString(String[] str, String delimiter, public static String joinQuotedString(String[] str, String delimiter,
int initialIndex, String quote) { int initialIndex, String quote) {
if (str.length == 0) { if (str.length == 0) {
return ""; return "";
} }
@ -92,7 +92,7 @@ public final class StringUtil {
/** /**
* Join an array of strings into a string. * Join an array of strings into a string.
* *
* @param str the string array * @param str the string array
* @param delimiter the delimiter * @param delimiter the delimiter
* @return a new string * @return a new string
@ -103,7 +103,7 @@ public final class StringUtil {
/** /**
* Join an array of strings into a string. * Join an array of strings into a string.
* *
* @param str an array of objects * @param str an array of objects
* @param delimiter the delimiter * @param delimiter the delimiter
* @param initialIndex the initial index to start form * @param initialIndex the initial index to start form
@ -122,7 +122,7 @@ public final class StringUtil {
/** /**
* Join an array of strings into a string. * Join an array of strings into a string.
* *
* @param str a list of integers * @param str a list of integers
* @param delimiter the delimiter * @param delimiter the delimiter
* @param initialIndex the initial index to start form * @param initialIndex the initial index to start form
@ -219,7 +219,7 @@ public final class StringUtil {
* calculated). (Note that the arrays aren't really copied anymore, just * calculated). (Note that the arrays aren't really copied anymore, just
* switched...this is clearly much better than cloning an array or doing * switched...this is clearly much better than cloning an array or doing
* a System.arraycopy() each time through the outer loop.) * a System.arraycopy() each time through the outer loop.)
* *
* Effectively, the difference between the two implementations is this * Effectively, the difference between the two implementations is this
* one does not cause an out of memory condition when calculating the LD * one does not cause an out of memory condition when calculating the LD
* over two very large strings. * over two very large strings.
@ -323,4 +323,4 @@ public final class StringUtil {
return parsableBlocks; return parsableBlocks;
} }
} }

Datei anzeigen

@ -23,12 +23,13 @@ import com.sk89q.worldedit.BlockVector2D;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Nullable;
/** /**
* Represents a configuration node. * Represents a configuration node.
*/ */

Datei anzeigen

@ -27,7 +27,13 @@ import org.yaml.snakeyaml.nodes.Tag;
import org.yaml.snakeyaml.reader.UnicodeReader; import org.yaml.snakeyaml.reader.UnicodeReader;
import org.yaml.snakeyaml.representer.Representer; import org.yaml.snakeyaml.representer.Representer;
import java.io.*; import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -294,4 +300,5 @@ public class YAMLProcessor extends YAMLNode {
this.nullRepresenter = o -> representScalar(Tag.NULL, ""); this.nullRepresenter = o -> representScalar(Tag.NULL, "");
} }
} }
}
}

Datei anzeigen

@ -816,7 +816,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Return fast mode status. * Return fast mode status.
* <p> *
* <p>Fast mode may skip lighting checks or adjacent block * <p>Fast mode may skip lighting checks or adjacent block
* notification.</p> * notification.</p>
* *
@ -991,8 +991,8 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Set a block, bypassing both history and block re-ordering. * Set a block, bypassing both history and block re-ordering.
* *
* @param position the position to set the block at * @param position the position to set the block at
* @param block the block * @param block the block
* @param stage the level * @param stage the level
* @return whether the block changed * @return whether the block changed
* @throws WorldEditException thrown on a set error * @throws WorldEditException thrown on a set error
*/ */
@ -1014,7 +1014,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Set a block, bypassing history but still utilizing block re-ordering. * Set a block, bypassing history but still utilizing block re-ordering.
* *
* @param position the position to set the block at * @param position the position to set the block at
* @param block the block * @param block the block
* @return whether the block changed * @return whether the block changed
*/ */
public boolean smartSetBlock(final Vector position, final BlockStateHolder block) { public boolean smartSetBlock(final Vector position, final BlockStateHolder block) {
@ -1589,7 +1589,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Sets all the blocks inside a region to a given pattern. * Sets all the blocks inside a region to a given pattern.
* *
* @param region the region * @param region the region
* @param pattern the pattern that provides the replacement block * @param pattern the pattern that provides the replacement block
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1643,8 +1643,8 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Replaces all the blocks matching a given mask, within a given region, to a block * Replaces all the blocks matching a given mask, within a given region, to a block
* returned by a given pattern. * returned by a given pattern.
* *
* @param region the region to replace the blocks within * @param region the region to replace the blocks within
* @param mask the mask that blocks must match * @param mask the mask that blocks must match
* @param pattern the pattern that provides the new blocks * @param pattern the pattern that provides the new blocks
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1666,7 +1666,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* If the center sits between two blocks on a certain axis, then two blocks * If the center sits between two blocks on a certain axis, then two blocks
* will be placed to mark the center. * will be placed to mark the center.
* *
* @param region the region to find the center of * @param region the region to find the center of
* @param pattern the replacement pattern * @param pattern the replacement pattern
* @return the number of blocks placed * @return the number of blocks placed
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1686,7 +1686,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Make the faces of the given region as if it was a {@link CuboidRegion}. * Make the faces of the given region as if it was a {@link CuboidRegion}.
* *
* @param region the region * @param region the region
* @param block the block to place * @param block the block to place
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -1698,7 +1698,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Make the faces of the given region as if it was a {@link CuboidRegion}. * Make the faces of the given region as if it was a {@link CuboidRegion}.
* *
* @param region the region * @param region the region
* @param pattern the pattern to place * @param pattern the pattern to place
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1718,7 +1718,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* may be inefficient, because there may not be an efficient implementation supported * may be inefficient, because there may not be an efficient implementation supported
* for that specific shape. * for that specific shape.
* *
* @param region the region * @param region the region
* @param pattern the pattern to place * @param pattern the pattern to place
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1735,12 +1735,13 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
} }
} }
/** /**
* Make the walls (all faces but those parallel to the X-Z plane) of the given region * Make the walls (all faces but those parallel to the X-Z plane) of the given region
* as if it was a {@link CuboidRegion}. * as if it was a {@link CuboidRegion}.
* *
* @param region the region * @param region the region
* @param block the block to place * @param block the block to place
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -1753,7 +1754,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Make the walls (all faces but those parallel to the X-Z plane) of the given region * Make the walls (all faces but those parallel to the X-Z plane) of the given region
* as if it was a {@link CuboidRegion}. * as if it was a {@link CuboidRegion}.
* *
* @param region the region * @param region the region
* @param pattern the pattern to place * @param pattern the pattern to place
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1773,7 +1774,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* may be inefficient, because there may not be an efficient implementation supported * may be inefficient, because there may not be an efficient implementation supported
* for that specific shape. * for that specific shape.
* *
* @param region the region * @param region the region
* @param pattern the pattern to place * @param pattern the pattern to place
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1803,7 +1804,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* (as if it were a cuboid). * (as if it were a cuboid).
* *
* @param region the region * @param region the region
* @param block the placed block * @param block the placed block
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -1816,7 +1817,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Places a layer of blocks on top of ground blocks in the given region * Places a layer of blocks on top of ground blocks in the given region
* (as if it were a cuboid). * (as if it were a cuboid).
* *
* @param region the region * @param region the region
* @param pattern the placed block pattern * @param pattern the placed block pattern
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1859,9 +1860,9 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Stack a cuboid region. * Stack a cuboid region.
* *
* @param region the region to stack * @param region the region to stack
* @param dir the direction to stack * @param dir the direction to stack
* @param count the number of times to stack * @param count the number of times to stack
* @param copyAir true to also copy air blocks * @param copyAir true to also copy air blocks
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1893,10 +1894,10 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Move the blocks in a region a certain direction. * Move the blocks in a region a certain direction.
* *
* @param region the region to move * @param region the region to move
* @param dir the direction * @param dir the direction
* @param distance the distance to move * @param distance the distance to move
* @param copyAir true to copy air blocks * @param copyAir true to copy air blocks
* @param replacement the replacement block to fill in after moving, or null to use air * @param replacement the replacement block to fill in after moving, or null to use air
* @return number of blocks moved * @return number of blocks moved
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -1950,10 +1951,10 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Move the blocks in a region a certain direction. * Move the blocks in a region a certain direction.
* *
* @param region the region to move * @param region the region to move
* @param dir the direction * @param dir the direction
* @param distance the distance to move * @param distance the distance to move
* @param copyAir true to copy air blocks * @param copyAir true to copy air blocks
* @param replacement the replacement block to fill in after moving, or null to use air * @param replacement the replacement block to fill in after moving, or null to use air
* @return number of blocks moved * @return number of blocks moved
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
@ -2005,8 +2006,8 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Fix liquids so that they turn into stationary blocks and extend outward. * Fix liquids so that they turn into stationary blocks and extend outward.
* *
* @param origin the original position * @param origin the original position
* @param radius the radius to fix * @param radius the radius to fix
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2037,8 +2038,8 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Makes a cylinder. * Makes a cylinder.
* *
* @param pos Center of the cylinder * @param pos Center of the cylinder
* @param block The block pattern to use * @param block The block pattern to use
* @param radius The cylinder's radius * @param radius The cylinder's radius
* @param height The cylinder's up/down extent. If negative, extend downward. * @param height The cylinder's up/down extent. If negative, extend downward.
* @param filled If false, only a shell will be generated. * @param filled If false, only a shell will be generated.
@ -2052,12 +2053,12 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Makes a cylinder. * Makes a cylinder.
* *
* @param pos Center of the cylinder * @param pos Center of the cylinder
* @param block The block pattern to use * @param block The block pattern to use
* @param radiusX The cylinder's largest north/south extent * @param radiusX The cylinder's largest north/south extent
* @param radiusZ The cylinder's largest east/west extent * @param radiusZ The cylinder's largest east/west extent
* @param height The cylinder's up/down extent. If negative, extend downward. * @param height The cylinder's up/down extent. If negative, extend downward.
* @param filled If false, only a shell will be generated. * @param filled If false, only a shell will be generated.
* @return number of blocks changed * @return number of blocks changed
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2266,28 +2267,28 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
} }
/** /**
* Makes a sphere. * Makes a sphere.
* *
* @param pos Center of the sphere or ellipsoid * @param pos Center of the sphere or ellipsoid
* @param block The block pattern to use * @param block The block pattern to use
* @param radius The sphere's radius * @param radius The sphere's radius
* @param filled If false, only a shell will be generated. * @param filled If false, only a shell will be generated.
* @return number of blocks changed * @return number of blocks changed
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
public int makeSphere(final Vector pos, final Pattern block, final double radius, final boolean filled) { public int makeSphere(final Vector pos, final Pattern block, final double radius, final boolean filled) {
return this.makeSphere(pos, block, radius, radius, radius, filled); return makeSphere(pos, block, radius, radius, radius, filled);
} }
/** /**
* Makes a sphere or ellipsoid. * Makes a sphere or ellipsoid.
* *
* @param pos Center of the sphere or ellipsoid * @param pos Center of the sphere or ellipsoid
* @param block The block pattern to use * @param block The block pattern to use
* @param radiusX The sphere/ellipsoid's largest north/south extent * @param radiusX The sphere/ellipsoid's largest north/south extent
* @param radiusY The sphere/ellipsoid's largest up/down extent * @param radiusY The sphere/ellipsoid's largest up/down extent
* @param radiusZ The sphere/ellipsoid's largest east/west extent * @param radiusZ The sphere/ellipsoid's largest east/west extent
* @param filled If false, only a shell will be generated. * @param filled If false, only a shell will be generated.
* @return number of blocks changed * @return number of blocks changed
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2364,9 +2365,9 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Makes a pyramid. * Makes a pyramid.
* *
* @param position a position * @param position a position
* @param block a block * @param block a block
* @param size size of pyramid * @param size size of pyramid
* @param filled true if filled * @param filled true if filled
* @return number of blocks changed * @return number of blocks changed
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2394,7 +2395,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Thaw blocks in a radius. * Thaw blocks in a radius.
* *
* @param position the position * @param position the position
* @param radius the radius * @param radius the radius
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2443,7 +2444,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Make snow in a radius. * Make snow in a radius.
* *
* @param position a position * @param position a position
* @param radius a radius * @param radius a radius
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2508,7 +2509,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Make dirt green. * Make dirt green.
* *
* @param position a position * @param position a position
* @param radius a radius * @param radius a radius
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2567,7 +2568,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Makes pumpkin patches randomly in an area around the given position. * Makes pumpkin patches randomly in an area around the given position.
* *
* @param position the base position * @param position the base position
* @param apothem the apothem of the (square) area * @param apothem the apothem of the (square) area
* @return number of patches created * @return number of patches created
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2828,9 +2829,9 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Hollows out the region (Semi-well-defined for non-cuboid selections). * Hollows out the region (Semi-well-defined for non-cuboid selections).
* *
* @param region the region to hollow out. * @param region the region to hollow out.
* @param thickness the thickness of the shell to leave (manhattan distance) * @param thickness the thickness of the shell to leave (manhattan distance)
* @param pattern The block pattern to use * @param pattern The block pattern to use
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2914,10 +2915,11 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
* Draws a line (out of blocks) between two vectors. * Draws a line (out of blocks) between two vectors.
* *
* @param pattern The block pattern used to draw the line. * @param pattern The block pattern used to draw the line.
* @param pos1 One of the points that define the line. * @param pos1 One of the points that define the line.
* @param pos2 The other point that defines the line. * @param pos2 The other point that defines the line.
* @param radius The radius (thickness) of the line. * @param radius The radius (thickness) of the line.
* @param filled If false, only a shell will be generated. * @param filled If false, only a shell will be generated.
*
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -2983,14 +2985,15 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
/** /**
* Draws a spline (out of blocks) between specified vectors. * Draws a spline (out of blocks) between specified vectors.
* *
* @param pattern The block pattern used to draw the spline. * @param pattern The block pattern used to draw the spline.
* @param nodevectors The list of vectors to draw through. * @param nodevectors The list of vectors to draw through.
* @param tension The tension of every node. * @param tension The tension of every node.
* @param bias The bias of every node. * @param bias The bias of every node.
* @param continuity The continuity of every node. * @param continuity The continuity of every node.
* @param quality The quality of the spline. Must be greater than 0. * @param quality The quality of the spline. Must be greater than 0.
* @param radius The radius (thickness) of the spline. * @param radius The radius (thickness) of the spline.
* @param filled If false, only a shell will be generated. * @param filled If false, only a shell will be generated.
*
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException thrown if too many blocks are changed * @throws MaxChangedBlocksException thrown if too many blocks are changed
*/ */
@ -3121,7 +3124,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
for (final Vector recurseDirection : this.recurseDirections) { for (final Vector recurseDirection : this.recurseDirections) {
queue.addLast(current.add(recurseDirection).toBlockVector()); queue.addLast(current.add(recurseDirection).toBlockVector());
} }
} } // while
} }
public int makeBiomeShape(final Region region, final Vector zero, final Vector unit, final BaseBiome biomeType, final String expressionString, final boolean hollow) throws ExpressionException { public int makeBiomeShape(final Region region, final Vector zero, final Vector unit, final BaseBiome biomeType, final String expressionString, final boolean hollow) throws ExpressionException {

Datei anzeigen

@ -19,14 +19,14 @@
package com.sk89q.worldedit; package com.sk89q.worldedit;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.event.extent.EditSessionEvent; import com.sk89q.worldedit.event.extent.EditSessionEvent;
import com.sk89q.worldedit.extent.inventory.BlockBag; import com.sk89q.worldedit.extent.inventory.BlockBag;
import com.sk89q.worldedit.util.eventbus.EventBus; import com.sk89q.worldedit.util.eventbus.EventBus;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Creates new {@link EditSession}s. To get an instance of this factory, * Creates new {@link EditSession}s. To get an instance of this factory,
* use {@link WorldEdit#getEditSessionFactory()}. * use {@link WorldEdit#getEditSessionFactory()}.

Datei anzeigen

@ -19,10 +19,10 @@
package com.sk89q.worldedit; package com.sk89q.worldedit;
import com.sk89q.worldedit.util.logging.LogFormat;
import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.item.ItemTypes; import com.sk89q.worldedit.world.item.ItemTypes;
import com.sk89q.worldedit.util.logging.LogFormat;
import com.sk89q.worldedit.world.registry.LegacyMapper; import com.sk89q.worldedit.world.registry.LegacyMapper;
import com.sk89q.worldedit.world.snapshot.SnapshotRepository; import com.sk89q.worldedit.world.snapshot.SnapshotRepository;

Datei anzeigen

@ -141,7 +141,7 @@ public class LocalSession implements TextureHolder {
/** /**
* Construct the object. * Construct the object.
* <p> *
* <p>{@link #setConfiguration(LocalConfiguration)} should be called * <p>{@link #setConfiguration(LocalConfiguration)} should be called
* later with configuration.</p> * later with configuration.</p>
*/ */
@ -495,7 +495,7 @@ public class LocalSession implements TextureHolder {
* Performs an undo. * Performs an undo.
* *
* @param newBlockBag a new block bag * @param newBlockBag a new block bag
* @param player the player * @param player the player
* @return whether anything was undone * @return whether anything was undone
*/ */
public EditSession undo(@Nullable BlockBag newBlockBag, Player player) { public EditSession undo(@Nullable BlockBag newBlockBag, Player player) {
@ -531,7 +531,7 @@ public class LocalSession implements TextureHolder {
* Performs a redo * Performs a redo
* *
* @param newBlockBag a new block bag * @param newBlockBag a new block bag
* @param player the player * @param player the player
* @return whether anything was redone * @return whether anything was redone
*/ */
public EditSession redo(@Nullable BlockBag newBlockBag, Player player) { public EditSession redo(@Nullable BlockBag newBlockBag, Player player) {
@ -620,7 +620,7 @@ public class LocalSession implements TextureHolder {
/** /**
* Set the region selector. * Set the region selector.
* *
* @param world the world * @param world the world
* @param selector the selector * @param selector the selector
*/ */
public void setRegionSelector(World world, RegionSelector selector) { public void setRegionSelector(World world, RegionSelector selector) {
@ -777,7 +777,7 @@ public class LocalSession implements TextureHolder {
/** /**
* Sets the clipboard. * Sets the clipboard.
* <p> *
* <p>Pass {@code null} to clear the clipboard.</p> * <p>Pass {@code null} to clear the clipboard.</p>
* *
* @param clipboard the clipboard, or null if the clipboard is to be cleared * @param clipboard the clipboard, or null if the clipboard is to be cleared
@ -969,7 +969,7 @@ public class LocalSession implements TextureHolder {
* or the tool is not assigned, the slot will be replaced with the * or the tool is not assigned, the slot will be replaced with the
* brush tool. * brush tool.
* *
* @param item the item type ID * @param item the item type
* @return the tool, or {@code null} * @return the tool, or {@code null}
* @throws InvalidToolBindException if the item can't be bound to that item * @throws InvalidToolBindException if the item can't be bound to that item
*/ */
@ -1010,7 +1010,7 @@ public class LocalSession implements TextureHolder {
/** /**
* Set the tool. * Set the tool.
* *
* @param item the item type ID * @param item the item type
* @param tool the tool to set, which can be {@code null} * @param tool the tool to set, which can be {@code null}
* @throws InvalidToolBindException if the item can't be bound to that item * @throws InvalidToolBindException if the item can't be bound to that item
*/ */

Datei anzeigen

@ -55,4 +55,4 @@ public enum PlayerDirection {
return isOrthogonal; return isOrthogonal;
} }
} }

Datei anzeigen

@ -21,6 +21,7 @@ package com.sk89q.worldedit;
import com.boydti.fawe.util.MathMan; import com.boydti.fawe.util.MathMan;
import com.sk89q.worldedit.math.transform.AffineTransform; import com.sk89q.worldedit.math.transform.AffineTransform;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -96,7 +97,7 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
/** /**
* Construct a new instance with X, Y, and Z coordinates set to 0. * Construct a new instance with X, Y, and Z coordinates set to 0.
* <p> *
* <p>One can also refer to a static {@link #ZERO}.</p> * <p>One can also refer to a static {@link #ZERO}.</p>
*/ */
public Vector() { public Vector() {
@ -648,7 +649,7 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
/** /**
* Rounds all components to the closest integer. * Rounds all components to the closest integer.
* <p> *
* <p>Components &lt; 0.5 are rounded down, otherwise up.</p> * <p>Components &lt; 0.5 are rounded down, otherwise up.</p>
* *
* @return a new vector * @return a new vector
@ -670,9 +671,9 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
/** /**
* Perform a 2D transformation on this vector and return a new one. * Perform a 2D transformation on this vector and return a new one.
* *
* @param angle in degrees * @param angle in degrees
* @param aboutX about which x coordinate to rotate * @param aboutX about which x coordinate to rotate
* @param aboutZ about which z coordinate to rotate * @param aboutZ about which z coordinate to rotate
* @param translateX what to add after rotation * @param translateX what to add after rotation
* @param translateZ what to add after rotation * @param translateZ what to add after rotation
* @return a new vector * @return a new vector
@ -686,9 +687,9 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
double z2 = x * Math.sin(angle) + z * Math.cos(angle); double z2 = x * Math.sin(angle) + z * Math.cos(angle);
return new Vector( return new Vector(
x2 + aboutX + translateX, x2 + aboutX + translateX,
getY(), getY(),
z2 + aboutZ + translateZ z2 + aboutZ + translateZ
); );
} }
@ -779,9 +780,9 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
*/ */
public static BlockVector toBlockPoint(double x, double y, double z) { public static BlockVector toBlockPoint(double x, double y, double z) {
return new BlockVector( return new BlockVector(
Math.floor(x), Math.floor(x),
Math.floor(y), Math.floor(y),
Math.floor(z) Math.floor(z)
); );
} }
@ -792,9 +793,9 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
*/ */
public BlockVector toBlockPoint() { public BlockVector toBlockPoint() {
return new BlockVector( return new BlockVector(
Math.floor(getX()), Math.floor(getX()),
Math.floor(getY()), Math.floor(getY()),
Math.floor(getZ()) Math.floor(getZ())
); );
} }
@ -880,7 +881,7 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
Math.max(v1.getZ(), v2.getZ()) Math.max(v1.getZ(), v2.getZ())
); );
} }
/** /**
* Gets the midpoint of two vectors. * Gets the midpoint of two vectors.
* *

Datei anzeigen

@ -80,7 +80,7 @@ public class Vector2D implements Serializable {
/** /**
* Construct a new instance with X and Z coordinates set to 0. * Construct a new instance with X and Z coordinates set to 0.
* <p> *
* <p>One can also refer to a static {@link #ZERO}.</p> * <p>One can also refer to a static {@link #ZERO}.</p>
*/ */
public Vector2D() { public Vector2D() {
@ -511,7 +511,7 @@ public class Vector2D implements Serializable {
/** /**
* Rounds all components to the closest integer. * Rounds all components to the closest integer.
* <p> *
* <p>Components &lt; 0.5 are rounded down, otherwise up.</p> * <p>Components &lt; 0.5 are rounded down, otherwise up.</p>
* *
* @return a new vector * @return a new vector
@ -533,9 +533,9 @@ public class Vector2D implements Serializable {
/** /**
* Perform a 2D transformation on this vector and return a new one. * Perform a 2D transformation on this vector and return a new one.
* *
* @param angle in degrees * @param angle in degrees
* @param aboutX about which x coordinate to rotate * @param aboutX about which x coordinate to rotate
* @param aboutZ about which z coordinate to rotate * @param aboutZ about which z coordinate to rotate
* @param translateX what to add after rotation * @param translateX what to add after rotation
* @param translateZ what to add after rotation * @param translateZ what to add after rotation
* @return a new vector * @return a new vector
@ -548,8 +548,8 @@ public class Vector2D implements Serializable {
double x2 = x * Math.cos(angle) - z * Math.sin(angle); double x2 = x * Math.cos(angle) - z * Math.sin(angle);
double z2 = x * Math.sin(angle) + z * Math.cos(angle); double z2 = x * Math.sin(angle) + z * Math.cos(angle);
return new Vector2D( return new Vector2D(
x2 + aboutX + translateX, x2 + aboutX + translateX,
z2 + aboutZ + translateZ z2 + aboutZ + translateZ
); );
} }
@ -648,8 +648,8 @@ public class Vector2D implements Serializable {
*/ */
public static Vector2D getMinimum(Vector2D v1, Vector2D v2) { public static Vector2D getMinimum(Vector2D v1, Vector2D v2) {
return new Vector2D( return new Vector2D(
Math.min(v1.getX(), v2.getX()), Math.min(v1.getX(), v2.getX()),
Math.min(v1.getZ(), v2.getZ()) Math.min(v1.getZ(), v2.getZ())
); );
} }
@ -662,8 +662,8 @@ public class Vector2D implements Serializable {
*/ */
public static Vector2D getMaximum(Vector2D v1, Vector2D v2) { public static Vector2D getMaximum(Vector2D v1, Vector2D v2) {
return new Vector2D( return new Vector2D(
Math.max(v1.getX(), v2.getX()), Math.max(v1.getX(), v2.getX()),
Math.max(v1.getZ(), v2.getZ()) Math.max(v1.getZ(), v2.getZ())
); );
} }

Datei anzeigen

@ -19,6 +19,9 @@
package com.sk89q.worldedit; package com.sk89q.worldedit;
import static com.sk89q.worldedit.event.platform.Interaction.HIT;
import static com.sk89q.worldedit.event.platform.Interaction.OPEN;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.sk89q.worldedit.blocks.BaseItem; import com.sk89q.worldedit.blocks.BaseItem;
@ -56,7 +59,6 @@ import com.sk89q.worldedit.world.registry.BundledBlockData;
import com.sk89q.worldedit.world.registry.BundledItemData; import com.sk89q.worldedit.world.registry.BundledItemData;
import com.sk89q.worldedit.world.registry.LegacyMapper; import com.sk89q.worldedit.world.registry.LegacyMapper;
import javax.script.ScriptException;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -69,8 +71,7 @@ import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import static com.sk89q.worldedit.event.platform.Interaction.HIT; import javax.script.ScriptException;
import static com.sk89q.worldedit.event.platform.Interaction.OPEN;
/** /**
* The entry point and container for a working implementation of WorldEdit. * The entry point and container for a working implementation of WorldEdit.

Datei anzeigen

@ -19,10 +19,11 @@
package com.sk89q.worldedit.blocks; package com.sk89q.worldedit.blocks;
import javax.annotation.Nullable;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nullable;
/** /**
* The colors for wool. * The colors for wool.

Datei anzeigen

@ -24,13 +24,13 @@ import com.sk89q.minecraft.util.commands.CommandLocals;
import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.blocks.BaseItem; import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.util.command.composition.SimpleCommand;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.util.command.argument.CommandArgs; import com.sk89q.worldedit.util.command.argument.CommandArgs;
import com.sk89q.worldedit.util.command.composition.SimpleCommand;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
public class ItemParser extends SimpleCommand<BaseItem> { public class ItemParser extends SimpleCommand<BaseItem> {

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.command.argument; package com.sk89q.worldedit.command.argument;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandLocals; import com.sk89q.minecraft.util.commands.CommandLocals;
import com.sk89q.worldedit.extent.NullExtent; import com.sk89q.worldedit.extent.NullExtent;
@ -26,13 +28,9 @@ import com.sk89q.worldedit.function.Contextual;
import com.sk89q.worldedit.function.EditContext; import com.sk89q.worldedit.function.EditContext;
import com.sk89q.worldedit.function.RegionFunction; import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.function.block.BlockReplace; import com.sk89q.worldedit.function.block.BlockReplace;
import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.util.command.argument.CommandArgs; import com.sk89q.worldedit.util.command.argument.CommandArgs;
import com.sk89q.worldedit.util.command.composition.SimpleCommand; import com.sk89q.worldedit.util.command.composition.SimpleCommand;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
public class ReplaceParser extends SimpleCommand<Contextual<? extends RegionFunction>> { public class ReplaceParser extends SimpleCommand<Contextual<? extends RegionFunction>> {

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.command.composition; package com.sk89q.worldedit.command.composition;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandLocals; import com.sk89q.minecraft.util.commands.CommandLocals;
import com.sk89q.worldedit.command.argument.RegionFunctionParser; import com.sk89q.worldedit.command.argument.RegionFunctionParser;
@ -30,8 +32,6 @@ import com.sk89q.worldedit.util.command.argument.CommandArgs;
import com.sk89q.worldedit.util.command.composition.CommandExecutor; import com.sk89q.worldedit.util.command.composition.CommandExecutor;
import com.sk89q.worldedit.util.command.composition.SimpleCommand; import com.sk89q.worldedit.util.command.composition.SimpleCommand;
import static com.google.common.base.Preconditions.checkNotNull;
public class ApplyCommand extends SimpleCommand<Contextual<? extends Operation>> { public class ApplyCommand extends SimpleCommand<Contextual<? extends Operation>> {
private final CommandExecutor<Contextual<? extends RegionFunction>> functionParser; private final CommandExecutor<Contextual<? extends RegionFunction>> functionParser;

Datei anzeigen

@ -20,6 +20,9 @@
package com.sk89q.worldedit.command.composition; package com.sk89q.worldedit.command.composition;
import com.boydti.fawe.config.BBC; import com.boydti.fawe.config.BBC;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandLocals; import com.sk89q.minecraft.util.commands.CommandLocals;
import com.sk89q.minecraft.util.commands.CommandPermissionsException; import com.sk89q.minecraft.util.commands.CommandPermissionsException;
@ -41,8 +44,6 @@ import com.sk89q.worldedit.util.command.argument.CommandArgs;
import com.sk89q.worldedit.util.command.composition.CommandExecutor; import com.sk89q.worldedit.util.command.composition.CommandExecutor;
import com.sk89q.worldedit.util.command.composition.SimpleCommand; import com.sk89q.worldedit.util.command.composition.SimpleCommand;
import static com.google.common.base.Preconditions.checkNotNull;
public class ShapedBrushCommand extends SimpleCommand<Object> { public class ShapedBrushCommand extends SimpleCommand<Object> {
private final CommandExecutor<? extends Contextual<? extends Operation>> delegate; private final CommandExecutor<? extends Contextual<? extends Operation>> delegate;

Datei anzeigen

@ -19,7 +19,8 @@
package com.sk89q.worldedit.command.tool; package com.sk89q.worldedit.command.tool;
import com.sk89q.worldedit.*; import com.sk89q.worldedit.LocalConfiguration;
import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.extension.platform.Platform;

Datei anzeigen

@ -23,11 +23,11 @@ import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalConfiguration; import com.sk89q.worldedit.LocalConfiguration;
import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.blocks.MobSpawnerBlock; import com.sk89q.worldedit.blocks.MobSpawnerBlock;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockStateHolder;
/** /**
* Looks up information about a block. * Looks up information about a block.

Datei anzeigen

@ -22,9 +22,9 @@ package com.sk89q.worldedit.command.tool.brush;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.world.block.BlockTypes;
public class CylinderBrush implements Brush { public class CylinderBrush implements Brush {

Datei anzeigen

@ -22,11 +22,9 @@ package com.sk89q.worldedit.command.tool.brush;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.world.block.BlockTypes;
public class HollowCylinderBrush implements Brush { public class HollowCylinderBrush implements Brush {

Datei anzeigen

@ -22,11 +22,9 @@ package com.sk89q.worldedit.command.tool.brush;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.world.block.BlockTypes;
public class HollowSphereBrush implements Brush { public class HollowSphereBrush implements Brush {

Datei anzeigen

@ -20,11 +20,11 @@
package com.sk89q.worldedit.command.tool.brush; package com.sk89q.worldedit.command.tool.brush;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.math.convolution.HeightMap;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.math.convolution.GaussianKernel; import com.sk89q.worldedit.math.convolution.GaussianKernel;
import com.sk89q.worldedit.math.convolution.HeightMap;
import com.sk89q.worldedit.math.convolution.HeightMapFilter; import com.sk89q.worldedit.math.convolution.HeightMapFilter;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;

Datei anzeigen

@ -23,10 +23,9 @@ import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.world.block.BlockTypes;
public class SphereBrush implements Brush { public class SphereBrush implements Brush {

Datei anzeigen

@ -21,14 +21,11 @@ package com.sk89q.worldedit.command.util;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import com.boydti.fawe.util.SetQueue;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.google.common.base.Supplier;
import com.sk89q.minecraft.util.commands.CommandException; import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.worldedit.entity.metadata.EntityProperties; import com.sk89q.worldedit.entity.metadata.EntityProperties;
import com.sk89q.worldedit.function.EntityFunction; import com.sk89q.worldedit.function.EntityFunction;
import java.util.concurrent.Callable;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -151,6 +148,7 @@ public class EntityRemover {
return true; return true;
} }
} }
return false; return false;
}; };
} }

Datei anzeigen

@ -19,16 +19,14 @@
package com.sk89q.worldedit.entity; package com.sk89q.worldedit.entity;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.world.NbtValued; import com.sk89q.worldedit.world.NbtValued;
import com.sk89q.worldedit.world.entity.EntityType; import com.sk89q.worldedit.world.entity.EntityType;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.HashMap;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Represents a mutable "snapshot" of an entity. * Represents a mutable "snapshot" of an entity.
* *

Datei anzeigen

@ -19,13 +19,13 @@
package com.sk89q.worldedit.event.platform; package com.sk89q.worldedit.event.platform;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.event.Cancellable; import com.sk89q.worldedit.event.Cancellable;
import com.sk89q.worldedit.event.Event; import com.sk89q.worldedit.event.Event;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Called when a block is interacted with. * Called when a block is interacted with.
*/ */

Datei anzeigen

@ -19,14 +19,14 @@
package com.sk89q.worldedit.event.platform; package com.sk89q.worldedit.event.platform;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.event.Event; import com.sk89q.worldedit.event.Event;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Posted when suggestions for auto-completion are requested for command input. * Posted when suggestions for auto-completion are requested for command input.
*/ */

Datei anzeigen

@ -19,11 +19,11 @@
package com.sk89q.worldedit.event.platform; package com.sk89q.worldedit.event.platform;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.LocalConfiguration; import com.sk89q.worldedit.LocalConfiguration;
import com.sk89q.worldedit.event.Event; import com.sk89q.worldedit.event.Event;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Raised when the configuration has been loaded or re-loaded. * Raised when the configuration has been loaded or re-loaded.
*/ */

Datei anzeigen

@ -19,12 +19,12 @@
package com.sk89q.worldedit.event.platform; package com.sk89q.worldedit.event.platform;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.event.Cancellable; import com.sk89q.worldedit.event.Cancellable;
import com.sk89q.worldedit.event.Event; import com.sk89q.worldedit.event.Event;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Raised whenever a player sends input. * Raised whenever a player sends input.
*/ */

Datei anzeigen

@ -21,14 +21,11 @@ package com.sk89q.worldedit.extension.factory;
import com.sk89q.util.StringUtil; import com.sk89q.util.StringUtil;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.internal.registry.AbstractFactory; import com.sk89q.worldedit.internal.registry.AbstractFactory;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

Datei anzeigen

@ -39,6 +39,7 @@ public final class MaskFactory extends AbstractFactory<Mask> {
*/ */
public MaskFactory(WorldEdit worldEdit) { public MaskFactory(WorldEdit worldEdit) {
super(worldEdit); super(worldEdit);
parsers.add(new DefaultMaskParser(worldEdit)); parsers.add(new DefaultMaskParser(worldEdit));
} }

Datei anzeigen

@ -39,6 +39,7 @@ public final class PatternFactory extends AbstractFactory<Pattern> {
*/ */
public PatternFactory(WorldEdit worldEdit) { public PatternFactory(WorldEdit worldEdit) {
super(worldEdit); super(worldEdit);
parsers.add(new HashTagPatternParser(worldEdit)); parsers.add(new HashTagPatternParser(worldEdit));
} }

Datei anzeigen

@ -21,14 +21,13 @@ package com.sk89q.worldedit.extension.factory;
import com.sk89q.util.StringUtil; import com.sk89q.util.StringUtil;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern; import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.internal.registry.InputParser; import com.sk89q.worldedit.internal.registry.InputParser;
import com.sk89q.worldedit.world.block.BlockStateHolder;
class RandomPatternParser extends InputParser<Pattern> { class RandomPatternParser extends InputParser<Pattern> {

Datei anzeigen

@ -20,11 +20,11 @@
package com.sk89q.worldedit.extension.factory; package com.sk89q.worldedit.extension.factory;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.internal.registry.InputParser; import com.sk89q.worldedit.internal.registry.InputParser;
import com.sk89q.worldedit.extension.input.InputParseException;
class SingleBlockPatternParser extends InputParser<Pattern> { class SingleBlockPatternParser extends InputParser<Pattern> {

Datei anzeigen

@ -19,7 +19,6 @@
package com.sk89q.worldedit.extension.platform; package com.sk89q.worldedit.extension.platform;
import com.sk89q.worldedit.entity.metadata.Metadatable;
import com.sk89q.worldedit.internal.cui.CUIEvent; import com.sk89q.worldedit.internal.cui.CUIEvent;
import com.sk89q.worldedit.session.SessionOwner; import com.sk89q.worldedit.session.SessionOwner;
import com.sk89q.worldedit.util.Identifiable; import com.sk89q.worldedit.util.Identifiable;

Datei anzeigen

@ -25,10 +25,11 @@ import com.sk89q.worldedit.util.command.Dispatcher;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.registry.Registries; import com.sk89q.worldedit.world.registry.Registries;
import javax.annotation.Nullable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Nullable;
/** /**
* Represents a platform that WorldEdit has been implemented for. * Represents a platform that WorldEdit has been implemented for.
* *

Datei anzeigen

@ -22,10 +22,9 @@ package com.sk89q.worldedit.extent;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.world.biome.BaseBiome; import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -36,8 +35,8 @@ public interface OutputExtent {
/** /**
* Change the block at the given location to the given block. The operation may * Change the block at the given location to the given block. The operation may
* not tie the given {@link BlockState} to the world, so future changes to the * not tie the given {@link BlockStateHolder} to the world, so future changes to the
* {@link BlockState} do not affect the world until this method is called again. * {@link BlockStateHolder} do not affect the world until this method is called again.
* *
* <p>The return value of this method indicates whether the change was probably * <p>The return value of this method indicates whether the change was probably
* successful. It may not be successful if, for example, the location is out * successful. It may not be successful if, for example, the location is out

Datei anzeigen

@ -24,9 +24,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.Mask;
@ -35,6 +32,8 @@ import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.regions.AbstractRegion; import com.sk89q.worldedit.regions.AbstractRegion;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionOperationException; import com.sk89q.worldedit.regions.RegionOperationException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;

Datei anzeigen

@ -65,4 +65,4 @@ public class LastAccessExtentCache extends AbstractDelegateExtent {
} }
} }
} }

Datei anzeigen

@ -19,13 +19,13 @@
package com.sk89q.worldedit.extent.clipboard; package com.sk89q.worldedit.extent.clipboard;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* An implementation of {@link Entity} that stores a {@link BaseEntity} with it. * An implementation of {@link Entity} that stores a {@link BaseEntity} with it.
* *

Datei anzeigen

@ -20,7 +20,6 @@
package com.sk89q.worldedit.extent.clipboard.io; package com.sk89q.worldedit.extent.clipboard.io;
import com.sk89q.worldedit.extent.clipboard.Clipboard; import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.world.registry.Registries;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;

Datei anzeigen

@ -60,4 +60,4 @@ public abstract class NBTSchematicReader implements ClipboardReader {
return expected.cast(test); return expected.cast(test);
} }
} }

Datei anzeigen

@ -20,8 +20,6 @@
package com.sk89q.worldedit.extent.clipboard.io.legacycompat; package com.sk89q.worldedit.extent.clipboard.io.legacycompat;
import com.sk89q.jnbt.Tag; import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockStateHolder;
import java.util.Map; import java.util.Map;

Datei anzeigen

@ -26,8 +26,6 @@ import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSyntaxException; import com.google.gson.JsonSyntaxException;
import com.sk89q.jnbt.StringTag; import com.sk89q.jnbt.StringTag;
import com.sk89q.jnbt.Tag; import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;

Datei anzeigen

@ -33,8 +33,8 @@ import com.sk89q.worldedit.function.operation.RunContext;
import com.sk89q.worldedit.registry.state.Property; import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.util.collection.TupleArrayList; import com.sk89q.worldedit.util.collection.TupleArrayList;
import com.sk89q.worldedit.world.block.BlockCategories; import com.sk89q.worldedit.world.block.BlockCategories;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.Deque; import java.util.Deque;

Datei anzeigen

@ -19,15 +19,14 @@
package com.sk89q.worldedit.extent.validation; package com.sk89q.worldedit.extent.validation;
import static com.google.common.base.Preconditions.checkArgument;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import static com.google.common.base.Preconditions.checkArgument;
/** /**
* Limits the number of blocks that can be changed before a * Limits the number of blocks that can be changed before a

Datei anzeigen

@ -19,16 +19,15 @@
package com.sk89q.worldedit.extent.validation; package com.sk89q.worldedit.extent.validation;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import static com.google.common.base.Preconditions.checkNotNull; import com.sk89q.worldedit.world.block.BlockType;
/** /**
* Validates set data to prevent creating invalid blocks and such. * Validates set data to prevent creating invalid blocks and such.

Datei anzeigen

@ -23,13 +23,12 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
/** /**
* Handles various quirks when setting blocks, such as ice turning * Handles various quirks when setting blocks, such as ice turning

Datei anzeigen

@ -19,15 +19,14 @@
package com.sk89q.worldedit.extent.world; package com.sk89q.worldedit.extent.world;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Automatically loads chunks when blocks are accessed. * Automatically loads chunks when blocks are accessed.

Datei anzeigen

@ -19,22 +19,21 @@
package com.sk89q.worldedit.extent.world; package com.sk89q.worldedit.extent.world;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.BlockVector2D; import com.sk89q.worldedit.BlockVector2D;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.AbstractDelegateExtent;
import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.operation.RunContext; import com.sk89q.worldedit.function.operation.RunContext;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Implements "fast mode" which may skip physics, lighting, etc. * Implements "fast mode" which may skip physics, lighting, etc.
*/ */

Datei anzeigen

@ -19,14 +19,14 @@
package com.sk89q.worldedit.function; package com.sk89q.worldedit.function;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
public class EditContext { public class EditContext {
private Extent destination; private Extent destination;

Datei anzeigen

@ -19,12 +19,12 @@
package com.sk89q.worldedit.function; package com.sk89q.worldedit.function;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.mask.Mask2D; import com.sk89q.worldedit.function.mask.Mask2D;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Passes calls to {@link #apply(com.sk89q.worldedit.Vector2D)} to the * Passes calls to {@link #apply(com.sk89q.worldedit.Vector2D)} to the
* delegate {@link com.sk89q.worldedit.function.FlatRegionFunction} if they * delegate {@link com.sk89q.worldedit.function.FlatRegionFunction} if they

Datei anzeigen

@ -19,13 +19,12 @@
package com.sk89q.worldedit.function; package com.sk89q.worldedit.function;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.Mask;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Applies a {@link RegionFunction} to the first ground block. * Applies a {@link RegionFunction} to the first ground block.
*/ */
@ -38,7 +37,7 @@ public class GroundFunction implements LayerFunction {
/** /**
* Create a new ground function. * Create a new ground function.
* *
* @param mask a mask * @param mask a mask
* @param function the function to apply * @param function the function to apply
*/ */
public GroundFunction(Mask mask, RegionFunction function) { public GroundFunction(Mask mask, RegionFunction function) {
@ -88,6 +87,7 @@ public class GroundFunction implements LayerFunction {
affected++; affected++;
} }
} }
return false; return false;
} }

Datei anzeigen

@ -19,12 +19,12 @@
package com.sk89q.worldedit.function; package com.sk89q.worldedit.function;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.Mask;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Passes calls to {@link #apply(com.sk89q.worldedit.Vector)} to the * Passes calls to {@link #apply(com.sk89q.worldedit.Vector)} to the
* delegate {@link com.sk89q.worldedit.function.RegionFunction} if they * delegate {@link com.sk89q.worldedit.function.RegionFunction} if they

Datei anzeigen

@ -19,14 +19,14 @@
package com.sk89q.worldedit.function.biome; package com.sk89q.worldedit.function.biome;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.FlatRegionFunction; import com.sk89q.worldedit.function.FlatRegionFunction;
import com.sk89q.worldedit.world.biome.BaseBiome; import com.sk89q.worldedit.world.biome.BaseBiome;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Replaces the biome at the locations that this function is applied to. * Replaces the biome at the locations that this function is applied to.
*/ */

Datei anzeigen

@ -19,6 +19,9 @@
package com.sk89q.worldedit.function.factory; package com.sk89q.worldedit.function.factory;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
import com.sk89q.worldedit.function.Contextual; import com.sk89q.worldedit.function.Contextual;
import com.sk89q.worldedit.function.EditContext; import com.sk89q.worldedit.function.EditContext;
import com.sk89q.worldedit.function.RegionFunction; import com.sk89q.worldedit.function.RegionFunction;
@ -27,9 +30,6 @@ import com.sk89q.worldedit.function.visitor.RegionVisitor;
import com.sk89q.worldedit.regions.NullRegion; import com.sk89q.worldedit.regions.NullRegion;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
public class Apply implements Contextual<Operation> { public class Apply implements Contextual<Operation> {
private final Region region; private final Region region;

Datei anzeigen

@ -19,6 +19,9 @@
package com.sk89q.worldedit.function.factory; package com.sk89q.worldedit.function.factory;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
@ -34,9 +37,6 @@ import com.sk89q.worldedit.regions.Region;
import java.util.List; import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
public class Deform implements Contextual<Operation> { public class Deform implements Contextual<Operation> {
private Extent destination; private Extent destination;

Datei anzeigen

@ -22,12 +22,12 @@ package com.sk89q.worldedit.function.generator;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.function.RegionFunction; import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern; import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
/** /**
* Generates flora (which may include tall grass, flowers, etc.). * Generates flora (which may include tall grass, flowers, etc.).

Datei anzeigen

@ -22,11 +22,11 @@ package com.sk89q.worldedit.function.generator;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.util.TreeGenerator;
import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.util.TreeGenerator;
/** /**
* Generates forests by searching for the ground starting from the given upper Y * Generates forests by searching for the ground starting from the given upper Y

Datei anzeigen

@ -26,8 +26,8 @@ import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.RegionFunction; import com.sk89q.worldedit.function.RegionFunction;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.Random; import java.util.Random;

Datei anzeigen

@ -58,4 +58,4 @@ public abstract class AbstractExtentMask extends AbstractMask {
this.extent = extent; this.extent = extent;
} }
} }

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.biome.BaseBiome; import com.sk89q.worldedit.world.biome.BaseBiome;
@ -28,8 +30,6 @@ import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Tests true if the biome at applied points is the same as the one given. * Tests true if the biome at applied points is the same as the one given.
*/ */

Datei anzeigen

@ -19,12 +19,12 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkArgument;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkArgument;
/** /**
* Has the criteria where the Y value of passed positions must be within * Has the criteria where the Y value of passed positions must be within
* a certain range of Y values (inclusive). * a certain range of Y values (inclusive).

Datei anzeigen

@ -19,8 +19,8 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.extent.Extent;
import javax.annotation.Nullable; import javax.annotation.Nullable;

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.internal.expression.Expression; import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.internal.expression.ExpressionException; import com.sk89q.worldedit.internal.expression.ExpressionException;
@ -27,8 +29,6 @@ import com.sk89q.worldedit.regions.shape.WorldEditExpressionEnvironment;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* A mask that evaluates an expression. * A mask that evaluates an expression.
* *

Datei anzeigen

@ -19,13 +19,13 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.internal.expression.Expression; import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.internal.expression.ExpressionException; import com.sk89q.worldedit.internal.expression.ExpressionException;
import com.sk89q.worldedit.internal.expression.runtime.EvaluationException; import com.sk89q.worldedit.internal.expression.runtime.EvaluationException;
import static com.google.common.base.Preconditions.checkNotNull;
public class ExpressionMask2D extends AbstractMask2D { public class ExpressionMask2D extends AbstractMask2D {
private final Expression expression; private final Expression expression;

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import java.util.Arrays; import java.util.Arrays;
@ -26,8 +28,6 @@ import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Tests true if all contained masks test true. * Tests true if all contained masks test true.
*/ */

Datei anzeigen

@ -19,14 +19,14 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.math.noise.NoiseGenerator; import com.sk89q.worldedit.math.noise.NoiseGenerator;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* A mask that uses a noise generator and returns true whenever the noise * A mask that uses a noise generator and returns true whenever the noise
* generator returns a value above the given density. * generator returns a value above the given density.

Datei anzeigen

@ -19,12 +19,12 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.math.noise.NoiseGenerator;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.math.noise.NoiseGenerator;
/** /**
* A mask that uses a noise generator and returns true whenever the noise * A mask that uses a noise generator and returns true whenever the noise
* generator returns a value above the given density. * generator returns a value above the given density.

Datei anzeigen

@ -19,10 +19,10 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import com.sk89q.worldedit.Vector2D;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector2D;
/** /**
* Checks whether another mask tests true for a position that is offset * Checks whether another mask tests true for a position that is offset
* a given vector. * a given vector.

Datei anzeigen

@ -19,13 +19,13 @@
package com.sk89q.worldedit.function.mask; package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* A mask that tests whether given positions are contained within a region. * A mask that tests whether given positions are contained within a region.
*/ */

Datei anzeigen

@ -19,12 +19,12 @@
package com.sk89q.worldedit.function.operation; package com.sk89q.worldedit.function.operation;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import java.util.List; import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Executes a delegete operation, but returns to another operation upon * Executes a delegete operation, but returns to another operation upon
* completing the delegate. * completing the delegate.

Datei anzeigen

@ -19,6 +19,8 @@
package com.sk89q.worldedit.function.operation; package com.sk89q.worldedit.function.operation;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
@ -27,8 +29,6 @@ import java.util.Collection;
import java.util.Deque; import java.util.Deque;
import java.util.List; import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Executes multiple queues in order. * Executes multiple queues in order.
*/ */

Datei anzeigen

@ -19,12 +19,12 @@
package com.sk89q.worldedit.function.util; package com.sk89q.worldedit.function.util;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.FlatRegionFunction; import com.sk89q.worldedit.function.FlatRegionFunction;
import static com.google.common.base.Preconditions.checkNotNull;
/** /**
* Offsets the position parameter by adding a given offset vector. * Offsets the position parameter by adding a given offset vector.
*/ */

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden Mehr anzeigen