tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Ported to 1.7

Browse source
This commit is contained in:
AlgorithmX2 2014-02-08 19:34:52 -06:00
parent 30c1deb8cf
commit d50c7f6312
328 changed files with 2209 additions and 2311 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
block/AEBaseBlock.java
View file

@ -8,21 +8,21 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.client.resources.Resource;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.IResource;
import net.minecraft.entity.Entity;
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.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.implementations.items.IMemoryCard;
import appeng.api.implementations.items.MemoryCardMessages;
import appeng.api.util.IOrientable;
@ -32,7 +32,6 @@ import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
import appeng.client.render.WorldRender;
import appeng.client.texture.FlipableIcon;
import appeng.core.Configuration;
import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler;
import appeng.core.features.IAEFeature;
@ -58,7 +57,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
protected boolean isFullSize = true;
@SideOnly(Side.CLIENT)
public Icon renderIcon;
public IIcon renderIcon;
@SideOnly(Side.CLIENT)
BlockRenderInfo renderInfo;
@ -83,9 +82,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@SideOnly(Side.CLIENT)
private FlipableIcon optionaIcon(IconRegister ir, String Name, Icon substitute)
private FlipableIcon optionaIcon(IIconRegister ir, String Name, IIcon substitute)
{
// if the input is an flippable icon find the original.
// if the input is an flippable IIcon find the original.
while (substitute instanceof FlipableIcon)
substitute = ((FlipableIcon) substitute).getOriginal();
@ -94,9 +93,10 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
try
{
ResourceLocation resLoc = new ResourceLocation( Name );
resLoc = new ResourceLocation( resLoc.getResourceDomain(), String.format( "%s/%s%s", new Object[] { "textures/blocks", resLoc.getResourcePath(), ".png" } ) );
resLoc = new ResourceLocation( resLoc.getResourceDomain(), String.format( "%s/%s%s", new Object[] { "textures/blocks",
resLoc.getResourcePath(), ".png" } ) );
Resource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc );
IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc );
if ( res != null )
return new FlipableIcon( ir.registerIcon( Name ) );
}
@ -111,7 +111,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegistry)
public void registerBlockIcons(IIconRegister iconRegistry)
{
BlockRenderInfo info = getRendererInstance();
FlipableIcon topIcon;
@ -135,7 +135,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int direction, int metadata)
public IIcon getIcon(int direction, int metadata)
{
if ( renderIcon != null )
return renderIcon;
@ -144,7 +144,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
public Icon getBlockTexture(IBlockAccess w, int x, int y, int z, int s)
public IIcon getIcon(IBlockAccess w, int x, int y, int z, int s)
{
return getIcon( mapRotation( w, x, y, z, s ), 0 );
}
@ -163,19 +163,19 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
protected AEBaseBlock(Class<?> c, Material mat) {
this( c, mat, null );
setLightOpacity( 15 );
setLightValue( 0 );
setLightLevel( 0 );
setHardness( 1.2F );
}
protected AEBaseBlock(Class<?> c, Material mat, String subname) {
super( Configuration.instance.getBlockID( c, subname ), mat );
super( mat );
if ( mat == Material.glass )
setStepSound( Block.soundGlassFootstep );
setStepSound( Block.soundTypeGlass );
else if ( mat == Material.rock )
setStepSound( Block.soundStoneFootstep );
setStepSound( Block.soundTypeStone );
else
setStepSound( Block.soundMetalFootstep );
setStepSound( Block.soundTypeMetal );
FeatureFullname = AEFeatureHandler.getName( c, subname );
FeatureSubname = subname;
@ -205,7 +205,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
final public boolean isBlockNormalCube(World world, int x, int y, int z)
final public boolean isNormalCube(IBlockAccess world, int x, int y, int z)
{
return isFullSize;
}
@ -243,7 +243,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
final public TileEntity createTileEntity(World world, int metadata)
final public TileEntity createNewTileEntity(World var1, int var2)
{
try
{
@ -255,18 +255,12 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
}
@Override
final public TileEntity createNewTileEntity(World world)
{
return createTileEntity( world, 0 );
}
final public <T extends TileEntity> T getTileEntity(IBlockAccess w, int x, int y, int z)
{
if ( !hasBlockTileEntity() )
return null;
TileEntity te = w.getBlockTileEntity( x, y, z );
TileEntity te = w.getTileEntity( x, y, z );
if ( tileEntityType.isInstance( te ) )
return (T) te;
@ -387,7 +381,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
@Override
public void breakBlock(World w, int x, int y, int z, int a, int b)
public void breakBlock(World w, int x, int y, int z, Block a, int b)
{
AEBaseTile te = getTileEntity( w, x, y, z );
if ( te != null )
@ -404,7 +398,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
super.breakBlock( w, x, y, z, a, b );
if ( te != null )
w.setBlockTileEntity( x, y, z, null );
w.setTileEntity( x, y, z, null );
}
@Override
@ -598,8 +592,8 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{
if ( Platform.isWrench( player, is, x, y, z ) && player.isSneaking() )
{
int id = w.getBlockId( x, y, z );
if ( id != 0 )
Block id = w.getBlock( x, y, z );
if ( id != null )
{
AEBaseTile tile = getTileEntity( w, x, y, z );
ItemStack[] drops = Platform.getBlockDrops( w, x, y, z );
@ -621,7 +615,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
}
}
if ( Block.blocksList[id].removeBlockByPlayer( w, player, x, y, z ) )
if ( id.removedByPlayer( w, player, x, y, z ) )
{
List<ItemStack> l = new ArrayList<ItemStack>();
for (ItemStack iss : drops)

12
block/AEBaseItemBlock.java
View file

@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.util.IOrientable;
import appeng.api.util.IOrientableBlock;
import appeng.block.networking.BlockWireless;
@ -23,19 +23,17 @@ public class AEBaseItemBlock extends ItemBlock
final AEBaseBlock blockType;
public AEBaseItemBlock(int id) {
public AEBaseItemBlock(Block id) {
super( id );
blockType = (AEBaseBlock) Block.blocksList[id + 256];
blockType = (AEBaseBlock) id;
if ( Platform.isClient() )
MinecraftForgeClient.registerItemRenderer( blockType.blockID, ItemRenderer.instance );
MinecraftForgeClient.registerItemRenderer( this, ItemRenderer.instance );
}
@Override
public void addInformation(ItemStack is, EntityPlayer player, List lines, boolean advancedItemTooltips)
{
Block blk = Block.blocksList[getBlockID()];
if ( blk instanceof AEBaseBlock )
((AEBaseBlock) blk).addInformation( is, player, lines, advancedItemTooltips );
blockType.addInformation( is, player, lines, advancedItemTooltips );
}
@Override

7
block/AEBaseItemBlockChargeable.java
View file

@ -17,7 +17,7 @@ import appeng.util.Platform;
public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEItemPowerStorage
{
public AEBaseItemBlockChargeable(int id) {
public AEBaseItemBlockChargeable(Block id) {
super( id );
}
@ -36,14 +36,13 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
double percent = internalCurrentPower / internalMaxPower;
lines.add( GuiText.StoredEnergy.getLocal() + ":" + MessageFormat.format( " {0,number,#} ", internalCurrentPower )
+ Platform.gui_localize( PowerUnits.AE.unlocalizedName ) + " - "
+ MessageFormat.format( " {0,number,#.##%} ", percent ) );
+ Platform.gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) );
}
private double getMax(ItemStack is)
{
Block blk = Block.blocksList[getBlockID()];
Block blk = Block.getBlockFromItem( this );
if ( blk == AEApi.instance().blocks().blockEnergyCell.block() )
return 200000;
else

11
block/grindstone/BlockCrank.java
View file

@ -2,13 +2,14 @@ package appeng.block.grindstone;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.implementations.tiles.ICrankable;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
@ -47,7 +48,7 @@ public class BlockCrank extends AEBaseBlock
private boolean isCrankable(World w, int x, int y, int z, ForgeDirection offset)
{
TileEntity te = w.getBlockTileEntity( x + offset.offsetX, y + offset.offsetY, z + offset.offsetZ );
TileEntity te = w.getTileEntity( x + offset.offsetX, y + offset.offsetY, z + offset.offsetZ );
if ( te instanceof ICrankable )
{
return ((ICrankable) te).canCrankAttach( offset.getOpposite() );
@ -72,13 +73,13 @@ public class BlockCrank extends AEBaseBlock
@Override
public boolean isValidOrientation(World w, int x, int y, int z, ForgeDirection forward, ForgeDirection up)
{
TileEntity te = w.getBlockTileEntity( x, y, z );
TileEntity te = w.getTileEntity( x, y, z );
return !(te instanceof TileCrank) || isCrankable( w, x, y, z, up.getOpposite() );
}
private void dropCrank(World w, int x, int y, int z)
{
w.destroyBlock( x, y, z, true );
w.func_147480_a( x, y, z, true ); // w.destroyBlock( x, y, z, true );
w.markBlockForUpdate( x, y, z );
}
@ -99,7 +100,7 @@ public class BlockCrank extends AEBaseBlock
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, int id)
public void onNeighborBlockChange(World w, int x, int y, int z, Block id)
{
AEBaseTile tile = getTileEntity( w, x, y, z );
if ( tile != null )

2
block/grindstone/BlockGrinder.java
View file

@ -5,7 +5,7 @@ import java.util.EnumSet;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;

2
block/misc/BlockCellWorkbench.java
View file

@ -5,7 +5,7 @@ import java.util.EnumSet;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;

2
block/misc/BlockCharger.java
View file

@ -12,7 +12,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;

2
block/misc/BlockCondenser.java
View file

@ -5,7 +5,7 @@ import java.util.EnumSet;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;

2
block/misc/BlockInterface.java
View file

@ -5,7 +5,7 @@ import java.util.EnumSet;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;

21
block/misc/BlockQuartzTorch.java
View file

@ -5,6 +5,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityFX;
@ -12,7 +13,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.util.IOrientable;
import appeng.api.util.IOrientableBlock;
import appeng.block.AEBaseBlock;
@ -34,7 +35,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
super( BlockQuartzTorch.class, Material.circuits );
setfeature( EnumSet.of( AEFeature.DecorativeLights ) );
setLightOpacity( 0 );
setLightValue( 0.9375F );
setLightLevel( 0.9375F );
isFullSize = isOpaque = false;
}
@ -52,7 +53,8 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
private void dropTorch(World w, int x, int y, int z)
{
w.destroyBlock( x, y, z, true );
w.func_147480_a( x, y, z, true );
// w.destroyBlock( x, y, z, true );
w.markBlockForUpdate( x, y, z );
}
@ -67,7 +69,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
private boolean canPlaceAt(World w, int x, int y, int z, ForgeDirection dir)
{
return w.isBlockSolidOnSide( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
return w.isSideSolid( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false );
}
@Override
@ -77,7 +79,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, int id)
public void onNeighborBlockChange(World w, int x, int y, int z, Block id)
{
ForgeDirection up = getOrientable( w, x, y, z ).getUp();
if ( !canPlaceAt( w, x, y, z, up.getOpposite() ) )
@ -97,11 +99,10 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
@Override
public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e)
{/*
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 *
* getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add(
* AxisAlignedBB.getAABBPool().getAABB( xOff + (double) x + 0.15, yOff +
* (double) y + 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x +
* 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; double zOff = -0.15 *
* getUp().offsetZ; out.add( AxisAlignedBB.getAABBPool().getAABB( xOff + (double) x + 0.15, yOff + (double) y +
* 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x + 0.85, yOff + (double) y + 0.85, zOff + (double) z +
* 0.85 ) );
*/
}

4
block/misc/BlockSecurity.java
View file

@ -5,7 +5,7 @@ import java.util.EnumSet;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RendererSecurity;
@ -46,7 +46,7 @@ public class BlockSecurity extends AEBaseBlock
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SECURITY );
}
else
p.sendChatToPlayer( PlayerMessages.MachineNotPowered.get() );
p.addChatMessage( PlayerMessages.MachineNotPowered.get() );
}
return true;

19
block/misc/BlockTinyTNT.java
View file

@ -7,14 +7,15 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.Item;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import appeng.block.AEBaseBlock;
@ -40,7 +41,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
isFullSize = isOpaque = false;
EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.TINY_TNT, AppEng.instance, 16, 4, true );
BlockDispenser.dispenseBehaviorRegistry.putObject( Item.itemsList[blockID], new DispenserBehaviorTinyTNT() );
BlockDispenser.dispenseBehaviorRegistry.putObject( Block.getIdFromBlock( this ), new DispenserBehaviorTinyTNT() );
}
@Override
@ -50,15 +51,15 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
}
@Override
public void registerIcons(IconRegister iconRegistry)
public void registerBlockIcons(IIconRegister iconRegistry)
{
// no images required.
}
@Override
public Icon getIcon(int direction, int metadata)
public IIcon getIcon(int direction, int metadata)
{
return new FullIcon( Block.tnt.getIcon( direction, metadata ) );
return new FullIcon( Blocks.tnt.getIcon( direction, metadata ) );
}
@Override
@ -89,7 +90,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, int id)
public void onNeighborBlockChange(World w, int x, int y, int z, Block id)
{
if ( w.isBlockIndirectlyGettingPowered( x, y, z ) )
{
@ -101,7 +102,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
@Override
public boolean onActivated(World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
if ( player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().itemID == Item.flintAndSteel.itemID )
if ( player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel )
{
this.startFuse( w, x, y, z, player );
w.setBlockToAir( x, y, z );

10
block/misc/BlockVibrationChamber.java
View file

@ -5,10 +5,10 @@ import java.util.Random;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.texture.ExtraTextures;
import appeng.core.Configuration;
@ -38,7 +38,7 @@ public class BlockVibrationChamber extends AEBaseBlock
TileVibrationChamber tc = getTileEntity( w, x, y, z );
if ( tc != null && !player.isSneaking() )
{
Platform.openGUI( player, tc, ForgeDirection.getOrientation(side),GuiBridge.GUI_VIBRATIONCHAMBER );
Platform.openGUI( player, tc, ForgeDirection.getOrientation( side ), GuiBridge.GUI_VIBRATIONCHAMBER );
return true;
}
}
@ -47,9 +47,9 @@ public class BlockVibrationChamber extends AEBaseBlock
}
@Override
public Icon getBlockTexture(IBlockAccess w, int x, int y, int z, int s)
public IIcon getIcon(IBlockAccess w, int x, int y, int z, int s)
{
Icon ico = super.getBlockTexture( w, x, y, z, s );
IIcon ico = super.getIcon( w, x, y, z, s );
TileVibrationChamber tvc = getTileEntity( w, x, y, z );
if ( tvc != null && tvc.isOn && ico == getRendererInstance().getTexture( ForgeDirection.SOUTH ) )

41
block/networking/BlockCableBus.java
View file

@ -6,25 +6,26 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.parts.PartItemStack;
import appeng.api.parts.SelectedPart;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RendererCableBus;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.ExtraTextures;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.core.CommonHelper;
@ -49,7 +50,7 @@ public class BlockCableBus extends AEBaseBlock
}
@Override
public boolean isLadder(World world, int x, int y, int z, EntityLivingBase entity)
public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity)
{
return cb( world, x, y, z ).isLadder( entity );
}
@ -76,7 +77,7 @@ public class BlockCableBus extends AEBaseBlock
@Override
public int getLightValue(IBlockAccess world, int x, int y, int z)
{
Block block = blocksList[world.getBlockId( x, y, z )];
Block block = world.getBlock( x, y, z );
if ( block != null && block != this )
{
return block.getLightValue( world, x, y, z );
@ -101,13 +102,13 @@ public class BlockCableBus extends AEBaseBlock
}
@Override
public boolean isBlockReplaceable(World world, int x, int y, int z)
public boolean isReplaceable(IBlockAccess world, int x, int y, int z)
{
return cb( world, x, y, z ).isEmpty();
}
@Override
public boolean removeBlockByPlayer(World world, EntityPlayer player, int x, int y, int z)
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z)
{
if ( player.capabilities.isCreativeMode )
{
@ -116,23 +117,23 @@ public class BlockCableBus extends AEBaseBlock
tile.dropItems = false;
// maybe ray trace?
}
return super.removeBlockByPlayer( world, player, x, y, z );
return super.removedByPlayer( world, player, x, y, z );
}
@Override
public Icon getBlockTexture(IBlockAccess w, int x, int y, int z, int s)
public IIcon getIcon(IBlockAccess w, int x, int y, int z, int s)
{
return getIcon( s, 0 );
}
@Override
public Icon getIcon(int direction, int metadata)
public IIcon getIcon(int direction, int metadata)
{
Icon i = super.getIcon( direction, metadata );
IIcon i = super.getIcon( direction, metadata );
if ( i != null )
return i;
return CableBusTextures.getMissing();
return ExtraTextures.BlockQuartzGlassB.getIcon();
}
@Override
@ -142,7 +143,7 @@ public class BlockCableBus extends AEBaseBlock
}
@Override
public void registerIcons(IconRegister iconRegistry)
public void registerBlockIcons(IIconRegister iconRegistry)
{
}
@ -154,21 +155,21 @@ public class BlockCableBus extends AEBaseBlock
}
@Override
public boolean isBlockSolidOnSide(World w, int x, int y, int z, ForgeDirection side)
public boolean isSideSolid(IBlockAccess w, int x, int y, int z, ForgeDirection side)
{
return cb( w, x, y, z ).isSolidOnSide( side );
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, int meh)
public void onNeighborBlockChange(World w, int x, int y, int z, Block meh)
{
cb( w, x, y, z ).onNeighborChanged();
}
@Override
public int idDropped(int i, Random r, int k)
public Item getItemDropped(int i, Random r, int k)
{
return 0;
return null;
}
@Override
@ -216,7 +217,7 @@ public class BlockCableBus extends AEBaseBlock
}
@Override
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List)
{
}
@ -230,7 +231,7 @@ public class BlockCableBus extends AEBaseBlock
private ICableBusContainer cb(IBlockAccess w, int x, int y, int z)
{
TileEntity te = w.getBlockTileEntity( x, y, z );
TileEntity te = w.getTileEntity( x, y, z );
if ( te instanceof TileCableBus )
return ((TileCableBus) te).cb;

3
block/networking/BlockController.java
View file

@ -2,6 +2,7 @@ package appeng.block.networking;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.World;
import appeng.block.AEBaseBlock;
@ -20,7 +21,7 @@ public class BlockController extends AEBaseBlock
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, int id_junk)
public void onNeighborBlockChange(World w, int x, int y, int z, Block id_junk)
{
TileController tc = getTileEntity( w, x, y, z );
if ( tc != null )

4
block/networking/BlockDenseEnergyCell.java
View file

@ -2,7 +2,7 @@ package appeng.block.networking;
import java.util.EnumSet;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import appeng.client.texture.ExtraTextures;
import appeng.core.features.AEFeature;
import appeng.tile.networking.TileDenseEnergyCell;
@ -23,7 +23,7 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
}
@Override
public Icon getIcon(int direction, int metadata)
public IIcon getIcon(int direction, int metadata)
{
switch (metadata)
{

7
block/networking/BlockEnergyCell.java
View file

@ -5,9 +5,10 @@ import java.util.List;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import appeng.block.AEBaseBlock;
import appeng.block.AEBaseItemBlockChargeable;
import appeng.client.render.BaseBlockRender;
@ -36,7 +37,7 @@ public class BlockEnergyCell extends AEBaseBlock
}
@Override
public void getSubBlocks(int id, CreativeTabs tab, List list)
public void getSubBlocks(Item id, CreativeTabs tab, List list)
{
super.getSubBlocks( id, tab, list );
@ -54,7 +55,7 @@ public class BlockEnergyCell extends AEBaseBlock
}
@Override
public Icon getIcon(int direction, int metadata)
public IIcon getIcon(int direction, int metadata)
{
switch (metadata)
{

6
block/networking/BlockWireless.java
View file

@ -8,9 +8,9 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderBlockWireless;
@ -39,7 +39,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
}
@Override
public Icon getIcon(int direction, int metadata)
public IIcon getIcon(int direction, int metadata)
{
return super.getIcon( direction, metadata );
}

5
block/qnb/BlockQuantumLinkChamber.java
View file

@ -3,10 +3,11 @@ package appeng.block.qnb;
import java.util.EnumSet;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderQNB;
@ -47,7 +48,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, int pointlessnumber)
public void onNeighborBlockChange(World w, int x, int y, int z, Block pointlessnumber)
{
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
if ( bridge != null )

3
block/qnb/BlockQuantumRing.java
View file

@ -2,6 +2,7 @@ package appeng.block.qnb;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.World;
import appeng.block.AEBaseBlock;
@ -24,7 +25,7 @@ public class BlockQuantumRing extends AEBaseBlock
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, int pointlessnumber)
public void onNeighborBlockChange(World w, int x, int y, int z, Block pointlessnumber)
{
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
if ( bridge != null )

3
block/solids/BlockMatrixFrame.java
View file

@ -5,6 +5,7 @@ import java.util.List;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderNull;
@ -29,7 +30,7 @@ public class BlockMatrixFrame extends AEBaseBlock
}
@Override
public void getSubBlocks(int id, CreativeTabs tab, List list)
public void getSubBlocks(Item id, CreativeTabs tab, List list)
{
}

5
block/solids/BlockQuartzGlass.java
View file

@ -2,7 +2,6 @@ package appeng.block.solids;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
import appeng.block.AEBaseBlock;
@ -29,9 +28,9 @@ public class BlockQuartzGlass extends AEBaseBlock
@Override
public boolean shouldSideBeRendered(IBlockAccess w, int x, int y, int z, int side)
{
if ( w.getBlockMaterial( x, y, z ) == Material.glass )
if ( w.getBlock( x, y, z ).getMaterial() == Material.glass )
{
if ( Block.blocksList[w.getBlockId( x, y, z )].getRenderType() == this.getRenderType() )
if ( w.getBlock( x, y, z ).getRenderType() == this.getRenderType() )
return false;
}
return super.shouldSideBeRendered( w, x, y, z, side );

4
block/solids/BlockQuartzLamp.java
View file

@ -19,8 +19,8 @@ public class BlockQuartzLamp extends BlockQuartzGlass
public BlockQuartzLamp() {
super( BlockQuartzLamp.class );
setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) );
setLightValue( 1.0f );
setTextureName( "BlockQuartzGlass" );
setLightLevel( 1.0f );
setBlockTextureName( "BlockQuartzGlass" );
}
@Override

