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

Add this qualifier

Browse source
This commit is contained in:
thatsIch 2015-09-30 14:26:54 +02:00
parent efecd4b8c1
commit ebda927fb5
105 changed files with 422 additions and 415 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/api/java/appeng/api/util/AEAxisAlignedBB.java
View file

@ -16,17 +16,17 @@ public class AEAxisAlignedBB
public AxisAlignedBB getBoundingBox() public AxisAlignedBB getBoundingBox()
{ {
return AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ); return AxisAlignedBB.fromBounds( this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ );
} }
public AEAxisAlignedBB( final double a, final double b, final double c, final double d, final double e, final double f) public AEAxisAlignedBB( final double a, final double b, final double c, final double d, final double e, final double f)
{ {
minX=a; this.minX =a;
minY=b; this.minY =b;
minZ=c; this.minZ =c;
maxX=d; this.maxX =d;
maxY=e; this.maxY =e;
maxZ=f; this.maxZ =f;
} }
public static AEAxisAlignedBB fromBounds( public static AEAxisAlignedBB fromBounds(

10
src/api/java/appeng/api/util/AEPartLocation.java
View file

@ -53,9 +53,9 @@ public enum AEPartLocation
private AEPartLocation( final int x, final int y, final int z) private AEPartLocation( final int x, final int y, final int z)
{ {
xOffset = x; this.xOffset = x;
yOffset = y; this.yOffset = y;
zOffset = z; this.zOffset = z;
} }
/** /**
@ -86,7 +86,7 @@ public enum AEPartLocation
*/ */
public AEPartLocation getOpposite() public AEPartLocation getOpposite()
{ {
return fromOrdinal(OPPOSITES[ordinal()]); return fromOrdinal(OPPOSITES[this.ordinal()]);
} }
/** /**
@ -94,7 +94,7 @@ public enum AEPartLocation
*/ */
public EnumFacing getFacing() public EnumFacing getFacing()
{ {
return facings[ordinal()]; return facings[this.ordinal()];
} }
} }

8
src/api/java/appeng/api/util/WorldCoord.java
View file

@ -54,9 +54,9 @@ public class WorldCoord
public WorldCoord( public WorldCoord(
final BlockPos pos ) final BlockPos pos )
{ {
x = pos.getX(); this.x = pos.getX();
y = pos.getY(); this.y = pos.getY();
z = pos.getZ(); this.z = pos.getZ();
} }
public WorldCoord subtract( final AEPartLocation direction, final int length ) public WorldCoord subtract( final AEPartLocation direction, final int length )
@ -177,7 +177,7 @@ public class WorldCoord
public BlockPos getPos() public BlockPos getPos()
{ {
return new BlockPos(x,y,z); return new BlockPos( this.x, this.y, this.z );
} }
@Override @Override

12
src/main/java/appeng/block/AEBaseBlock.java
View file

@ -90,7 +90,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
@Override @Override
public boolean isVisuallyOpaque() public boolean isVisuallyOpaque()
{ {
return isOpaque && isFullSize; return this.isOpaque && this.isFullSize;
} }
protected AEBaseBlock( final Material mat ) protected AEBaseBlock( final Material mat )
@ -139,7 +139,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
@Override @Override
final protected BlockState createBlockState() final protected BlockState createBlockState()
{ {
return new ExtendedBlockState( this, getAEStates(), new IUnlistedProperty[] { AE_BLOCK_POS, AE_BLOCK_ACCESS} ); return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { AE_BLOCK_POS, AE_BLOCK_ACCESS} );
} }
@Override @Override
@ -245,10 +245,10 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
public IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side ) public IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
{ {
final IBlockState state =w.getBlockState( pos ); final IBlockState state =w.getBlockState( pos );
final IOrientable ori = getOrientable( w, pos ); final IOrientable ori = this.getOrientable( w, pos );
if ( ori == null ) if ( ori == null )
return getIcon( side,state ); return this.getIcon( side,state );
return this.getIcon( this.mapRotation( ori, side ), state ); return this.getIcon( this.mapRotation( ori, side ), state );
} }
@ -680,12 +680,12 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
String textureName; String textureName;
public void setBlockTextureName( final String texture ) public void setBlockTextureName( final String texture )
{ {
textureName = texture; this.textureName = texture;
} }
private String getTextureName() private String getTextureName()
{ {
return textureName; return this.textureName;
} }
} }

2
src/main/java/appeng/block/AEBaseTileBlock.java
View file

@ -115,7 +115,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
@Nullable @Nullable
public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final int x, final int y, final int z ) public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final int x, final int y, final int z )
{ {
return getTileEntity( w, new BlockPos(x,y,z) ); return this.getTileEntity( w, new BlockPos(x,y,z) );
} }
@Nullable @Nullable

4
src/main/java/appeng/block/crafting/BlockCraftingUnit.java
View file

@ -73,7 +73,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
@Override @Override
public IBlockState getStateFromMeta( final int meta ) public IBlockState getStateFromMeta( final int meta )
{ {
return getDefaultState().withProperty( POWERED, ( meta & 1 ) == 1 ).withProperty( FORMED, ( meta & 2 ) == 2 ); return this.getDefaultState().withProperty( POWERED, ( meta & 1 ) == 1 ).withProperty( FORMED, ( meta & 2 ) == 2 );
} }
@Override @Override
@ -153,7 +153,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
@Override @Override
public appeng.client.texture.IAESprite getIcon( final EnumFacing side, final IBlockState state ) public appeng.client.texture.IAESprite getIcon( final EnumFacing side, final IBlockState state )
{ {
if( type == CraftingUnitType.ACCELERATOR ) if( this.type == CraftingUnitType.ACCELERATOR )
{ {
if( (boolean) state.getValue( FORMED ) ) if( (boolean) state.getValue( FORMED ) )
{ {

2
src/main/java/appeng/block/misc/BlockLightDetector.java
View file

@ -71,7 +71,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
public IBlockState getStateFromMeta( public IBlockState getStateFromMeta(
final int meta ) final int meta )
{ {
return getDefaultState(); return this.getDefaultState();
} }
@Override @Override

2
src/main/java/appeng/block/misc/BlockQuartzTorch.java
View file

@ -75,7 +75,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
public IBlockState getStateFromMeta( public IBlockState getStateFromMeta(
final int meta ) final int meta )
{ {
return getDefaultState(); return this.getDefaultState();
} }
@Override @Override

4
src/main/java/appeng/block/networking/BlockController.java
View file

@ -47,7 +47,7 @@ public class BlockController extends AEBaseTileBlock
@Override @Override
public String getName() public String getName()
{ {
return name(); return this.name();
} }
}; };
@ -70,7 +70,7 @@ public class BlockController extends AEBaseTileBlock
@Override @Override
public IBlockState getStateFromMeta( final int meta ) public IBlockState getStateFromMeta( final int meta )
{ {
return getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.OFFLINE ); return this.getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.OFFLINE );
} }
@Override @Override

2
src/main/java/appeng/block/networking/BlockEnergyCell.java
View file

@ -58,7 +58,7 @@ public class BlockEnergyCell extends AEBaseTileBlock
@Override @Override
public IBlockState getStateFromMeta( final int meta ) public IBlockState getStateFromMeta( final int meta )
{ {
return getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) ); return this.getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) );
} }
public BlockEnergyCell() public BlockEnergyCell()

44
src/main/java/appeng/client/ClientHelper.java
View file

@ -111,7 +111,7 @@ public class ClientHelper extends ServerHelper
@Override @Override
public void configureIcon( final Object item, final String name ) public void configureIcon( final Object item, final String name )
{ {
iconTmp.add( new IconReg( item, 0, name ) ); this.iconTmp.add( new IconReg( item, 0, name ) );
} }
@Override @Override
@ -271,11 +271,11 @@ public class ClientHelper extends ServerHelper
@Override @Override
public ModelResourceLocation getModelLocation( final ItemStack stack ) public ModelResourceLocation getModelLocation( final ItemStack stack )
{ {
return partRenderer; return ClientHelper.this.partRenderer;
} }
}; };
for( final IconReg reg : iconTmp ) for( final IconReg reg : this.iconTmp )
{ {
if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem ) if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem )
{ {
@ -291,7 +291,7 @@ public class ClientHelper extends ServerHelper
continue; continue;
} }
addIcon( reg.name ); this.addIcon( reg.name );
mesher.register( reg.item instanceof Item ? (Item) reg.item : Item.getItemFromBlock( (Block) reg.item ), stack -> renderer.rendererInstance.getResourcePath() ); mesher.register( reg.item instanceof Item ? (Item) reg.item : Item.getItemFromBlock( (Block) reg.item ), stack -> renderer.rendererInstance.getResourcePath() );
continue; continue;
@ -313,7 +313,7 @@ public class ClientHelper extends ServerHelper
} }
final String MODID = AppEng.MOD_ID + ":"; final String MODID = AppEng.MOD_ID + ":";
for( final List<IconReg> reg : iconRegistrations.values() ) for( final List<IconReg> reg : this.iconRegistrations.values() )
{ {
final String[] names = new String[reg.size()]; final String[] names = new String[reg.size()];
@ -380,16 +380,16 @@ public class ClientHelper extends ServerHelper
public ResourceLocation addIcon( final String string ) public ResourceLocation addIcon( final String string )
{ {
final ModelResourceLocation n = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, string ), "inventory" ); final ModelResourceLocation n = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, string ), "inventory" );
extraIcons.add( n ); this.extraIcons.add( n );
return n; return n;
} }
public ModelResourceLocation setIcon( final Item item, final String name ) public ModelResourceLocation setIcon( final Item item, final String name )
{ {
List<IconReg> reg = iconRegistrations.get( item ); List<IconReg> reg = this.iconRegistrations.get( item );
if( reg == null ) if( reg == null )
{ {
iconRegistrations.put( item, reg = new LinkedList<>() ); this.iconRegistrations.put( item, reg = new LinkedList<>() );
} }
final ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" ); final ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" );
@ -399,10 +399,10 @@ public class ClientHelper extends ServerHelper
public ModelResourceLocation setIcon( final Item item, final int meta, final String name ) public ModelResourceLocation setIcon( final Item item, final int meta, final String name )
{ {
List<IconReg> reg = iconRegistrations.get( item ); List<IconReg> reg = this.iconRegistrations.get( item );
if( reg == null ) if( reg == null )
{ {
iconRegistrations.put( item, reg = new LinkedList<>() ); this.iconRegistrations.put( item, reg = new LinkedList<>() );
} }
final ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" ); final ModelResourceLocation res = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, name ), "inventory" );
@ -493,9 +493,9 @@ public class ClientHelper extends ServerHelper
{ {
// inventory renderer // inventory renderer
final SmartModel buses = new SmartModel( new BlockRenderInfo( ( new RendererCableBus() ) ) ); final SmartModel buses = new SmartModel( new BlockRenderInfo( ( new RendererCableBus() ) ) );
event.modelRegistry.putObject( partRenderer, buses ); event.modelRegistry.putObject( this.partRenderer, buses );
for( final IconReg reg : iconTmp ) for( final IconReg reg : this.iconTmp )
{ {
if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem ) if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem )
{ {
@ -553,7 +553,7 @@ public class ClientHelper extends ServerHelper
@SubscribeEvent @SubscribeEvent
public void updateTextureSheet( final TextureStitchEvent.Pre ev ) public void updateTextureSheet( final TextureStitchEvent.Pre ev )
{ {
for( final IconReg reg : iconTmp ) for( final IconReg reg : this.iconTmp )
{ {
if( reg.item instanceof AEBaseItem ) if( reg.item instanceof AEBaseItem )
{ {
@ -571,7 +571,7 @@ public class ClientHelper extends ServerHelper
} }
} }
extraIcons.forEach( ev.map::registerSprite ); this.extraIcons.forEach( ev.map::registerSprite );
//if( ev.map.getTextureType() == ITEM_RENDERER ) //if( ev.map.getTextureType() == ITEM_RENDERER )
{ {
@ -604,18 +604,18 @@ public class ClientHelper extends ServerHelper
public IconReg( final Object item2, final int meta2, final String name2 ) public IconReg( final Object item2, final int meta2, final String name2 )
{ {
meta = meta2; this.meta = meta2;
name = name2; this.name = name2;
item = item2; this.item = item2;
loc = null; this.loc = null;
} }
public IconReg( final Item item2, final int meta2, final String name2, final ModelResourceLocation res ) public IconReg( final Item item2, final int meta2, final String name2, final ModelResourceLocation res )
{ {
meta = meta2; this.meta = meta2;
name = name2; this.name = name2;
item = item2; this.item = item2;
loc = res; this.loc = res;
} }
} }
} }

8
src/main/java/appeng/client/SmartModel.java
View file

@ -47,7 +47,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel,ISmartItemModel
public SmartModel( public SmartModel(
final BlockRenderInfo rendererInstance ) final BlockRenderInfo rendererInstance )
{ {
AERenderer = rendererInstance; this.AERenderer = rendererInstance;
} }
@Override @Override
@ -84,7 +84,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel,ISmartItemModel
@Override @Override
public TextureAtlasSprite getTexture() public TextureAtlasSprite getTexture()
{ {
return AERenderer != null ? AERenderer.getTexture( AEPartLocation.UP ).getAtlas() : MissingIcon.getMissing(); return this.AERenderer != null ? this.AERenderer.getTexture( AEPartLocation.UP ).getAtlas() : MissingIcon.getMissing();
} }
@Override @Override
@ -100,7 +100,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel,ISmartItemModel
final ModelGenerator helper = new ModelGenerator(); final ModelGenerator helper = new ModelGenerator();
final Block blk = Block.getBlockFromItem( stack.getItem() ); final Block blk = Block.getBlockFromItem( stack.getItem() );
helper.setRenderBoundsFromBlock( blk ); helper.setRenderBoundsFromBlock( blk );
AERenderer.rendererInstance.renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null ); this.AERenderer.rendererInstance.renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null );
helper.finalizeModel( true ); helper.finalizeModel( true );
return helper.getOutput(); return helper.getOutput();
} }
@ -116,7 +116,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel,ISmartItemModel
helper.setTranslation( -pos.getX(), -pos.getY(), -pos.getZ() ); helper.setTranslation( -pos.getX(), -pos.getY(), -pos.getZ() );
helper.setRenderBoundsFromBlock( blk ); helper.setRenderBoundsFromBlock( blk );
helper.blockAccess = world; helper.blockAccess = world;
AERenderer.rendererInstance.renderInWorld( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, world, pos, helper); this.AERenderer.rendererInstance.renderInWorld( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, world, pos, helper);
helper.finalizeModel( false ); helper.finalizeModel( false );
return helper.getOutput(); return helper.getOutput();
} }

22
src/main/java/appeng/client/gui/AEBaseGui.java
View file

@ -239,7 +239,7 @@ public abstract class AEBaseGui extends GuiContainer
} }
this.zLevel = 300.0F; this.zLevel = 300.0F;
itemRender.zLevel = 300.0F; this.itemRender.zLevel = 300.0F;
final int var10 = -267386864; final int var10 = -267386864;
this.drawGradientRect( var6 - 3, var7 - 4, var6 + var5 + 3, var7 - 3, var10, var10 ); 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 ); this.drawGradientRect( var6 - 3, var7 + var9 + 3, var6 + var5 + 3, var7 + var9 + 4, var10, var10 );
@ -277,7 +277,7 @@ public abstract class AEBaseGui extends GuiContainer
} }
this.zLevel = 0.0F; this.zLevel = 0.0F;
itemRender.zLevel = 0.0F; this.itemRender.zLevel = 0.0F;
} }
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
GL11.glPopAttrib(); GL11.glPopAttrib();
@ -722,17 +722,17 @@ public abstract class AEBaseGui extends GuiContainer
protected void drawItem( final int x, final int y, final ItemStack is ) protected void drawItem( final int x, final int y, final ItemStack is )
{ {
this.zLevel = 100.0F; this.zLevel = 100.0F;
itemRender.zLevel = 100.0F; this.itemRender.zLevel = 100.0F;
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
GL11.glEnable( GL11.GL_LIGHTING ); GL11.glEnable( GL11.GL_LIGHTING );
GL11.glEnable( GL12.GL_RESCALE_NORMAL ); GL11.glEnable( GL12.GL_RESCALE_NORMAL );
GL11.glEnable( GL11.GL_DEPTH_TEST ); GL11.glEnable( GL11.GL_DEPTH_TEST );
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI( is, x, y ); this.itemRender.renderItemAndEffectIntoGUI( is, x, y );
GL11.glPopAttrib(); GL11.glPopAttrib();
itemRender.zLevel = 0.0F; this.itemRender.zLevel = 0.0F;
this.zLevel = 0.0F; this.zLevel = 0.0F;
} }
@ -768,7 +768,7 @@ public abstract class AEBaseGui extends GuiContainer
try try
{ {
this.zLevel = 100.0F; this.zLevel = 100.0F;
itemRender.zLevel = 100.0F; this.itemRender.zLevel = 100.0F;
if( !this.isPowered() ) if( !this.isPowered() )
{ {
@ -778,7 +778,7 @@ public abstract class AEBaseGui extends GuiContainer
} }
this.zLevel = 0.0F; this.zLevel = 0.0F;
itemRender.zLevel = 0.0F; this.itemRender.zLevel = 0.0F;
this.aeRenderItem.aeStack = ( (SlotME) s ).getAEStack(); this.aeRenderItem.aeStack = ( (SlotME) s ).getAEStack();
@ -864,14 +864,14 @@ public abstract class AEBaseGui extends GuiContainer
if( ( (AppEngSlot) s ).isValid == hasCalculatedValidness.Invalid ) if( ( (AppEngSlot) s ).isValid == hasCalculatedValidness.Invalid )
{ {
this.zLevel = 100.0F; this.zLevel = 100.0F;
itemRender.zLevel = 100.0F; this.itemRender.zLevel = 100.0F;
GL11.glDisable( GL11.GL_LIGHTING ); GL11.glDisable( GL11.GL_LIGHTING );
drawRect( s.xDisplayPosition, s.yDisplayPosition, 16 + s.xDisplayPosition, 16 + s.yDisplayPosition, 0x66ff6666 ); drawRect( s.xDisplayPosition, s.yDisplayPosition, 16 + s.xDisplayPosition, 16 + s.yDisplayPosition, 0x66ff6666 );
GL11.glEnable( GL11.GL_LIGHTING ); GL11.glEnable( GL11.GL_LIGHTING );
this.zLevel = 0.0F; this.zLevel = 0.0F;
itemRender.zLevel = 0.0F; this.itemRender.zLevel = 0.0F;
} }
} }
@ -904,8 +904,8 @@ public abstract class AEBaseGui extends GuiContainer
} }
else else
{ {
final RenderItem ri = itemRender; final RenderItem ri = this.itemRender;
itemRender = item; this.itemRender = item;
return ri; return ri;
} }
} }

