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

Second update pass (2/3) - 82 -> 0 errors

Browse Source 
Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
This commit is contained in:
elix-x
2016-06-21 11:03:10 +02:00
parent 5498eb6d7c
commit 05aa6972c4
83 changed files with 564 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+2 -5
View File
@@ -160,11 +160,8 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
{
//TODO 1.9.4 - 2 hands! Just do something!
final EnumHand hand = EnumHand.MAIN_HAND;
public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
{
if( Platform.isClient() )
{
return true;
src/main/java/appeng/parts/reporting/AbstractPartReporting.java
+5 -4
View File
@@ -27,6 +27,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
@@ -189,7 +190,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
{
final TileEntity te = this.getTile();
@@ -225,14 +226,14 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
}
else
{
return super.onPartActivate( player, pos );
return super.onPartActivate( player, hand, pos );
}
}
@Override
public final void onPlacement( final EntityPlayer player, final ItemStack held, final AEPartLocation side )
public final void onPlacement( final EntityPlayer player, final EnumHand hand, final ItemStack held, final AEPartLocation side )
{
super.onPlacement( player, held, side );
super.onPlacement( player, hand, held, side );
final byte rotation = (byte) ( MathHelper.floor_double( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
if( side == AEPartLocation.UP )
src/main/java/appeng/parts/reporting/AbstractPartTerminal.java
+3 -2
View File
@@ -25,6 +25,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.Vec3d;
import appeng.api.config.Settings;
@@ -110,9 +111,9 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
{
if( !super.onPartActivate( player, pos ) )
if( !super.onPartActivate( player, hand, pos ) )
{
if( !player.isSneaking() )
{
src/main/java/appeng/parts/reporting/PartConversionMonitor.java
+1 -4
View File
@@ -55,11 +55,8 @@ public class PartConversionMonitor extends AbstractPartMonitor
}
@Override
public boolean onPartShiftActivate( final EntityPlayer player, final Vec3d pos )
public boolean onPartShiftActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
{
//TODO 1.9.4 - 2 hands! Just do something!
final EnumHand hand = EnumHand.MAIN_HAND;
if( Platform.isClient() )
{
return true;
src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java
+3 -2
View File
@@ -21,6 +21,7 @@ package appeng.parts.reporting;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.Vec3d;
import appeng.client.texture.CableBusTextures;
@@ -40,9 +41,9 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
{
if( !super.onPartActivate( player, pos ) )
if( !super.onPartActivate( player, hand, pos ) )
{
if( !player.isSneaking() )
{