9
block/solids/OreQuartz.java
View file

@ -4,6 +4,7 @@ import java.util.EnumSet;
import java.util.Random;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
@ -83,9 +84,9 @@ public class OreQuartz extends AEBaseBlock implements IOrientableBlock
}
@Override
public int idDropped(int id, Random rand, int meta)
public Item getItemDropped(int id, Random rand, int meta)
{
return getItemDropped().itemID;
return getItemDropped().getItem();
}
@Override
@ -103,7 +104,7 @@ public class OreQuartz extends AEBaseBlock implements IOrientableBlock
@Override
public int quantityDroppedWithBonus(int fortune, Random rand)
{
if ( fortune > 0 && this.blockID != this.idDropped( 0, rand, fortune ) )
if ( fortune > 0 && Item.getItemFromBlock( this ) != getItemDropped( 0, rand, fortune ) )
{
int j = rand.nextInt( fortune + 2 ) - 1;
@ -125,7 +126,7 @@ public class OreQuartz extends AEBaseBlock implements IOrientableBlock
{
super.dropBlockAsItemWithChance( w, x, y, z, blockid, something, meta );
if ( this.idDropped( blockid, w.rand, meta ) != this.blockID )
if ( getItemDropped( blockid, w.rand, meta ) != Item.getItemFromBlock( this ) )
{
int xp = MathHelper.getRandomIntegerInRange( w.rand, 2, 5 );

3
block/spatial/BlockSpatialIOPort.java
View file

@ -2,6 +2,7 @@ package appeng.block.spatial;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.World;
import appeng.block.AEBaseBlock;
@ -18,7 +19,7 @@ public class BlockSpatialIOPort extends AEBaseBlock
}
@Override
public final void onNeighborBlockChange(World w, int x, int y, int z, int junk)
public final void onNeighborBlockChange(World w, int x, int y, int z, Block junk)
{
TileSpatialIOPort te = getTileEntity( w, x, y, z );
if ( te != null )

3
block/spatial/BlockSpatialPylon.java
View file

@ -2,6 +2,7 @@ package appeng.block.spatial;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -21,7 +22,7 @@ public class BlockSpatialPylon extends AEBaseBlock
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, int junk)
public void onNeighborBlockChange(World w, int x, int y, int z, Block junk)
{
TileSpatialPylon tsp = getTileEntity( w, x, y, z );
if ( tsp != null )

6
block/storage/BlockChest.java
View file

@ -7,7 +7,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.storage.ICellHandler;
import appeng.api.storage.IMEInventoryHandler;
@ -73,10 +73,10 @@ public class BlockChest extends AEBaseBlock
}
}
p.sendChatToPlayer( PlayerMessages.ChestCannotReadStorageCell.get() );
p.addChatMessage( PlayerMessages.ChestCannotReadStorageCell.get() );
}
else
p.sendChatToPlayer( PlayerMessages.MachineNotPowered.get() );
p.addChatMessage( PlayerMessages.MachineNotPowered.get() );
return true;
}

2
block/storage/BlockDrive.java
View file

@ -5,7 +5,7 @@ import java.util.EnumSet;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderDrive;

5
block/storage/BlockIOPort.java
View file