2
src/main/java/appeng/client/gui/implementations/GuiChest.java
View file

@ -60,7 +60,7 @@ public class GuiChest extends AEBaseGui
{ {
super.initGui(); super.initGui();
this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) );
} }
@Override @Override

2
src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java
View file

@ -136,7 +136,7 @@ public class GuiCraftAmount extends AEBaseGui
if( this.originalGui != null && myIcon != null ) if( this.originalGui != null && myIcon != null )
{ {
this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender ) ); this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), this.itemRender ) );
} }
this.amountToCraft = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Integer.class ); this.amountToCraft = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Integer.class );

2
src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java
View file

@ -142,7 +142,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
if( this.myIcon != null ) if( this.myIcon != null )
{ {
this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 213, this.guiTop - 4, this.myIcon, this.myIcon.getDisplayName(), itemRender ) ); this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 213, this.guiTop - 4, this.myIcon, this.myIcon.getDisplayName(), this.itemRender ) );
this.originalGuiBtn.hideEdge = 13; this.originalGuiBtn.hideEdge = 13;
} }
} }

2
src/main/java/appeng/client/gui/implementations/GuiDrive.java
View file

@ -60,7 +60,7 @@ public class GuiDrive extends AEBaseGui
{ {
super.initGui(); super.initGui();
this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) );
} }
@Override @Override

2
src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java
View file

@ -58,7 +58,7 @@ public class GuiFormationPlane extends GuiUpgradeable
this.placeMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 28, Settings.PLACE_BLOCK, YesNo.YES ); this.placeMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 28, Settings.PLACE_BLOCK, YesNo.YES );
this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) );
this.buttonList.add( this.placeMode ); this.buttonList.add( this.placeMode );
this.buttonList.add( this.fuzzyMode ); this.buttonList.add( this.fuzzyMode );

2
src/main/java/appeng/client/gui/implementations/GuiInterface.java
View file

@ -56,7 +56,7 @@ public class GuiInterface extends GuiUpgradeable
@Override @Override
protected void addButtons() protected void addButtons()
{ {
this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ); this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender );
this.buttonList.add( this.priority ); this.buttonList.add( this.priority );
this.BlockMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO ); this.BlockMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO );

2
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
View file

@ -310,7 +310,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
if( this.viewCell || this instanceof GuiWirelessTerm ) if( this.viewCell || this instanceof GuiWirelessTerm )
{ {
this.buttonList.add( this.craftingStatusBtn = new GuiTabButton( this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), itemRender ) ); this.buttonList.add( this.craftingStatusBtn = new GuiTabButton( this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), this.itemRender ) );
this.craftingStatusBtn.hideEdge = 13; this.craftingStatusBtn.hideEdge = 13;
} }

4
src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java
View file

@ -94,8 +94,8 @@ public class GuiPatternTerm extends GuiMEMonitorable
public void initGui() public void initGui()
{ {
super.initGui(); super.initGui();
this.buttonList.add( this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.crafting_table ), GuiText.CraftingPattern.getLocal(), itemRender ) ); this.buttonList.add( this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.crafting_table ), GuiText.CraftingPattern.getLocal(), this.itemRender ) );
this.buttonList.add( this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.furnace ), GuiText.ProcessingPattern.getLocal(), itemRender ) ); this.buttonList.add( this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.furnace ), GuiText.ProcessingPattern.getLocal(), this.itemRender ) );
// buttonList.add( substitutionsBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, // buttonList.add( substitutionsBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163,
// Settings.ACTIONS, ActionItems.SUBSTITUTION ) ); // Settings.ACTIONS, ActionItems.SUBSTITUTION ) );

2
src/main/java/appeng/client/gui/implementations/GuiPriority.java
View file

@ -156,7 +156,7 @@ public class GuiPriority extends AEBaseGui
if( this.OriginalGui != null && myIcon != null ) if( this.OriginalGui != null && myIcon != null )
{ {
this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender ) ); this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), this.itemRender ) );
} }
this.priority = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Long.class ); this.priority = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Long.class );

2
src/main/java/appeng/client/gui/implementations/GuiStorageBus.java
View file

@ -68,7 +68,7 @@ public class GuiStorageBus extends GuiUpgradeable
this.storageFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY ); this.storageFilter = new GuiImgButton( this.guiLeft - 18, this.guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY );
this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); this.buttonList.add( this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), this.itemRender ) );
this.buttonList.add( this.storageFilter ); this.buttonList.add( this.storageFilter );
this.buttonList.add( this.fuzzyMode ); this.buttonList.add( this.fuzzyMode );

2
src/main/java/appeng/client/render/BaseBlockRender.java
View file

@ -763,6 +763,6 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
public ModelResourceLocation getResourcePath() public ModelResourceLocation getResourcePath()
{ {
return modelPath; return this.modelPath;
} }
} }

4
src/main/java/appeng/client/render/BusRenderer.java
View file

@ -113,8 +113,8 @@ public class BusRenderer implements IItemRenderer
GL11.glScaled( 1.2, 1.2, 1. ); GL11.glScaled( 1.2, 1.2, 1. );
GL11.glColor4f( 1, 1, 1, 1 ); GL11.glColor4f( 1, 1, 1, 1 );
renderer.setColorOpaque_F( 1, 1, 1 ); this.renderer.setColorOpaque_F( 1, 1, 1 );
renderer.setBrightness( 14 << 20 | 14 << 4 ); this.renderer.setBrightness( 14 << 20 | 14 << 4 );
BusRenderHelper.INSTANCE.setBounds( 0, 0, 0, 1, 1, 1 ); BusRenderHelper.INSTANCE.setBounds( 0, 0, 0, 1, 1, 1 );
BusRenderHelper.INSTANCE.setTexture( null ); BusRenderHelper.INSTANCE.setTexture( null );

24
src/main/java/appeng/client/render/IconUnwrapper.java
View file

@ -20,42 +20,42 @@ public class IconUnwrapper extends TextureAtlasSprite
final IAESprite src ) final IAESprite src )
{ {
super( src.getIconName() ); super( src.getIconName() );
width = src.getIconWidth(); this.width = src.getIconWidth();
height = src.getIconHeight(); this.height = src.getIconHeight();
min_u = src.getMinU(); this.min_u = src.getMinU();
max_u = src.getMaxU(); this.max_u = src.getMaxU();
min_v = src.getMinV(); this.min_v = src.getMinV();
max_v = src.getMaxV(); this.max_v = src.getMaxV();
} }
@Override @Override
public int getIconWidth() public int getIconWidth()
{ {
return width; return this.width;
} }
@Override @Override
public int getIconHeight() public int getIconHeight()
{ {
return height; return this.height;
} }
@Override @Override
public float getMaxU() public float getMaxU()
{ {
return max_u; return this.max_u;
} }
@Override @Override
public float getMinV() public float getMinV()
{ {
return min_v; return this.min_v;
} }
@Override @Override
public float getMaxV() public float getMaxV()
{ {
return max_v; return this.max_v;
} }
@Override @Override
@ -67,7 +67,7 @@ public class IconUnwrapper extends TextureAtlasSprite
@Override @Override
public float getMinU() public float getMinU()
{ {
return min_u; return this.min_u;
} }
@Override @Override

234
src/main/java/appeng/client/render/ModelGenerator.java
View file

