Simplified switch statements and minor formatting

worldedit-core/src/main/java/com/boydti/fawe/example/IntFaweChunk.java

@@ -202,17 +202,13 @@ public abstract class IntFaweChunk<T, V extends FaweQueue> extends FaweChunk<T>
         }
         vs[j] = combinedId;
         this.count[i]++;
-        switch (BlockTypes.getFromStateId(combinedId).getResource().toUpperCase()) {
+        if (BlockTypes.getFromStateId(combinedId).getMaterial().isAir()) {
-            case "AIR":
-            case "CAVE_AIR":
-            case "VOID_AIR":
             this.air[i]++;
             return;
-            default:
+        }
         heightMap[z << 4 | x] = (byte) y;
         return;
     }
-    }
 
     @Deprecated
     public void setBitMask(int ignore) {

worldedit-core/src/main/java/com/boydti/fawe/object/FaweQueue.java

@@ -284,10 +284,7 @@ public interface FaweQueue extends HasFaweQueue, Extent {
                     int combined = getCombinedId4Data(xx, y, zz);
                     BaseBlock block = BlockState.getFromInternalId(combined).toBaseBlock();
                     BlockType type = block.getBlockType();
-                    switch (type.getResource().toUpperCase()) {
+                    if (type.getMaterial().isAir()) {
-                        case "AIR":
-                        case "VOID_AIR":
-                        case "CAVE_AIR":
                         continue;
                     }
                     mutable.mutY(y);

worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualChunk.java

@@ -115,17 +115,12 @@ public class VisualChunk extends FaweChunk<FaweChunk> {
     public void setBlock(int x, int y, int z, int combinedId) {
         int index = getIndex(x, y, z);
         try {
-            switch (BlockTypes.getFromStateId(combinedId).getResource().toUpperCase()) {
+            if (BlockTypes.getFromStateId(combinedId).getMaterial().isAir()) {
-                case "AIR":
-                case "CAVE_AIR":
-                case "VOID_AIR":
                 add.clear(index);
                 remove.set(index);
-                    break;
+            } else {
-                default:
                 remove.clear(index);
                 add.set(index);
-                    break;
             }
         } catch (Throwable e) {
             e.printStackTrace();

worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/CPUOptimizedClipboard.java

@@ -175,12 +175,7 @@ public class CPUOptimizedClipboard extends FaweClipboard {
                 for (int z = 0; z < length; z++) {
                     for (int x = 0; x < width; x++, index++) {
                         BaseBlock block = getBlock(index);
-                        switch (block.getBlockType().getResource().toUpperCase()) {
+                        if (!block.getMaterial().isAir()) {
-                            case "AIR":
-                            case "CAVE_AIR":
-                            case "VOID_AIR":
-                                continue;
-                            default:
                             task.run(x, y, z, block);
                         }
                     }

worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java

@@ -404,12 +404,7 @@ public class DiskOptimizedClipboard extends FaweClipboard implements Closeable {
                     for (int x = 0; x < width; x++, pos += 4) {
                         int combinedId = mbb.getInt(pos);
                         BlockType type = BlockTypes.getFromStateId(combinedId);
-                        switch (type.getResource().toUpperCase()) {
+                        if (!type.getMaterial().isAir()) {
-                            case "AIR":
-                            case "CAVE_AIR":
-                            case "VOID_AIR":
-                                continue;
-                            default:
                             BlockState state = type.withStateId(combinedId);
                             if (type.getMaterial().hasContainer()) {
                                 trio.set(x, y, z);

worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/MemoryOptimizedClipboard.java

@@ -205,10 +205,7 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
         }
         if (lastCombinedIds == null) {
         	BlockType bt = BlockTypes.getFromStateId(v);
-            switch (bt.getResource().toUpperCase()) {
+            if (bt.getMaterial().isAir()) {
-                case "AIR":
-                case "CAVE_AIR":
-                case "VOID_AIR":
                 return;
             }
             lastCombinedIds = new byte[BLOCK_SIZE];
@@ -299,12 +296,7 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
                 for (int z = 0; z < length; z++) {
                     for (int x = 0; x < width; x++, index++) {
                         BaseBlock block = getBlock(index);
-                        switch (block.getBlockType().getResource().toUpperCase()) {
+                        if (!block.getMaterial().isAir()) {
-                            case "AIR":
-                            case "CAVE_AIR":
-                            case "VOID_AIR":
-                                continue;
-                            default:
                             task.run(x, y, z, block);
                         }
                     }

worldedit-core/src/main/java/com/boydti/fawe/object/schematic/StructureFormat.java

@@ -84,7 +84,7 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
         ListTag blocks = (ListTag) tags.get("blocks");
         if (blocks != null) {
             // Palette
-            List<CompoundTag> palette = (List<CompoundTag>) (List<?>) tags.get("palette").getValue();
+            List<CompoundTag> palette = (List<CompoundTag>) tags.get("palette").getValue();
             BlockState[] combinedArray = new BlockState[palette.size()];
             for (int i = 0; i < palette.size(); i++) {
                 CompoundTag compound = palette.get(i);
@@ -108,7 +108,7 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
                 combinedArray[i] = state;
             }
             // Populate blocks
-            List<CompoundTag> blocksList = (List<CompoundTag>) (List<?>) tags.get("blocks").getValue();
+            List<CompoundTag> blocksList = (List<CompoundTag>) tags.get("blocks").getValue();
             try {
                 for (CompoundTag compound : blocksList) {
                     Map<String, Tag> blockMap = compound.getValue();
@@ -184,7 +184,7 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
                     continue;
                 }
 
-                indexes.put((int) combined, (Integer) palette.size());
+                indexes.put(combined, (Integer) palette.size());
                 HashMap<String, Object> paletteEntry = new HashMap<>();
                 paletteEntry.put("Name", type.getId());
                 if (block.getInternalId() != type.getInternalId()) {
@@ -213,17 +213,16 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
             BlockVector3 min = region.getMinimumPoint();
             for (BlockVector3 point : region) {
                 BaseBlock block = clipboard.getFullBlock(point);
-                switch (block.getBlockType().getResource().toUpperCase()) {
+                if (block.getBlockType() != BlockTypes.STRUCTURE_VOID) {
-                    case "STRUCTURE_VOID":
-                        continue;
-                    default:
                     int combined = block.getInternalId();
                     int index = indexes.get(combined);
-                        List<Integer> pos = Arrays.asList((int) (point.getX() - min.getX()), (int) (point.getY() - min.getY()), (int) (point.getZ() - min.getZ()));
+                    List<Integer> pos = Arrays.asList(point.getX() - min.getX(),
+                        point.getY() - min.getY(), point.getZ() - min.getZ());
                     if (!block.hasNbtData()) {
                         blocks.add(FaweCache.asMap("state", index, "pos", pos));
                     } else {
-                            blocks.add(FaweCache.asMap("state", index, "pos", pos, "nbt", block.getNbtData()));
+                        blocks.add(
+                            FaweCache.asMap("state", index, "pos", pos, "nbt", block.getNbtData()));
                     }
                 }
             }
@@ -268,7 +267,7 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
     }
 
     private Tag writeVector(BlockVector3 vector, String name) {
-        List<DoubleTag> list = new ArrayList<DoubleTag>();
+        List<DoubleTag> list = new ArrayList<>();
         list.add(new DoubleTag(vector.getX()));
         list.add(new DoubleTag(vector.getY()));
         list.add(new DoubleTag(vector.getZ()));
@@ -276,7 +275,7 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
     }
 
     private Tag writeRotation(Location location, String name) {
-        List<FloatTag> list = new ArrayList<FloatTag>();
+        List<FloatTag> list = new ArrayList<>();
         list.add(new FloatTag(location.getYaw()));
         list.add(new FloatTag(location.getPitch()));
         return new ListTag(FloatTag.class, list);

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java

@@ -132,12 +132,7 @@ public class FloatingTreeRemover implements BlockTool {
 
                 if (visited.add(next)) {
                     BlockState state = world.getBlock(next);
-                    BlockType type = state.getBlockType();
+                    if (state.getBlockType().getMaterial().isAir() || state.getBlockType() == BlockTypes.SNOW) {
-                    switch (type.getResource().toUpperCase()) {
-                        case "AIR":
-                        case "CAVE_AIR":
-                        case "VOID_AIR":
-                        case "SNOW":
                         continue;
                     }
                     if (isTreeBlock(state.getBlockType())) {