@ -2,10 +2,11 @@ package appeng.block.storage;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;
@ -22,7 +23,7 @@ public class BlockIOPort extends AEBaseBlock
}
@Override
public final void onNeighborBlockChange(World w, int x, int y, int z, int junk)
public final void onNeighborBlockChange(World w, int x, int y, int z, Block junk)
{
TileIOPort te = getTileEntity( w, x, y, z );
if ( te != null )

10
client/ClientHelper.java
View file

@ -8,11 +8,10 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.init.Items;
import net.minecraft.world.World;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.TESRWrapper;
@ -27,6 +26,7 @@ import appeng.server.ServerHelper;
import appeng.util.Platform;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class ClientHelper extends ServerHelper
{
@ -40,10 +40,10 @@ public class ClientHelper extends ServerHelper
RenderManager.instance.entityRenderMap.put( EntityTinyTNTPrimed.class, new RenderTinyTNTPrimed() );
}
@ForgeSubscribe
@SubscribeEvent
public void updateTextureSheet(TextureStitchEvent.Pre ev)
{
if ( ev.map.textureType == 0 )
if ( ev.map.getTextureType() == 0 )
{
for (ExtraTextures et : ExtraTextures.values())
et.registerIcon( ev.map );
@ -97,7 +97,7 @@ public class ClientHelper extends ServerHelper
float y = (float) (((Platform.getRandomInt() % 100) * 0.01) - 0.5) * 0.7f;
float z = (float) (((Platform.getRandomInt() % 100) * 0.01) - 0.5) * 0.7f;
EnergyFx fx = new EnergyFx( w, posX + x, posY + y, posZ + z, Item.diamond );
EnergyFx fx = new EnergyFx( w, posX + x, posY + y, posZ + z, Items.diamond );
fx.motionX = -x * 0.1;
fx.motionY = -y * 0.1;

62
client/gui/AEBaseGui.java
View file

@ -39,9 +39,10 @@ import appeng.container.slot.SlotInaccessable;
import appeng.container.slot.SlotOutput;
import appeng.container.slot.SlotRestrictedInput;
import appeng.core.AELog;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketInventoryAction;
import appeng.helpers.InventoryAction;
import cpw.mods.fml.common.network.PacketDispatcher;
import appeng.util.Platform;
public abstract class AEBaseGui extends GuiContainer
{
@ -115,7 +116,7 @@ public abstract class AEBaseGui extends GuiContainer
try
{
p = new PacketInventoryAction( action, slotIdx, stack );
PacketDispatcher.sendPacketToServer( p.getPacket() );
NetworkHandler.instance.sendToServer( p );
}
catch (IOException e)
{
@ -144,7 +145,7 @@ public abstract class AEBaseGui extends GuiContainer
try
{
p = new PacketInventoryAction( action, slotIdx, stack );
PacketDispatcher.sendPacketToServer( p.getPacket() );
NetworkHandler.instance.sendToServer( p );
}
catch (IOException e)
{
@ -194,7 +195,7 @@ public abstract class AEBaseGui extends GuiContainer
try
{
p = new PacketInventoryAction( action, inventorySlots.inventorySlots.size(), stack );
PacketDispatcher.sendPacketToServer( p.getPacket() );
NetworkHandler.instance.sendToServer( p );
}
catch (IOException e)
{
@ -255,7 +256,7 @@ public abstract class AEBaseGui extends GuiContainer
for (var6 = 0; var6 < var4.length; ++var6)
{
var7 = fontRenderer.getStringWidth( (String) var4[var6] );
var7 = fontRendererObj.getStringWidth( (String) var4[var6] );
if ( var7 > var5 )
{
@ -281,7 +282,7 @@ public abstract class AEBaseGui extends GuiContainer
var5 = forceWidth;
this.zLevel = 300.0F;
itemRenderer.zLevel = 300.0F;
itemRender.zLevel = 300.0F;
int var10 = -267386864;
this.drawGradientRect( var6 - 3, var7 - 4, var6 + var5 + 3, var7 - 3, var10, var10 );
this.drawGradientRect( var6 - 3, var7 + var9 + 3, var6 + var5 + 3, var7 + var9 + 4, var10, var10 );
@ -308,7 +309,7 @@ public abstract class AEBaseGui extends GuiContainer
var14 = "\u00a77" + var14;
}
this.fontRenderer.drawStringWithShadow( var14, var6, var7, -1 );
this.fontRendererObj.drawStringWithShadow( var14, var6, var7, -1 );
if ( var13 == 0 )
{
@ -319,7 +320,7 @@ public abstract class AEBaseGui extends GuiContainer
}
this.zLevel = 0.0F;
itemRenderer.zLevel = 0.0F;
itemRender.zLevel = 0.0F;
}
GL11.glPopAttrib();
}
@ -343,15 +344,15 @@ public abstract class AEBaseGui extends GuiContainer
protected void drawItem(int x, int y, ItemStack is)
{
this.zLevel = 100.0F;
itemRenderer.zLevel = 100.0F;
itemRender.zLevel = 100.0F;
GL11.glEnable( GL11.GL_LIGHTING );
GL11.glEnable( GL12.GL_RESCALE_NORMAL );
RenderHelper.enableGUIStandardItemLighting();
itemRenderer.renderItemAndEffectIntoGUI( this.fontRenderer, this.mc.renderEngine, is, x, y );
itemRender.renderItemAndEffectIntoGUI( this.fontRendererObj, this.mc.renderEngine, is, x, y );
GL11.glDisable( GL11.GL_LIGHTING );
itemRenderer.zLevel = 0.0F;
itemRender.zLevel = 0.0F;
this.zLevel = 0.0F;
}
@ -401,7 +402,9 @@ public abstract class AEBaseGui extends GuiContainer
for (int j1 = 0; j1 < this.inventorySlots.inventorySlots.size(); ++j1)
{
Slot slot = (Slot) this.inventorySlots.inventorySlots.get( j1 );
if ( isPointInRegion( slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mousex, mousey ) )
// isPointInRegion
if ( func_146978_c( slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mousex, mousey ) )
{
return slot;
}
@ -430,12 +433,13 @@ public abstract class AEBaseGui extends GuiContainer
{
try
{
super.drawSlotInventory( s );
// drawSlotInventory
// super.func_146977_a( s );
}
catch (Exception err)
{
Tessellator tessellator = Tessellator.instance;
if ( tessellator.isDrawing )
if ( Platform.isDrawing( tessellator ) )
tessellator.draw();
}
}
@ -447,17 +451,18 @@ public abstract class AEBaseGui extends GuiContainer
return true;
}
@Override
// @Override
// private void func_146977_a(Slot p_146977_1_)
protected void drawSlotInventory(Slot s)
{
if ( s instanceof SlotME )
{
RenderItem pIR = itemRenderer;
itemRenderer = aeri;
RenderItem pIR = itemRender;
itemRender = aeri;
try
{
this.zLevel = 100.0F;
itemRenderer.zLevel = 100.0F;
itemRender.zLevel = 100.0F;
if ( !isPowered() )
{
@ -467,7 +472,7 @@ public abstract class AEBaseGui extends GuiContainer
}
this.zLevel = 0.0F;
itemRenderer.zLevel = 0.0F;
itemRender.zLevel = 0.0F;
if ( s instanceof SlotME )
aeri.aestack = ((SlotME) s).getAEStack();
@ -479,10 +484,10 @@ public abstract class AEBaseGui extends GuiContainer
catch (Exception err)
{
AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
if ( Tessellator.instance.isDrawing )
if ( Platform.isDrawing( Tessellator.instance ) )
Tessellator.instance.draw();
}
itemRenderer = pIR;
itemRender = pIR;
return;
}
else
@ -522,10 +527,10 @@ public abstract class AEBaseGui extends GuiContainer
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() );
tessellator.addVertexWithUV( (double) (par1 + 0), (double) (par2 + par6), (double) this.zLevel, (double) ((float) (par3 + 0) * f),
(double) ((float) (par4 + par6) * f1) );
tessellator.addVertexWithUV( (double) (par1 + par5), (double) (par2 + par6), (double) this.zLevel, (double) ((float) (par3 + par5) * f),
(double) ((float) (par4 + par6) * f1) );
tessellator.addVertexWithUV( (double) (par1 + par5), (double) (par2 + 0), (double) this.zLevel, (double) ((float) (par3 + par5) * f),
(double) ((float) (par4 + 0) * f1) );
tessellator.addVertexWithUV( (double) (par1 + par5), (double) (par2 + par6), (double) this.zLevel,
(double) ((float) (par3 + par5) * f), (double) ((float) (par4 + par6) * f1) );
tessellator.addVertexWithUV( (double) (par1 + par5), (double) (par2 + 0), (double) this.zLevel,
(double) ((float) (par3 + par5) * f), (double) ((float) (par4 + 0) * f1) );
tessellator.addVertexWithUV( (double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) ((float) (par3 + 0) * f),
(double) ((float) (par4 + 0) * f1) );
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, 1.0f );
@ -533,7 +538,7 @@ public abstract class AEBaseGui extends GuiContainer
}
catch (Exception err)
{
if ( tessellator.isDrawing )
if ( Platform.isDrawing( tessellator ) )
tessellator.draw();
}
GL11.glPopAttrib();
@ -563,14 +568,14 @@ public abstract class AEBaseGui extends GuiContainer
if ( ((AppEngSlot) s).isValid == hasCalculatedValidness.Invalid )
{
this.zLevel = 100.0F;
itemRenderer.zLevel = 100.0F;
itemRender.zLevel = 100.0F;
GL11.glDisable( GL11.GL_LIGHTING );
super.drawRect( s.xDisplayPosition, s.yDisplayPosition, 16 + s.xDisplayPosition, 16 + s.yDisplayPosition, 0x66ff6666 );
GL11.glEnable( GL11.GL_LIGHTING );
this.zLevel = 0.0F;
itemRenderer.zLevel = 0.0F;
itemRender.zLevel = 0.0F;
}
}
@ -592,4 +597,5 @@ public abstract class AEBaseGui extends GuiContainer
// do the usual for non-ME Slots.
safeDrawSlot( s );
}
}

3
client/gui/AEBaseMEGui.java
View file

@ -57,7 +57,6 @@ public abstract class AEBaseMEGui extends AEBaseGui
}
// Vanillia version...
@Override
protected void drawItemStackTooltip(ItemStack stack, int x, int y)
{
Slot s = getSlot( x, y );
@ -96,7 +95,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
return;
}
}
super.drawItemStackTooltip( stack, x, y );
// super.drawItemStackTooltip( stack, x, y );
}
}

8
client/gui/implementations/GuiCellWorkbench.java
View file

@ -17,10 +17,10 @@ import appeng.api.implementations.items.IUpgradeModule;
import appeng.client.gui.widgets.GuiImgButton;
import appeng.container.implementations.ContainerCellWorkbench;
import appeng.core.localization.GuiText;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketValueConfig;
import appeng.tile.misc.TileCellWorkbench;
import appeng.util.Platform;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiCellWorkbench extends GuiUpgradeable
{
@ -104,11 +104,11 @@ public class GuiCellWorkbench extends GuiUpgradeable
{
if ( btn == partition )
{
PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "CellWorkbench.Action", "Partition" )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Action", "Partition" ) );
}
else if ( btn == clear )
{
PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "CellWorkbench.Action", "Clear" )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Action", "Clear" ) );
}
else if ( btn == fuzzyMode )
{
@ -117,7 +117,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
FuzzyMode fz = (FuzzyMode) fuzzyMode.getCurrentValue();
fz = Platform.rotateEnum( fz, backwards, Settings.FUZZY_MODE.getPossibleValues() );
PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "CellWorkbench.Fuzzy", fz.name() )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Fuzzy", fz.name() ) );
}
else
super.actionPerformed( btn );

10
client/gui/implementations/GuiChest.java
View file