@ -42,9 +42,9 @@ public class ModelGenerator
public CachedModel() public CachedModel()
{ {
general = new ArrayList<BakedQuad>(); this.general = new ArrayList<BakedQuad>();
for ( final EnumFacing f : EnumFacing.VALUES ) for ( final EnumFacing f : EnumFacing.VALUES )
faces[f.ordinal()] = new ArrayList<BakedQuad>(); this.faces[f.ordinal()] = new ArrayList<BakedQuad>();
} }
@Override @Override
@ -80,14 +80,14 @@ public class ModelGenerator
@Override @Override
public List getGeneralQuads() public List getGeneralQuads()
{ {
return general; return this.general;
} }
@Override @Override
public List getFaceQuads( public List getFaceQuads(
final EnumFacing p_177551_1_ ) final EnumFacing p_177551_1_ )
{ {
return faces[p_177551_1_.ordinal()]; return this.faces[p_177551_1_.ordinal()];
} }
} }
@ -123,13 +123,13 @@ public class ModelGenerator
final Block block ) final Block block )
{ {
if ( block == null ) return; if ( block == null ) return;
renderMinX = block.getBlockBoundsMinX(); this.renderMinX = block.getBlockBoundsMinX();
renderMinY = block.getBlockBoundsMinY(); this.renderMinY = block.getBlockBoundsMinY();
renderMinZ = block.getBlockBoundsMinZ(); this.renderMinZ = block.getBlockBoundsMinZ();
renderMaxX = block.getBlockBoundsMaxX(); this.renderMaxX = block.getBlockBoundsMaxX();
renderMaxY = block.getBlockBoundsMaxY(); this.renderMaxY = block.getBlockBoundsMaxY();
renderMaxZ = block.getBlockBoundsMaxZ(); this.renderMaxZ = block.getBlockBoundsMaxZ();
} }
public void setRenderBounds( public void setRenderBounds(
@ -140,12 +140,12 @@ public class ModelGenerator
final double h, final double h,
final double i ) final double i )
{ {
renderMinX = d; this.renderMinX = d;
renderMinY = e; this.renderMinY = e;
renderMinZ = f; this.renderMinZ = f;
renderMaxX = g; this.renderMaxX = g;
renderMaxY = h; this.renderMaxY = h;
renderMaxZ = i; this.renderMaxZ = i;
} }
int color = -1; int color = -1;
@ -153,7 +153,7 @@ public class ModelGenerator
public void setBrightness( public void setBrightness(
final int i ) final int i )
{ {
brightness=i; this.brightness =i;
} }
public void setColorRGBA_F( public void setColorRGBA_F(
@ -163,7 +163,7 @@ public class ModelGenerator
final float a ) final float a )
{ {
final int alpha = ( int ) ( a * 0xff ); final int alpha = ( int ) ( a * 0xff );
color = alpha << 24 | this.color = alpha << 24 |
r << 16 | r << 16 |
b << 8 | b << 8 |
b; b;
@ -173,7 +173,7 @@ public class ModelGenerator
final int whiteVariant ) final int whiteVariant )
{ {
final int alpha = 0xff; final int alpha = 0xff;
color = //alpha << 24 | this.color = //alpha << 24 |
whiteVariant; whiteVariant;
} }
public void setColorOpaque( public void setColorOpaque(
@ -182,7 +182,7 @@ public class ModelGenerator
final int b ) final int b )
{ {
final int alpha = 0xff; final int alpha = 0xff;
color =// alpha << 24 | this.color =// alpha << 24 |
r << 16 | r << 16 |
g << 8 | g << 8 |
b; b;
@ -194,7 +194,7 @@ public class ModelGenerator
final int b ) final int b )
{ {
final int alpha = 0xff; final int alpha = 0xff;
color = //alpha << 24 | this.color = //alpha << 24 |
Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, r ) ) << 16 |
Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, g ) ) << 8 |
Math.min( 0xff, Math.max( 0, b ) ); Math.min( 0xff, Math.max( 0, b ) );
@ -209,7 +209,7 @@ public class ModelGenerator
final int g = (int)( gf * 0xff ); final int g = (int)( gf * 0xff );
final int b = (int)( bf * 0xff ); final int b = (int)( bf * 0xff );
final int alpha = 0xff; final int alpha = 0xff;
color = //alpha << 24 | this.color = //alpha << 24 |
Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, r ) ) << 16 |
Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, g ) ) << 8 |
Math.min( 0xff, Math.max( 0, b ) ); Math.min( 0xff, Math.max( 0, b ) );
@ -226,7 +226,7 @@ public class ModelGenerator
final Block blk = Block.getBlockFromItem( it ); final Block blk = Block.getBlockFromItem( it );
if ( blk != null ) if ( blk != null )
return getIcon(blk.getStateFromMeta( is.getMetadata() ))[0]; return this.getIcon(blk.getStateFromMeta( is.getMetadata() ))[0];
if ( it instanceof AEBaseItem ) if ( it instanceof AEBaseItem )
{ {
@ -293,7 +293,7 @@ public class ModelGenerator
return out; return out;
} }
return getIcon( state ); return this.getIcon( state );
} }
int point =0; int point =0;
@ -308,48 +308,48 @@ public class ModelGenerator
final double u, final double u,
final double v ) final double v )
{ {
points[point++] = new float[]{ (float)x+tx, (float)y+ty, (float)z+tz, (float)u, (float)v }; this.points[this.point++] = new float[]{ (float)x+ this.tx, (float)y+ this.ty, (float)z+ this.tz, (float)u, (float)v };
if ( point == 4 ) if ( this.point == 4 )
{ {
brightness = -1; this.brightness = -1;
final int[] vertData = { final int[] vertData = {
Float.floatToRawIntBits( points[0][0] ), Float.floatToRawIntBits( this.points[0][0] ),
Float.floatToRawIntBits( points[0][1] ), Float.floatToRawIntBits( this.points[0][1] ),
Float.floatToRawIntBits( points[0][2] ), Float.floatToRawIntBits( this.points[0][2] ),
brightness, this.brightness,
Float.floatToRawIntBits( points[0][3] ), Float.floatToRawIntBits( this.points[0][3] ),
Float.floatToRawIntBits( points[0][4] ), Float.floatToRawIntBits( this.points[0][4] ),
0, 0,
Float.floatToRawIntBits( points[1][0] ), Float.floatToRawIntBits( this.points[1][0] ),
Float.floatToRawIntBits( points[1][1] ), Float.floatToRawIntBits( this.points[1][1] ),
Float.floatToRawIntBits( points[1][2] ), Float.floatToRawIntBits( this.points[1][2] ),
brightness, this.brightness,
Float.floatToRawIntBits( points[1][3] ), Float.floatToRawIntBits( this.points[1][3] ),
Float.floatToRawIntBits( points[1][4] ), Float.floatToRawIntBits( this.points[1][4] ),
0, 0,
Float.floatToRawIntBits( points[2][0] ), Float.floatToRawIntBits( this.points[2][0] ),
Float.floatToRawIntBits( points[2][1] ), Float.floatToRawIntBits( this.points[2][1] ),
Float.floatToRawIntBits( points[2][2] ), Float.floatToRawIntBits( this.points[2][2] ),
brightness, this.brightness,
Float.floatToRawIntBits( points[2][3] ), Float.floatToRawIntBits( this.points[2][3] ),
Float.floatToRawIntBits( points[2][4] ), Float.floatToRawIntBits( this.points[2][4] ),
0, 0,
Float.floatToRawIntBits( points[3][0] ), Float.floatToRawIntBits( this.points[3][0] ),
Float.floatToRawIntBits( points[3][1] ), Float.floatToRawIntBits( this.points[3][1] ),
Float.floatToRawIntBits( points[3][2] ), Float.floatToRawIntBits( this.points[3][2] ),
brightness, this.brightness,
Float.floatToRawIntBits( points[3][3] ), Float.floatToRawIntBits( this.points[3][3] ),
Float.floatToRawIntBits( points[3][4] ), Float.floatToRawIntBits( this.points[3][4] ),
0, 0,
}; };
generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, color, face )); this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ));
point=0; this.point =0;
} }
} }
@ -359,15 +359,15 @@ public class ModelGenerator
{ {
//setRenderBoundsFromBlock( block ); //setRenderBoundsFromBlock( block );
final IAESprite[] textures = getIcon( blockAccess,pos ); final IAESprite[] textures = this.getIcon( this.blockAccess,pos );
setColorOpaque_I( 0xffffff ); this.setColorOpaque_I( 0xffffff );
renderFaceXNeg( block, pos, textures[EnumFacing.WEST.ordinal()] ); this.renderFaceXNeg( block, pos, textures[EnumFacing.WEST.ordinal()] );
renderFaceXPos( block, pos, textures[EnumFacing.EAST.ordinal()] ); this.renderFaceXPos( block, pos, textures[EnumFacing.EAST.ordinal()] );
renderFaceYNeg( block, pos, textures[EnumFacing.DOWN.ordinal()] ); this.renderFaceYNeg( block, pos, textures[EnumFacing.DOWN.ordinal()] );
renderFaceYPos( block, pos, textures[EnumFacing.UP.ordinal()] ); this.renderFaceYPos( block, pos, textures[EnumFacing.UP.ordinal()] );
renderFaceZNeg( block, pos, textures[EnumFacing.NORTH.ordinal()] ); this.renderFaceZNeg( block, pos, textures[EnumFacing.NORTH.ordinal()] );
renderFaceZPos( block, pos, textures[EnumFacing.SOUTH.ordinal()] ); this.renderFaceZPos( block, pos, textures[EnumFacing.SOUTH.ordinal()] );
return false; return false;
} }
@ -377,9 +377,9 @@ public class ModelGenerator
final int y, final int y,
final int z ) final int z )
{ {
tx=x; this.tx =x;
ty=y; this.ty =y;
tz=z; this.tz =z;
} }
public boolean isAlphaPass() public boolean isAlphaPass()
@ -458,17 +458,17 @@ public class ModelGenerator
to_b = 1.0f - to_b; to_b = 1.0f - to_b;
final float[] afloat = {// :P final float[] afloat = {// :P
16.0f * ( quadsUV[0] + quadsUV[2] * from_a + quadsUV[4] * from_b ), // 0 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * from_b ), // 0
16.0f * ( quadsUV[1] + quadsUV[3] * from_a + quadsUV[5] * from_b ), // 1 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * from_b ), // 1
16.0f * ( quadsUV[0] + quadsUV[2] * to_a + quadsUV[4] * from_b ), // 2 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * from_b ), // 2
16.0f * ( quadsUV[1] + quadsUV[3] * to_a + quadsUV[5] * from_b ), // 3 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * from_b ), // 3
16.0f * ( quadsUV[0] + quadsUV[2] * to_a + quadsUV[4] * to_b ), // 2 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * to_a + this.quadsUV[4] * to_b ), // 2
16.0f * ( quadsUV[1] + quadsUV[3] * to_a + quadsUV[5] * to_b ), // 3 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * to_a + this.quadsUV[5] * to_b ), // 3
16.0f * ( quadsUV[0] + quadsUV[2] * from_a + quadsUV[4] * to_b ), // 0 16.0f * ( this.quadsUV[0] + this.quadsUV[2] * from_a + this.quadsUV[4] * to_b ), // 0
16.0f * ( quadsUV[1] + quadsUV[3] * from_a + quadsUV[5] * to_b ), // 1 16.0f * ( this.quadsUV[1] + this.quadsUV[3] * from_a + this.quadsUV[5] * to_b ), // 1
}; };
return afloat; return afloat;
@ -479,12 +479,12 @@ public class ModelGenerator
final BlockPos pos, final BlockPos pos,
final IAESprite lights ) final IAESprite lights )
{ {
final boolean isEdge = renderMinX < 0.0001; final boolean isEdge = this.renderMinX < 0.0001;
final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMinY* 16.0f, (float)renderMinZ * 16.0f); final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f);
final Vector3f from = new Vector3f( (float)renderMinX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMaxZ * 16.0f); final Vector3f from = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f);
final EnumFacing myFace = EnumFacing.WEST; final EnumFacing myFace = EnumFacing.WEST;
addFace(myFace, isEdge,to,from,defUVs,lights ); this.addFace(myFace, isEdge,to,from, this.defUVs,lights );
} }
public void renderFaceYNeg( public void renderFaceYNeg(
@ -492,12 +492,12 @@ public class ModelGenerator
final BlockPos pos, final BlockPos pos,
final IAESprite lights ) final IAESprite lights )
{ {
final boolean isEdge = renderMinY < 0.0001; final boolean isEdge = this.renderMinY < 0.0001;
final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMinY* 16.0f, (float)renderMinZ* 16.0f ); final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f );
final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMinY* 16.0f, (float)renderMaxZ* 16.0f ); final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMaxZ * 16.0f );
final EnumFacing myFace = EnumFacing.DOWN; final EnumFacing myFace = EnumFacing.DOWN;
addFace(myFace, isEdge,to,from,defUVs, lights ); this.addFace(myFace, isEdge,to,from, this.defUVs, lights );
} }
public void renderFaceZNeg( public void renderFaceZNeg(
@ -505,12 +505,12 @@ public class ModelGenerator
final BlockPos pos, final BlockPos pos,
final IAESprite lights ) final IAESprite lights )
{ {
final boolean isEdge = renderMinZ < 0.0001; final boolean isEdge = this.renderMinZ < 0.0001;
final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMinY* 16.0f, (float)renderMinZ* 16.0f ); final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f );
final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMinZ* 16.0f ); final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMinZ * 16.0f );
final EnumFacing myFace = EnumFacing.NORTH; final EnumFacing myFace = EnumFacing.NORTH;
addFace(myFace, isEdge,to,from,defUVs, lights ); this.addFace(myFace, isEdge,to,from, this.defUVs, lights );
} }
public void renderFaceYPos( public void renderFaceYPos(
@ -518,12 +518,12 @@ public class ModelGenerator
final BlockPos pos, final BlockPos pos,
final IAESprite lights ) final IAESprite lights )
{ {
final boolean isEdge = renderMaxY > 0.9999; final boolean isEdge = this.renderMaxY > 0.9999;
final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMinZ* 16.0f ); final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMinZ * 16.0f );
final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMaxZ * 16.0f); final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f);
final EnumFacing myFace = EnumFacing.UP; final EnumFacing myFace = EnumFacing.UP;
addFace(myFace, isEdge,to,from,defUVs,lights ); this.addFace(myFace, isEdge,to,from, this.defUVs,lights );
} }
public void renderFaceZPos( public void renderFaceZPos(
@ -531,12 +531,12 @@ public class ModelGenerator
final BlockPos pos, final BlockPos pos,
final IAESprite lights ) final IAESprite lights )
{ {
final boolean isEdge = renderMaxZ > 0.9999; final boolean isEdge = this.renderMaxZ > 0.9999;
final Vector3f to = new Vector3f( (float)renderMinX* 16.0f, (float)renderMinY* 16.0f, (float)renderMaxZ* 16.0f ); final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMaxZ * 16.0f );
final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMaxZ* 16.0f ); final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f );
final EnumFacing myFace = EnumFacing.SOUTH; final EnumFacing myFace = EnumFacing.SOUTH;
addFace(myFace, isEdge,to,from,defUVs,lights ); this.addFace(myFace, isEdge,to,from, this.defUVs,lights );
} }
public void renderFaceXPos( public void renderFaceXPos(
@ -544,12 +544,12 @@ public class ModelGenerator
final BlockPos pos, final BlockPos pos,
final IAESprite lights ) final IAESprite lights )
{ {
final boolean isEdge = renderMaxX > 0.9999; final boolean isEdge = this.renderMaxX > 0.9999;
final Vector3f to = new Vector3f( (float)renderMaxX * 16.0f, (float)renderMinY* 16.0f, (float)renderMinZ* 16.0f ); final Vector3f to = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f );
final Vector3f from = new Vector3f( (float)renderMaxX* 16.0f, (float)renderMaxY* 16.0f, (float)renderMaxZ* 16.0f ); final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f );
final EnumFacing myFace = EnumFacing.EAST; final EnumFacing myFace = EnumFacing.EAST;
addFace(myFace, isEdge,to,from,defUVs, lights ); this.addFace(myFace, isEdge,to,from, this.defUVs, lights );
} }
private void addFace( private void addFace(
@ -559,10 +559,10 @@ public class ModelGenerator
final float[] defUVs2, final float[] defUVs2,
IAESprite texture ) IAESprite texture )
{ {
if ( overrideBlockTexture != null ) if ( this.overrideBlockTexture != null )
texture = overrideBlockTexture; texture = this.overrideBlockTexture;
faces.add( new SMFace(face,isEdge,color,to,from,defUVs2,new IconUnwrapper(texture))); this.faces.add( new SMFace( face, isEdge, this.color, to, from, defUVs2, new IconUnwrapper( texture ) ) );
} }
EnumFacing currentFace = EnumFacing.UP; EnumFacing currentFace = EnumFacing.UP;
@ -572,18 +572,24 @@ public class ModelGenerator
final float y, final float y,
final float z ) final float z )
{ {
if ( x > 0.5 ) currentFace = EnumFacing.EAST; if ( x > 0.5 )
if ( x < -0.5 ) currentFace = EnumFacing.WEST; this.currentFace = EnumFacing.EAST;
if ( y > 0.5 ) currentFace = EnumFacing.UP; if ( x < -0.5 )
if ( y < -0.5 ) currentFace = EnumFacing.DOWN; this.currentFace = EnumFacing.WEST;
if ( z > 0.5 ) currentFace = EnumFacing.SOUTH; if ( y > 0.5 )
if ( z < -0.5 ) currentFace = EnumFacing.NORTH; this.currentFace = EnumFacing.UP;
if ( y < -0.5 )
this.currentFace = EnumFacing.DOWN;
if ( z > 0.5 )
this.currentFace = EnumFacing.SOUTH;
if ( z < -0.5 )
this.currentFace = EnumFacing.NORTH;
} }
public void setOverrideBlockTexture( public void setOverrideBlockTexture(
final IAESprite object ) final IAESprite object )
{ {
overrideBlockTexture = object; this.overrideBlockTexture = object;
} }
public void finalizeModel( final boolean Flip ) public void finalizeModel( final boolean Flip )
@ -593,15 +599,15 @@ public class ModelGenerator
if ( Flip ) if ( Flip )
mr = ModelRotation.X0_Y180; mr = ModelRotation.X0_Y180;
for ( final SMFace face : faces ) for ( final SMFace face : this.faces )
{ {
final EnumFacing myFace = face.face; final EnumFacing myFace = face.face;
final float[] uvs = getFaceUvs( myFace, face.from, face.to ); final float[] uvs = this.getFaceUvs( myFace, face.from, face.to );
final BlockFaceUV uv = new BlockFaceUV( uvs, 0 ); final BlockFaceUV uv = new BlockFaceUV( uvs, 0 );
final BlockPartFace bpf = new BlockPartFace( myFace, face.color, "", uv ); final BlockPartFace bpf = new BlockPartFace( myFace, face.color, "", uv );
BakedQuad bf = faceBakery.makeBakedQuad( face.to, face.from, bpf, face.spite, myFace, mr, null, true, true ); BakedQuad bf = this.faceBakery.makeBakedQuad( face.to, face.from, bpf, face.spite, myFace, mr, null, true, true );
bf = new IColoredBakedQuad.ColoredBakedQuad( bf.getVertexData(), face.color, bf.getFace() ); bf = new IColoredBakedQuad.ColoredBakedQuad( bf.getVertexData(), face.color, bf.getFace() );
if ( face.isEdge ) if ( face.isEdge )
@ -613,7 +619,7 @@ public class ModelGenerator
public IBakedModel getOutput() public IBakedModel getOutput()
{ {
return generatedModel; return this.generatedModel;
} }
} }

