fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First update pass (1/3) - ~1400 -> 82 errors

Browse Source 
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
This commit is contained in:
elix-x
2016-06-19 14:43:27 +02:00
parent d9725a7d9b
commit 5498eb6d7c
288 changed files with 1637 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/grindstone/BlockCrank.java
+8 -4
View File
@@ -21,6 +21,8 @@ package appeng.block.grindstone;
import java.util.EnumSet;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@@ -28,8 +30,9 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.util.FakePlayer;
@@ -48,7 +51,7 @@ public class BlockCrank extends AEBaseTileBlock
public BlockCrank()
{
super( Material.wood );
super( Material.WOOD );
this.setTileEntity( TileCrank.class );
this.setLightOpacity( 0 );
@@ -64,7 +67,7 @@ public class BlockCrank extends AEBaseTileBlock
}
@Override
public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
if( player instanceof FakePlayer || player == null )
{
@@ -87,6 +90,7 @@ public class BlockCrank extends AEBaseTileBlock
private void dropCrank( final World world, final BlockPos pos )
{
world.destroyBlock( pos, true ); // w.destroyBlock( x, y, z, true );
//TODO 1.9.4 - markBlockForUpdate => ?
world.markBlockForUpdate( pos );
}
@@ -138,7 +142,7 @@ public class BlockCrank extends AEBaseTileBlock
}
@Override
public void onNeighborBlockChange( final World world, final BlockPos pos, final IBlockState state, final Block neighborBlock )
public void neighborChanged( final IBlockState state, final World world, final BlockPos pos, final Block neighborBlock )
{
final AEBaseTile tile = this.getTileEntity( world, pos );
src/main/java/appeng/block/grindstone/BlockGrinder.java
+7 -11
View File
@@ -21,11 +21,14 @@ package appeng.block.grindstone;
import java.util.EnumSet;
import javax.annotation.Nullable;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.BlockPos;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import appeng.api.util.AEPartLocation;
@@ -41,7 +44,7 @@ public class BlockGrinder extends AEBaseTileBlock
public BlockGrinder()
{
super( Material.rock );
super( Material.ROCK );
this.setTileEntity( TileGrinder.class );
this.setHardness( 3.2F );
@@ -49,14 +52,7 @@ public class BlockGrinder extends AEBaseTileBlock
}
@Override
public boolean onBlockActivated( final World worldIn, final BlockPos pos, final IBlockState state, final EntityPlayer playerIn, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
// TODO Auto-generated method stub
return super.onBlockActivated( worldIn, pos, state, playerIn, side, hitX, hitY, hitZ );
}
@Override
public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
final TileGrinder tg = this.getTileEntity( w, pos );
if( tg != null && !p.isSneaking() )