ActionResultType in onActivated

src/main/java/appeng/block/grindstone/BlockCrank.java

@@ -47,16 +47,11 @@ import appeng.tile.AEBaseTile;
 import appeng.tile.grindstone.TileCrank;
 
 
-public class BlockCrank extends AEBaseTileBlock
+public class BlockCrank extends AEBaseTileBlock<TileCrank>
 {
 
-	public BlockCrank()
-	{
-		super( Material.WOOD );
-
-		this.setLightOpacity( 0 );
-		this.setHarvestLevel( "axe", 0 );
-		this.setFullSize( this.setOpaque( false ) );
+	public BlockCrank(Properties props) {
+		super(props);
 	}
 
 	@Override
@@ -65,7 +60,7 @@ public class BlockCrank extends AEBaseTileBlock
 		if( player instanceof FakePlayer || player == null )
 		{
 			this.dropCrank( w, pos );
-			return true;
+			return ActionResultType.SUCCESS;
 		}
 
 		final AEBaseTile tile = this.getTileEntity( w, pos );
@@ -77,7 +72,7 @@ public class BlockCrank extends AEBaseTileBlock
 			}
 		}
 
-		return true;
+		return ActionResultType.SUCCESS;
 	}
 
 	private void dropCrank( final World world, final BlockPos pos )

src/main/java/appeng/block/grindstone/BlockGrinder.java

@@ -19,9 +19,8 @@
 package appeng.block.grindstone;
 
 
-import javax.annotation.Nullable;
-
-import net.minecraft.block.material.Material;
+import appeng.block.AEBaseTileBlock;
+import appeng.tile.grindstone.TileGrinder;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResultType;
@@ -30,32 +29,25 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.world.World;
 
-import appeng.api.util.AEPartLocation;
-import appeng.block.AEBaseTileBlock;
-import appeng.core.sync.GuiBridge;
-import appeng.tile.grindstone.TileGrinder;
-import appeng.util.Platform;
+import javax.annotation.Nullable;
 
 
-public class BlockGrinder extends AEBaseTileBlock
+public class BlockGrinder extends AEBaseTileBlock<TileGrinder>
 {
 
-	public BlockGrinder()
-	{
-		super( Material.ROCK );
-
-		this.setHardness( 3.2F );
+	public BlockGrinder(Properties props) {
+		super(props);
 	}
 
 	@Override
 	public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit)
 	{
 		final TileGrinder tg = this.getTileEntity( w, pos );
-		if( tg != null && !p.isShiftKeyDown() )
+		if( tg != null && !p.isCrouching() )
 		{
-			Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_GRINDER );
-			return true;
+			// FIXME Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit.getFace()), GuiBridge.GUI_GRINDER );
+			return ActionResultType.SUCCESS;
 		}
-		return false;
+		return ActionResultType.PASS;
 	}
 }

src/main/java/appeng/block/grindstone/CrankRendering.java

@@ -1,40 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, 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.block.grindstone;
-
-
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-import appeng.bootstrap.BlockRenderingCustomizer;
-import appeng.bootstrap.IBlockRendering;
-import appeng.bootstrap.IItemRendering;
-import appeng.client.render.tesr.CrankTESR;
-
-
-public class CrankRendering extends BlockRenderingCustomizer
-{
-
-	@Override
-	@OnlyIn( Dist.CLIENT )
-	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
-	{
-		rendering.tileEntityRenderer( new CrankTESR() );
-	}
-}