some minor cleanup, require java 7 for 1.8 slime knights mods

SlimeKnights · Jan 4, 2015 · f246f78 · f246f78
1 parent 0a46978
commit f246f78
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -35,6 +35,8 @@ repositories {
 
 apply plugin: 'forge'
 group = 'mantle'
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 
 // Define properties file
 ext.configFile = file "build.properties"

diff --git a/src/mantle/blocks/abstracts/MultiServantLogic.java b/src/mantle/blocks/abstracts/MultiServantLogic.java
@@ -54,10 +54,10 @@ public BlockPos getMasterPosition ()
         return master;
     }
 
-    public void overrideMaster (int x, int y, int z)
+    public void overrideMaster (BlockPos pos)
     {
         hasMaster = true;
-        master = new BlockPos(x, y, z);
+        master = pos;
         state = worldObj.getBlockState(master);
         masterBlock = state.getBlock();
     }
@@ -91,7 +91,7 @@ public boolean verifyMaster (IMasterLogic logic, World world, BlockPos pos)
         }
         else
         {
-            overrideMaster(pos.getX(), pos.getY(), pos.getZ());
+            overrideMaster(pos);
             return true;
         }
     }
@@ -195,11 +195,11 @@ public World getWorld ()
     }
 
     @Deprecated
-    public boolean setMaster (int x, int y, int z)
+    public boolean setMaster (BlockPos pos)
     {
         if (!hasMaster || worldObj.getBlockState(master) != state || (worldObj.getBlockState(master).getBlock() != masterBlock))
         {
-            overrideMaster(x, y, z);
+            overrideMaster(pos);
             return true;
         }
         else

diff --git a/src/mantle/world/WorldHelper.java b/src/mantle/world/WorldHelper.java