16
src/main/java/appeng/client/render/blocks/RenderBlockWireless.java
View file

@ -57,7 +57,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
public void renderInventory( final BlockWireless blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj ) public void renderInventory( final BlockWireless blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{ {
this.blk = blk; this.blk = blk;
center = new BlockPos(0,0,0); this.center = new BlockPos(0,0,0);
this.hasChan = false; this.hasChan = false;
this.hasPower = false; this.hasPower = false;
final BlockRenderInfo ri = blk.getRendererInstance(); final BlockRenderInfo ri = blk.getRendererInstance();
@ -128,7 +128,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
this.renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, fdx, fdy, fdz ); this.renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, fdx, fdy, fdz );
super.renderInWorld( blk, world, pos, renderer ); super.renderInWorld( blk, world, pos, renderer );
center = pos; this.center = pos;
ri.setTemporaryRenderIcon( null ); ri.setTemporaryRenderIcon( null );
this.renderTorchAtAngle( renderer, fdx, fdy, fdz ); this.renderTorchAtAngle( renderer, fdx, fdy, fdz );
@ -210,7 +210,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
private void renderTorchAtAngle( final ModelGenerator renderer, final EnumFacing x, final EnumFacing y, final EnumFacing z ) private void renderTorchAtAngle( final ModelGenerator renderer, final EnumFacing x, final EnumFacing y, final EnumFacing z )
{ {
final IAESprite r = ( this.hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : renderer.getIcon( blk.getDefaultState() )[0] ); final IAESprite r = ( this.hasChan ? CableBusTextures.BlockWirelessOn.getIcon() : renderer.getIcon( this.blk.getDefaultState() )[0] );
final IAESprite sides = new OffsetIcon( r, 0.0f, -2.0f ); final IAESprite sides = new OffsetIcon( r, 0.0f, -2.0f );
switch( z ) switch( z )
@ -251,14 +251,14 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
renderer.setColorOpaque_I( 0xffffff ); renderer.setColorOpaque_I( 0xffffff );
this.renderBlockBounds( renderer, 0, 7, 1, 16, 9, 16, x,y,z ); this.renderBlockBounds( renderer, 0, 7, 1, 16, 9, 16, x,y,z );
this.renderFace( center, this.blk, sides, renderer, y ); this.renderFace( this.center, this.blk, sides, renderer, y );
this.renderFace( center, this.blk, sides, renderer, y.getOpposite() ); this.renderFace( this.center, this.blk, sides, renderer, y.getOpposite() );
this.renderBlockBounds( renderer, 7, 0, 1, 9, 16, 16, x, y, z ); this.renderBlockBounds( renderer, 7, 0, 1, 9, 16, 16, x, y, z );
this.renderFace( center, this.blk, sides, renderer, x ); this.renderFace( this.center, this.blk, sides, renderer, x );
this.renderFace( center, this.blk, sides, renderer, x.getOpposite() ); this.renderFace( this.center, this.blk, sides, renderer, x.getOpposite() );
this.renderBlockBounds( renderer, 7, 7, 1, 9, 9, 10.6, x, y, z ); this.renderBlockBounds( renderer, 7, 7, 1, 9, 9, 10.6, x, y, z );
this.renderFace( center, this.blk, r, renderer, z ); this.renderFace( this.center, this.blk, r, renderer, z );
} }
} }

22
src/main/java/appeng/client/texture/BaseIcon.java
View file

@ -8,69 +8,69 @@ public class BaseIcon implements IAESprite
public BaseIcon( final TextureAtlasSprite src ) public BaseIcon( final TextureAtlasSprite src )
{ {
spite = src; this.spite = src;
} }
@Override @Override
public int getIconWidth() public int getIconWidth()
{ {
return spite.getIconWidth(); return this.spite.getIconWidth();
} }
@Override @Override
public int getIconHeight() public int getIconHeight()
{ {
return spite.getIconHeight(); return this.spite.getIconHeight();
} }
@Override @Override
public float getMaxU() public float getMaxU()
{ {
return spite.getMaxU(); return this.spite.getMaxU();
} }
@Override @Override
public float getInterpolatedU( public float getInterpolatedU(
final double px ) final double px )
{ {
return spite.getInterpolatedU( px ); return this.spite.getInterpolatedU( px );
} }
@Override @Override
public float getMinV() public float getMinV()
{ {
return spite.getMinV(); return this.spite.getMinV();
} }
@Override @Override
public float getMaxV() public float getMaxV()
{ {
return spite.getMaxV(); return this.spite.getMaxV();
} }
@Override @Override
public String getIconName() public String getIconName()
{ {
return spite.getIconName(); return this.spite.getIconName();
} }
@Override @Override
public float getInterpolatedV( public float getInterpolatedV(
final double px ) final double px )
{ {
return spite.getInterpolatedV( px ); return this.spite.getInterpolatedV( px );
} }
@Override @Override
public float getMinU() public float getMinU()
{ {
return spite.getMinU(); return this.spite.getMinU();
} }
@Override @Override
public TextureAtlasSprite getAtlas() public TextureAtlasSprite getAtlas()
{ {
return spite; return this.spite;
} }
} }

2
src/main/java/appeng/client/texture/CableBusTextures.java
View file

@ -108,6 +108,6 @@ public enum CableBusTextures
public void registerIcon( final TextureMap map ) public void registerIcon( final TextureMap map )
{ {
IIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/" + name ) ) ); this.IIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/" + this.name ) ) );
} }
} }

2
src/main/java/appeng/client/texture/ExtraBlockTextures.java
View file

@ -118,6 +118,6 @@ public enum ExtraBlockTextures
public void registerIcon( final TextureMap map ) public void registerIcon( final TextureMap map )
{ {
IIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/" + name ) ) ); this.IIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/" + this.name ) ) );
} }
} }

2
src/main/java/appeng/client/texture/ExtraItemTextures.java
View file

@ -59,6 +59,6 @@ public enum ExtraItemTextures
public void registerIcon( final TextureMap map ) public void registerIcon( final TextureMap map )
{ {
IIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "items/" + name ) ) ); this.IIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "items/" + this.name ) ) );
} }
} }

2
src/main/java/appeng/client/texture/FlippableIcon.java
View file

@ -32,7 +32,7 @@ public class FlippableIcon implements IAESprite
@Override @Override
public TextureAtlasSprite getAtlas() public TextureAtlasSprite getAtlas()
{ {
return original.getAtlas(); return this.original.getAtlas();
} }
public FlippableIcon( final IAESprite o ) public FlippableIcon( final IAESprite o )

2
src/main/java/appeng/client/texture/FullIcon.java
View file

@ -42,7 +42,7 @@ public class FullIcon implements IAESprite
@Override @Override
public TextureAtlasSprite getAtlas() public TextureAtlasSprite getAtlas()
{ {
return p; return this.p;
} }
@Override @Override

2
src/main/java/appeng/client/texture/OffsetIcon.java
View file

@ -118,6 +118,6 @@ public class OffsetIcon implements IAESprite
@Override @Override
public TextureAtlasSprite getAtlas() public TextureAtlasSprite getAtlas()
{ {
return p.getAtlas(); return this.p.getAtlas();
} }
} }

2
src/main/java/appeng/client/texture/TaughtIcon.java
View file

@ -34,7 +34,7 @@ public class TaughtIcon implements IAESprite
@Override @Override
public TextureAtlasSprite getAtlas() public TextureAtlasSprite getAtlas()
{ {
return icon.getAtlas(); return this.icon.getAtlas();
} }
public TaughtIcon( final IAESprite iIcon, final float tightness ) public TaughtIcon( final IAESprite iIcon, final float tightness )

2
src/main/java/appeng/container/ContainerOpenContext.java
View file

@ -48,6 +48,6 @@ public class ContainerOpenContext
{ {
return null; return null;
} }
return this.w.getTileEntity( new BlockPos( x,y,z) ); return this.w.getTileEntity( new BlockPos( this.x, this.y, this.z ) );
} }
} }

4
src/main/java/appeng/container/slot/AppEngCraftingSlot.java
View file

