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/p2p/PartP2PItems.java
+2 -2
View File
@@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.text.ITextComponent;
import appeng.api.networking.IGridNode;
import appeng.api.networking.events.MENetworkBootingStatusChange;
@@ -400,7 +400,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements /* IPip
}
@Override
public IChatComponent getDisplayName()
public ITextComponent getDisplayName()
{
return null;
}
src/main/java/appeng/parts/p2p/PartP2PRedstone.java
+3 -3
View File
@@ -24,8 +24,8 @@ import net.minecraft.block.BlockRedstoneWire;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import appeng.api.networking.events.MENetworkBootingStatusChange;
@@ -152,8 +152,8 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
srcSide = EnumFacing.UP;
}
this.power = b.getWeakPower( this.getTile().getWorld(), target, state, srcSide );
this.power = Math.max( this.power, b.getWeakPower( this.getTile().getWorld(), target, state, srcSide ) );
this.power = b.getWeakPower( state, this.getTile().getWorld(), target, srcSide );
this.power = Math.max( this.power, b.getWeakPower( state, this.getTile().getWorld(), target, srcSide ) );
this.sendToOutput( this.power );
}
else
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+5 -5
View File
@@ -30,8 +30,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
import net.minecraft.util.Vec3;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -149,7 +149,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
}
else
{
return renderer.getIcon( new ItemStack( Blocks.quartz_block ) );
return renderer.getIcon( new ItemStack( Blocks.QUARTZ_BLOCK ) );
}
}
@@ -227,7 +227,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
}
@Override
public boolean onPartActivate( final EntityPlayer player, final Vec3 pos )
public boolean onPartActivate( final EntityPlayer player, final Vec3d pos )
{
final ItemStack is = player.inventory.getCurrentItem();
@@ -394,7 +394,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
}
@Override
public boolean onPartShiftActivate( final EntityPlayer player, final Vec3 pos )
public boolean onPartShiftActivate( final EntityPlayer player, final Vec3d pos )
{
final ItemStack is = player.inventory.getCurrentItem();
if( is != null && is.getItem() instanceof IMemoryCard )