Merge upstream changes through 88f22f2e

This was not a straightforward merge. A new method was added upstream to:
        worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java

This file has been substantially changed vs upstream worldedit. I merged
things as best I could - added the new method to this interface, and
then implemented it in:
        worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

Unfortunately there's no easy way to test that it works - so I left a note...

Signed-off-by: Byron Marohn <combustible@live.com>

worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/AbstractProperty.java

@@ -116,6 +116,11 @@ public class AbstractProperty<T> implements Property<T> {
         return this.name;
     }
 
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{name=" + name + "}";
+    }
+
     @Override
     public int hashCode() {
         return name.hashCode();

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

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.world.block;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.collect.ImmutableList;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
@@ -138,7 +140,9 @@ public interface BlockType extends FawePattern, Comparable<BlockTypes> {
      */
     @Deprecated
     default <V> Property<V> getProperty(String name) {
-        return getPropertyMap().get(name);
+        Property<V> property = getPropertyMap().get(name);
+        checkArgument(property != null, "%s has no property named %s", this, name);
+        return property;
     }
 
     default boolean hasProperty(PropertyKey key) {
@@ -146,7 +150,9 @@ public interface BlockType extends FawePattern, Comparable<BlockTypes> {
     }
 
     default <V> Property<V> getProperty(PropertyKey key) {
-        return getPropertyMap().get(key.getId());
+        Property<V> property = getPropertyMap().get(key.getId());
+        checkArgument(property != null, "%s has no property named %s", this, key.getId());
+        return property;
     }
 
     /**
@@ -163,6 +169,13 @@ public interface BlockType extends FawePattern, Comparable<BlockTypes> {
      */
     List<BlockState> getAllStates();
 
+    /**
+     * Gets a state of this BlockType with the given properties.
+     *
+     * @return The state, if it exists
+     */
+    BlockState getState(Map<Property<?>, Object> key);
+
     /**
      * Gets whether this block type has an item representation.
      *

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

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.world.block;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.boydti.fawe.Fawe;
 import com.boydti.fawe.command.SuggestInputParseException;
 import com.boydti.fawe.util.MathMan;
@@ -825,6 +827,24 @@ public enum BlockTypes implements BlockType {
         return IntStream.of(settings.stateOrdinals).filter(i -> i != -1).mapToObj(i -> states[i]).collect(Collectors.toList());
     }
 
+    public BlockState getState(Map<Property<?>, Object> key) {
+        int id = getInternalId();
+        for (Map.Entry<Property<?>, Object> iter : key.entrySet()) {
+            Property<?> prop = iter.getKey();
+            Object value = iter.getValue();
+
+            /*
+             * TODO:
+             * This is likely wrong. The only place this seems to currently (Dec 23 2018)
+             * be invoked is via ForgeWorld, and value is a String when invoked there...
+             */
+            AbstractProperty btp = settings.propertiesMap.get(prop.getName());
+            checkArgument(btp != null, "%s has no property named %s", this, prop.getName());
+            id = btp.modify(id, btp.getValueFor((String)value));
+        }
+        return withStateId(id);
+    }
+
     @Deprecated
     public int getMaxStateId() {
         return settings.permutations;

worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeAdapter.java

@@ -19,13 +19,27 @@
 
 package com.sk89q.worldedit.forge;
 
+import com.google.common.collect.ImmutableList;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.registry.state.BooleanProperty;
+import com.sk89q.worldedit.registry.state.DirectionalProperty;
+import com.sk89q.worldedit.registry.state.EnumProperty;
+import com.sk89q.worldedit.registry.state.IntegerProperty;
+import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.world.World;
+
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
+import java.util.stream.Collectors;
+
 final class ForgeAdapter {
 
     private ForgeAdapter() {
@@ -60,8 +74,41 @@ final class ForgeAdapter {
         }
     }
 
+    public static Direction adaptEnumFacing(EnumFacing face) {
+        switch (face) {
+            case NORTH: return Direction.NORTH;
+            case SOUTH: return Direction.SOUTH;
+            case WEST: return Direction.WEST;
+            case EAST: return Direction.EAST;
+            case DOWN: return Direction.DOWN;
+            case UP:
+            default:
+                return Direction.UP;
+        }
+    }
+
     public static BlockPos toBlockPos(Vector vector) {
         return new BlockPos(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ());
     }
 
+    public static Property<?> adaptProperty(IProperty<?> property) {
+        if (property instanceof PropertyBool) {
+            return new BooleanProperty(property.getName(), ImmutableList.copyOf(((PropertyBool) property).getAllowedValues()));
+        }
+        if (property instanceof PropertyInteger) {
+            return new IntegerProperty(property.getName(), ImmutableList.copyOf(((PropertyInteger) property).getAllowedValues()));
+        }
+        if (property instanceof PropertyDirection) {
+            return new DirectionalProperty(property.getName(), ((PropertyDirection) property).getAllowedValues().stream()
+                    .map(ForgeAdapter::adaptEnumFacing)
+                    .collect(Collectors.toList()));
+        }
+        if (property instanceof PropertyEnum) {
+            return new EnumProperty(property.getName(), ((PropertyEnum<?>) property).getAllowedValues().stream()
+                    .map(e -> e.getName())
+                    .collect(Collectors.toList()));
+        }
+        return new IPropertyAdapter<>(property);
+    }
+
 }

worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBlockMaterial.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.forge;
+
+import com.sk89q.worldedit.world.registry.BlockMaterial;
+import com.sk89q.worldedit.world.registry.PassthroughBlockMaterial;
+
+import net.minecraft.block.material.EnumPushReaction;
+import net.minecraft.block.material.Material;
+
+import javax.annotation.Nullable;
+
+/**
+ * Forge block material that pulls as much info as possible from the Minecraft
+ * Material, and passes the rest to another implementation, typically the
+ * bundled block info.
+ */
+public class ForgeBlockMaterial extends PassthroughBlockMaterial {
+
+    private final Material delegate;
+
+    public ForgeBlockMaterial(Material delegate, @Nullable BlockMaterial secondary) {
+        super(secondary);
+        this.delegate = delegate;
+    }
+
+    @Override
+    public boolean isAir() {
+        return delegate == Material.AIR || super.isAir();
+    }
+
+    @Override
+    public boolean isOpaque() {
+        return delegate.isOpaque();
+    }
+
+    @Override
+    public boolean isLiquid() {
+        return delegate.isLiquid();
+    }
+
+    @Override
+    public boolean isSolid() {
+        return delegate.isSolid();
+    }
+
+    @Override
+    public boolean isFragileWhenPushed() {
+        return delegate.getMobilityFlag() == EnumPushReaction.DESTROY;
+    }
+
+    @Override
+    public boolean isUnpushable() {
+        return delegate.getMobilityFlag() == EnumPushReaction.BLOCK;
+    }
+
+    @Override
+    public boolean isMovementBlocker() {
+        return delegate.blocksMovement();
+    }
+
+    @Override
+    public boolean isBurnable() {
+        return delegate.getCanBurn();
+    }
+
+    @Override
+    public boolean isToolRequired() {
+        return !delegate.isToolNotRequired();
+    }
+
+    @Override
+    public boolean isReplacedDuringPlacement() {
+        return delegate.isReplaceable();
+    }
+
+}

worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBlockRegistry.java

@@ -0,0 +1,58 @@
+/*
+ * 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.forge;
+
+import com.sk89q.worldedit.registry.state.Property;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
+import com.sk89q.worldedit.world.registry.BundledBlockRegistry;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class ForgeBlockRegistry extends BundledBlockRegistry {
+
+    private Map<Material, ForgeBlockMaterial> materialMap = new HashMap<>();
+
+    @Override
+    public BlockMaterial getMaterial(BlockType blockType) {
+        return materialMap.computeIfAbsent(Block.getBlockFromName(blockType.getId()).getDefaultState().getMaterial(),
+                m -> new ForgeBlockMaterial(m, super.getMaterial(blockType)));
+    }
+
+    @Override
+    public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
+        Map<String, Property<?>> map = new TreeMap<>();
+        Collection<IProperty<?>> propertyKeys = Block.getBlockFromName(blockType.getId())
+                .getDefaultState()
+                .getPropertyKeys();
+        for (IProperty<?> key : propertyKeys) {
+            map.put(key.getName(), ForgeAdapter.adaptProperty(key));
+        }
+        return map;
+    }
+
+}

worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeRegistries.java

@@ -20,6 +20,7 @@
 package com.sk89q.worldedit.forge;
 
 import com.sk89q.worldedit.world.registry.BiomeRegistry;
+import com.sk89q.worldedit.world.registry.BlockRegistry;
 import com.sk89q.worldedit.world.registry.BundledRegistries;
 import com.sk89q.worldedit.world.registry.ItemRegistry;
 
@@ -29,9 +30,15 @@ import com.sk89q.worldedit.world.registry.ItemRegistry;
 class ForgeRegistries extends BundledRegistries {
 
     private static final ForgeRegistries INSTANCE = new ForgeRegistries();
+    private final BlockRegistry blockRegistry = new ForgeBlockRegistry();
     private final BiomeRegistry biomeRegistry = new ForgeBiomeRegistry();
     private final ItemRegistry itemRegistry = new ForgeItemRegistry();
 
+    @Override
+    public BlockRegistry getBlockRegistry() {
+        return blockRegistry;
+    }
+
     @Override
     public BiomeRegistry getBiomeRegistry() {
         return biomeRegistry;

worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java

@@ -30,7 +30,6 @@ import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.blocks.BaseItem;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.entity.BaseEntity;
@@ -38,15 +37,17 @@ import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.internal.Constants;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.TreeGenerator.TreeType;
 import com.sk89q.worldedit.world.AbstractWorld;
 import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.item.ItemTypes;
-import com.sk89q.worldedit.world.registry.LegacyMapper;
 import com.sk89q.worldedit.world.weather.WeatherType;
 import com.sk89q.worldedit.world.weather.WeatherTypes;
 
@@ -55,6 +56,10 @@ import net.minecraft.block.BlockLeaves;
 import net.minecraft.block.BlockOldLeaf;
 import net.minecraft.block.BlockOldLog;
 import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.item.EntityItem;
@@ -66,7 +71,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -95,8 +102,11 @@ import net.minecraftforge.common.DimensionManager;
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
+import java.util.TreeMap;
 
 import javax.annotation.Nullable;
 
@@ -173,7 +183,11 @@ public class ForgeWorld extends AbstractWorld {
         Chunk chunk = world.getChunkFromChunkCoords(x >> 4, z >> 4);
         BlockPos pos = new BlockPos(x, y, z);
         IBlockState old = chunk.getBlockState(pos);
-        IBlockState newState = Block.getBlockById(block.getBlockType().getLegacyId()).getDefaultState(); // TODO .getStateFromMeta(block.getData());
+        Block mcBlock = Block.getBlockFromName(block.getBlockType().getId());
+        IBlockState newState = mcBlock.getDefaultState();
+        @SuppressWarnings("unchecked")
+        Map<Property<?>, Object> states = block.getStates();
+        newState = applyProperties(mcBlock.getBlockState(), newState, states);
         IBlockState successState = chunk.setBlockState(pos, newState);
         boolean successful = successState != null;
 
@@ -199,6 +213,29 @@ public class ForgeWorld extends AbstractWorld {
         return successful;
     }
 
+    // Can't get the "Object" to be right for withProperty w/o this
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private IBlockState applyProperties(BlockStateContainer stateContainer, IBlockState newState, Map<Property<?>, Object> states) {
+        for (Map.Entry<Property<?>, Object> state : states.entrySet()) {
+
+            IProperty property = stateContainer.getProperty(state.getKey().getName());
+            Comparable value = (Comparable) state.getValue();
+            // we may need to adapt this value, depending on the source prop
+            if (property instanceof PropertyDirection) {
+                Direction dir = (Direction) value;
+                value = ForgeAdapter.adapt(dir);
+            } else if (property instanceof PropertyEnum) {
+                String enumName = (String) value;
+                value = ((PropertyEnum<?>) property).parseValue((String) value).or(() -> {
+                    throw new IllegalStateException("Enum property " + property.getName() + " does not contain " + enumName);
+                });
+            }
+
+            newState = newState.withProperty(property, value);
+        }
+        return newState;
+    }
+
     @Override
     public int getBlockLightLevel(Vector position) {
         checkNotNull(position);
@@ -429,9 +466,24 @@ public class ForgeWorld extends AbstractWorld {
     public BlockState getBlock(Vector position) {
         World world = getWorld();
         BlockPos pos = new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ());
-        IBlockState state = world.getBlockState(pos);
+        IBlockState mcState = world.getBlockState(pos);
 
-        return LegacyMapper.getInstance().getBlockFromLegacy(Block.getIdFromBlock(state.getBlock()), state.getBlock().getMetaFromState(state));
+        BlockType blockType = BlockType.REGISTRY.get(Block.REGISTRY.getNameForObject(mcState.getBlock()).toString());
+        return blockType.getState(adaptProperties(blockType, mcState.getProperties()));
+    }
+
+    private Map<Property<?>, Object> adaptProperties(BlockType block, Map<IProperty<?>, Comparable<?>> mcProps) {
+        Map<Property<?>, Object> props = new TreeMap<>(Comparator.comparing(Property::getName));
+        for (Map.Entry<IProperty<?>, Comparable<?>> prop : mcProps.entrySet()) {
+            Object value = prop.getValue();
+            if (prop.getKey() instanceof PropertyDirection) {
+                value = ForgeAdapter.adaptEnumFacing((EnumFacing) value);
+            } else if (prop.getKey() instanceof PropertyEnum) {
+                value = ((IStringSerializable) value).getName();
+            }
+            props.put(block.getProperty(prop.getKey().getName()), value);
+        }
+        return props;
     }
 
     @Override

worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java

@@ -38,6 +38,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.CommandEvent;
@@ -125,12 +126,18 @@ public class ForgeWorldEdit {
             this.provider = new ForgePermissionsProvider.VanillaPermissionsProvider(platform);
         }
 
-        for (Block block : Block.REGISTRY) {
+        for (ResourceLocation name : Block.REGISTRY.getKeys()) {
-            BlockTypes.register(new BlockType(Block.REGISTRY.getNameForObject(block).toString()));
+            String nameStr = name.toString();
+            if (!BlockType.REGISTRY.keySet().contains(nameStr)) {
+                BlockTypes.register(new BlockType(nameStr));
+            }
         }
 
-        for (Item item : Item.REGISTRY) {
+        for (ResourceLocation name : Item.REGISTRY.getKeys()) {
-            ItemTypes.register(new ItemType(Item.REGISTRY.getNameForObject(item).toString()));
+            String nameStr = name.toString();
+            if (!ItemType.REGISTRY.keySet().contains(nameStr)) {
+                ItemTypes.register(new ItemType(nameStr));
+            }
         }
     }
 

worldedit-forge/src/main/java/com/sk89q/worldedit/forge/IPropertyAdapter.java

@@ -0,0 +1,72 @@
+/*
+ * 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.forge;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.registry.state.Property;
+
+import net.minecraft.block.properties.IProperty;
+
+import java.util.List;
+
+class IPropertyAdapter<T extends Comparable<T>> implements Property<T> {
+
+    private final IProperty<T> property;
+    private final List<T> values;
+
+    public IPropertyAdapter(IProperty<T> property) {
+        this.property = property;
+        this.values = ImmutableList.copyOf(property.getAllowedValues());
+    }
+
+    @Override
+    public String getName() {
+        return property.getName();
+    }
+
+    @Override
+    public List<T> getValues() {
+        return values;
+    }
+
+    @Override
+    public T getValueFor(String string) throws IllegalArgumentException {
+        Optional<T> val = property.parseValue(string);
+        checkArgument(val.isPresent(), "%s has no value for %s", getName(), string);
+        return val.get();
+    }
+
+    @Override
+    public int hashCode() {
+        return getName().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof Property)) {
+            return false;
+        }
+        return getName().equals(((Property<?>) obj).getName());
+    }
+
+}