Closes #1283: Add custom Callable to prevent memory leaks

src/main/java/appeng/util/BlockUpdate.java

@@ -19,33 +19,29 @@
 package appeng.util;
 
 
-import java.util.concurrent.Callable;
-
 import net.minecraft.world.World;
 
 
-public class BlockUpdate implements Callable
+public class BlockUpdate implements IWorldCallable<Boolean>
 {
 
-	final World w;
 	final int x;
 	final int y;
 	final int z;
 
-	public BlockUpdate( World w, int x, int y, int z )
+	public BlockUpdate( int x, int y, int z )
 	{
-		this.w = w;
 		this.x = x;
 		this.y = y;
 		this.z = z;
 	}
 
 	@Override
-	public Object call() throws Exception
+	public Boolean call( World world ) throws Exception
 	{
-		if( this.w.blockExists( this.x, this.y, this.z ) )
+		if( world.blockExists( this.x, this.y, this.z ) )
 		{
-			this.w.notifyBlocksOfNeighborChange( this.x, this.y, this.z, Platform.AIR_BLOCK );
+			world.notifyBlocksOfNeighborChange( this.x, this.y, this.z, Platform.AIR_BLOCK );
 		}
 
 		return true;

src/main/java/appeng/util/IWorldCallable.java

@@ -0,0 +1,49 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.util;
+
+
+import java.util.concurrent.Callable;
+
+import javax.annotation.Nullable;
+
+import net.minecraft.world.World;
+
+
+/**
+ * An interface similar to {@link Callable}, but allowing to pass the {@link World} when calling.
+ *
+ * @see Callable
+ * @author yueh
+ * @version rv3
+ * @since rv3
+ */
+public interface IWorldCallable<T>
+{
+	/**
+	 * Similar to {@link Callable#call()}
+	 *
+	 * @see Callable#call()
+	 * @param world
+	 * @return
+	 * @throws Exception
+	 */
+	@Nullable
+	T call( @Nullable World world ) throws Exception;
+}

src/main/java/appeng/util/Platform.java

@@ -1911,7 +1911,7 @@ public class Platform
 	{
 		if( !worldObj.isRemote )
 		{
-			TickHandler.INSTANCE.addCallable( worldObj, new BlockUpdate( worldObj, xCoord, yCoord, zCoord ) );
+			TickHandler.INSTANCE.addCallable( worldObj, new BlockUpdate( xCoord, yCoord, zCoord ) );
 		}
 	}