Upstream merge

worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java

@@ -59,6 +59,7 @@ public abstract class LocalConfiguration {
     protected BlockMask disallowedBlocksMask;
     public int defaultChangeLimit = -1;
     public int maxChangeLimit = -1;
+    public int defaultVerticalHeight = 256;
     public int defaultMaxPolygonalPoints = -1;
     public int maxPolygonalPoints = 20;
     public int defaultMaxPolyhedronPoints = -1;

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/Chunk3dVectorConverter.java

@@ -0,0 +1,94 @@
+/*
+ * 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.worldedit.command.argument;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Range;
+import com.google.common.reflect.TypeToken;
+import com.sk89q.worldedit.internal.annotation.Chunk3d;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.formatting.text.Component;
+import com.sk89q.worldedit.util.formatting.text.TextComponent;
+import org.enginehub.piston.CommandManager;
+import org.enginehub.piston.converter.ArgumentConverter;
+import org.enginehub.piston.converter.ArgumentConverters;
+import org.enginehub.piston.converter.ConversionResult;
+import org.enginehub.piston.converter.FailedConversion;
+import org.enginehub.piston.converter.SuccessfulConversion;
+import org.enginehub.piston.inject.InjectedValueAccess;
+import org.enginehub.piston.inject.Key;
+
+import java.util.List;
+import java.util.function.Function;
+
+public class Chunk3dVectorConverter<C, T> implements ArgumentConverter<T> {
+    public static void register(CommandManager commandManager) {
+        CommaSeparatedValuesConverter<Integer> intConverter = CommaSeparatedValuesConverter.wrap(ArgumentConverters.get(TypeToken.of(int.class)));
+        commandManager.registerConverter(Key.of(BlockVector3.class, Chunk3d.class),
+            new Chunk3dVectorConverter<>(
+                intConverter,
+                Range.closed(2, 3),
+                cmps -> {
+                    switch (cmps.size()) {
+                        case 2:
+                            return BlockVector3.at(cmps.get(0), 0, cmps.get(1));
+                        case 3:
+                            return BlockVector3.at(cmps.get(0), cmps.get(1), cmps.get(2));
+                    }
+                    throw new AssertionError("Expected 2 or 3 components");
+                },
+                "block vector with x,z or x,y,z"
+            ));
+    }
+
+    private final ArgumentConverter<C> componentConverter;
+    private final Range<Integer> componentCount;
+    private final Function<List<C>, T> vectorConstructor;
+    private final String acceptableArguments;
+
+    private Chunk3dVectorConverter(ArgumentConverter<C> componentConverter,
+                                   Range<Integer> componentCount,
+                                   Function<List<C>, T> vectorConstructor,
+                                   String acceptableArguments) {
+        this.componentConverter = componentConverter;
+        this.componentCount = componentCount;
+        this.vectorConstructor = vectorConstructor;
+        this.acceptableArguments = acceptableArguments;
+    }
+
+    @Override
+    public Component describeAcceptableArguments() {
+        return TextComponent.of("any " + acceptableArguments);
+    }
+
+    @Override
+    public ConversionResult<T> convert(String argument, InjectedValueAccess context) {
+        ConversionResult<C> components = componentConverter.convert(argument, context);
+        if (!components.isSuccessful()) {
+            return components.failureAsAny();
+        }
+        if (!componentCount.contains(components.get().size())) {
+            return FailedConversion.from(new IllegalArgumentException(
+                "Must have " + componentCount + " vector components"));
+        }
+        T vector = vectorConstructor.apply(ImmutableList.copyOf(components.get()));
+        return SuccessfulConversion.fromSingle(vector);
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/HeightConverter.java

@@ -0,0 +1,74 @@
+/*
+ * 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.worldedit.command.argument;
+
+import com.google.common.reflect.TypeToken;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.internal.annotation.VertHeight;
+import com.sk89q.worldedit.util.formatting.text.Component;
+import com.sk89q.worldedit.util.formatting.text.TextComponent;
+import org.enginehub.piston.CommandManager;
+import org.enginehub.piston.converter.ArgumentConverter;
+import org.enginehub.piston.converter.ArgumentConverters;
+import org.enginehub.piston.converter.ConversionResult;
+import org.enginehub.piston.converter.SuccessfulConversion;
+import org.enginehub.piston.inject.InjectedValueAccess;
+import org.enginehub.piston.inject.Key;
+
+/**
+ * Converter for handling default heights as the
+ * {@linkplain LocalConfiguration#defaultVerticalHeight currently configured
+ * height}.
+ */
+public class HeightConverter implements ArgumentConverter<Integer> {
+
+    /**
+     * The value that converts to the default vertical height.
+     */
+    public static final String DEFAULT_VALUE = "default-vertical-height";
+
+    private static final ArgumentConverter<Integer> INT_CONVERTER =
+        ArgumentConverters.get(TypeToken.of(int.class));
+
+    public static void register(CommandManager commandManager) {
+        commandManager.registerConverter(Key.of(int.class, VertHeight.class),
+            new HeightConverter()
+        );
+    }
+
+    private HeightConverter() {
+    }
+
+    @Override
+    public Component describeAcceptableArguments() {
+        return TextComponent.of("Any integer");
+    }
+
+    @Override
+    public ConversionResult<Integer> convert(String argument, InjectedValueAccess context) {
+        if (DEFAULT_VALUE.equals(argument)) {
+            return SuccessfulConversion.fromSingle(
+                WorldEdit.getInstance().getConfiguration().defaultVerticalHeight
+            );
+        }
+        return INT_CONVERTER.convert(argument, context);
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormat.java

@@ -135,25 +135,6 @@ public interface ClipboardFormat {
     }
 
 
-    default URL uploadPublic(final Clipboard clipboard, String category, String user) {
-        // summary
-        // blocks
-        HashMap<String, Object> map = new HashMap<>();
-        BlockVector3 dimensions = clipboard.getDimensions();
-        map.put("width", dimensions.getX());
-        map.put("height", dimensions.getY());
-        map.put("length", dimensions.getZ());
-        map.put("creator", user);
-        Gson gson = new Gson();
-        String json = gson.toJson(map);
-        return MainUtil.upload(Settings.IMP.WEB.ASSETS, false, json, category, null, new RunnableVal<OutputStream>() {
-            @Override
-            public void run(OutputStream value) {
-                write(value, clipboard);
-            }
-        });
-    }
-
     default URL uploadAnonymous(final Clipboard clipboard) {
         return MainUtil.upload(null, null, getPrimaryFileExtension(), new RunnableVal<OutputStream>() {
             @Override

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java

@@ -177,18 +177,8 @@ public class ClipboardFormats {
             input = new URL(base, "uploads/" + input.substring(4) + "." + format.getPrimaryFileExtension()).toString();
         }
         if (input.startsWith("http")) {
-            if (!player.hasPermission("worldedit.schematic.load.asset")) {
-                if (message) player.print(Caption.of("fawe.error.no-perm", "worldedit.schematic.load.asset"));
             return null;
         }
-            URL url = new URL(input);
-            URL webInterface = new URL(Settings.IMP.WEB.ASSETS);
-            if (!url.getHost().equalsIgnoreCase(webInterface.getHost())) {
-                if (message) player.print(Caption.of("fawe.error.web.unauthorized", url));
-                return null;
-            }
-            return loadAllFromUrl(url);
-        } else {
         if (Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS && Pattern.compile("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}").matcher(input).find() && !player.hasPermission("worldedit.schematic.load.other")) {
             player.print(Caption.of("fawe.error.no-perm", "worldedit.schematic.load.other"));
             return null;
@@ -252,7 +242,6 @@ public class ClipboardFormats {
         }
         return new MultiClipboardHolder(f.toURI(), clipboards);
     }
-    }
 
     public static URIClipboardHolder[] loadAllFromDirectory(File dir) {
         HashSet<String> extensions = new HashSet<>(Arrays.asList(ClipboardFormats.getFileExtensionArray()));

worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/Chunk3d.java

@@ -0,0 +1,41 @@
+/*
+ * 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.worldedit.internal.annotation;
+
+import org.enginehub.piston.inject.InjectAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that this value is for 3d-chunk compatibility.
+ *
+ * <p>
+ * For vectors, this means that the vector supports 2D & 3D inputs,
+ * with 2D getting a Y value of 0.
+ * </p>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+@InjectAnnotation
+public @interface Chunk3d {
+}

worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/VertHeight.java

@@ -0,0 +1,36 @@
+/*
+ * 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.worldedit.internal.annotation;
+
+import org.enginehub.piston.inject.InjectAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that this value is for holding the vertical height.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+@InjectAnnotation
+public @interface VertHeight {
+}

worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/BiomeMath.java

@@ -0,0 +1,51 @@
+/*
+ * 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.worldedit.internal.util;
+
+import net.royawesome.jlibnoise.MathHelper;
+
+public class BiomeMath {
+
+    // From BiomeArray / BiomeContainer
+    public static final int HORIZONTAL_SECTION_COUNT = (int) Math.round(Math.log(16.0D) / Math.log(2.0D)) - 2;
+    public static final int VERTICAL_SECTION_COUNT = (int)Math.round(Math.log(256.0D) / Math.log(2.0D)) - 2;
+    public static final int HORIZONTAL_BIT_MASK = (1 << HORIZONTAL_SECTION_COUNT) - 1;
+    public static final int VERTICAL_BIT_MASK = (1 << VERTICAL_SECTION_COUNT) - 1;
+
+    private BiomeMath() {
+    }
+
+    /**
+     * Compute the index into the MC biome array.
+     *
+     * @param x the block x coordinate
+     * @param y the block y coordinate
+     * @param z the block z coordinate
+     * @return the index into the standard MC biome array
+     */
+    public static int computeBiomeIndex(int x, int y, int z) {
+        int l = x & HORIZONTAL_BIT_MASK;
+        int m = MathHelper.clamp(y, 0, VERTICAL_BIT_MASK);
+        int n = z & HORIZONTAL_BIT_MASK;
+        return m << HORIZONTAL_SECTION_COUNT + HORIZONTAL_SECTION_COUNT
+            | n << HORIZONTAL_SECTION_COUNT
+            | l;
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeData.java

@@ -21,7 +21,10 @@ package com.sk89q.worldedit.world.biome;
 
 /**
  * Provides information about a biome.
+ *
+ * @deprecated This no longer returns useful information.
  */
+@Deprecated
 public interface BiomeData {
 
     /**

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

@@ -28,7 +28,10 @@ import javax.annotation.Nullable;
 
 /**
  * Returns the name of a biome using a given {@code BiomeRegistry}.
+ *
+ * @deprecated for removal, appears to be unused
  */
+@Deprecated
 class BiomeName implements Function<BiomeType, String> {
 
     private final BiomeRegistry registry;

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

@@ -35,7 +35,10 @@ import javax.annotation.Nullable;
 
 /**
  * Utility methods related to biomes.
+ *
+ * @deprecated Only method is being deprecated for removal.
  */
+@Deprecated
 public final class Biomes {
 
     private Biomes() {
@@ -48,7 +51,9 @@ public final class Biomes {
      * @param name the name to test
      * @param registry a biome registry
      * @return a biome or null
+     * @deprecated This uses the outdated name system. Find names by comparing with their ID instead.
      */
+    @Deprecated
     @Nullable
     public static BiomeType findBiomeByName(Collection<BiomeType> biomes, String name, BiomeRegistry registry) {
         checkNotNull(biomes);

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

@@ -21,7 +21,6 @@ package com.sk89q.worldedit.world.block;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.boydti.fawe.beta.ITileInput;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
@@ -36,6 +35,7 @@ import com.sk89q.worldedit.world.registry.BlockMaterial;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
 import java.util.Map;
 import java.util.Objects;
+
 import javax.annotation.Nullable;
 
 /**

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BiomeRegistry.java

@@ -35,6 +35,7 @@ public interface BiomeRegistry {
      * @param biome the biome
      * @return a data object or null if information is not known
      */
+    @Deprecated
     @Nullable
     BiomeData getData(BiomeType biome);
 

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

@@ -40,6 +40,7 @@ public interface BlockRegistry {
      * @param blockType the block
      * @return The name, or null if it's unknown
      */
+    @Deprecated
     @Nullable
     String getName(BlockType blockType);
 

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

@@ -33,6 +33,7 @@ public interface ItemRegistry {
      * @param itemType the item
      * @return The name, or null if it's unknown
      */
+    @Deprecated
     @Nullable
     String getName(ItemType itemType);
 

worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/ChunkStore.java

@@ -40,6 +40,22 @@ public abstract class ChunkStore implements Closeable {
      */
     public static final int CHUNK_SHIFTS = 4;
 
+    /**
+     * {@code >>} - to Y of 3D-chunk
+     * {@code <<} - from Y of 3D-chunk
+     */
+    public static final int CHUNK_SHIFTS_Y = 8;
+
+    /**
+     * Convert a position to a 3D-chunk. Y is counted in steps of 256.
+     *
+     * @param position the position
+     * @return chunk coordinates
+     */
+    public static BlockVector3 toChunk3d(BlockVector3 position) {
+        return position.shr(CHUNK_SHIFTS, CHUNK_SHIFTS_Y, CHUNK_SHIFTS);
+    }
+
     /**
      * Convert a position to a chunk.
      *