From 224bfef50cffd2f0ab98b8c5fcb88894dfc9ff5a Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Fri, 4 Apr 2014 13:59:28 -0700
Subject: [PATCH] Throw old DataExceptions in schematic related classes.

The schematic related classes are slated for deprecation at some point.
---
 .../sk89q/worldedit/data/DataException.java   |  7 ++++
 .../schematic/MCEditSchematicFormat.java      | 37 +++++++------------
 .../worldedit/schematic/SchematicFormat.java  | 16 +++-----
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/src/legacy/java/com/sk89q/worldedit/data/DataException.java b/src/legacy/java/com/sk89q/worldedit/data/DataException.java
index d907cde5e..9a32346fb 100644
--- a/src/legacy/java/com/sk89q/worldedit/data/DataException.java
+++ b/src/legacy/java/com/sk89q/worldedit/data/DataException.java
@@ -24,4 +24,11 @@ package com.sk89q.worldedit.data;
  */
 @Deprecated
 public class DataException extends com.sk89q.worldedit.world.DataException {
+
+    public DataException(String msg) {
+        super(msg);
+    }
+
+    public DataException() {
+    }
 }
diff --git a/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java b/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java
index e6e5e1892..4376420f4 100644
--- a/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java
+++ b/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java
@@ -18,11 +18,15 @@
 
 package com.sk89q.worldedit.schematic;
 
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import com.sk89q.jnbt.*;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.CuboidClipboard;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.blocks.TileEntityBlock;
+import com.sk89q.worldedit.data.DataException;
+
+import java.io.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,23 +34,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.zip.GZIPInputStream;
 
-import com.sk89q.jnbt.ByteArrayTag;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.IntTag;
-import com.sk89q.jnbt.ListTag;
-import com.sk89q.jnbt.NBTConstants;
-import com.sk89q.jnbt.NBTInputStream;
-import com.sk89q.jnbt.NBTOutputStream;
-import com.sk89q.jnbt.ShortTag;
-import com.sk89q.jnbt.StringTag;
-import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.CuboidClipboard;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.TileEntityBlock;
-import com.sk89q.worldedit.world.DataException;
-
 /**
  * @author zml2008
  */
@@ -184,7 +171,11 @@ public class MCEditSchematicFormat extends SchematicFormat {
                     BaseBlock block = getBlockForId(blocks[index], blockData[index]);
 
                     if (block instanceof TileEntityBlock && tileEntitiesMap.containsKey(pt)) {
-                        ((TileEntityBlock) block).setNbtData(new CompoundTag("", tileEntitiesMap.get(pt)));
+                        try {
+                            ((TileEntityBlock) block).setNbtData(new CompoundTag("", tileEntitiesMap.get(pt)));
+                        } catch (com.sk89q.worldedit.world.DataException e) {
+                            throw new DataException(e.getMessage());
+                        }
                     }
                     clipboard.setBlock(pt, block);
                 }
diff --git a/src/main/java/com/sk89q/worldedit/schematic/SchematicFormat.java b/src/main/java/com/sk89q/worldedit/schematic/SchematicFormat.java
index a630cb4c3..b25c76486 100644
--- a/src/main/java/com/sk89q/worldedit/schematic/SchematicFormat.java
+++ b/src/main/java/com/sk89q/worldedit/schematic/SchematicFormat.java
@@ -18,19 +18,13 @@
 
 package com.sk89q.worldedit.schematic;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.sk89q.worldedit.CuboidClipboard;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.world.DataException;
+import com.sk89q.worldedit.data.DataException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
 
 /**
  * Represents a format that a schematic can be stored as