@ -10,9 +10,9 @@ import appeng.container.implementations.ContainerChest;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketSwitchGuis;
import appeng.tile.storage.TileChest;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiChest extends AEBaseGui
{
@ -28,7 +28,7 @@ public class GuiChest extends AEBaseGui
{
try
{
PacketDispatcher.sendPacketToServer( (new PacketSwitchGuis( GuiBridge.GUI_PRIORITY )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) );
}
catch (IOException e)
{
@ -42,7 +42,7 @@ public class GuiChest extends AEBaseGui
{
super.initGui();
buttonList.add( priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRenderer ) );
buttonList.add( priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) );
}
public GuiChest(InventoryPlayer inventoryPlayer, TileChest te) {
@ -60,8 +60,8 @@ public class GuiChest extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.Chest.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.Chest.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
}

8
client/gui/implementations/GuiCondenser.java
View file

@ -15,9 +15,9 @@ import appeng.client.gui.widgets.GuiProgressBar.Direction;
import appeng.container.implementations.ContainerCondenser;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketConfigButton;
import appeng.tile.misc.TileCondenser;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiCondenser extends AEBaseGui
{
@ -43,7 +43,7 @@ public class GuiCondenser extends AEBaseGui
{
try
{
PacketDispatcher.sendPacketToServer( (new PacketConfigButton( Settings.CONDENSER_OUTPUT, backwards )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketConfigButton( Settings.CONDENSER_OUTPUT, backwards ) );
}
catch (IOException e)
{
@ -77,8 +77,8 @@ public class GuiCondenser extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.Condenser.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.Condenser.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
mode.set( cvc.output );
mode.FillVar = "" + cvc.output.requiredPower;

2
client/gui/implementations/GuiCraftingTerm.java
View file

@ -22,7 +22,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
super.drawFG( offsetX, offsetY, mouseX, mouseY );
fontRenderer.drawString( GuiText.CraftingTerminal.getLocal(), 8, ySize - 96 + 1 - reservedSpace, 4210752 );
fontRendererObj.drawString( GuiText.CraftingTerminal.getLocal(), 8, ySize - 96 + 1 - reservedSpace, 4210752 );
}
}

10
client/gui/implementations/GuiDrive.java
View file

@ -10,9 +10,9 @@ import appeng.container.implementations.ContainerDrive;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketSwitchGuis;
import appeng.tile.storage.TileDrive;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiDrive extends AEBaseGui
{
@ -28,7 +28,7 @@ public class GuiDrive extends AEBaseGui
{
try
{
PacketDispatcher.sendPacketToServer( (new PacketSwitchGuis( GuiBridge.GUI_PRIORITY )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) );
}
catch (IOException e)
{
@ -42,7 +42,7 @@ public class GuiDrive extends AEBaseGui
{
super.initGui();
buttonList.add( priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRenderer ) );
buttonList.add( priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) );
}
public GuiDrive(InventoryPlayer inventoryPlayer, TileDrive te) {
@ -60,8 +60,8 @@ public class GuiDrive extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.Drive.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.Drive.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
}

4
client/gui/implementations/GuiGrinder.java
View file

@ -24,8 +24,8 @@ public class GuiGrinder extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.GrindStone.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.GrindStone.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
}

10
client/gui/implementations/GuiIOPort.java
View file

@ -16,9 +16,9 @@ import appeng.client.gui.widgets.GuiImgButton;
import appeng.container.implementations.ContainerIOPort;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketConfigButton;
import appeng.tile.storage.TileIOPort;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiIOPort extends GuiUpgradeable
{
@ -42,8 +42,8 @@ public class GuiIOPort extends GuiUpgradeable
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.IOPort.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.IOPort.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
if ( redstoneMode != null )
redstoneMode.set( cvb.rsMode );
@ -77,10 +77,10 @@ public class GuiIOPort extends GuiUpgradeable
try
{
if ( btn == fullMode )
PacketDispatcher.sendPacketToServer( (new PacketConfigButton( fullMode.getSetting(), backwards )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketConfigButton( fullMode.getSetting(), backwards ) );
if ( btn == operationMode )
PacketDispatcher.sendPacketToServer( (new PacketConfigButton( operationMode.getSetting(), backwards )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketConfigButton( operationMode.getSetting(), backwards ) );
}
catch (IOException e)
{

10
client/gui/implementations/GuiInterface.java
View file

@ -24,13 +24,13 @@ public class GuiInterface extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.Interface.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.Interface.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.Config.getLocal(), 18, 6 + 11 + 7, 4210752 );
fontRenderer.drawString( GuiText.StoredItems.getLocal(), 18, 6 + 60 + 7, 4210752 );
fontRenderer.drawString( GuiText.Patterns.getLocal(), 8, 6 + 73 + 7, 4210752 );
fontRendererObj.drawString( GuiText.Config.getLocal(), 18, 6 + 11 + 7, 4210752 );
fontRendererObj.drawString( GuiText.StoredItems.getLocal(), 18, 6 + 60 + 7, 4210752 );
fontRendererObj.drawString( GuiText.Patterns.getLocal(), 8, 6 + 73 + 7, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
}

8
client/gui/implementations/GuiLevelEmitter.java
View file

@ -13,9 +13,9 @@ import appeng.client.gui.widgets.GuiImgButton;
import appeng.container.implementations.ContainerLevelEmitter;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketValueConfig;
import appeng.parts.automation.PartLevelEmitter;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiLevelEmitter extends GuiUpgradeable
{
@ -34,7 +34,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
{
super.initGui();
level = new GuiTextField( this.fontRenderer, this.guiLeft + 44, this.guiTop + 43, 59, this.fontRenderer.FONT_HEIGHT );
level = new GuiTextField( fontRendererObj, this.guiLeft + 44, this.guiTop + 43, 59, fontRendererObj.FONT_HEIGHT );
level.setEnableBackgroundDrawing( false );
level.setMaxStringLength( 16 );
level.setTextColor( 0xFFFFFF );
@ -112,7 +112,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
level.setText( Out = Long.toString( result ) );
PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "LevelEmitter.Value", Out )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) );
}
catch (IOException e)
{
@ -149,7 +149,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
if ( Out.length() == 0 )
Out = "0";
PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "LevelEmitter.Value", Out )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) );
}
catch (IOException e)
{

6
client/gui/implementations/GuiMEMonitorable.java
View file

@ -124,7 +124,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource
buttonList.add( new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_DIRECTION, Configuration.instance.settings
.getSetting( Settings.SORT_DIRECTION ) ) );
searchField = new GuiTextField( this.fontRenderer, this.guiLeft + Math.max( 82, xoffset ), this.guiTop + 6, 89, this.fontRenderer.FONT_HEIGHT );
searchField = new GuiTextField( fontRendererObj, this.guiLeft + Math.max( 82, xoffset ), this.guiTop + 6, 89, fontRendererObj.FONT_HEIGHT );
searchField.setEnableBackgroundDrawing( false );
searchField.setMaxStringLength( 25 );
searchField.setTextColor( 0xFFFFFF );
@ -201,8 +201,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( myName.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( myName.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
@Override

13
client/gui/implementations/GuiNetworkStatus.java
View file

@ -108,10 +108,10 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
{
ContainerNetworkStatus ns = (ContainerNetworkStatus) inventorySlots;
fontRenderer.drawString( GuiText.NetworkDetails.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.NetworkDetails.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.PowerInputRate.getLocal() + ": " + formatPowerLong( ns.avgAddition ), 8, 16, 4210752 );
fontRenderer.drawString( GuiText.PowerUsageRate.getLocal() + ": " + formatPowerLong( ns.powerUsage ), 8, 26, 4210752 );
fontRendererObj.drawString( GuiText.PowerInputRate.getLocal() + ": " + formatPowerLong( ns.avgAddition ), 8, 16, 4210752 );
fontRendererObj.drawString( GuiText.PowerUsageRate.getLocal() + ": " + formatPowerLong( ns.powerUsage ), 8, 26, 4210752 );
int sectionLength = 30;
@ -138,8 +138,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
if ( refStack.getStackSize() >= 10000 )
str = Long.toString( refStack.getStackSize() / 1000 ) + StatCollector.translateToLocal( "AppEng.Sizes.1000" );
int w = fontRenderer.getStringWidth( str );
fontRenderer.drawString( str, (int) ((x * sectionLength + xo + sectionLength - 19 - ((float) w * 0.5)) * 2), (int) ((y * 18 + yo + 6) * 2),
int w = fontRendererObj.getStringWidth( str );
fontRendererObj.drawString( str, (int) ((x * sectionLength + xo + sectionLength - 19 - ((float) w * 0.5)) * 2), (int) ((y * 18 + yo + 6) * 2),
4210752 );
GL11.glPopMatrix();
@ -216,7 +216,6 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
// Vanillia version...
@Override
protected void drawItemStackTooltip(ItemStack stack, int x, int y)
{
Slot s = getSlot( x, y );
@ -246,7 +245,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
drawTooltip( x, y, 0, join( currenttip, "\n" ) );
}
}
super.drawItemStackTooltip( stack, x, y );
// super.drawItemStackTooltip( stack, x, y );
}
@Override

4
client/gui/implementations/GuiNetworkTool.java
View file

@ -24,8 +24,8 @@ public class GuiNetworkTool extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.NetworkTool.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.NetworkTool.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
}

17
client/gui/implementations/GuiPriority.java
View file

@ -14,13 +14,13 @@ import appeng.container.implementations.ContainerPriority;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketSwitchGuis;
import appeng.core.sync.packets.PacketValueConfig;
import appeng.helpers.IPriorityHost;
import appeng.parts.misc.PartStorageBus;
import appeng.tile.storage.TileChest;
import appeng.tile.storage.TileDrive;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiPriority extends AEBaseGui
{
@ -74,9 +74,9 @@ public class GuiPriority extends AEBaseGui
}
if ( OriginalGui != null )
buttonList.add( originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRenderer ) );
buttonList.add( originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender ) );
priority = new GuiTextField( this.fontRenderer, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRenderer.FONT_HEIGHT );
priority = new GuiTextField( fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, fontRendererObj.FONT_HEIGHT );
priority.setEnableBackgroundDrawing( false );
priority.setMaxStringLength( 16 );
priority.setTextColor( 0xFFFFFF );
@ -94,7 +94,7 @@ public class GuiPriority extends AEBaseGui
{
try
{
PacketDispatcher.sendPacketToServer( (new PacketSwitchGuis( OriginalGui )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketSwitchGuis( OriginalGui ) );
}
catch (IOException e)
{
@ -144,7 +144,7 @@ public class GuiPriority extends AEBaseGui
priority.setText( Out = Long.toString( result ) );
PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "PriorityHost.Priority", Out )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", Out ) );
}
catch (IOException e)
{
@ -157,7 +157,8 @@ public class GuiPriority extends AEBaseGui
{
if ( !this.checkHotbarKeys( key ) )
{
if ( (key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character )) && priority.textboxKeyTyped( character, key ) )
if ( (key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character ))
&& priority.textboxKeyTyped( character, key ) )
{
try
{
@ -176,7 +177,7 @@ public class GuiPriority extends AEBaseGui
if ( Out.length() == 0 )
Out = "0";
PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "PriorityHost.Priority", Out )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", Out ) );
}
catch (IOException e)
{
@ -207,6 +208,6 @@ public class GuiPriority extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.Priority.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.Priority.getLocal(), 8, 6, 4210752 );
}
}

4
client/gui/implementations/GuiQNB.java
View file

@ -24,8 +24,8 @@ public class GuiQNB extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.QuantumLinkChamber.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.QuantumLinkChamber.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
}

18
client/gui/implementations/GuiSecurity.java
View file

