Fixed checkstyle test for the Sponge platform

EngineHub · Mar 19, 2016 · a91d881 · a91d881
1 parent 04cf831
commit a91d881
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git 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
@@ -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);
     }
 }