From a91d881d736d4d01bc70a4cc369cf1e00989a38a Mon Sep 17 00:00:00 2001
From: Wyatt Childers <wchilders@nearce.com>
Date: Sat, 19 Mar 2016 14:32:01 -0400
Subject: [PATCH] Fixed checkstyle test for the Sponge platform

---
 config/checkstyle/import-control.xml                | 13 +++++++------
 .../java/com/sk89q/worldedit/sponge/IDHelper.java   | 12 ++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/config/checkstyle/import-control.xml b/config/checkstyle/import-control.xml
index 3e42334712..66d38b3eae 100644
--- a/config/checkstyle/import-control.xml
+++ b/config/checkstyle/import-control.xml
@@ -41,12 +41,6 @@
       <allow pkg="net.minecraft.server"/>
     </subpackage>
 
-    <subpackage name="spout">
-      <allow pkg="org.spout"/>
-      <allow pkg="org.jboss.netty"/>
-      <allow pkg="org.apache"/>
-    </subpackage>
-
     <subpackage name="forge">
       <allow pkg="cpw"/>
       <allow pkg="net.minecraft"/>
@@ -57,5 +51,12 @@
       <allow pkg="io.netty.buffer"/>
       <allow pkg="org.spongepowered.api" />
     </subpackage>
+
+    <subpackage name="sponge">
+      <allow pkg="net.minecraft"/>
+      <allow pkg="com.google.inject" />
+      <allow pkg="com.flowpowered.math" />
+      <allow pkg="org.spongepowered.api" />
+    </subpackage>
   </subpackage>
 </import-control>
diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/IDHelper.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/IDHelper.java
index c19ccf06f8..be717fa3da 100644
--- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/IDHelper.java
+++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/IDHelper.java
@@ -42,15 +42,15 @@ public static int resolve(BiomeType type) {
         return ((BiomeGenBase) type).biomeID;
     }
 
-    public static ItemType resolveItem(int ID) {
-        return (ItemType) Item.getItemById(ID);
+    public static ItemType resolveItem(int intID) {
+        return (ItemType) Item.getItemById(intID);
     }
 
-    public static BlockType resolveBlock(int ID) {
-        return (BlockType) Block.getBlockById(ID);
+    public static BlockType resolveBlock(int intID) {
+        return (BlockType) Block.getBlockById(intID);
     }
 
-    public static BiomeType resolveBiome(int ID) {
-        return (BiomeType) BiomeGenBase.getBiome(ID);
+    public static BiomeType resolveBiome(int intID) {
+        return (BiomeType) BiomeGenBase.getBiome(intID);
     }
 }