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

All parameters on one line (for now)

Browse Source 
Easier picking of 1.7 changes
This commit is contained in:
yueh
2016-01-01 02:02:05 +01:00
parent e08ab38c52
commit f84b9a7e1d
147 changed files with 840 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/ToolMemoryCard.java
+2 -13
View File
@@ -140,15 +140,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
}
@Override
public boolean onItemUse(
final ItemStack is,
final EntityPlayer player,
final World w,
final BlockPos pos,
final EnumFacing side,
final float hx,
final float hy,
final float hz )
public boolean onItemUse( final ItemStack is, final EntityPlayer player, final World w, final BlockPos pos, final EnumFacing side, final float hx, final float hy, final float hz )
{
if( player.isSneaking() && !w.isRemote )
{
@@ -164,10 +156,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
}
@Override
public boolean doesSneakBypassUse(
final World world,
final BlockPos pos,
final EntityPlayer player )
public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player )
{
return true;
}
src/main/java/appeng/items/tools/ToolNetworkTool.java
+3 -17
View File
@@ -98,15 +98,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /
}
@Override
public boolean onItemUseFirst(
final ItemStack stack,
final EntityPlayer player,
final World world,
final BlockPos pos,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
final MovingObjectPosition mop = new MovingObjectPosition( new Vec3( hitX, hitY, hitZ ), side, pos );
final TileEntity te = world.getTileEntity( pos );
@@ -134,10 +126,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /
}
@Override
public boolean doesSneakBypassUse(
final World world,
final BlockPos pos,
final EntityPlayer player )
public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player )
{
return true;
}
@@ -200,10 +189,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /
}
@Override
public boolean canWrench(
final ItemStack wrench,
final EntityPlayer player,
final BlockPos pos )
public boolean canWrench( final ItemStack wrench, final EntityPlayer player, final BlockPos pos )
{
return true;
}
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+2 -11
View File
@@ -121,15 +121,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
@Override
public boolean onItemUse(
final ItemStack is,
final EntityPlayer p,
final World w,
final BlockPos pos,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
public boolean onItemUse( final ItemStack is, final EntityPlayer p, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
final Block blk = w.getBlockState( pos ).getBlock();
@@ -302,8 +294,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
list.add( i );
}
Collections.sort( list, new Comparator<IAEItemStack>()
{
Collections.sort( list, new Comparator<IAEItemStack>(){
@Override
public int compare( final IAEItemStack a, final IAEItemStack b )
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
+2 -12
View File
@@ -105,9 +105,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
this.blockOnly = false;
}
public InWorldToolOperationIngredient(
final Block blk,
final boolean b )
public InWorldToolOperationIngredient( final Block blk, final boolean b )
{
this.state = blk.getDefaultState();
this.blockOnly = b;
@@ -248,15 +246,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
}
@Override
public boolean onItemUse(
final ItemStack item,
final EntityPlayer p,
final World w,
final BlockPos pos,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
public boolean onItemUse( final ItemStack item, final EntityPlayer p, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
if( this.getAECurrentPower( item ) > 1600 )
{
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
+1 -2
View File
@@ -120,8 +120,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
@Override
public IConfigManager getConfigManager( final ItemStack target )
{
final ConfigManager out = new ConfigManager( new IConfigManagerHost()
{
final ConfigManager out = new ConfigManager( new IConfigManagerHost(){
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java
+1 -9
View File
@@ -54,15 +54,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
}
@Override
public boolean onItemUse(
final ItemStack stack,
final EntityPlayer p,
final World worldIn,
final BlockPos pos,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
public boolean onItemUse( final ItemStack stack, final EntityPlayer p, final World worldIn, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
if( Platform.isServer() )
{
src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
+3 -17
View File
@@ -52,15 +52,7 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , ITool
}
@Override
public boolean onItemUseFirst(
final ItemStack stack,
final EntityPlayer player,
final World world,
final BlockPos pos,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
final Block b = world.getBlockState( pos ).getBlock();
if( b != null && !player.isSneaking() && Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) )
@@ -81,19 +73,13 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , ITool
}
@Override
public boolean doesSneakBypassUse(
final World world,
final BlockPos pos,
final EntityPlayer player )
public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player )
{
return true;
}
@Override
public boolean canWrench(
final ItemStack wrench,
final EntityPlayer player,
final BlockPos pos )
public boolean canWrench( final ItemStack wrench, final EntityPlayer player, final BlockPos pos )
{
return true;
}