From 574f162019bf3eadd3a5e93742e035dcd1163e97 Mon Sep 17 00:00:00 2001 From: aumgn Date: Sun, 11 Nov 2012 14:38:51 +0100 Subject: [PATCH] Clean up warnings --- src/main/java/com/sk89q/worldedit/CuboidClipboard.java | 2 -- src/main/java/com/sk89q/worldedit/WorldEdit.java | 1 - src/main/java/com/sk89q/worldedit/blocks/BlockData.java | 1 + src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java | 4 ---- src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java | 1 - src/main/java/com/sk89q/worldedit/commands/BrushCommands.java | 4 ++-- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/CuboidClipboard.java b/src/main/java/com/sk89q/worldedit/CuboidClipboard.java index 3bd9676f2..7e6b6018b 100644 --- a/src/main/java/com/sk89q/worldedit/CuboidClipboard.java +++ b/src/main/java/com/sk89q/worldedit/CuboidClipboard.java @@ -22,8 +22,6 @@ package com.sk89q.worldedit; import com.sk89q.worldedit.blocks.*; import com.sk89q.worldedit.data.*; -import com.sk89q.worldedit.regions.CuboidRegion; -import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.schematic.SchematicFormat; import java.io.File; diff --git a/src/main/java/com/sk89q/worldedit/WorldEdit.java b/src/main/java/com/sk89q/worldedit/WorldEdit.java index 3b98c372f..5f48b4ab1 100644 --- a/src/main/java/com/sk89q/worldedit/WorldEdit.java +++ b/src/main/java/com/sk89q/worldedit/WorldEdit.java @@ -74,7 +74,6 @@ import com.sk89q.worldedit.commands.ToolUtilCommands; import com.sk89q.worldedit.commands.UtilityCommands; import com.sk89q.worldedit.masks.BiomeTypeMask; import com.sk89q.worldedit.masks.BlockMask; -import com.sk89q.worldedit.masks.BlockTypeMask; import com.sk89q.worldedit.masks.CombinedMask; import com.sk89q.worldedit.masks.DynamicRegionMask; import com.sk89q.worldedit.masks.ExistingBlockMask; diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockData.java b/src/main/java/com/sk89q/worldedit/blocks/BlockData.java index f735a6f72..355b6cbc7 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/BlockData.java +++ b/src/main/java/com/sk89q/worldedit/blocks/BlockData.java @@ -486,6 +486,7 @@ public final class BlockData { return (16 - data) & 0xf; case WEST_EAST: return (8 - data) & 0xf; + default: } break; diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java index 377373f98..e5750c0e6 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java @@ -19,9 +19,7 @@ package com.sk89q.worldedit.bukkit; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.bukkit.Server; import org.bukkit.World; @@ -48,8 +46,6 @@ public class BukkitUtil { private BukkitUtil() { } - private static final Map wlw = new HashMap(); - public static LocalWorld getLocalWorld(World w) { return new BukkitWorld(w); } diff --git a/src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java b/src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java index e3b759740..f5827ab0a 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.server.NBTBase; diff --git a/src/main/java/com/sk89q/worldedit/commands/BrushCommands.java b/src/main/java/com/sk89q/worldedit/commands/BrushCommands.java index 38ec514d3..3d33ab8fc 100644 --- a/src/main/java/com/sk89q/worldedit/commands/BrushCommands.java +++ b/src/main/java/com/sk89q/worldedit/commands/BrushCommands.java @@ -32,7 +32,7 @@ import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BlockID; -import com.sk89q.worldedit.masks.BlockTypeMask; +import com.sk89q.worldedit.masks.BlockMask; import com.sk89q.worldedit.patterns.Pattern; import com.sk89q.worldedit.patterns.SingleBlockPattern; import com.sk89q.worldedit.tools.BrushTool; @@ -233,7 +233,7 @@ public class BrushCommands { Pattern fill = new SingleBlockPattern(new BaseBlock(0)); tool.setFill(fill); tool.setSize(radius); - tool.setMask(new BlockTypeMask(BlockID.FIRE)); + tool.setMask(new BlockMask(new BaseBlock(BlockID.FIRE))); tool.setBrush(new SphereBrush(), "worldedit.brush.ex"); player.print(String.format("Extinguisher equipped (%.0f).",