@ -10,8 +10,8 @@ import appeng.client.gui.widgets.GuiToggleButton;
import appeng.container.implementations.ContainerSecurity;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketValueConfig;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiSecurity extends GuiMEMonitorable
{
@ -31,11 +31,11 @@ public class GuiSecurity extends GuiMEMonitorable
super.initGui();
int top = this.guiTop + this.ySize - 116;
buttonList.add( inject = new GuiToggleButton( this.guiLeft + 56 + 18 * 0, top, 11 * 16 + 0, 12 * 16 + 0, SecurityPermissions.INJECT.getUnlocalizedName(),
SecurityPermissions.INJECT.getUnlocalizedTip() ) );
buttonList.add( inject = new GuiToggleButton( this.guiLeft + 56 + 18 * 0, top, 11 * 16 + 0, 12 * 16 + 0, SecurityPermissions.INJECT
.getUnlocalizedName(), SecurityPermissions.INJECT.getUnlocalizedTip() ) );
buttonList.add( extract = new GuiToggleButton( this.guiLeft + 56 + 18 * 1, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT.getUnlocalizedName(),
SecurityPermissions.EXTRACT.getUnlocalizedTip() ) );
buttonList.add( extract = new GuiToggleButton( this.guiLeft + 56 + 18 * 1, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT
.getUnlocalizedName(), SecurityPermissions.EXTRACT.getUnlocalizedTip() ) );
buttonList.add( craft = new GuiToggleButton( this.guiLeft + 56 + 18 * 2, top, 11 * 16 + 2, 12 * 16 + 2, SecurityPermissions.CRAFT.getUnlocalizedName(),
SecurityPermissions.CRAFT.getUnlocalizedTip() ) );
@ -43,8 +43,8 @@ public class GuiSecurity extends GuiMEMonitorable
buttonList.add( build = new GuiToggleButton( this.guiLeft + 56 + 18 * 3, top, 11 * 16 + 3, 12 * 16 + 3, SecurityPermissions.BUILD.getUnlocalizedName(),
SecurityPermissions.BUILD.getUnlocalizedTip() ) );
buttonList.add( security = new GuiToggleButton( this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, SecurityPermissions.SECURITY.getUnlocalizedName(),
SecurityPermissions.SECURITY.getUnlocalizedTip() ) );
buttonList.add( security = new GuiToggleButton( this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, SecurityPermissions.SECURITY
.getUnlocalizedName(), SecurityPermissions.SECURITY.getUnlocalizedTip() ) );
}
protected void actionPerformed(net.minecraft.client.gui.GuiButton btn)
@ -68,7 +68,7 @@ public class GuiSecurity extends GuiMEMonitorable
{
try
{
PacketDispatcher.sendPacketToServer( (new PacketValueConfig( "TileSecurity.ToggleOption", toggleSetting.name() )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileSecurity.ToggleOption", toggleSetting.name() ) );
}
catch (IOException e)
{
@ -95,7 +95,7 @@ public class GuiSecurity extends GuiMEMonitorable
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
super.drawFG( offsetX, offsetY, mouseX, mouseY );
fontRenderer.drawString( GuiText.SecurityCardEditor.getLocal(), 8, ySize - 96 + 1 - reservedSpace, 4210752 );
fontRendererObj.drawString( GuiText.SecurityCardEditor.getLocal(), 8, ySize - 96 + 1 - reservedSpace, 4210752 );
}
@Override

4
client/gui/implementations/GuiSpatialIOPort.java
View file

@ -24,8 +24,8 @@ public class GuiSpatialIOPort extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.SpatialIOPort.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.SpatialIOPort.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
}

14
client/gui/implementations/GuiStorageBus.java
View file

@ -16,10 +16,10 @@ import appeng.container.implementations.ContainerStorageBus;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketConfigButton;
import appeng.core.sync.packets.PacketSwitchGuis;
import appeng.parts.misc.PartStorageBus;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiStorageBus extends GuiUpgradeable
{
@ -41,8 +41,8 @@ public class GuiStorageBus extends GuiUpgradeable
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.StorageBus.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.StorageBus.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
if ( fuzzyMode != null )
fuzzyMode.set( cvb.fzMode );
@ -57,7 +57,7 @@ public class GuiStorageBus extends GuiUpgradeable
fuzzyMode = new GuiImgButton( this.guiLeft - 18, guiTop + 28, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
rwMode = new GuiImgButton( this.guiLeft - 18, guiTop + 8, Settings.ACCESS, AccessRestriction.READ_WRITE );
buttonList.add( priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRenderer ) );
buttonList.add( priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) );
buttonList.add( fuzzyMode );
buttonList.add( rwMode );
@ -74,7 +74,7 @@ public class GuiStorageBus extends GuiUpgradeable
{
try
{
PacketDispatcher.sendPacketToServer( (new PacketSwitchGuis( GuiBridge.GUI_PRIORITY )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) );
}
catch (IOException e)
{
@ -84,10 +84,10 @@ public class GuiStorageBus extends GuiUpgradeable
try
{
if ( btn == fuzzyMode )
PacketDispatcher.sendPacketToServer( (new PacketConfigButton( fuzzyMode.getSetting(), backwards )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketConfigButton( fuzzyMode.getSetting(), backwards ) );
if ( btn == rwMode )
PacketDispatcher.sendPacketToServer( (new PacketConfigButton( rwMode.getSetting(), backwards )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketConfigButton( rwMode.getSetting(), backwards ) );
}
catch (IOException e)
{

10
client/gui/implementations/GuiUpgradeable.java
View file

@ -17,9 +17,9 @@ import appeng.client.gui.widgets.GuiImgButton;
import appeng.container.implementations.ContainerUpgradeable;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketConfigButton;
import appeng.parts.automation.PartImportBus;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiUpgradeable extends AEBaseGui
{
@ -69,10 +69,10 @@ public class GuiUpgradeable extends AEBaseGui
try
{
if ( btn == redstoneMode )
PacketDispatcher.sendPacketToServer( (new PacketConfigButton( redstoneMode.getSetting(), backwards )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketConfigButton( redstoneMode.getSetting(), backwards ) );
if ( btn == fuzzyMode )
PacketDispatcher.sendPacketToServer( (new PacketConfigButton( fuzzyMode.getSetting(), backwards )).getPacket() );
NetworkHandler.instance.sendToServer( new PacketConfigButton( fuzzyMode.getSetting(), backwards ) );
}
catch (IOException e)
@ -120,8 +120,8 @@ public class GuiUpgradeable extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( getName().getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( getName().getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
if ( redstoneMode != null )
redstoneMode.set( cvb.rsMode );

4
client/gui/implementations/GuiVibrationChamber.java
View file

@ -44,8 +44,8 @@ public class GuiVibrationChamber extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.VibrationChamber.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.VibrationChamber.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
int k = 25;
int l = -15;

4
client/gui/implementations/GuiWireless.java
View file

@ -24,8 +24,8 @@ public class GuiWireless extends AEBaseGui
@Override
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY)
{
fontRenderer.drawString( GuiText.Wireless.getLocal(), 8, 6, 4210752 );
fontRenderer.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
fontRendererObj.drawString( GuiText.Wireless.getLocal(), 8, 6, 4210752 );
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
}
}

16
client/gui/widgets/GuiImgButton.java
View file

@ -72,18 +72,18 @@ public class GuiImgButton extends GuiButton implements ITooltip
static private Map<EnumPair, BtnAppearance> Appearances;
private void registerApp(int icon, Settings setting, Enum val, ButtonToolTips title, Object hint)
private void registerApp(int IIcon, Settings setting, Enum val, ButtonToolTips title, Object hint)
{
BtnAppearance a = new BtnAppearance();
a.DisplayName = title.getUnlocalized();
a.DisplayValue = (String) (hint instanceof String ? hint : ((ButtonToolTips) hint).getUnlocalized());
a.index = icon;
a.index = IIcon;
Appearances.put( new EnumPair( setting, val ), a );
}
public void setVisibility(boolean vis)
{
drawButton = vis;
visible = vis;
enabled = vis;
}
@ -174,13 +174,13 @@ public class GuiImgButton extends GuiButton implements ITooltip
@Override
public boolean isVisible()
{
return drawButton;
return visible;
}
@Override
public void drawButton(Minecraft par1Minecraft, int par2, int par3)
{
if ( this.drawButton )
if ( this.visible )
{
int iconIndex = getIconIndex();
@ -195,7 +195,8 @@ public class GuiImgButton extends GuiButton implements ITooltip
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
par1Minecraft.renderEngine.bindTexture( ExtraTextures.GuiTexture( "guis/states.png" ) );
this.field_82253_i = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width
&& par3 < this.yPosition + this.height;
int uv_y = (int) Math.floor( iconIndex / 16 );
int uv_x = iconIndex - uv_y * 16;
@ -210,7 +211,8 @@ public class GuiImgButton extends GuiButton implements ITooltip
{
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
par1Minecraft.renderEngine.bindTexture( ExtraTextures.GuiTexture( "guis/states.png" ) );
this.field_82253_i = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width
&& par3 < this.yPosition + this.height;
int uv_y = (int) Math.floor( iconIndex / 16 );
int uv_x = iconIndex - uv_y * 16;

2
client/gui/widgets/GuiProgressBar.java
View file

@ -43,7 +43,7 @@ public class GuiProgressBar extends GuiButton implements ITooltip
@Override
public void drawButton(Minecraft par1Minecraft, int par2, int par3)
{
if ( this.drawButton )
if ( this.visible )
{
par1Minecraft.getTextureManager().bindTexture( texture );

8
client/gui/widgets/GuiTabButton.java
View file

@ -24,7 +24,7 @@ public class GuiTabButton extends GuiButton implements ITooltip
public void setVisibility(boolean vis)
{
drawButton = vis;
visible = vis;
enabled = vis;
}
@ -53,17 +53,17 @@ public class GuiTabButton extends GuiButton implements ITooltip
@Override
public boolean isVisible()
{
return drawButton;
return visible;
}
@Override
public void drawButton(Minecraft par1Minecraft, int par2, int par3)
{
if ( this.drawButton )
if ( this.visible )
{
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
par1Minecraft.renderEngine.bindTexture( ExtraTextures.GuiTexture( "guis/states.png" ) );
this.field_82253_i = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
int uv_y = (int) Math.floor( 13 / 16 );
int uv_x = 13 - uv_y * 16;

8
client/gui/widgets/GuiToggleButton.java
View file

@ -26,7 +26,7 @@ public class GuiToggleButton extends GuiButton implements ITooltip
public void setVisibility(boolean vis)
{
drawButton = vis;
visible = vis;
enabled = vis;
}
@ -45,19 +45,19 @@ public class GuiToggleButton extends GuiButton implements ITooltip
@Override
public boolean isVisible()
{
return drawButton;
return visible;
}
@Override
public void drawButton(Minecraft par1Minecraft, int par2, int par3)
{
if ( this.drawButton )
if ( this.visible )
{
int iconIndex = getIconIndex();
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
par1Minecraft.renderEngine.bindTexture( ExtraTextures.GuiTexture( "guis/states.png" ) );
this.field_82253_i = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
int uv_y = (int) Math.floor( iconIndex / 16 );
int uv_x = iconIndex - uv_y * 16;

18
client/render/BaseBlockRender.java
View file

@ -14,9 +14,9 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
@ -248,9 +248,9 @@ public class BaseBlockRender
return MAX_DISTANCE;
}
public Icon firstNotNull(Icon... s)
public IIcon firstNotNull(IIcon... s)
{
for (Icon o : s)
for (IIcon o : s)
if ( o != null )
return o;
return ExtraTextures.getMissing();
@ -258,7 +258,7 @@ public class BaseBlockRender
public void renderInvBlock(EnumSet<ForgeDirection> sides, AEBaseBlock block, Tessellator tess, int color, RenderBlocks renderer)
{
if ( tess.isDrawing )
if ( Platform.isDrawing( tess ) )
tess.draw();
if ( sides.contains( ForgeDirection.DOWN ) )
@ -517,7 +517,7 @@ public class BaseBlockRender
@SideOnly(Side.CLIENT)
private void renderFace(Tessellator tess, double offsetX, double offsetY, double offsetZ, double ax, double ay, double az, double bx, double by, double bz,
double ua, double ub, double va, double vb, Icon ico, boolean flip)
double ua, double ub, double va, double vb, IIcon ico, boolean flip)
{
if ( flip )
{
@ -544,7 +544,7 @@ public class BaseBlockRender
}
@SideOnly(Side.CLIENT)
protected void renderCutoutFace(Block block, Icon ico, int x, int y, int z, RenderBlocks renderer, ForgeDirection orientation, float edgeThickness)
protected void renderCutoutFace(Block block, IIcon ico, int x, int y, int z, RenderBlocks renderer, ForgeDirection orientation, float edgeThickness)
{
Tessellator tess = Tessellator.instance;
@ -631,7 +631,7 @@ public class BaseBlockRender
}
@SideOnly(Side.CLIENT)
protected void renderFace(int x, int y, int z, Block block, Icon ico, RenderBlocks renderer, ForgeDirection orientation)
protected void renderFace(int x, int y, int z, Block block, IIcon ico, RenderBlocks renderer, ForgeDirection orientation)
{
switch (orientation)
{
@ -729,7 +729,7 @@ public class BaseBlockRender
{
if ( itemstack != null )
{
EntityItem entityitem = new EntityItem( par1EntityItemFrame.worldObj, 0.0D, 0.0D, 0.0D, itemstack );
EntityItem entityitem = new EntityItem( par1EntityItemFrame.getWorldObj(), 0.0D, 0.0D, 0.0D, itemstack );
entityitem.getEntityItem().stackSize = 1;
// set all this stuff and then do shit? meh?

24
client/render/BlockRenderInfo.java
View file

@ -2,8 +2,8 @@ package appeng.client.render;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.TmpFlipableIcon;
import net.minecraft.util.Icon;
import net.minecraftforge.common.ForgeDirection;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
public class BlockRenderInfo
{
@ -41,24 +41,24 @@ public class BlockRenderInfo
}
public void setTemporaryRenderIcon(Icon icon)
public void setTemporaryRenderIcon(IIcon IIcon)
{
if ( icon == null )
if ( IIcon == null )
useTmp = false;
else
{
useTmp = true;
tmpTopIcon.setOriginal( icon );
tmpBottomIcon.setOriginal( icon );
tmpSouthIcon.setOriginal( icon );
tmpNorthIcon.setOriginal( icon );
tmpEastIcon.setOriginal( icon );
tmpWestIcon.setOriginal( icon );
tmpTopIcon.setOriginal( IIcon );
tmpBottomIcon.setOriginal( IIcon );
tmpSouthIcon.setOriginal( IIcon );
tmpNorthIcon.setOriginal( IIcon );
tmpEastIcon.setOriginal( IIcon );
tmpWestIcon.setOriginal( IIcon );
}
}
public void setTemporaryRenderIcons(Icon nTopIcon, Icon nBottomIcon, Icon nSouthIcon, Icon nNorthIcon, Icon nEastIcon,
Icon nWestIcon)
public void setTemporaryRenderIcons(IIcon nTopIcon, IIcon nBottomIcon, IIcon nSouthIcon, IIcon nNorthIcon, IIcon nEastIcon,
IIcon nWestIcon)
{
tmpTopIcon.setOriginal( nTopIcon == null ? getTexture( ForgeDirection.UP ) : nTopIcon );
tmpBottomIcon.setOriginal( nBottomIcon == null ? getTexture( ForgeDirection.DOWN ) : nBottomIcon );

30
client/render/BusRenderHelper.java
View file

@ -5,8 +5,8 @@ import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.Icon;
import net.minecraftforge.common.ForgeDirection;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper;
@ -149,15 +149,15 @@ public class BusRenderHelper implements IPartRenderHelper
}
@Override
public void setTexture(Icon ico)
public void setTexture(IIcon ico)
{
blk.getRendererInstance().setTemporaryRenderIcon( ico );
}
@Override
public void setTexture(Icon Down, Icon Up, Icon North, Icon South, Icon West, Icon East)
public void setTexture(IIcon Down, IIcon Up, IIcon North, IIcon South, IIcon West, IIcon East)
{
Icon list[] = new Icon[6];
IIcon list[] = new IIcon[6];
list[0] = Down;
list[1] = Up;
@ -215,10 +215,10 @@ public class BusRenderHelper implements IPartRenderHelper
}
@Override
public void renderInventoryFace(Icon icon, ForgeDirection face, RenderBlocks renderer)
public void renderInventoryFace(IIcon IIcon, ForgeDirection face, RenderBlocks renderer)
{
renderer.setRenderBounds( minX / 16.0, minY / 16.0, minZ / 16.0, maxX / 16.0, maxY / 16.0, maxZ / 16.0 );
setTexture( icon );
setTexture( IIcon );
bbr.renderInvBlock( EnumSet.of( face ), blk, Tessellator.instance, color, renderer );
}
@ -241,11 +241,7 @@ public class BusRenderHelper implements IPartRenderHelper
bbr.renderBlockBounds( renderer, minX, minY, minZ, maxX, maxY, maxZ, ax, ay, az );
int blkId = renderer.blockAccess.getBlockId( x, y, z );
if ( Block.blocksList[blkId] == null )
return;
renderer.renderStandardBlock( blk, x, y, z );
renderer.renderStandardBlock( renderer.blockAccess.getBlock( x, y, z ), x, y, z );
}
@Override
@ -261,15 +257,11 @@ public class BusRenderHelper implements IPartRenderHelper
public void renderBlockCurrentBounds(int x, int y, int z, RenderBlocks renderer)
{
int blkId = renderer.blockAccess.getBlockId( x, y, z );
if ( Block.blocksList[blkId] == null )
return;
renderer.renderStandardBlock( blk, x, y, z );
renderer.renderStandardBlock( renderer.blockAccess.getBlock( x, y, z ), x, y, z );
}
@Override
public void renderFaceCutout(int x, int y, int z, Icon ico, ForgeDirection face, float edgeThickness, RenderBlocks renderer)
public void renderFaceCutout(int x, int y, int z, IIcon ico, ForgeDirection face, float edgeThickness, RenderBlocks renderer)
{
switch (face)
{
@ -301,7 +293,7 @@ public class BusRenderHelper implements IPartRenderHelper
}
@Override
public void renderFace(int x, int y, int z, Icon ico, ForgeDirection face, RenderBlocks renderer)
public void renderFace(int x, int y, int z, IIcon ico, ForgeDirection face, RenderBlocks renderer)
{
prepareBounds( renderer );
switch (face)

11
client/render/BusRenderer.java
View file

@ -3,9 +3,10 @@ package appeng.client.render;
import java.util.HashMap;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
@ -29,7 +30,7 @@ public class BusRenderer implements IItemRenderer
public IPart getRenderer(ItemStack is, IPartItem c)
{
int id = (is.getItem().itemID << Platform.DEF_OFFSET) | is.getItemDamage();
int id = (Item.getIdFromItem( is.getItem() ) << Platform.DEF_OFFSET) | is.getItemDamage();
IPart part = renderPart.get( id );
if ( part == null )
@ -61,6 +62,11 @@ public class BusRenderer implements IItemRenderer
return;
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
GL11.glEnable( GL11.GL_ALPHA_TEST );
GL11.glEnable( GL11.GL_DEPTH_TEST );
GL11.glEnable( GL11.GL_BLEND );
if ( type == ItemRenderType.ENTITY )
GL11.glTranslatef( -0.5f, -0.5f, -0.5f );
if ( type == ItemRenderType.INVENTORY )
@ -96,6 +102,7 @@ public class BusRenderer implements IItemRenderer
ip.renderInventory( BusRenderHelper.instance, renderer );
}
GL11.glPopAttrib();
GL11.glPopMatrix();
}
}

2
client/render/CableRenderHelper.java
View file

@ -7,7 +7,7 @@ import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.parts.IFacadePart;
import appeng.api.parts.IPart;
import appeng.facade.FacadeContainer;

8
client/render/ItemRenderer.java
View file

@ -26,11 +26,19 @@ public class ItemRenderer implements IItemRenderer
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
{
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
GL11.glEnable( GL11.GL_ALPHA_TEST );
GL11.glEnable( GL11.GL_DEPTH_TEST );
GL11.glEnable( GL11.GL_BLEND );
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
if ( type == ItemRenderType.ENTITY )
GL11.glTranslatef( -0.5f, -0.5f, -0.5f );
if ( type == ItemRenderType.INVENTORY )
GL11.glTranslatef( 0.0f, -0.1f, 0.0f );
WorldRender.instance.renderItemBlock( item );
GL11.glPopAttrib();
GL11.glPopMatrix();
}

30
client/render/RenderBlocksWorkaround.java
View file

@ -6,8 +6,8 @@ import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.Icon;
import net.minecraftforge.common.ForgeDirection;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.core.AELog;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -19,12 +19,12 @@ public class RenderBlocksWorkaround extends RenderBlocks
public boolean calculations = true;
public EnumSet<ForgeDirection> faces = EnumSet.allOf( ForgeDirection.class );
private Icon rXPos = null;
private Icon rXNeg = null;
private Icon rYPos = null;
private Icon rYNeg = null;
private Icon rZPos = null;
private Icon rZNeg = null;
private IIcon rXPos = null;
private IIcon rXNeg = null;
private IIcon rYPos = null;
private IIcon rYNeg = null;
private IIcon rZPos = null;
private IIcon rZNeg = null;
private boolean isAO = false;
@ -71,7 +71,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
}
public void setTexture(Icon ico)
public void setTexture(IIcon ico)
{
rXPos = rXNeg = rYPos = rYNeg = rZPos = rZNeg = ico;
}
@ -169,7 +169,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
@Override
public void renderFaceXNeg(Block par1Block, double par2, double par4, double par6, Icon par8Icon)
public void renderFaceXNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.WEST ) )
{
@ -220,7 +220,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
@Override
public void renderFaceXPos(Block par1Block, double par2, double par4, double par6, Icon par8Icon)
public void renderFaceXPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.EAST ) )
{
@ -299,7 +299,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
@Override
public void renderFaceYNeg(Block par1Block, double par2, double par4, double par6, Icon par8Icon)
public void renderFaceYNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.DOWN ) )
{
@ -350,7 +350,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
@Override
public void renderFaceYPos(Block par1Block, double par2, double par4, double par6, Icon par8Icon)
public void renderFaceYPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.UP ) )
{
@ -401,7 +401,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
@Override
public void renderFaceZNeg(Block par1Block, double par2, double par4, double par6, Icon par8Icon)
public void renderFaceZNeg(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.NORTH ) )
{
@ -452,7 +452,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
@Override
public void renderFaceZPos(Block par1Block, double par2, double par4, double par6, Icon par8Icon)
public void renderFaceZPos(Block par1Block, double par2, double par4, double par6, IIcon par8Icon)
{
if ( faces.contains( ForgeDirection.SOUTH ) )
{

7
client/render/TESRWrapper.java
View file

@ -11,6 +11,7 @@ import org.lwjgl.opengl.GL11;
import appeng.block.AEBaseBlock;
import appeng.core.AELog;
import appeng.tile.AEBaseTile;
import appeng.util.Platform;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -42,7 +43,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer
Tessellator tess = Tessellator.instance;
if ( tess.isDrawing )
if ( Platform.isDrawing( tess ) )
return;
try
@ -50,10 +51,10 @@ public class TESRWrapper extends TileEntitySpecialRenderer
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
rbinstance.blockAccess = te.worldObj;
rbinstance.blockAccess = te.getWorldObj();
blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess, x, y, z, f, rbinstance );
if ( tess.isDrawing )
if ( Platform.isDrawing( tess ) )
throw new RuntimeException( "Error durring rendering." );
GL11.glPopAttrib();

4
client/render/WorldRender.java
View file

@ -45,7 +45,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler
}
@Override
public boolean shouldRender3DInInventory()
public boolean shouldRender3DInInventory(int modelId)
{
return true;
}
@ -58,7 +58,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler
public void renderItemBlock(ItemStack item)
{
AEBaseBlock block = (AEBaseBlock) Block.blocksList[item.itemID];
AEBaseBlock block = (AEBaseBlock) Block.getBlockFromItem( item.getItem() );
renderer.setRenderBoundsFromBlock( block );
getRender( block ).renderInventory( block, item, renderer );
}

8
client/render/blocks/RenderBlockCharger.java
View file

@ -9,7 +9,7 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@ -123,15 +123,15 @@ public class RenderBlockCharger extends BaseBlockRender
GL11.glScalef( 1.0f / 1.1f, 1.0f / 1.1f, 1.0f / 1.1f );
GL11.glScalef( 1.0f, 1.0f, 1.0f );
int k = sis.itemID;
if ( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( Block.blocksList[k].getRenderType() ) )
Block blk = Block.getBlockFromItem( sis.getItem() );
if ( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( blk.getRenderType() ) )
{
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
}
int light = tile.worldObj.getLightBrightnessForSkyBlocks( tile.xCoord, tile.yCoord, tile.zCoord, 0 );
int light = tile.getWorldObj().getLightBrightnessForSkyBlocks( tile.xCoord, tile.yCoord, tile.zCoord, 0 );
int br = light;// << 20 | light << 4;
int var11 = br % 65536;
int var12 = br / 65536;

6
client/render/blocks/RenderBlockController.java
View file

@ -19,9 +19,9 @@ public class RenderBlockController extends BaseBlockRender
public boolean renderInWorld(AEBaseBlock blk, IBlockAccess world, int x, int y, int z, RenderBlocks renderer)
{
boolean xx = world.getBlockTileEntity( x - 1, y, z ) instanceof TileController && world.getBlockTileEntity( x + 1, y, z ) instanceof TileController;
boolean yy = world.getBlockTileEntity( x, y - 1, z ) instanceof TileController && world.getBlockTileEntity( x, y + 1, z ) instanceof TileController;
boolean zz = world.getBlockTileEntity( x, y, z - 1 ) instanceof TileController && world.getBlockTileEntity( x, y, z + 1 ) instanceof TileController;
boolean xx = world.getTileEntity( x - 1, y, z ) instanceof TileController && world.getTileEntity( x + 1, y, z ) instanceof TileController;
boolean yy = world.getTileEntity( x, y - 1, z ) instanceof TileController && world.getTileEntity( x, y + 1, z ) instanceof TileController;
boolean zz = world.getTileEntity( x, y, z - 1 ) instanceof TileController && world.getTileEntity( x, y, z + 1 ) instanceof TileController;
int meta = world.getBlockMetadata( x, y, z );
boolean hasPower = meta > 0;

4
client/render/blocks/RenderBlockCrank.java
View file

@ -7,7 +7,7 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
@ -69,7 +69,7 @@ public class RenderBlockCrank extends BaseBlockRender
tess.setTranslation( -tc.xCoord, -tc.yCoord, -tc.zCoord );
tess.startDrawingQuads();
rbinstance.renderAllFaces = true;
rbinstance.blockAccess = tc.worldObj;
rbinstance.blockAccess = tc.getWorldObj();
rbinstance.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.1, 0.5D + 0.05 );

12
client/render/blocks/RenderBlockWireless.java
View file

@ -5,9 +5,9 @@ import java.util.EnumSet;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.util.AEColor;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
@ -39,7 +39,7 @@ public class RenderBlockWireless extends BaseBlockRender
renderer.renderAllFaces = true;
Icon r = CableBusTextures.PartMonitorSidesStatus.getIcon();
IIcon r = CableBusTextures.PartMonitorSidesStatus.getIcon();
ri.setTemporaryRenderIcons( r, r, CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), r, r );
renderBlockBounds( renderer, 5, 5, 0, 11, 11, 1, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH );
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, tess, 0xffffff, renderer );
@ -107,7 +107,7 @@ public class RenderBlockWireless extends BaseBlockRender
renderer.renderAllFaces = true;
Icon r = CableBusTextures.PartMonitorSidesStatus.getIcon();
IIcon r = CableBusTextures.PartMonitorSidesStatus.getIcon();
ri.setTemporaryRenderIcons( r, r, CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), r, r );
renderBlockBounds( renderer, 5, 5, 0, 11, 11, 1, fdx, fdy, fdz );
super.renderInWorld( blk, world, x, y, z, renderer );
@ -193,8 +193,8 @@ public class RenderBlockWireless extends BaseBlockRender
private void renderTorchAtAngle(RenderBlocks renderer, ForgeDirection x, ForgeDirection y, ForgeDirection z)
{
Icon r = (hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : blk.getIcon( 0, 0 ));
Icon sides = new OffsetIcon( r, 0.0f, -2.0f );
IIcon r = (hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : blk.getIcon( 0, 0 ));
IIcon sides = new OffsetIcon( r, 0.0f, -2.0f );
switch (z)
{

8
client/render/blocks/RenderDrive.java
View file

@ -5,9 +5,9 @@ import java.util.EnumSet;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.texture.ExtraTextures;
@ -44,7 +44,7 @@ public class RenderDrive extends BaseBlockRender
boolean result = super.renderInWorld( imb, world, x, y, z, renderer );
Tessellator tess = Tessellator.instance;
Icon ico = ExtraTextures.MEStorageCellTextures.getIcon();
IIcon ico = ExtraTextures.MEStorageCellTextures.getIcon();
int b = world.getLightBrightnessForSkyBlocks( x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ, 0 );
@ -236,7 +236,7 @@ public class RenderDrive extends BaseBlockRender
if ( stat != 0 )
{
Icon wico = ExtraTextures.White.getIcon();
IIcon wico = ExtraTextures.White.getIcon();
u1 = wico.getInterpolatedU( (spin % 4 < 2) ? 1 : 6 );
u2 = wico.getInterpolatedU( ((spin + 1) % 4 < 2) ? 1 : 6 );
u3 = wico.getInterpolatedU( ((spin + 2) % 4 < 2) ? 1 : 6 );

6
client/render/blocks/RenderMEChest.java
View file

@ -5,9 +5,9 @@ import java.util.EnumSet;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.storage.ICellHandler;
import appeng.block.AEBaseBlock;
@ -108,7 +108,7 @@ public class RenderMEChest extends BaseBlockRender
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
ICellHandler ch = AEApi.instance().registries().cell().getHander( sp.getStorageType() );
Icon ico = ch == null ? null : ch.getTopTexture();
IIcon ico = ch == null ? null : ch.getTopTexture();
renderFace( x, y, z, imb, ico == null ? ExtraTextures.MEChest.getIcon() : ico, renderer, up );
renderer.overrideBlockTexture = null;

6
client/render/blocks/RenderQNB.java
View file

@ -6,9 +6,9 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition;
@ -20,7 +20,7 @@ import appeng.tile.qnb.TileQuantumBridge;
public class RenderQNB extends BaseBlockRender
{
public void renderCableAt(double Thickness, IBlockAccess world, int x, int y, int z, AEBaseBlock block, RenderBlocks renderer, Icon texture, double pull,
public void renderCableAt(double Thickness, IBlockAccess world, int x, int y, int z, AEBaseBlock block, RenderBlocks renderer, IIcon texture, double pull,
EnumSet<ForgeDirection> connections)
{
block.getRendererInstance().setTemporaryRenderIcon( texture );

6
client/render/blocks/RenderQuartzGlass.java
View file

@ -5,7 +5,7 @@ import java.util.Random;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
@ -36,8 +36,8 @@ public class RenderQuartzGlass extends BaseBlockRender
boolean isGlass(AEBaseBlock imb, IBlockAccess world, int x, int y, int z)
{
return world.getBlockId( x, y, z ) == AEApi.instance().blocks().blockQuartzGlass.block().blockID
|| world.getBlockId( x, y, z ) == AEApi.instance().blocks().blockQuartzVibrantGlass.block().blockID;
return world.getBlock( x, y, z ) == AEApi.instance().blocks().blockQuartzGlass.block()
|| world.getBlock( x, y, z ) == AEApi.instance().blocks().blockQuartzVibrantGlass.block();
}
void renderEdge(AEBaseBlock imb, IBlockAccess world, int x, int y, int z, RenderBlocks renderer, ForgeDirection side, ForgeDirection direction)

8
client/render/blocks/RenderQuartzTorch.java
View file

@ -2,12 +2,12 @@ package appeng.client.render.blocks;
import java.util.EnumSet;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.util.IOrientable;
import appeng.block.AEBaseBlock;
import appeng.block.misc.BlockQuartzTorch;
@ -51,7 +51,7 @@ public class RenderQuartzTorch extends BaseBlockRender
renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, tess, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( Block.hopperBlock.getIcon( 0, 0 ) );
blk.getRendererInstance().setTemporaryRenderIcon( Blocks.hopper.getIcon( 0, 0 ) );
renderer.renderAllFaces = true;
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
@ -125,7 +125,7 @@ public class RenderQuartzTorch extends BaseBlockRender
super.renderInWorld( block, world, x, y, z, renderer );
}
blk.getRendererInstance().setTemporaryRenderIcon( Block.hopperBlock.getIcon( 0, 0 ) );
blk.getRendererInstance().setTemporaryRenderIcon( Blocks.hopper.getIcon( 0, 0 ) );
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
boolean out = renderer.renderStandardBlock( blk, x, y, z );

8
client/render/blocks/RenderSpatialPylon.java
View file

@ -3,9 +3,9 @@ package appeng.client.render.blocks;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo;
@ -149,7 +149,7 @@ public class RenderSpatialPylon extends BaseBlockRender
return result;
}
private Icon getBlockTextureFromSideOutside(AEBaseBlock blk, TileSpatialPylon sp, int displayBits, ForgeDirection ori, ForgeDirection dir)
private IIcon getBlockTextureFromSideOutside(AEBaseBlock blk, TileSpatialPylon sp, int displayBits, ForgeDirection ori, ForgeDirection dir)
{
if ( ori.equals( dir ) || ori.getOpposite().equals( dir ) )
@ -167,7 +167,7 @@ public class RenderSpatialPylon extends BaseBlockRender
return blk.getIcon( 0, 0 );
}
private Icon getBlockTextureFromSideInside(AEBaseBlock blk, TileSpatialPylon sp, int displayBits, ForgeDirection ori, ForgeDirection dir)
private IIcon getBlockTextureFromSideInside(AEBaseBlock blk, TileSpatialPylon sp, int displayBits, ForgeDirection ori, ForgeDirection dir)
{
boolean good = (displayBits & sp.DISPLAY_ENABLED) == sp.DISPLAY_ENABLED;

5
client/render/blocks/RenderStorageMonitor.java
View file

@ -48,9 +48,8 @@ public class RenderStorageMonitor extends BaseBlockRender
GL11.glScalef( 1.0f / 1.5f, 1.0f / 1.5f, 1.0f / 1.5f );
GL11.glScalef( 1.0f, -1.0f, 0.005f );
int k = sis.itemID;
Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null);
if ( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( Block.blocksList[k].getRenderType() ) )
Block block = Block.getBlockFromItem( sis.getItem() );
if ( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( block.getRenderType() ) )
{
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );

6
client/render/blocks/RendererSecurity.java
View file

@ -5,9 +5,9 @@ import java.util.EnumSet;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.texture.ExtraTextures;
@ -55,7 +55,7 @@ public class RendererSecurity extends BaseBlockRender
Tessellator.instance.setColorOpaque_I( 0xffffff );
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
Icon ico = sp.isActive() ? ExtraTextures.BlockMESecurityOn.getIcon() : ExtraTextures.MEChest.getIcon();
IIcon ico = sp.isActive() ? ExtraTextures.BlockMESecurityOn.getIcon() : ExtraTextures.MEChest.getIcon();
renderFace( x, y, z, imb, ico, renderer, up );
renderer.overrideBlockTexture = null;

6
client/render/effects/EnergyFx.java
View file

@ -5,9 +5,9 @@ import net.minecraft.client.particle.EntityBreakingFX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.Item;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class EnergyFx extends EntityBreakingFX
{
private Icon particleTextureIndex;
private IIcon particleTextureIndex;
public EnergyFx(World par1World, double par2, double par4, double par6, Item par8Item) {
super( par1World, par2, par4, par6, par8Item );

6
client/render/effects/MatterCannonEffect.java
View file

@ -5,15 +5,15 @@ import net.minecraft.client.particle.EntityBreakingFX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.Item;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.client.texture.ExtraTextures;
public class MatterCannonEffect extends EntityBreakingFX
{
private Icon particleTextureIndex;
private IIcon particleTextureIndex;
public MatterCannonEffect(World par1World, double par2, double par4, double par6, Item par8Item) {
super( par1World, par2, par4, par6, par8Item );

6
client/render/entity/RenderTinyTNTPrimed.java
View file

@ -1,11 +1,11 @@
package appeng.client.render.entity;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
@ -54,7 +54,7 @@ public class RenderTinyTNTPrimed extends Render
GL11.glScalef( 0.5f, 0.5f, 0.5f );
f2 = (1.0F - ((float) tnt.fuse - life + 1.0F) / 100.0F) * 0.8F;
this.bindEntityTexture( tnt );
this.blockRenderer.renderBlockAsItem( Block.tnt, 0, tnt.getBrightness( life ) );
this.blockRenderer.renderBlockAsItem( Blocks.tnt, 0, tnt.getBrightness( life ) );
if ( tnt.fuse / 5 % 2 == 0 )
{
@ -63,7 +63,7 @@ public class RenderTinyTNTPrimed extends Render
GL11.glEnable( GL11.GL_BLEND );
GL11.glBlendFunc( GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, f2 );
this.blockRenderer.renderBlockAsItem( Block.tnt, 0, 1.0F );
this.blockRenderer.renderBlockAsItem( Blocks.tnt, 0, 1.0F );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
GL11.glDisable( GL11.GL_BLEND );
GL11.glEnable( GL11.GL_LIGHTING );

22
client/render/items/ToolBiometricCardRender.java
View file

@ -2,10 +2,10 @@ package appeng.client.render.items;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.Item;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
@ -31,12 +31,12 @@ public class ToolBiometricCardRender implements IItemRenderer
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
{
Icon par2Icon = item.getIconIndex();
IIcon par2Icon = item.getIconIndex();
float f4 = ((Icon) par2Icon).getMinU();
float f5 = ((Icon) par2Icon).getMaxU();
float f6 = ((Icon) par2Icon).getMinV();
float f7 = ((Icon) par2Icon).getMaxV();
float f4 = ((IIcon) par2Icon).getMinU();
float f5 = ((IIcon) par2Icon).getMaxU();
float f6 = ((IIcon) par2Icon).getMinV();
float f7 = ((IIcon) par2Icon).getMaxV();
float f12 = 0.0625F;
Tessellator tessellator = Tessellator.instance;
@ -49,6 +49,7 @@ public class ToolBiometricCardRender implements IItemRenderer
GL11.glScalef( 16F, 16F, 10F );
GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
GL11.glEnable( GL11.GL_ALPHA_TEST );
tessellator.startDrawingQuads();
tessellator.setNormal( 0.0F, 1.0F, 0.0F );
@ -61,7 +62,7 @@ public class ToolBiometricCardRender implements IItemRenderer
else
{
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12 );
ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, ((IIcon) par2Icon).getIconWidth(), ((IIcon) par2Icon).getIconHeight(), f12 );
GL11.glDisable( GL11.GL_CULL_FACE );
GL11.glColor4f( 1, 1, 1, 1.0F );
@ -70,8 +71,8 @@ public class ToolBiometricCardRender implements IItemRenderer
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
}
float u = Item.snowball.getIconFromDamage( 0 ).getInterpolatedU( 8.1 );
float v = Item.snowball.getIconFromDamage( 0 ).getInterpolatedV( 8.1 );
float u = Items.snowball.getIconFromDamage( 0 ).getInterpolatedU( 8.1 );
float v = Items.snowball.getIconFromDamage( 0 ).getInterpolatedV( 8.1 );
NBTTagCompound myTag = Platform.openNbtData( item );
String username = myTag.getString( "username" );
@ -80,6 +81,7 @@ public class ToolBiometricCardRender implements IItemRenderer
GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
GL11.glTranslatef( 4, 6, 0 );
GL11.glDisable( GL11.GL_LIGHTING );
tessellator.startDrawingQuads();
float z = 0;

12
client/texture/CableBusTextures.java
View file

@ -2,7 +2,7 @@ package appeng.client.texture;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -72,7 +72,7 @@ public enum CableBusTextures
ItemPartLevelEmitterOn("ItemPart.LevelEmitterOn.png"), PartTransitionPlaneBack("PartTransitionPlaneBack");
final private String name;
public Icon icon;
public IIcon IIcon;
public static ResourceLocation GuiTexture(String string)
{
@ -88,18 +88,18 @@ public enum CableBusTextures
this.name = name;
}
public Icon getIcon()
public IIcon getIcon()
{
return icon;
return IIcon;
}
public void registerIcon(TextureMap map)
{
icon = map.registerIcon( "appliedenergistics2:" + name );
IIcon = map.registerIcon( "appliedenergistics2:" + name );
}
@SideOnly(Side.CLIENT)
public static Icon getMissing()
public static IIcon getMissing()
{
return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture )).getAtlasSprite( "missingno" );
}

12
client/texture/ExtraTextures.java
View file

@ -2,7 +2,7 @@ package appeng.client.texture;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -53,7 +53,7 @@ public enum ExtraTextures
BlockMESecurityOn("BlockMESecurityOn");
final private String name;
public Icon icon;
public IIcon IIcon;
public static ResourceLocation GuiTexture(String string)
{
@ -69,18 +69,18 @@ public enum ExtraTextures
this.name = name;
}
public Icon getIcon()
public IIcon getIcon()
{
return icon;
return IIcon;
}
public void registerIcon(TextureMap map)
{
icon = map.registerIcon( "appliedenergistics2:" + name );
IIcon = map.registerIcon( "appliedenergistics2:" + name );
}
@SideOnly(Side.CLIENT)
public static Icon getMissing()
public static IIcon getMissing()
{
return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture )).getAtlasSprite( "missingno" );
}

10
client/texture/FlipableIcon.java
View file

@ -1,15 +1,15 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
public class FlipableIcon implements Icon
public class FlipableIcon implements IIcon
{
protected Icon original;
protected IIcon original;
boolean flip_u;
boolean flip_v;
public FlipableIcon(Icon o) {
public FlipableIcon(IIcon o) {
original = o;
flip_u = false;
flip_v = false;
@ -81,7 +81,7 @@ public class FlipableIcon implements Icon
return original.getIconName();
}
public Icon getOriginal()
public IIcon getOriginal()
{
return original;
}

8
client/texture/FullIcon.java
View file

@ -1,15 +1,15 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class FullIcon implements Icon
public class FullIcon implements IIcon
{
private Icon p;
private IIcon p;
public FullIcon(Icon o) {
public FullIcon(IIcon o) {
p = o;
}

8
client/texture/OffsetIcon.java
View file

@ -1,18 +1,18 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class OffsetIcon implements Icon
public class OffsetIcon implements IIcon
{
final float offsetX;
final float offsetY;
private Icon p;
private IIcon p;
public OffsetIcon(Icon o, float x, float y) {
public OffsetIcon(IIcon o, float x, float y) {
p = o;
offsetX = x;
offsetY = y;

8
client/texture/TaughtIcon.java
View file

@ -1,17 +1,17 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TaughtIcon implements Icon
public class TaughtIcon implements IIcon
{
final float tightness;
private Icon p;
private IIcon p;
public TaughtIcon(Icon o, float tightness) {
public TaughtIcon(IIcon o, float tightness) {
p = o;
this.tightness = tightness;
}

4
client/texture/TmpFlipableIcon.java
View file

@ -1,6 +1,6 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
public class TmpFlipableIcon extends FlipableIcon
{
@ -9,7 +9,7 @@ public class TmpFlipableIcon extends FlipableIcon
super( null );
}
public void setOriginal(Icon i)
public void setOriginal(IIcon i)
{
while (i instanceof FlipableIcon)
i = ((FlipableIcon) i).getOriginal();

25
container/AEBaseContainer.java
View file

@ -12,7 +12,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.SecurityPermissions;
@ -50,6 +50,7 @@ public abstract class AEBaseContainer extends Container
final IPart part;
final protected BaseActionSource mySrc;
public boolean isContainerValid = true;
int ticksSinceCheck = 900;
@ -71,7 +72,9 @@ public abstract class AEBaseContainer extends Container
host = (IActionHost) part;
if ( host == null )
invPlayer.player.closeScreen();// close!
{
isContainerValid = false;
}
else
{
IGridNode gn = host.getActionableNode();
@ -85,14 +88,14 @@ public abstract class AEBaseContainer extends Container
IEnergyGrid eg = g.getCache( IEnergyGrid.class );
if ( !eg.isNetworkPowered() )
{
invPlayer.player.closeScreen();
isContainerValid = false;
return;
}
}
ISecurityGrid sg = g.getCache( ISecurityGrid.class );
if ( !sg.hasPermission( invPlayer.player, security ) )
invPlayer.player.closeScreen();
isContainerValid = false;
}
}
}
@ -152,9 +155,13 @@ public abstract class AEBaseContainer extends Container
@Override
public boolean canInteractWith(EntityPlayer entityplayer)
{
if ( tileEntity instanceof IInventory )
return ((IInventory) tileEntity).isUseableByPlayer( entityplayer );
return true;
if ( isContainerValid )
{
if ( tileEntity instanceof IInventory )
return ((IInventory) tileEntity).isUseableByPlayer( entityplayer );
return true;
}
return false;
}
@Override
@ -337,7 +344,7 @@ public abstract class AEBaseContainer extends Container
d.onSlotChanged();
// if ( worldEntity != null )
// worldEntity.onInventoryChanged();
// worldEntity.markDirty();
// if ( hasMETiles ) updateClient();
updateSlot( clickSlot );
@ -367,7 +374,7 @@ public abstract class AEBaseContainer extends Container
d.onSlotChanged();
// if ( worldEntity != null )
// worldEntity.onInventoryChanged();
// worldEntity.markDirty();
// if ( hasMETiles ) updateClient();
updateSlot( clickSlot );

2
container/ContainerOpenContext.java
View file

@ -1,7 +1,7 @@
package appeng.container;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
public class ContainerOpenContext
{

18
container/implementations/ContainerCellWorkbench.java
View file

@ -72,7 +72,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
{
IInventory inv = getCellUpgradeInventory();
ItemStack is = inv.decrStackSize( i, j );
inv.onInventoryChanged();
inv.markDirty();
return is;
}
@ -81,7 +81,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
{
IInventory inv = getCellUpgradeInventory();
ItemStack is = inv.getStackInSlotOnClosing( i );
inv.onInventoryChanged();
inv.markDirty();
return is;
}
@ -90,17 +90,17 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
{
IInventory inv = getCellUpgradeInventory();
inv.setInventorySlotContents( i, itemstack );
inv.onInventoryChanged();
inv.markDirty();
}
@Override
public String getInvName()
public String getInventoryName()
{
return "Upgrades";
}
@Override
public boolean isInvNameLocalized()
public boolean hasCustomInventoryName()
{
return false;
}
@ -112,7 +112,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
}
@Override
public void onInventoryChanged()
public void markDirty()
{
}
@ -124,12 +124,12 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
}
@Override
public void openChest()
public void openInventory()
{
}
@Override
public void closeChest()
public void closeInventory()
{
}
@ -239,7 +239,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
icrafting.sendSlotContents( this, sri.slotNumber, sri.getStack() );
}
}
((EntityPlayerMP) icrafting).playerInventoryBeingManipulated = false;
((EntityPlayerMP) icrafting).isChangingQuantityOnly = false;
}
}

2
container/implementations/ContainerCondenser.java
View file

@ -70,7 +70,7 @@ public class ContainerCondenser extends AEBaseContainer
if ( changed )
{
// if the bars changed an item was probably made, so just send shit!
((EntityPlayerMP) icrafting).playerInventoryBeingManipulated = false;
((EntityPlayerMP) icrafting).isChangingQuantityOnly = false;
}
}

2
container/implementations/ContainerIOPort.java
View file

@ -60,7 +60,7 @@ public class ContainerIOPort extends ContainerUpgradeable
offy = 17;
for (int y = 0; y < 3; y++)
for (int x = 0; x < 2; x++)
addSlotToContainer( new SlotOutput( cells, 6 + x + y * 2, offx + x * 18, offy + y * 18, PlaceableItemType.STORAGE_CELLS.icon ) );
addSlotToContainer( new SlotOutput( cells, 6 + x + y * 2, offx + x * 18, offy + y * 18, PlaceableItemType.STORAGE_CELLS.IIcon ) );
IInventory upgrades = myte.getInventoryByName( "upgrades" );
addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0 )).setNotDraggable() );

22
container/implementations/ContainerMEMonitorable.java
View file

@ -4,11 +4,11 @@ import java.io.IOException;
import java.nio.BufferOverflowException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.network.packet.Packet;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.implementations.guiobjects.IPortableCell;
import appeng.api.implementations.tiles.IMEChest;
import appeng.api.networking.IGrid;
@ -24,11 +24,10 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.container.AEBaseContainer;
import appeng.core.AELog;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketMEInventoryUpdate;
import appeng.util.Platform;
import appeng.util.item.ItemList;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonitorHandlerReciever<IAEItemStack>
{
@ -64,7 +63,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonito
}
}
else
ip.player.closeScreen();
isContainerValid = false;
}
else
monitor = null;
@ -104,13 +103,12 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonito
if ( !piu.isEmpty() )
{
Packet p = piu.getPacket();
items.resetStatus();
for (Object c : this.crafters)
{
if ( c instanceof Player )
PacketDispatcher.sendPacketToPlayer( p, (Player) c );
if ( c instanceof EntityPlayer )
NetworkHandler.instance.sendTo( piu, (EntityPlayerMP) c );
}
}
}
@ -129,7 +127,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonito
{
super.addCraftingToCrafters( c );
if ( Platform.isServer() && c instanceof Player && monitor != null )
if ( Platform.isServer() && c instanceof EntityPlayer && monitor != null )
{
try
{
@ -144,16 +142,14 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonito
}
catch (BufferOverflowException boe)
{
Packet p = piu.getPacket();
PacketDispatcher.sendPacketToPlayer( p, (Player) c );
NetworkHandler.instance.sendTo( piu, (EntityPlayerMP) c );
piu = new PacketMEInventoryUpdate();
piu.appendItem( send );
}
}
Packet p = piu.getPacket();
PacketDispatcher.sendPacketToPlayer( p, (Player) c );
NetworkHandler.instance.sendTo( piu, (EntityPlayerMP) c );
}
catch (IOException e)
{

6
container/implementations/ContainerMEPortableCell.java
View file

@ -37,14 +37,14 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable
if ( Platform.isSameItem( civ.getItemStack(), currentItem ) )
getPlayerInv().setInventorySlotContents( getPlayerInv().currentItem, civ.getItemStack() );
else
getPlayerInv().player.closeScreen();
isContainerValid = false;
}
else
getPlayerInv().player.closeScreen();
isContainerValid = false;
}
}
else
getPlayerInv().player.closeScreen();
isContainerValid = false;
// drain 1 ae t
ticks++;

15
container/implementations/ContainerNetworkStatus.java
View file

@ -2,11 +2,12 @@ package appeng.container.implementations;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.Packet;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.implementations.guiobjects.INetworkTool;
import appeng.api.networking.IGrid;
@ -17,11 +18,10 @@ import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.container.AEBaseContainer;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketMEInventoryUpdate;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -42,7 +42,7 @@ public class ContainerNetworkStatus extends AEBaseContainer
}
if ( network == null && Platform.isServer() )
ip.player.closeScreen();
isContainerValid = false;
}
private void findNode(IGridHost host, ForgeDirection d)
@ -142,11 +142,10 @@ public class ContainerNetworkStatus extends AEBaseContainer
piu.appendItem( ais );
}
Packet p = piu.getPacket();
for (Object c : this.crafters)
{
if ( c instanceof Player )
PacketDispatcher.sendPacketToPlayer( p, (Player) c );
if ( c instanceof EntityPlayer )
NetworkHandler.instance.sendTo( piu, (EntityPlayerMP) c );
}
}
catch (IOException e)

4
container/implementations/ContainerNetworkTool.java
View file

@ -38,10 +38,10 @@ public class ContainerNetworkTool extends AEBaseContainer
if ( Platform.isSameItem( toolInv.getItemStack(), currentItem ) )
getPlayerInv().setInventorySlotContents( getPlayerInv().currentItem, toolInv.getItemStack() );
else
getPlayerInv().player.closeScreen();
isContainerValid = false;
}
else
getPlayerInv().player.closeScreen();
isContainerValid = false;
}
super.detectAndSendChanges();

4
container/implementations/ContainerSecurity.java
View file

@ -53,10 +53,10 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE
super.onContainerClosed( player );
if ( wirelessIn.getHasStack() )
player.dropPlayerItem( wirelessIn.getStack() );
player.dropPlayerItemWithRandomChoice( wirelessIn.getStack(), false );
if ( wirelessOut.getHasStack() )
player.dropPlayerItem( wirelessOut.getStack() );
player.dropPlayerItemWithRandomChoice( wirelessOut.getStack(), false );
}
public void toggleSetting(String value, EntityPlayer player)

2
container/implementations/ContainerSpatialIOPort.java
View file

@ -18,7 +18,7 @@ public class ContainerSpatialIOPort extends AEBaseContainer
myte = te;
addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.SPATIAL_STORAGE_CELLS, te, 0, 71, 14 ) );
addSlotToContainer( new SlotOutput( te, 1, 71, 14, PlaceableItemType.SPATIAL_STORAGE_CELLS.icon ) );
addSlotToContainer( new SlotOutput( te, 1, 71, 14, PlaceableItemType.SPATIAL_STORAGE_CELLS.IIcon ) );
bindPlayerInventory( ip, 0, 199 - /* height of playerinventory */82 );
}

4
container/implementations/ContainerUpgradeable.java
View file

@ -149,10 +149,10 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
if ( Platform.isSameItem( tbinv.getItemStack(), currentItem ) )
getPlayerInv().setInventorySlotContents( tbslot, tbinv.getItemStack() );
else
getPlayerInv().player.closeScreen();
isContainerValid = false;
}
else
getPlayerInv().player.closeScreen();
isContainerValid = false;
}
}
}

Some files were not shown because too many files have changed in this diff Show more