Implement block states for commands and /testforblock command

src/main/java/net/glowstone/GlowServer.java

@@ -11,7 +11,7 @@
 import net.glowstone.advancement.GlowAdvancementDisplay;
 import net.glowstone.block.BuiltinMaterialValueManager;
 import net.glowstone.block.MaterialValueManager;
-import net.glowstone.block.state.GlowDispenser;
+import net.glowstone.block.entity.state.GlowDispenser;
 import net.glowstone.boss.BossBarManager;
 import net.glowstone.boss.GlowBossBar;
 import net.glowstone.client.GlowClient;
@@ -861,6 +861,7 @@ private void loadPlugins() {
         commandMap.register("minecraft", new EffectCommand());
         commandMap.register("minecraft", new EnchantCommand());
         commandMap.register("minecraft", new TestForCommand());
+        commandMap.register("minecraft", new TestForBlockCommand());
 
         File folder = new File(config.getString(Key.PLUGIN_FOLDER));
         if (!folder.isDirectory() && !folder.mkdirs()) {

src/main/java/net/glowstone/block/blocktype/BlockBanner.java

@@ -4,7 +4,7 @@
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.block.entity.BlockEntity;
 import net.glowstone.block.entity.BannerEntity;
-import net.glowstone.block.state.GlowBanner;
+import net.glowstone.block.entity.state.GlowBanner;
 import net.glowstone.chunk.GlowChunk;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.util.nbt.CompoundTag;

src/main/java/net/glowstone/block/blocktype/BlockBed.java

@@ -5,7 +5,7 @@
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.block.entity.BedEntity;
 import net.glowstone.block.entity.BlockEntity;
-import net.glowstone.block.state.GlowBed;
+import net.glowstone.block.entity.state.GlowBed;
 import net.glowstone.chunk.GlowChunk;
 import net.glowstone.entity.GlowPlayer;
 import org.bukkit.DyeColor;

src/main/java/net/glowstone/block/blocktype/BlockDispenser.java

@@ -4,7 +4,7 @@
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.block.entity.BlockEntity;
 import net.glowstone.block.entity.DispenserEntity;
-import net.glowstone.block.state.GlowDispenser;
+import net.glowstone.block.entity.state.GlowDispenser;
 import net.glowstone.chunk.GlowChunk;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.inventory.MaterialMatcher;

src/main/java/net/glowstone/block/blocktype/BlockFlowerPot.java

@@ -4,7 +4,7 @@
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.block.entity.BlockEntity;
 import net.glowstone.block.entity.FlowerPotEntity;
-import net.glowstone.block.state.GlowFlowerPot;
+import net.glowstone.block.entity.state.GlowFlowerPot;
 import net.glowstone.chunk.GlowChunk;
 import net.glowstone.entity.GlowPlayer;
 import org.bukkit.GrassSpecies;

src/main/java/net/glowstone/block/blocktype/BlockHopper.java

@@ -5,7 +5,7 @@
 import net.glowstone.block.entity.BlockEntity;
 import net.glowstone.block.entity.ContainerEntity;
 import net.glowstone.block.entity.HopperEntity;
-import net.glowstone.block.state.GlowHopper;
+import net.glowstone.block.entity.state.GlowHopper;
 import net.glowstone.chunk.GlowChunk;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.entity.objects.GlowItem;

src/main/java/net/glowstone/block/blocktype/BlockJukebox.java

@@ -3,7 +3,7 @@
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.entity.BlockEntity;
 import net.glowstone.block.entity.JukeboxEntity;
-import net.glowstone.block.state.GlowJukebox;
+import net.glowstone.block.entity.state.GlowJukebox;
 import net.glowstone.chunk.GlowChunk;
 import net.glowstone.entity.GlowPlayer;
 import org.bukkit.GameMode;

src/main/java/net/glowstone/block/blocktype/BlockSkull.java

@@ -4,7 +4,7 @@
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.block.entity.SkullEntity;
 import net.glowstone.block.entity.BlockEntity;
-import net.glowstone.block.state.GlowSkull;
+import net.glowstone.block.entity.state.GlowSkull;
 import net.glowstone.chunk.GlowChunk;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.util.pattern.BlockPattern;

src/main/java/net/glowstone/block/entity/BannerEntity.java

@@ -3,7 +3,7 @@
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.block.blocktype.BlockBanner;
-import net.glowstone.block.state.GlowBanner;
+import net.glowstone.block.entity.state.GlowBanner;
 import net.glowstone.constants.GlowBlockEntity;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.util.nbt.CompoundTag;

src/main/java/net/glowstone/block/entity/BedEntity.java

@@ -4,7 +4,7 @@
 import lombok.Setter;
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowBed;
+import net.glowstone.block.entity.state.GlowBed;
 import net.glowstone.constants.GlowBlockEntity;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.util.nbt.CompoundTag;

src/main/java/net/glowstone/block/entity/BrewingStandEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowBrewingStand;
+import net.glowstone.block.entity.state.GlowBrewingStand;
 import net.glowstone.inventory.GlowBrewerInventory;
 import net.glowstone.util.nbt.CompoundTag;
 

src/main/java/net/glowstone/block/entity/ChestEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowChest;
+import net.glowstone.block.entity.state.GlowChest;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.inventory.GlowChestInventory;
 import net.glowstone.net.message.play.game.BlockActionMessage;

src/main/java/net/glowstone/block/entity/DispenserEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowDispenser;
+import net.glowstone.block.entity.state.GlowDispenser;
 import net.glowstone.inventory.GlowInventory;
 import org.bukkit.event.inventory.InventoryType;
 

src/main/java/net/glowstone/block/entity/DropperEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowDropper;
+import net.glowstone.block.entity.state.GlowDropper;
 
 public class DropperEntity extends DispenserEntity {
 

src/main/java/net/glowstone/block/entity/FlowerPotEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowFlowerPot;
+import net.glowstone.block.entity.state.GlowFlowerPot;
 import net.glowstone.constants.GlowBlockEntity;
 import net.glowstone.constants.ItemIds;
 import net.glowstone.entity.GlowPlayer;

src/main/java/net/glowstone/block/entity/FurnaceEntity.java

@@ -4,7 +4,7 @@
 import net.glowstone.GlowServer;
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowFurnace;
+import net.glowstone.block.entity.state.GlowFurnace;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.inventory.GlowFurnaceInventory;
 import net.glowstone.inventory.crafting.CraftingManager;

src/main/java/net/glowstone/block/entity/HopperEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowHopper;
+import net.glowstone.block.entity.state.GlowHopper;
 import net.glowstone.inventory.GlowInventory;
 import org.bukkit.event.inventory.InventoryType;
 

src/main/java/net/glowstone/block/entity/JukeboxEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowJukebox;
+import net.glowstone.block.entity.state.GlowJukebox;
 import net.glowstone.io.nbt.NbtSerialization;
 import net.glowstone.util.nbt.CompoundTag;
 import org.bukkit.inventory.ItemStack;

src/main/java/net/glowstone/block/entity/MobSpawnerEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowCreatureSpawner;
+import net.glowstone.block.entity.state.GlowCreatureSpawner;
 import net.glowstone.util.nbt.CompoundTag;
 import org.bukkit.entity.EntityType;
 

src/main/java/net/glowstone/block/entity/NoteblockEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowNoteBlock;
+import net.glowstone.block.entity.state.GlowNoteBlock;
 import net.glowstone.util.nbt.CompoundTag;
 import org.bukkit.Note;
 

src/main/java/net/glowstone/block/entity/SignEntity.java

@@ -2,7 +2,7 @@
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
-import net.glowstone.block.state.GlowSign;
+import net.glowstone.block.entity.state.GlowSign;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.util.TextMessage;
 import net.glowstone.util.nbt.CompoundTag;

src/main/java/net/glowstone/block/entity/SkullEntity.java

@@ -3,7 +3,7 @@
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;
 import net.glowstone.block.blocktype.BlockSkull;
-import net.glowstone.block.state.GlowSkull;
+import net.glowstone.block.entity.state.GlowSkull;
 import net.glowstone.constants.GlowBlockEntity;
 import net.glowstone.entity.GlowPlayer;
 import net.glowstone.entity.meta.profile.PlayerProfile;

src/main/java/net/glowstone/block/state/GlowBanner.java → src/main/java/net/glowstone/block/entity/state/GlowBanner.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;

src/main/java/net/glowstone/block/state/GlowBeacon.java → src/main/java/net/glowstone/block/entity/state/GlowBeacon.java

@@ -1,5 +1,5 @@
 
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.entity.BeaconEntity;

src/main/java/net/glowstone/block/state/GlowBed.java → src/main/java/net/glowstone/block/entity/state/GlowBed.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;

src/main/java/net/glowstone/block/state/GlowBrewingStand.java → src/main/java/net/glowstone/block/entity/state/GlowBrewingStand.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.entity.BrewingStandEntity;

src/main/java/net/glowstone/block/state/GlowChest.java → src/main/java/net/glowstone/block/entity/state/GlowChest.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.GlowServer;
 import net.glowstone.block.GlowBlock;

src/main/java/net/glowstone/block/state/GlowContainer.java → src/main/java/net/glowstone/block/entity/state/GlowContainer.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import com.destroystokyo.paper.loottable.LootableBlockInventory;
 import net.glowstone.block.GlowBlock;

src/main/java/net/glowstone/block/state/GlowCreatureSpawner.java → src/main/java/net/glowstone/block/entity/state/GlowCreatureSpawner.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;

src/main/java/net/glowstone/block/state/GlowDispenser.java → src/main/java/net/glowstone/block/entity/state/GlowDispenser.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.entity.DispenserEntity;

src/main/java/net/glowstone/block/state/GlowDropper.java → src/main/java/net/glowstone/block/entity/state/GlowDropper.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import org.bukkit.block.Dropper;

src/main/java/net/glowstone/block/state/GlowFlowerPot.java → src/main/java/net/glowstone/block/entity/state/GlowFlowerPot.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;

src/main/java/net/glowstone/block/state/GlowFurnace.java → src/main/java/net/glowstone/block/entity/state/GlowFurnace.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.entity.FurnaceEntity;

src/main/java/net/glowstone/block/state/GlowHopper.java → src/main/java/net/glowstone/block/entity/state/GlowHopper.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.entity.HopperEntity;

src/main/java/net/glowstone/block/state/GlowJukebox.java → src/main/java/net/glowstone/block/entity/state/GlowJukebox.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;

src/main/java/net/glowstone/block/state/GlowNoteBlock.java → src/main/java/net/glowstone/block/entity/state/GlowNoteBlock.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.EventFactory;
 import net.glowstone.block.GlowBlock;

src/main/java/net/glowstone/block/state/GlowSign.java → src/main/java/net/glowstone/block/entity/state/GlowSign.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;

src/main/java/net/glowstone/block/state/GlowSkull.java → src/main/java/net/glowstone/block/entity/state/GlowSkull.java

@@ -1,4 +1,4 @@
-package net.glowstone.block.state;
+package net.glowstone.block.entity.state;
 
 import net.glowstone.block.GlowBlock;
 import net.glowstone.block.GlowBlockState;

src/main/java/net/glowstone/block/state/BlockStateData.java

@@ -0,0 +1,55 @@
+package net.glowstone.block.state;
+
+import com.google.common.collect.Maps;
+
+import java.util.Map;
+
+public class BlockStateData {
+
+    private final Map<String, String> map = Maps.newHashMap();
+    private final int numericValue;
+
+    public BlockStateData(int numericValue) {
+        this.numericValue = numericValue;
+    }
+
+    public BlockStateData() {
+        this.numericValue = -1;
+    }
+
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    public void put(String key, String value) {
+        map.put(key, value);
+    }
+
+    public boolean contains(String key) {
+        return map.containsKey(key);
+    }
+
+    public String get(String key) {
+        return map.get(key);
+    }
+
+    public boolean isNumeric() {
+        return numericValue != -1;
+    }
+
+    public int getNumericValue() {
+        return numericValue;
+    }
+
+    @Override
+    public String toString() {
+        if (isNumeric()) {
+            return String.valueOf(numericValue);
+        }
+        StringBuilder builder = new StringBuilder();
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            builder.append(",").append(entry.getKey()).append("=").append(entry.getValue());
+        }
+        return builder.length() == 0 ? builder.toString() : builder.substring(1);
+    }
+}

src/main/java/net/glowstone/block/state/BlockStateReader.java

@@ -0,0 +1,15 @@
+package net.glowstone.block.state;
+
+import org.bukkit.Material;
+import org.bukkit.material.MaterialData;
+
+import java.util.Set;
+
+public abstract class BlockStateReader<T extends MaterialData> {
+
+    public abstract Set<String> getValidStates();
+
+    public abstract T read(Material material, BlockStateData data) throws InvalidBlockStateException;
+
+    public abstract boolean matches(BlockStateData state, T data) throws InvalidBlockStateException;
+}

src/main/java/net/glowstone/block/state/InvalidBlockStateException.java

@@ -0,0 +1,14 @@
+package net.glowstone.block.state;
+
+import net.glowstone.constants.ItemIds;
+import org.bukkit.Material;
+
+public class InvalidBlockStateException extends Exception {
+    public InvalidBlockStateException(Material material, String state) {
+        super("'" + state + "' is not a state for block " + ItemIds.getName(material));
+    }
+
+    public InvalidBlockStateException(Material material, BlockStateData state) {
+        super("'" + state.toString() + "' is not a state for block " + ItemIds.getName(material));
+    }
+}