Added support for block data and sign texts. Decoupled more code from the server modification.

src/com/sk89q/worldedit/blocks/BaseBlock.java

@@ -0,0 +1,92 @@
+// $Id$
+/*
+ * WorldEdit
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldedit.blocks;
+
+/**
+ * Represents a block.
+ *
+ * @author sk89q
+ */
+public class BaseBlock {
+    /**
+     * BaseBlock type.
+     */
+    private short type = 0;
+    /**
+     * BaseBlock data.
+     */
+    private char data = 0;
+
+    /**
+     * Construct the block with its type.
+     *
+     * @param type
+     */
+    public BaseBlock(int type) {
+        this.type = (short)type;
+    }
+
+    /**
+     * Construct the block with its type and data.
+     *
+     * @param type
+     */
+    public BaseBlock(int type, int data) {
+        this.type = (short)type;
+        this.data = (char)data;
+    }
+
+    /**
+     * @return the type
+     */
+    public int getType() {
+        return (int)type;
+    }
+
+    /**
+     * @param type the type to set
+     */
+    public void setType(int type) {
+        this.type = (short)type;
+    }
+
+    /**
+     * @return the data
+     */
+    public int getData() {
+        return (int)data;
+    }
+
+    /**
+     * @param data the data to set
+     */
+    public void setData(int data) {
+        this.data = (char)data;
+    }
+
+    /**
+     * Returns true if it's air.
+     *
+     * @return if air
+     */
+    public boolean isAir() {
+        return type == 0;
+    }
+}

src/com/sk89q/worldedit/blocks/SignBlock.java

@@ -0,0 +1,137 @@
+// $Id$
+/*
+ * WorldEdit
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldedit.blocks;
+
+import com.sk89q.worldedit.SchematicException;
+import java.util.Map;
+import java.util.HashMap;
+import org.jnbt.*;
+
+/**
+ *
+ * @author sk89q
+ */
+public class SignBlock extends BaseBlock implements TileEntityBlock {
+    /**
+     * Stores the sign's text.
+     */
+    private String[] text;
+
+    /**
+     * Construct the sign without text.
+     *
+     * @param text
+     */
+    public SignBlock(int type, int data) {
+        super(type, data);
+        this.text = new String[]{ "", "", "", "" };
+    }
+
+    /**
+     * Construct the sign with text.
+     *
+     * @param text
+     */
+    public SignBlock(int type, int data, String[] text) {
+        super(type, data);
+        this.text = text;
+    }
+
+    /**
+     * @return the text
+     */
+    public String[] getText() {
+        return text;
+    }
+
+    /**
+     * @param text the text to set
+     */
+    public void setText(String[] text) {
+        this.text = text;
+    }
+
+    /**
+     * Return the name of the title entity ID.
+     *
+     * @return title entity ID
+     */
+    public String getTileEntityID() {
+        return "Sign";
+    }
+    
+    /**
+     * Store additional tile entity data. Returns true if the data is used.
+     *
+     * @return map of values
+     * @throws SchematicException
+     */
+    public Map<String,Tag> toTileEntityNBT()
+            throws SchematicException {
+        Map<String,Tag> values = new HashMap<String,Tag>();
+        values.put("Text1", new StringTag("Text1", text[0]));
+        values.put("Text2", new StringTag("Text2", text[1]));
+        values.put("Text3", new StringTag("Text3", text[2]));
+        values.put("Text4", new StringTag("Text4", text[3]));
+        return values;
+    }
+
+    /**
+     * Get additional information from the title entity data.
+     *
+     * @param values
+     * @throws SchematicException
+     */
+    public void fromTileEntityNBT(Map<String,Tag> values)
+            throws SchematicException  {
+        if (values == null) {
+            return;
+        }
+        
+        Tag t;
+
+        text = new String[]{ "", "", "", "" };
+
+        t = values.get("id");
+        if (!(t instanceof StringTag) || !((StringTag)t).getValue().equals("Sign")) {
+            throw new SchematicException("'Sign' tile entity expected");
+        }
+
+        t = values.get("Text1");
+        if (t instanceof StringTag) {
+            text[0] = ((StringTag)t).getValue();
+        }
+
+        t = values.get("Text2");
+        if (t instanceof StringTag) {
+            text[1] = ((StringTag)t).getValue();
+        }
+
+        t = values.get("Text3");
+        if (t instanceof StringTag) {
+            text[2] = ((StringTag)t).getValue();
+        }
+
+        t = values.get("Text4");
+        if (t instanceof StringTag) {
+            text[3] = ((StringTag)t).getValue();
+        }
+    }
+}

src/com/sk89q/worldedit/blocks/TileEntityBlock.java

@@ -0,0 +1,54 @@
+// $Id$
+/*
+ * WorldEdit
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldedit.blocks;
+
+import com.sk89q.worldedit.SchematicException;
+import java.util.Map;
+import org.jnbt.Tag;
+
+/**
+ * A class implementing this interface has extra TileEntityBlock data to store.
+ *
+ * @author sk89q
+ */
+public interface TileEntityBlock {
+    /**
+     * Return the name of the title entity ID.
+     * 
+     * @return title entity ID
+     */
+    public String getTileEntityID();
+    /**
+     * Store additional tile entity data.
+     *
+     * @return map of values
+     * @throws SchematicException
+     */
+    public Map<String,Tag> toTileEntityNBT()
+            throws SchematicException ;
+    /**
+     * Get additional information from the title entity data.
+     * 
+     * @param values
+     * @throws SchematicException
+     */
+    public void fromTileEntityNBT(Map<String,Tag> values)
+            throws SchematicException ;
+}