@ -142,7 +142,7 @@ public class AppEngCraftingSlot extends AppEngSlot
@Override @Override
public void onPickupFromSlot( final EntityPlayer playerIn, final ItemStack stack ) public void onPickupFromSlot( final EntityPlayer playerIn, final ItemStack stack )
{ {
net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(playerIn, stack, craftMatrix); net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(playerIn, stack, this.craftMatrix );
this.onCrafting(stack); this.onCrafting(stack);
net.minecraftforge.common.ForgeHooks.setCraftingPlayer(playerIn); net.minecraftforge.common.ForgeHooks.setCraftingPlayer(playerIn);
final InventoryCrafting ic = new InventoryCrafting( this.myContainer, 3, 3 ); final InventoryCrafting ic = new InventoryCrafting( this.myContainer, 3, 3 );
@ -153,7 +153,7 @@ public class AppEngCraftingSlot extends AppEngSlot
final ItemStack[] aitemstack = CraftingManager.getInstance().func_180303_b(ic, playerIn.worldObj); final ItemStack[] aitemstack = CraftingManager.getInstance().func_180303_b(ic, playerIn.worldObj);
for ( int x=0; x < this.craftMatrix.getSizeInventory(); x++ ) for ( int x=0; x < this.craftMatrix.getSizeInventory(); x++ )
craftMatrix.setInventorySlotContents( x, ic.getStackInSlot( x ) ); this.craftMatrix.setInventorySlotContents( x, ic.getStackInSlot( x ) );
net.minecraftforge.common.ForgeHooks.setCraftingPlayer(null); net.minecraftforge.common.ForgeHooks.setCraftingPlayer(null);

16
src/main/java/appeng/core/api/definitions/ApiBlocks.java
View file

@ -215,14 +215,14 @@ public final class ApiBlocks implements IBlocks
this.lightDetector = constructor.registerTileDefinition( new BlockLightDetector() ); this.lightDetector = constructor.registerTileDefinition( new BlockLightDetector() );
this.paint = constructor.registerTileDefinition( new BlockPaint() ); this.paint = constructor.registerTileDefinition( new BlockPaint() );
this.skyStoneStair = makeStairs( constructor, skyStone_stone, "skystone.stone" ); this.skyStoneStair = this.makeStairs( constructor, this.skyStone_stone, "skystone.stone" );
this.skyStoneBlockStair = makeStairs( constructor, skyStone_block, "skystone.block" ); this.skyStoneBlockStair = this.makeStairs( constructor, this.skyStone_block, "skystone.block" );
this.skyStoneBrickStair = makeStairs( constructor, skyStone_brick, "skystone.brick" ); this.skyStoneBrickStair = this.makeStairs( constructor, this.skyStone_brick, "skystone.brick" );
this.skyStoneSmallBrickStair = makeStairs( constructor, skyStone_smallbrick, "skystone.brick.small" ); this.skyStoneSmallBrickStair = this.makeStairs( constructor, this.skyStone_smallbrick, "skystone.brick.small" );
this.fluixStair = makeStairs( constructor, fluix, "fluix" ); this.fluixStair = this.makeStairs( constructor, this.fluix, "fluix" );
this.quartzStair = makeStairs( constructor, quartz, "quartz.certus" ); this.quartzStair = this.makeStairs( constructor, this.quartz, "quartz.certus" );
this.chiseledQuartzStair = makeStairs( constructor, quartzChiseled, "quartz.certus.chiseled" ); this.chiseledQuartzStair = this.makeStairs( constructor, this.quartzChiseled, "quartz.certus.chiseled" );
this.quartzPillarStair = makeStairs( constructor, quartzPillar, "quartz.certus.pillar" ); this.quartzPillarStair = this.makeStairs( constructor, this.quartzPillar, "quartz.certus.pillar" );
// TODO Re-Add Slabs... // TODO Re-Add Slabs...
/* /*

2
src/main/java/appeng/core/features/ItemFeatureHandler.java
View file

@ -97,7 +97,7 @@ public final class ItemFeatureHandler implements IFeatureHandler
if( side == Side.CLIENT ) if( side == Side.CLIENT )
{ {
CommonHelper.proxy.configureIcon( item, itemPhysicalName ); CommonHelper.proxy.configureIcon( this.item, itemPhysicalName );
} }
} }
} }

5
src/main/java/appeng/core/sync/AppEngPacket.java
View file

@ -93,12 +93,13 @@ public abstract class AppEngPacket implements Packet
PacketCallState caller; PacketCallState caller;
public void setCallParam( final PacketCallState call ){caller = call;} public void setCallParam( final PacketCallState call ){
this.caller = call;}
@Override @Override
public void processPacket( final INetHandler handler) public void processPacket( final INetHandler handler)
{ {
caller.call(this); this.caller.call( this );
} }
} }

2
src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java
View file

@ -218,7 +218,7 @@ public class PacketNEIRecipe extends AppEngPacket
// If that doesn't work, grab from the player's inventory // If that doesn't work, grab from the player's inventory
if( whichItem == null && playerInventory != null ) if( whichItem == null && playerInventory != null )
{ {
whichItem = extractItemFromPlayerInventory( player, realForFake, patternItem ); whichItem = this.extractItemFromPlayerInventory( player, realForFake, patternItem );
} }
craftMatrix.setInventorySlotContents( x, whichItem ); craftMatrix.setInventorySlotContents( x, whichItem );

4
src/main/java/appeng/debug/TileCubeGenerator.java
View file

@ -65,7 +65,7 @@ public class TileCubeGenerator extends AEBaseTile implements IUpdatePlayerListBo
void spawn() void spawn()
{ {
this.worldObj.setBlockToAir( pos ); this.worldObj.setBlockToAir( this.pos );
final Item i = this.is.getItem(); final Item i = this.is.getItem();
final EnumFacing side = EnumFacing.UP; final EnumFacing side = EnumFacing.UP;
@ -78,7 +78,7 @@ public class TileCubeGenerator extends AEBaseTile implements IUpdatePlayerListBo
{ {
for( int z = -half; z < half; z++ ) for( int z = -half; z < half; z++ )
{ {
final BlockPos p = pos.add( x, y-1, z ); final BlockPos p = this.pos.add( x, y - 1, z );
i.onItemUse( this.is.copy(), this.who, this.worldObj, p, side, 0.5f, 0.0f, 0.5f ); i.onItemUse( this.is.copy(), this.who, this.worldObj, p, side, 0.5f, 0.0f, 0.5f );
} }
} }

2
src/main/java/appeng/decorative/solid/QuartzPillarBlock.java
View file

@ -54,7 +54,7 @@ public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock
public IBlockState getStateFromMeta( public IBlockState getStateFromMeta(
final int meta ) final int meta )
{ {
return getDefaultState(); return this.getDefaultState();
} }
@Override @Override

4
src/main/java/appeng/decorative/solid/SkyStoneBlock.java
View file

@ -75,7 +75,7 @@ public class SkyStoneBlock extends AEBaseBlock
level = is.getItem().getHarvestLevel( is, "pickaxe" ); level = is.getItem().getHarvestLevel( is, "pickaxe" );
} }
if( type != SkystoneType.STONE || level >= 3 || event.originalSpeed > BREAK_SPEAK_THRESHOLD ) if( this.type != SkystoneType.STONE || level >= 3 || event.originalSpeed > BREAK_SPEAK_THRESHOLD )
{ {
event.newSpeed /= BREAK_SPEAK_SCALAR; event.newSpeed /= BREAK_SPEAK_SCALAR;
} }
@ -106,7 +106,7 @@ public class SkyStoneBlock extends AEBaseBlock
@Override @Override
public String getUnlocalizedName( final ItemStack is ) public String getUnlocalizedName( final ItemStack is )
{ {
switch( type ) switch( this.type )
{ {
case BLOCK: case BLOCK:
return this.getUnlocalizedName() + ".Block"; return this.getUnlocalizedName() + ".Block";

4
src/main/java/appeng/facade/FacadePart.java
View file

@ -352,7 +352,7 @@ public class FacadePart implements IFacadePart, IBoxProvider
{ {
final ItemStack randomItem = fi.getTextureItem( this.facade ); final ItemStack randomItem = fi.getTextureItem( this.facade );
instance.setTexture( renderer.getIcon( facade ) ); instance.setTexture( renderer.getIcon( this.facade ) );
instance.setBounds( 7, 7, 4, 9, 9, 14 ); instance.setBounds( 7, 7, 4, 9, 9, 14 );
instance.renderInventoryBox( renderer ); instance.renderInventoryBox( renderer );
instance.setTexture( null ); instance.setTexture( null );
@ -376,7 +376,7 @@ public class FacadePart implements IFacadePart, IBoxProvider
renderer.setBrightness( 15 << 20 | 15 << 4 ); renderer.setBrightness( 15 << 20 | 15 << 4 );
renderer.setColorOpaque_F( 1, 1, 1 ); renderer.setColorOpaque_F( 1, 1, 1 );
instance.setTexture( renderer.getIcon( blk.getDefaultState() )[side.ordinal()] ); instance.setTexture( renderer.getIcon( blk.getDefaultState() )[this.side.ordinal()] );
instance.setBounds( 0, 0, 14, 16, 16, 16 ); instance.setBounds( 0, 0, 14, 16, 16, 16 );
instance.renderInventoryBox( renderer ); instance.renderInventoryBox( renderer );

10
src/main/java/appeng/helpers/MetaRotation.java
View file

@ -63,9 +63,9 @@ public class MetaRotation implements IOrientable
@Override @Override
public EnumFacing getUp() public EnumFacing getUp()
{ {
final IBlockState state = w.getBlockState( pos ); final IBlockState state = this.w.getBlockState( this.pos );
if (useFacing ) if ( this.useFacing )
{ {
final EnumFacing f = state == null ? EnumFacing.UP : (EnumFacing) state.getValue( BlockTorch.FACING ); final EnumFacing f = state == null ? EnumFacing.UP : (EnumFacing) state.getValue( BlockTorch.FACING );
return f; return f;
@ -93,10 +93,10 @@ public class MetaRotation implements IOrientable
{ {
if( this.w instanceof World ) if( this.w instanceof World )
{ {
if ( useFacing ) if ( this.useFacing )
( (World) this.w ).setBlockState( pos, w.getBlockState( pos ).withProperty( BlockTorch.FACING, up ) ); ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( BlockTorch.FACING, up ) );
else else
( (World) this.w ).setBlockState( pos, w.getBlockState( pos ).withProperty( AEBaseBlock.AXIS_ORIENTATION, up.getAxis() ) ); ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( AEBaseBlock.AXIS_ORIENTATION, up.getAxis() ) );
} }
else else
{ {

2
src/main/java/appeng/helpers/MultiCraftingTracker.java
View file

@ -55,7 +55,7 @@ public class MultiCraftingTracker
public int getFailedCraftingAttempts() public int getFailedCraftingAttempts()
{ {
return failedCraftingAttempts; return this.failedCraftingAttempts;
} }
public void readFromNBT( final NBTTagCompound extra ) public void readFromNBT( final NBTTagCompound extra )

2
src/main/java/appeng/items/AEBaseItem.java
View file

@ -121,7 +121,7 @@ public abstract class AEBaseItem extends Item implements IAEFeature
public IAESprite getIcon( public IAESprite getIcon(
final ItemStack is ) final ItemStack is )
{ {
return myIcon; return this.myIcon;
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

10
src/main/java/appeng/items/contents/NetworkToolViewer.java
View file

@ -142,7 +142,7 @@ public class NetworkToolViewer implements INetworkTool
public int getField( public int getField(
final int id ) final int id )
{ {
return inv.getField( id ); return this.inv.getField( id );
} }
@Override @Override
@ -150,24 +150,24 @@ public class NetworkToolViewer implements INetworkTool
final int id, final int id,
final int value ) final int value )
{ {
inv.setField( id, value ); this.inv.setField( id, value );
} }
@Override @Override
public int getFieldCount() public int getFieldCount()
{ {
return inv.getFieldCount(); return this.inv.getFieldCount();
} }
@Override @Override
public void clear() public void clear()
{ {
inv.clear(); this.inv.clear();
} }
@Override @Override
public IChatComponent getDisplayName() public IChatComponent getDisplayName()
{ {
return inv.getDisplayName(); return this.inv.getDisplayName();
} }
} }

8
src/main/java/appeng/items/misc/ItemCrystalSeed.java
View file

@ -103,22 +103,22 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
{ {
ModelResourceLocation[] list = null; ModelResourceLocation[] list = null;
int damage = getProgress( stack ); int damage = ItemCrystalSeed.this.getProgress( stack );
if( damage < CERTUS + SINGLE_OFFSET ) if( damage < CERTUS + SINGLE_OFFSET )
{ {
list = certus; list = ItemCrystalSeed.this.certus;
} }
else if( damage < NETHER + SINGLE_OFFSET ) else if( damage < NETHER + SINGLE_OFFSET )
{ {
damage -= NETHER; damage -= NETHER;
list = nether; list = ItemCrystalSeed.this.nether;
} }
else if( damage < FLUIX + SINGLE_OFFSET ) else if( damage < FLUIX + SINGLE_OFFSET )
{ {
damage -= FLUIX; damage -= FLUIX;
list = fluix; list = ItemCrystalSeed.this.fluix;
} }
if( list == null ) if( list == null )

8
src/main/java/appeng/items/misc/ItemEncodedPattern.java
View file

@ -71,7 +71,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
final ClientHelper proxy, final ClientHelper proxy,
final String name ) final String name )
{ {
encodedPatternModel = res = proxy.setIcon( this, name ); this.encodedPatternModel = this.res = proxy.setIcon( this, name );
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){ Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){
@ -81,7 +81,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
public ModelResourceLocation getModelLocation( public ModelResourceLocation getModelLocation(
final ItemStack stack ) final ItemStack stack )
{ {
if ( recursive == false ) if ( this.recursive == false )
{ {
this.recursive = true; this.recursive = true;
@ -90,13 +90,13 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
final ItemStack is = iep.getOutput( stack ); final ItemStack is = iep.getOutput( stack );
if ( Minecraft.getMinecraft().thePlayer.isSneaking() ) if ( Minecraft.getMinecraft().thePlayer.isSneaking() )
{ {
return encodedPatternModel; return ItemEncodedPattern.this.encodedPatternModel;
} }
this.recursive = false; this.recursive = false;
} }
return res; return ItemEncodedPattern.this.res;
} }
}); });

4
src/main/java/appeng/items/misc/ItemPaintBall.java
View file

@ -62,7 +62,7 @@ public class ItemPaintBall extends AEBaseItem
public ModelResourceLocation getModelLocation( public ModelResourceLocation getModelLocation(
final ItemStack stack ) final ItemStack stack )
{ {
if ( isLumen(stack) ) if ( ItemPaintBall.this.isLumen(stack) )
return sloc; return sloc;
return loc; return loc;
@ -86,7 +86,7 @@ public class ItemPaintBall extends AEBaseItem
final ItemStack stack, final ItemStack stack,
final int renderPass ) final int renderPass )
{ {
final AEColor col = getColor(stack); final AEColor col = this.getColor(stack);
final int colorValue = stack.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant; final int colorValue = stack.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant;
final int r = ( colorValue >> 16 ) & 0xff; final int r = ( colorValue >> 16 ) & 0xff;

2
src/main/java/appeng/items/parts/ItemFacade.java
View file

@ -299,6 +299,6 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
public void registerCustomIcon( public void registerCustomIcon(
final TextureMap map ) final TextureMap map )
{ {
myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) )); this.myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) ));
} }
} }

10
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
View file

@ -101,21 +101,21 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
public InWorldToolOperationIngredient( final IBlockState state ) public InWorldToolOperationIngredient( final IBlockState state )
{ {
this.state = state; this.state = state;
blockOnly = false; this.blockOnly = false;
} }
public InWorldToolOperationIngredient( public InWorldToolOperationIngredient(
final Block blk, final Block blk,
final boolean b ) final boolean b )
{ {
state = blk.getDefaultState(); this.state = blk.getDefaultState();
blockOnly = b; this.blockOnly = b;
} }
@Override @Override
public int hashCode() public int hashCode()
{ {
return state.getBlock().hashCode(); return this.state.getBlock().hashCode();
} }
@Override @Override
@ -130,7 +130,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
return false; return false;
} }
final InWorldToolOperationIngredient other = (InWorldToolOperationIngredient) obj; final InWorldToolOperationIngredient other = (InWorldToolOperationIngredient) obj;
return state == other.state && ( blockOnly && state.getBlock() == other.state.getBlock() ); return this.state == other.state && ( this.blockOnly && this.state.getBlock() == other.state.getBlock() );
} }
} }

2
src/main/java/appeng/me/GridNode.java
View file

@ -668,7 +668,7 @@ public class GridNode implements IGridNode, IPathItem
public int getLastUsedChannels() public int getLastUsedChannels()
{ {
return lastUsedChannels; return this.lastUsedChannels;
} }
private static class MachineSecurityBreak implements IWorldCallable<Void> private static class MachineSecurityBreak implements IWorldCallable<Void>

8
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
View file

@ -1308,24 +1308,24 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
private void updateElapsedTime( final IAEItemStack is ) private void updateElapsedTime( final IAEItemStack is )
{ {
final long nextStartTime = System.nanoTime(); final long nextStartTime = System.nanoTime();
this.elapsedTime = this.getElapsedTime() + nextStartTime - lastTime; this.elapsedTime = this.getElapsedTime() + nextStartTime - this.lastTime;
this.lastTime = nextStartTime; this.lastTime = nextStartTime;
this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize(); this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize();
} }
public long getElapsedTime() public long getElapsedTime()
{ {
return elapsedTime; return this.elapsedTime;
} }
public long getRemainingItemCount() public long getRemainingItemCount()
{ {
return remainingItemCount; return this.remainingItemCount;
} }
public long getStartItemCount() public long getStartItemCount()
{ {
return startItemCount; return this.startItemCount;
} }
static class TaskProgress static class TaskProgress

10
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
View file

@ -141,7 +141,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, renderer.getIcon( is ), SIDE_ICON, SIDE_ICON ); rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, renderer.getIcon( this.is ), SIDE_ICON, SIDE_ICON );
rh.setBounds( 1, 1, 15, 15, 15, 16 ); rh.setBounds( 1, 1, 15, 15, 15, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@ -192,12 +192,12 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
final boolean isActive = ( this.clientFlags & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ); final boolean isActive = ( this.clientFlags & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG );
rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( is ), SIDE_ICON, SIDE_ICON ); rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( this.is ), SIDE_ICON, SIDE_ICON );
rh.setBounds( minX, minY, 15, maxX, maxY, 16 ); rh.setBounds( minX, minY, 15, maxX, maxY, 16 );
rh.renderBlock( opos, renderer ); rh.renderBlock( opos, renderer );
rh.setTexture( STATUS_ICON, STATUS_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( is ), STATUS_ICON, STATUS_ICON ); rh.setTexture( STATUS_ICON, STATUS_ICON, BACK_ICON, isActive ? activeIcon : renderer.getIcon( this.is ), STATUS_ICON, STATUS_ICON );
rh.setBounds( 5, 5, 14, 11, 11, 15 ); rh.setBounds( 5, 5, 14, 11, 11, 15 );
rh.renderBlock( opos, renderer ); rh.renderBlock( opos, renderer );
@ -225,7 +225,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
if( this.isAccepting && entity instanceof EntityItem && !entity.isDead && Platform.isServer() && this.proxy.isActive() ) if( this.isAccepting && entity instanceof EntityItem && !entity.isDead && Platform.isServer() && this.proxy.isActive() )
{ {
boolean capture = false; boolean capture = false;
final BlockPos pos = tile.getPos(); final BlockPos pos = this.tile.getPos();
switch( this.side ) switch( this.side )
{ {
@ -424,7 +424,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
final TileEntity te = this.getTile(); final TileEntity te = this.getTile();
final WorldServer w = (WorldServer) te.getWorld(); final WorldServer w = (WorldServer) te.getWorld();
final BlockPos pos = te.getPos().offset( side.getFacing() ); final BlockPos pos = te.getPos().offset( this.side.getFacing() );
final IEnergyGrid energy = this.proxy.getEnergy(); final IEnergyGrid energy = this.proxy.getEnergy();

6
src/main/java/appeng/parts/automation/PartExportBus.java
View file

@ -198,7 +198,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() );
rh.setBounds( 4, 4, 12, 12, 12, 14 ); rh.setBounds( 4, 4, 12, 12, 12, 14 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@ -214,7 +214,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() );
rh.setBounds( 4, 4, 12, 12, 12, 14 ); rh.setBounds( 4, 4, 12, 12, 12, 14 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
@ -225,7 +225,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
rh.setBounds( 6, 6, 15, 10, 10, 16 ); rh.setBounds( 6, 6, 15, 10, 10, 16 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 6, 6, 11, 10, 10, 12 ); rh.setBounds( 6, 6, 11, 10, 10, 12 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );

6
src/main/java/appeng/parts/automation/PartFormationPlane.java
View file

@ -268,7 +268,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() );
rh.setBounds( 1, 1, 15, 15, 15, 16 ); rh.setBounds( 1, 1, 15, 15, 15, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@ -314,12 +314,12 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
final boolean isActive = ( this.clientFlags & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ); final boolean isActive = ( this.clientFlags & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG );
rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( this.is ), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() );
rh.setBounds( minX, minY, 15, maxX, maxY, 16 ); rh.setBounds( minX, minY, 15, maxX, maxY, 16 );
rh.renderBlock( opos, renderer ); rh.renderBlock( opos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 5, 5, 14, 11, 11, 15 ); rh.setBounds( 5, 5, 14, 11, 11, 15 );
rh.renderBlock( opos, renderer ); rh.renderBlock( opos, renderer );

6
src/main/java/appeng/parts/automation/PartImportBus.java
View file

@ -102,7 +102,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() );
rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.setBounds( 3, 3, 15, 13, 13, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@ -118,7 +118,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() );
rh.setBounds( 4, 4, 14, 12, 12, 16 ); rh.setBounds( 4, 4, 14, 12, 12, 16 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
@ -128,7 +128,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
rh.setBounds( 6, 6, 12, 10, 10, 13 ); rh.setBounds( 6, 6, 12, 10, 10, 13 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 6, 6, 11, 10, 10, 12 ); rh.setBounds( 6, 6, 11, 10, 10, 12 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );

10
src/main/java/appeng/parts/automation/PartLevelEmitter.java
View file

@ -145,7 +145,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
final TileEntity te = this.host.getTile(); final TileEntity te = this.host.getTile();
this.prevState = isOn; this.prevState = isOn;
Platform.notifyBlocksOfNeighbors( te.getWorld(), te.getPos() ); Platform.notifyBlocksOfNeighbors( te.getWorld(), te.getPos() );
Platform.notifyBlocksOfNeighbors( te.getWorld(), te.getPos().offset( side.getFacing() ) ); Platform.notifyBlocksOfNeighbors( te.getWorld(), te.getPos().offset( this.side.getFacing() ) );
} }
} }
@ -194,7 +194,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
@Override @Override
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer ) public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{ {
return renderer.getIcon( is ).getAtlas(); return renderer.getIcon( this.is ).getAtlas();
} }
@Override @Override
@ -414,14 +414,14 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( renderer.getIcon( is ) ); rh.setTexture( renderer.getIcon( this.is ) );
this.renderTorchAtAngle( 0, -0.5, 0, renderer ); this.renderTorchAtAngle( 0, -0.5, 0, renderer );
} }
public void renderTorchAtAngle( double baseX, double baseY, double baseZ, final ModelGenerator renderer ) public void renderTorchAtAngle( double baseX, double baseY, double baseZ, final ModelGenerator renderer )
{ {
final boolean isOn = this.isLevelEmitterOn(); final boolean isOn = this.isLevelEmitterOn();
final IAESprite offTexture = renderer.getIcon( is ); final IAESprite offTexture = renderer.getIcon( this.is );
final IAESprite IIcon = ( isOn ? CableBusTextures.LevelEmitterTorchOn.getIcon() : offTexture ); final IAESprite IIcon = ( isOn ? CableBusTextures.LevelEmitterTorchOn.getIcon() : offTexture );
// //
this.centerX = baseX + 0.5; this.centerX = baseX + 0.5;
@ -580,7 +580,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( renderer.getIcon( is ) ); rh.setTexture( renderer.getIcon( this.is ) );
// rh.setTexture( CableBusTextures.ItemPartLevelEmitterOn.getIcon() ); // rh.setTexture( CableBusTextures.ItemPartLevelEmitterOn.getIcon() );
// rh.setBounds( 2, 2, 14, 14, 14, 16 ); // rh.setBounds( 2, 2, 14, 14, 14, 16 );

2
src/main/java/appeng/parts/automation/PartSharedItemBus.java
View file

@ -95,7 +95,7 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid
protected InventoryAdaptor getHandler() protected InventoryAdaptor getHandler()
{ {
final TileEntity self = this.getHost().getTile(); final TileEntity self = this.getHost().getTile();
final TileEntity target = this.getTileEntity( self, self.getPos().offset( side.getFacing() ) ); final TileEntity target = this.getTileEntity( self, self.getPos().offset( this.side.getFacing() ) );
final int newAdaptorHash = Platform.generateTileHash( target ); final int newAdaptorHash = Platform.generateTileHash( target );

4
src/main/java/appeng/parts/misc/PartCableAnchor.java
View file

@ -84,7 +84,7 @@ public class PartCableAnchor implements IPart
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper instance, final ModelGenerator renderer ) public void renderInventory( final IPartRenderHelper instance, final ModelGenerator renderer )
{ {
instance.setTexture( renderer.getIcon( is ) ); instance.setTexture( renderer.getIcon( this.is ) );
instance.setBounds( 7, 7, 4, 9, 9, 14 ); instance.setBounds( 7, 7, 4, 9, 9, 14 );
instance.renderInventoryBox( renderer ); instance.renderInventoryBox( renderer );
instance.setTexture( null ); instance.setTexture( null );
@ -94,7 +94,7 @@ public class PartCableAnchor implements IPart
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
final IAESprite myIcon = renderer.getIcon( is ); final IAESprite myIcon = renderer.getIcon( this.is );
rh.setTexture( myIcon ); rh.setTexture( myIcon );
if( this.host != null && this.host.getFacadeContainer().getFacade( this.mySide ) != null ) if( this.host != null && this.host.getFacadeContainer().getFacade( this.mySide ) != null )
{ {

10
src/main/java/appeng/parts/misc/PartInterface.java
View file

@ -114,7 +114,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@ -136,17 +136,17 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
rh.setBounds( 5, 5, 12, 11, 11, 13 ); rh.setBounds( 5, 5, 12, 11, 11, 13 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 5, 5, 13, 11, 11, 14 ); rh.setBounds( 5, 5, 13, 11, 11, 14 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
@ -218,7 +218,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
@Override @Override
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer) public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer)
{ {
return renderer.getIcon( is ).getAtlas(); return renderer.getIcon( this.is ).getAtlas();
} }
@Override @Override

10
src/main/java/appeng/parts/misc/PartStorageBus.java
View file

@ -264,7 +264,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.setBounds( 3, 3, 15, 13, 13, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@ -280,7 +280,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.setBounds( 3, 3, 15, 13, 13, 16 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
@ -288,12 +288,12 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
rh.setBounds( 2, 2, 14, 14, 14, 15 ); rh.setBounds( 2, 2, 14, 14, 14, 15 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
rh.setBounds( 5, 5, 12, 11, 11, 13 ); rh.setBounds( 5, 5, 12, 11, 11, 13 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 5, 5, 13, 11, 11, 14 ); rh.setBounds( 5, 5, 13, 11, 11, 14 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
@ -397,7 +397,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
this.cached = true; this.cached = true;
final TileEntity self = this.getHost().getTile(); final TileEntity self = this.getHost().getTile();
final TileEntity target = self.getWorld().getTileEntity( self.getPos().offset( side.getFacing() ) ); final TileEntity target = self.getWorld().getTileEntity( self.getPos().offset( this.side.getFacing() ) );
final int newHandlerHash = Platform.generateTileHash( target ); final int newHandlerHash = Platform.generateTileHash( target );

8
src/main/java/appeng/parts/misc/PartToggleBus.java
View file

@ -90,7 +90,7 @@ public class PartToggleBus extends PartBasicState
@Override @Override
public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer ) public TextureAtlasSprite getBreakingTexture( final ModelGenerator renderer )
{ {
return renderer.getIcon( is ).getAtlas(); return renderer.getIcon( this.is ).getAtlas();
} }
@Override @Override
@ -124,7 +124,7 @@ public class PartToggleBus extends PartBasicState
{ {
GL11.glTranslated( -0.2, -0.3, 0.0 ); GL11.glTranslated( -0.2, -0.3, 0.0 );
rh.setTexture( renderer.getIcon( is ) ); rh.setTexture( renderer.getIcon( this.is ) );
rh.setBounds( 6, 6, 14 - 4, 10, 10, 16 - 4 ); rh.setBounds( 6, 6, 14 - 4, 10, 10, 16 - 4 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@ -147,7 +147,7 @@ public class PartToggleBus extends PartBasicState
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
rh.setTexture( renderer.getIcon( is ) ); rh.setTexture( renderer.getIcon( this.is ) );
rh.setBounds( 6, 6, 14, 10, 10, 16 ); rh.setBounds( 6, 6, 14, 10, 10, 16 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
@ -155,7 +155,7 @@ public class PartToggleBus extends PartBasicState
rh.setBounds( 6, 6, 11, 10, 10, 13 ); rh.setBounds( 6, 6, 11, 10, 10, 13 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() );
rh.setBounds( 6, 6, 13, 10, 10, 14 ); rh.setBounds( 6, 6, 13, 10, 10, 14 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );

2
src/main/java/appeng/parts/networking/PartDenseCable.java
View file

@ -504,7 +504,7 @@ public class PartDenseCable extends PartCable
default: default:
} }
return renderer.getIcon( is ); return renderer.getIcon( this.is );
} }
private boolean isDense( final AEPartLocation of ) private boolean isDense( final AEPartLocation of )

4
src/main/java/appeng/parts/networking/PartQuartzFiber.java
View file

@ -81,7 +81,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
{ {
GL11.glTranslated( -0.2, -0.3, 0.0 ); GL11.glTranslated( -0.2, -0.3, 0.0 );
rh.setTexture( renderer.getIcon( is ) ); rh.setTexture( renderer.getIcon( this.is ) );
rh.setBounds( 6.0f, 6.0f, 5.0f, 10.0f, 10.0f, 11.0f ); rh.setBounds( 6.0f, 6.0f, 5.0f, 10.0f, 10.0f, 11.0f );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
rh.setTexture( null ); rh.setTexture( null );
@ -91,7 +91,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer ) public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
{ {
final IAESprite myIcon = renderer.getIcon( is ); final IAESprite myIcon = renderer.getIcon( this.is );
rh.setTexture( myIcon ); rh.setTexture( myIcon );
rh.setBounds( 6, 6, 10, 10, 10, 16 ); rh.setBounds( 6, 6, 10, 10, 10, 16 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );

2
src/main/java/appeng/parts/p2p/PartP2PItems.java
View file

@ -124,7 +124,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements /*IPipe
if( this.proxy.isActive() ) if( this.proxy.isActive() )
{ {
final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( side.getFacing() ) ); final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( this.side.getFacing() ) );
if( this.which.contains( this ) ) if( this.which.contains( this ) )
{ {

4
src/main/java/appeng/parts/p2p/PartP2PLight.java
View file

@ -88,7 +88,7 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
final TileEntity te = this.getTile(); final TileEntity te = this.getTile();
final World w = te.getWorld(); final World w = te.getWorld();
final int newLevel = w.getLight( te.getPos().offset( side.getFacing() ) ); final int newLevel = w.getLight( te.getPos().offset( this.side.getFacing() ) );
if( this.lastValue != newLevel && this.proxy.isActive() ) if( this.lastValue != newLevel && this.proxy.isActive() )
{ {
@ -144,7 +144,7 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
if( this.opacity < 0 ) if( this.opacity < 0 )
{ {
final TileEntity te = this.getTile(); final TileEntity te = this.getTile();
this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( side.getFacing() ) ); this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( this.side.getFacing() ) );
} }
return (int) ( emit * ( this.opacity / 255.0f ) ); return (int) ( emit * ( this.opacity / 255.0f ) );

2
src/main/java/appeng/parts/p2p/PartP2PLiquids.java
View file

@ -222,7 +222,7 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
return this.cachedTank; return this.cachedTank;
} }
final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( side.getFacing() ) ); final TileEntity te = this.tile.getWorld().getTileEntity( this.tile.getPos().offset( this.side.getFacing() ) );
if( te instanceof IFluidHandler ) if( te instanceof IFluidHandler )
{ {
return this.cachedTank = (IFluidHandler) te; return this.cachedTank = (IFluidHandler) te;

6
src/main/java/appeng/parts/p2p/PartP2PRedstone.java
View file

@ -88,11 +88,11 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
{ {
final World worldObj = this.tile.getWorld(); final World worldObj = this.tile.getWorld();
Platform.notifyBlocksOfNeighbors( worldObj,tile.getPos()); Platform.notifyBlocksOfNeighbors( worldObj, this.tile.getPos());
// and this cause sometimes it can go thought walls. // and this cause sometimes it can go thought walls.
for ( final EnumFacing face : EnumFacing.VALUES ) for ( final EnumFacing face : EnumFacing.VALUES )
Platform.notifyBlocksOfNeighbors( worldObj,tile.getPos().offset( face ) ); Platform.notifyBlocksOfNeighbors( worldObj, this.tile.getPos().offset( face ) );
} }
@MENetworkEventSubscribe @MENetworkEventSubscribe
@ -137,7 +137,7 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
{ {
if( !this.output ) if( !this.output )
{ {
final BlockPos target = tile.getPos().offset( side.getFacing() ); final BlockPos target = this.tile.getPos().offset( this.side.getFacing() );
final IBlockState state = this.tile.getWorld().getBlockState( target ); final IBlockState state = this.tile.getWorld().getBlockState( target );
final Block b = state.getBlock(); final Block b = state.getBlock();

4
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
View file

@ -129,7 +129,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( is ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@ -161,7 +161,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );
rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( is ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), renderer.getIcon( this.is ), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer ); rh.renderBlock( pos, renderer );

2
src/main/java/appeng/parts/reporting/AbstractPartReporting.java
View file

@ -250,7 +250,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
if( this.opacity < 0 ) if( this.opacity < 0 )
{ {
final TileEntity te = this.getTile(); final TileEntity te = this.getTile();
this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( side.getFacing() ) ); this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( this.side.getFacing() ) );
} }
return (int) ( emit * ( this.opacity / 255.0f ) ); return (int) ( emit * ( this.opacity / 255.0f ) );

2
src/main/java/appeng/parts/reporting/PartConversionMonitor.java
View file

@ -149,7 +149,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
{ {
final TileEntity te = this.tile; final TileEntity te = this.tile;
final List<ItemStack> list = Collections.singletonList( newItems ); final List<ItemStack> list = Collections.singletonList( newItems );
Platform.spawnDrops( player.worldObj, te.getPos().offset( side.getFacing() ), list ); Platform.spawnDrops( player.worldObj, te.getPos().offset( this.side.getFacing() ), list );
} }
if( player.openContainer != null ) if( player.openContainer != null )

2
src/main/java/appeng/spatial/StorageHelper.java
View file

@ -295,7 +295,7 @@ public class StorageHelper
@Override @Override
public void visit( final BlockPos pos ) public void visit( final BlockPos pos )
{ {
this.dst.setBlockState( pos, state ); this.dst.setBlockState( pos, this.state );
} }
} }

10
src/main/java/appeng/tile/AEBaseInvTile.java
View file

@ -114,7 +114,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
@Override @Override
public boolean hasCustomName() public boolean hasCustomName()
{ {
return getInternalInventory().hasCustomName(); return this.getInternalInventory().hasCustomName();
} }
@Override @Override
@ -128,7 +128,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
{ {
final double squaredMCReach = 64.0D; final double squaredMCReach = 64.0D;
return this.worldObj.getTileEntity( pos ) == this && p.getDistanceSq( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D ) <= squaredMCReach; return this.worldObj.getTileEntity( this.pos ) == this && p.getDistanceSq( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D ) <= squaredMCReach;
} }
@Override @Override
@ -157,7 +157,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
@Override @Override
public int[] getSlotsForFace( final EnumFacing side ) public int[] getSlotsForFace( final EnumFacing side )
{ {
final Block blk = this.worldObj.getBlockState( pos ).getBlock(); final Block blk = this.worldObj.getBlockState( this.pos ).getBlock();
if( blk instanceof AEBaseBlock ) if( blk instanceof AEBaseBlock )
{ {
return this.getAccessibleSlotsBySide( ( (AEBaseBlock) blk ).mapRotation( this, side ) ); return this.getAccessibleSlotsBySide( ( (AEBaseBlock) blk ).mapRotation( this, side ) );
@ -204,11 +204,11 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
@Override @Override
public IChatComponent getDisplayName() public IChatComponent getDisplayName()
{ {
if( hasCustomName() ) if( this.hasCustomName() )
{ {
return new ChatComponentText( this.getCustomName() ); return new ChatComponentText( this.getCustomName() );
} }
return new ChatComponentTranslation( getBlockType().getUnlocalizedName() ); return new ChatComponentTranslation( this.getBlockType().getUnlocalizedName() );
} }
public abstract int[] getAccessibleSlotsBySide( EnumFacing whichSide ); public abstract int[] getAccessibleSlotsBySide( EnumFacing whichSide );

12
src/main/java/appeng/tile/AEBaseTile.java
View file

@ -97,7 +97,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
public boolean notLoaded() public boolean notLoaded()
{ {
return !this.worldObj.isBlockLoaded( pos ); return !this.worldObj.isBlockLoaded( this.pos );
} }
@Nonnull @Nonnull
@ -214,7 +214,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
stream.capacity( stream.readableBytes() ); stream.capacity( stream.readableBytes() );
data.setByteArray( "X", stream.array() ); data.setByteArray( "X", stream.array() );
return new S35PacketUpdateTileEntity( pos, 64, data ); return new S35PacketUpdateTileEntity( this.pos, 64, data );
} }
private boolean hasHandlerFor( final TileEventType type ) private boolean hasHandlerFor( final TileEventType type )
@ -300,8 +300,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
// TODO: Optimize Network Load // TODO: Optimize Network Load
if( this.worldObj != null ) if( this.worldObj != null )
{ {
AELog.blockUpdate( pos, this ); AELog.blockUpdate( this.pos, this );
this.worldObj.markBlockForUpdate( pos ); this.worldObj.markBlockForUpdate( this.pos );
} }
} }
} }
@ -424,7 +424,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
this.forward = inForward; this.forward = inForward;
this.up = inUp; this.up = inUp;
this.markForUpdate(); this.markForUpdate();
Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
} }
public void onPlacement( final ItemStack stack, final EntityPlayer player, final EnumFacing side ) public void onPlacement( final ItemStack stack, final EntityPlayer player, final EnumFacing side )
@ -570,7 +570,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
public void securityBreak() public void securityBreak()
{ {
this.worldObj.destroyBlock( pos, true ); this.worldObj.destroyBlock( this.pos, true );
this.disableDrops(); this.disableDrops();
} }

2
src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java
View file

@ -80,7 +80,7 @@ public class TileCraftingStorageTile extends TileCraftingTile
return 0; return 0;
} }
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( pos ).getBlock(); final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock();
switch( unit.type ) switch( unit.type )
{ {
default: default:

10
src/main/java/appeng/tile/crafting/TileCraftingTile.java
View file

@ -114,7 +114,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
return false; return false;
} }
final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( pos ).getBlock(); final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock();
return unit.type == CraftingUnitType.ACCELERATOR; return unit.type == CraftingUnitType.ACCELERATOR;
} }
@ -157,12 +157,12 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
power = this.gridProxy.isActive(); power = this.gridProxy.isActive();
} }
final IBlockState current = this.worldObj.getBlockState( pos ); final IBlockState current = this.worldObj.getBlockState( this.pos );
final IBlockState newState = current.withProperty( BlockCraftingUnit.POWERED, power ).withProperty( BlockCraftingUnit.FORMED, formed ); final IBlockState newState = current.withProperty( BlockCraftingUnit.POWERED, power ).withProperty( BlockCraftingUnit.FORMED, formed );
if( current != newState ) if( current != newState )
{ {
this.worldObj.setBlockState( pos, newState ); this.worldObj.setBlockState( this.pos, newState );
} }
if( updateFormed ) if( updateFormed )
@ -182,7 +182,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{ {
if( Platform.isClient() ) if( Platform.isClient() )
{ {
return (boolean)this.worldObj.getBlockState( pos ).getValue( BlockCraftingUnit.FORMED ); return (boolean)this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.FORMED );
} }
return this.cluster != null; return this.cluster != null;
} }
@ -334,7 +334,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
{ {
if( Platform.isClient() ) if( Platform.isClient() )
{ {
return (boolean)this.worldObj.getBlockState( pos ).getValue( BlockCraftingUnit.POWERED ); return (boolean)this.worldObj.getBlockState( this.pos ).getValue( BlockCraftingUnit.POWERED );
} }
return this.gridProxy.isActive(); return this.gridProxy.isActive();
} }

6
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
View file

@ -511,9 +511,9 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
try try
{ {
final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), 32 ); final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32 );
final IAEItemStack item = AEItemStack.create( output ); final IAEItemStack item = AEItemStack.create( output );
NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( pos, (byte) speed, item ), where ); NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( this.pos, (byte) speed, item ), where );
} }
catch( final IOException e ) catch( final IOException e )
{ {
@ -592,7 +592,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
return output; return output;
} }
final TileEntity te = this.getWorld().getTileEntity( pos.offset( d ) ); final TileEntity te = this.getWorld().getTileEntity( this.pos.offset( d ) );
if( te == null ) if( te == null )
{ {

8
src/main/java/appeng/tile/grindstone/TileCrank.java
View file

@ -81,7 +81,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl
} }
final EnumFacing grinder = this.getUp().getOpposite(); final EnumFacing grinder = this.getUp().getOpposite();
final TileEntity te = this.worldObj.getTileEntity( pos.offset( grinder ) ); final TileEntity te = this.worldObj.getTileEntity( this.pos.offset( grinder ) );
if( te instanceof ICrankable ) if( te instanceof ICrankable )
{ {
return (ICrankable) te; return (ICrankable) te;
@ -106,8 +106,8 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl
public void setOrientation( final EnumFacing inForward, final EnumFacing inUp ) public void setOrientation( final EnumFacing inForward, final EnumFacing inUp )
{ {
super.setOrientation( inForward, inUp ); super.setOrientation( inForward, inUp );
final IBlockState state = this.worldObj.getBlockState( pos ); final IBlockState state = this.worldObj.getBlockState( this.pos );
this.getBlockType().onNeighborBlockChange( this.worldObj, pos, state, state.getBlock() ); this.getBlockType().onNeighborBlockChange( this.worldObj, this.pos, state, state.getBlock() );
} }
@Override @Override
@ -143,7 +143,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl
this.hits++; this.hits++;
if( this.hits > 10 ) if( this.hits > 10 )
{ {
this.worldObj.destroyBlock( pos, false ); this.worldObj.destroyBlock( this.pos, false );
} }
} }
} }

6
src/main/java/appeng/tile/grindstone/TileGrinder.java
View file

@ -49,8 +49,8 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable
public void setOrientation( final EnumFacing inForward, final EnumFacing inUp ) public void setOrientation( final EnumFacing inForward, final EnumFacing inUp )
{ {
super.setOrientation( inForward, inUp ); super.setOrientation( inForward, inUp );
final IBlockState state = worldObj.getBlockState( pos ); final IBlockState state = this.worldObj.getBlockState( this.pos );
this.getBlockType().onNeighborBlockChange( this.worldObj, pos, state, state.getBlock() ); this.getBlockType().onNeighborBlockChange( this.worldObj, this.pos, state, state.getBlock() );
} }
@Override @Override
@ -185,7 +185,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable
final List<ItemStack> out = new ArrayList<ItemStack>(); final List<ItemStack> out = new ArrayList<ItemStack>();
out.add( notAdded ); out.add( notAdded );
Platform.spawnDrops( this.worldObj, pos.offset( this.getForward() ), out ); Platform.spawnDrops( this.worldObj, this.pos.offset( this.getForward() ), out );
} }
} }

2
src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
View file

@ -313,7 +313,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
{ {
for( int x = 0; x < this.size; x++ ) for( int x = 0; x < this.size; x++ )
{ {
setInventorySlotContents( x, null ); this.setInventorySlotContents( x, null );
} }
} }
} }

2
src/main/java/appeng/tile/inventory/AppEngInternalInventory.java
View file

@ -317,7 +317,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
{ {
for( int x = 0; x < this.size; x++ ) for( int x = 0; x < this.size; x++ )
{ {
setInventorySlotContents( x,null ); this.setInventorySlotContents( x,null );
} }
} }
} }

2
src/main/java/appeng/tile/misc/TileCharger.java
View file

@ -292,7 +292,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IUpda
final List<ItemStack> drops = new ArrayList<ItemStack>(); final List<ItemStack> drops = new ArrayList<ItemStack>();
drops.add( myItem ); drops.add( myItem );
this.setInventorySlotContents( 0, null ); this.setInventorySlotContents( 0, null );
Platform.spawnDrops( this.worldObj, pos.offset( getForward() ), drops ); Platform.spawnDrops( this.worldObj, this.pos.offset( this.getForward() ), drops );
} }
} }
} }

4
src/main/java/appeng/tile/misc/TileInterface.java
View file

@ -116,7 +116,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT
this.setOrientation( this.pointAt.yOffset != 0 ? EnumFacing.SOUTH : EnumFacing.UP, this.pointAt.getOpposite().getFacing() ); this.setOrientation( this.pointAt.yOffset != 0 ? EnumFacing.SOUTH : EnumFacing.UP, this.pointAt.getOpposite().getFacing() );
} }
configureNodeSides(); this.configureNodeSides();
this.markForUpdate(); this.markForUpdate();
this.markDirty(); this.markDirty();
} }
@ -153,7 +153,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT
@Override @Override
public void onReady() public void onReady()
{ {
configureNodeSides(); this.configureNodeSides();
super.onReady(); super.onReady();
this.duality.initialize(); this.duality.initialize();
} }

4
src/main/java/appeng/tile/misc/TileLightDetector.java
View file

@ -50,12 +50,12 @@ public class TileLightDetector extends AEBaseTile implements IUpdatePlayerListBo
public void updateLight() public void updateLight()
{ {
final int val = this.worldObj.getLight( pos ); final int val = this.worldObj.getLight( this.pos );
if( this.lastLight != val ) if( this.lastLight != val )
{ {
this.lastLight = val; this.lastLight = val;
Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
} }
} }

8
src/main/java/appeng/tile/misc/TilePaint.java
View file

@ -132,7 +132,7 @@ public class TilePaint extends AEBaseTile
if( this.worldObj != null ) if( this.worldObj != null )
{ {
this.worldObj.getLightFor( EnumSkyBlock.BLOCK, pos ); this.worldObj.getLightFor( EnumSkyBlock.BLOCK, this.pos );
} }
} }
@ -169,7 +169,7 @@ public class TilePaint extends AEBaseTile
public boolean isSideValid( final EnumFacing side ) public boolean isSideValid( final EnumFacing side )
{ {
final BlockPos p = pos.offset( side ); final BlockPos p = this.pos.offset( side );
final IBlockState blk = this.worldObj.getBlockState( p ); final IBlockState blk = this.worldObj.getBlockState( p );
return blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() ); return blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() );
} }
@ -210,7 +210,7 @@ public class TilePaint extends AEBaseTile
if( this.dots == null ) if( this.dots == null )
{ {
this.worldObj.setBlockToAir( pos ); this.worldObj.setBlockToAir( this.pos );
} }
} }
@ -233,7 +233,7 @@ public class TilePaint extends AEBaseTile
public void addBlot( final ItemStack type, final EnumFacing side, final Vec3 hitVec ) public void addBlot( final ItemStack type, final EnumFacing side, final Vec3 hitVec )
{ {
final BlockPos p = pos.offset(side); final BlockPos p = this.pos.offset( side );
final IBlockState blk = this.worldObj.getBlockState( p ); final IBlockState blk = this.worldObj.getBlockState( p );
if( blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() ) ) if( blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() ) )

2
src/main/java/appeng/tile/misc/TileVibrationChamber.java
View file

@ -291,7 +291,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
if ( this.hasWorldObj() ) if ( this.hasWorldObj() )
{ {
Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
} }
} }
} }

16
src/main/java/appeng/tile/networking/TileCableBus.java
View file

@ -89,7 +89,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
if( newLV != this.oldLV ) if( newLV != this.oldLV )
{ {
this.oldLV = newLV; this.oldLV = newLV;
this.worldObj.checkLight( pos ); this.worldObj.checkLight( this.pos );
} }
this.updateTileSetting(); this.updateTileSetting();
@ -104,7 +104,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
{ {
final TileCableBus tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance(); final TileCableBus tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance();
tcb.copyFrom( this ); tcb.copyFrom( this );
this.getWorld().setTileEntity( pos, tcb ); this.getWorld().setTileEntity( this.pos, tcb );
} }
catch( final Throwable ignored ) catch( final Throwable ignored )
{ {
@ -178,7 +178,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
if( newLV != this.oldLV ) if( newLV != this.oldLV )
{ {
this.oldLV = newLV; this.oldLV = newLV;
this.worldObj.getLight( pos ); this.worldObj.getLight( this.pos );
// worldObj.updateAllLightTypes( xCoord, yCoord, zCoord ); // worldObj.updateAllLightTypes( xCoord, yCoord, zCoord );
} }
@ -209,9 +209,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
super.onReady(); super.onReady();
if( this.cb.isEmpty() ) if( this.cb.isEmpty() )
{ {
if( this.worldObj.getTileEntity( pos ) == this ) if( this.worldObj.getTileEntity( this.pos ) == this )
{ {
this.worldObj.destroyBlock( pos, true ); this.worldObj.destroyBlock( this.pos, true );
} }
} }
else else
@ -340,7 +340,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
} }
} }
this.getWorld().setBlockToAir( pos ); this.getWorld().setBlockToAir( this.pos );
} }
@Override @Override
@ -360,9 +360,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override @Override
public void notifyNeighbors() public void notifyNeighbors()
{ {
if( this.worldObj != null && this.worldObj.isBlockLoaded( pos ) && !CableBusContainer.isLoading() ) if( this.worldObj != null && this.worldObj.isBlockLoaded( this.pos ) && !CableBusContainer.isLoading() )
{ {
Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
} }
} }

2
src/main/java/appeng/tile/networking/TileCableBusTESR.java
View file

@ -34,7 +34,7 @@ public class TileCableBusTESR extends TileCableBus
{ {
final TileCableBus tcb = (TileCableBus) BlockCableBus.noTesrTile.newInstance(); final TileCableBus tcb = (TileCableBus) BlockCableBus.noTesrTile.newInstance();
tcb.copyFrom( this ); tcb.copyFrom( this );
this.getWorld().setTileEntity( pos, tcb ); this.getWorld().setTileEntity( this.pos, tcb );
} }
catch( final Throwable ignored ) catch( final Throwable ignored )
{ {

10
src/main/java/appeng/tile/networking/TileController.java
View file

@ -73,9 +73,9 @@ public class TileController extends AENetworkPowerTile
public void onNeighborChange( final boolean force ) public void onNeighborChange( final boolean force )
{ {
final boolean xx = checkController( pos.offset( EnumFacing.EAST ) ) && checkController( pos.offset( EnumFacing.WEST ) ); final boolean xx = this.checkController( this.pos.offset( EnumFacing.EAST ) ) && this.checkController( this.pos.offset( EnumFacing.WEST ) );
final boolean yy = checkController( pos.offset( EnumFacing.UP ) ) && checkController( pos.offset( EnumFacing.DOWN ) ); final boolean yy = this.checkController( this.pos.offset( EnumFacing.UP ) ) && this.checkController( this.pos.offset( EnumFacing.DOWN ) );
final boolean zz = checkController( pos.offset( EnumFacing.NORTH ) ) && checkController( pos.offset( EnumFacing.SOUTH ) ); final boolean zz = this.checkController( this.pos.offset( EnumFacing.NORTH ) ) && this.checkController( this.pos.offset( EnumFacing.SOUTH ) );
// int meta = world.getBlockMetadata( xCoord, yCoord, zCoord ); // int meta = world.getBlockMetadata( xCoord, yCoord, zCoord );
// boolean hasPower = meta > 0; // boolean hasPower = meta > 0;
@ -127,9 +127,9 @@ public class TileController extends AENetworkPowerTile
metaState = ControllerBlockState.OFFLINE; metaState = ControllerBlockState.OFFLINE;
} }
if( checkController( pos ) && this.worldObj.getBlockState( pos ).getValue( BlockController.CONTROLLER_STATE ) != metaState ) if( this.checkController( this.pos ) && this.worldObj.getBlockState( this.pos ).getValue( BlockController.CONTROLLER_STATE ) != metaState )
{ {
this.worldObj.setBlockState( pos, worldObj.getBlockState( pos ).withProperty( BlockController.CONTROLLER_STATE, metaState ) ); this.worldObj.setBlockState( this.pos, this.worldObj.getBlockState( this.pos ).withProperty( BlockController.CONTROLLER_STATE, metaState ) );
} }
} }

6
src/main/java/appeng/tile/networking/TileEnergyCell.java
View file

@ -60,8 +60,8 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
public void onReady() public void onReady()
{ {
super.onReady(); super.onReady();
final int value = ( Integer ) this.worldObj.getBlockState( pos ).getValue( BlockEnergyCell.ENERGY_STORAGE ); final int value = ( Integer ) this.worldObj.getBlockState( this.pos ).getValue( BlockEnergyCell.ENERGY_STORAGE );
currentMeta = (byte)value; this.currentMeta = (byte)value;
this.changePowerLevel(); this.changePowerLevel();
} }
@ -86,7 +86,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
if( this.currentMeta != boundMetadata ) if( this.currentMeta != boundMetadata )
{ {
this.currentMeta = boundMetadata; this.currentMeta = boundMetadata;
this.worldObj.setBlockState( pos, this.worldObj.getBlockState( pos ).withProperty( BlockEnergyCell.ENERGY_STORAGE, (int)boundMetadata ) ); this.worldObj.setBlockState( this.pos, this.worldObj.getBlockState( this.pos ).withProperty( BlockEnergyCell.ENERGY_STORAGE, (int)boundMetadata ) );
} }
} }

2
src/main/java/appeng/tile/qnb/TileQuantumBridge.java
View file

@ -264,7 +264,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
for( final AEPartLocation d : AEPartLocation.values() ) for( final AEPartLocation d : AEPartLocation.values() )
{ {
final TileEntity te = this.worldObj.getTileEntity( d == AEPartLocation.INTERNAL ? pos : pos.offset( d.getFacing() ) ); final TileEntity te = this.worldObj.getTileEntity( d == AEPartLocation.INTERNAL ? this.pos : this.pos.offset( d.getFacing() ) );
if( te instanceof TileQuantumBridge ) if( te instanceof TileQuantumBridge )
{ {
set.add( d ); set.add( d );

2
src/main/java/appeng/tile/spatial/TileSpatialIOPort.java
View file

@ -89,7 +89,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl
public void updateRedstoneState() public void updateRedstoneState()
{ {
final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( pos ) != 0 ? YesNo.YES : YesNo.NO; final YesNo currentState = this.worldObj.isBlockIndirectlyGettingPowered( this.pos ) != 0 ? YesNo.YES : YesNo.NO;
if( this.lastRedstoneState != currentState ) if( this.lastRedstoneState != currentState )
{ {
this.lastRedstoneState = currentState; this.lastRedstoneState = currentState;

2
src/main/java/appeng/tile/spatial/TileSpatialPylon.java
View file

@ -195,7 +195,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock
if( hasLight != this.didHaveLight ) if( hasLight != this.didHaveLight )
{ {
this.didHaveLight = hasLight; this.didHaveLight = hasLight;
this.worldObj.checkLight( pos ); this.worldObj.checkLight( this.pos );
// worldObj.updateAllLightTypes( xCoord, yCoord, zCoord ); // worldObj.updateAllLightTypes( xCoord, yCoord, zCoord );
} }
} }

4
src/main/java/appeng/tile/storage/TileChest.java
View file

@ -544,7 +544,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
// update the neighbors // update the neighbors
if( this.worldObj != null ) if( this.worldObj != null )
{ {
Platform.notifyBlocksOfNeighbors( this.worldObj, pos ); Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos );
this.markForUpdate(); this.markForUpdate();
} }
} }
@ -860,7 +860,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
@Override @Override
public void saveChanges( final IMEInventory cellInventory ) public void saveChanges( final IMEInventory cellInventory )
{ {
this.worldObj.markChunkDirty( pos, this ); this.worldObj.markChunkDirty( this.pos, this );
} }
private static class ChestNoHandler extends Exception private static class ChestNoHandler extends Exception

2
src/main/java/appeng/tile/storage/TileDrive.java
View file

@ -417,6 +417,6 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override @Override
public void saveChanges( final IMEInventory cellInventory ) public void saveChanges( final IMEInventory cellInventory )
{ {
this.worldObj.markChunkDirty( pos, this ); this.worldObj.markChunkDirty( this.pos, this );
} }
} }

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