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/parts/reporting/AbstractPartDisplay.java
+1 -1
View File
@@ -20,8 +20,8 @@ package appeng.parts.reporting;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+12 -8
View File
@@ -31,13 +31,14 @@ import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.VertexBuffer;
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.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -159,8 +160,11 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3 pos )
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
{
//TODO 1.9.4 - 2 hands! Just do something!
final EnumHand hand = EnumHand.MAIN_HAND;
if( Platform.isClient() )
{
return true;
@@ -177,7 +181,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
}
final TileEntity te = this.getTile();
final ItemStack eq = player.getCurrentEquippedItem();
final ItemStack eq = player.getHeldItem( hand );
if( Platform.isWrench( player, eq, te.getPos() ) )
{
@@ -268,7 +272,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
}
final Tessellator tess = Tessellator.getInstance();
final WorldRenderer wr = tess.getWorldRenderer();
final VertexBuffer wr = tess.getBuffer();
if( ( this.getClientFlags() & ( PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG ) ) != ( PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG ) )
{
@@ -310,7 +314,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
return this.configuredItem;
}
private void tesrRenderScreen( final WorldRenderer wr, final IAEItemStack ais )
private void tesrRenderScreen( final VertexBuffer wr, final IAEItemStack ais )
{
// GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
@@ -435,7 +439,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
}
@Override
public boolean showNetworkInfo( final MovingObjectPosition where )
public boolean showNetworkInfo( final RayTraceResult where )
{
return false;
}
src/main/java/appeng/parts/reporting/AbstractPartPanel.java
+1 -1
View File
@@ -20,8 +20,8 @@ package appeng.parts.reporting;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
src/main/java/appeng/parts/reporting/AbstractPartReporting.java
+3 -3
View File
@@ -27,8 +27,8 @@ 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.MathHelper;
import net.minecraft.util.Vec3;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import appeng.api.implementations.IPowerChannelState;
import appeng.api.implementations.parts.IPartMonitor;
@@ -189,7 +189,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3 pos )
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
{
final TileEntity te = this.getTile();
src/main/java/appeng/parts/reporting/AbstractPartTerminal.java
+2 -2
View File
@@ -25,7 +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.Vec3;
import net.minecraft.util.math.Vec3d;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
@@ -110,7 +110,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3 pos )
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
{
if( !super.onPartActivate( player, pos ) )
{
src/main/java/appeng/parts/reporting/PartConversionMonitor.java
+7 -3
View File
@@ -26,7 +26,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Vec3;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.Vec3d;
import appeng.api.networking.energy.IEnergySource;
import appeng.api.networking.security.PlayerSource;
@@ -54,8 +55,11 @@ public class PartConversionMonitor extends AbstractPartMonitor
}
@Override
public boolean onPartShiftActivate( final EntityPlayer player, final Vec3 pos )
public boolean onPartShiftActivate( final EntityPlayer player, final Vec3d pos )
{
//TODO 1.9.4 - 2 hands! Just do something!
final EnumHand hand = EnumHand.MAIN_HAND;
if( Platform.isClient() )
{
return true;
@@ -73,7 +77,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
boolean ModeB = false;
ItemStack item = player.getCurrentEquippedItem();
ItemStack item = player.getHeldItem( hand );
if( item == null && this.getDisplayed() != null )
{
ModeB = true;
src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java
+2 -2
View File
@@ -21,7 +21,7 @@ package appeng.parts.reporting;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.util.math.Vec3d;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
@@ -40,7 +40,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3 pos )
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
{
if( !super.onPartActivate( player, pos ) )
{