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

Typo FlipableIcon

Browse Source
This commit is contained in:
thatsIch
2014-09-20 23:22:45 +02:00
parent 697d96fa54
commit 13e1bc772d
8 changed files with 192 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/render/BlockRenderInfo.java
+16 -16
View File
@@ -1,9 +1,9 @@
package appeng.client.render;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.TmpFlippableIcon;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.TmpFlipableIcon;
public class BlockRenderInfo
{
@@ -15,21 +15,21 @@ public class BlockRenderInfo
final public BaseBlockRender rendererInstance;
private boolean useTmp = false;
private TmpFlipableIcon tmpTopIcon = new TmpFlipableIcon();
private TmpFlipableIcon tmpBottomIcon = new TmpFlipableIcon();
private TmpFlipableIcon tmpSouthIcon = new TmpFlipableIcon();
private TmpFlipableIcon tmpNorthIcon = new TmpFlipableIcon();
private TmpFlipableIcon tmpEastIcon = new TmpFlipableIcon();
private TmpFlipableIcon tmpWestIcon = new TmpFlipableIcon();
private TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon();
private TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon();
private TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon();
private TmpFlippableIcon tmpNorthIcon = new TmpFlippableIcon();
private TmpFlippableIcon tmpEastIcon = new TmpFlippableIcon();
private TmpFlippableIcon tmpWestIcon = new TmpFlippableIcon();
private FlipableIcon topIcon = null;
private FlipableIcon bottomIcon = null;
private FlipableIcon southIcon = null;
private FlipableIcon northIcon = null;
private FlipableIcon eastIcon = null;
private FlipableIcon westIcon = null;
private FlippableIcon topIcon = null;
private FlippableIcon bottomIcon = null;
private FlippableIcon southIcon = null;
private FlippableIcon northIcon = null;
private FlippableIcon eastIcon = null;
private FlippableIcon westIcon = null;
public void updateIcons(FlipableIcon Bottom, FlipableIcon Top, FlipableIcon North, FlipableIcon South, FlipableIcon East, FlipableIcon West)
public void updateIcons(FlippableIcon Bottom, FlippableIcon Top, FlippableIcon North, FlippableIcon South, FlippableIcon East, FlippableIcon West)
{
topIcon = Top;
bottomIcon = Bottom;
@@ -67,7 +67,7 @@ public class BlockRenderInfo
useTmp = true;
}
public FlipableIcon getTexture(ForgeDirection dir)
public FlippableIcon getTexture(ForgeDirection dir)
{
if ( useTmp )
{
client/render/blocks/RenderMEChest.java
+2 -2
View File
@@ -2,6 +2,7 @@ package appeng.client.render.blocks;
import java.util.EnumSet;
import appeng.client.texture.FlippableIcon;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
@@ -15,7 +16,6 @@ import appeng.api.util.AEColor;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.OffsetIcon;
import appeng.tile.storage.TileChest;
import appeng.util.Platform;
@@ -68,7 +68,7 @@ public class RenderMEChest extends BaseBlockRender
Tessellator.instance.setBrightness( b );
Tessellator.instance.setColorOpaque_I( 0xffffff );
FlipableIcon fico = new FlipableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) );
FlippableIcon fico = new FlippableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) );
if ( forward == ForgeDirection.EAST && (up == ForgeDirection.NORTH || up == ForgeDirection.SOUTH) )
fico.setFlip( true, false );
else if ( forward == ForgeDirection.NORTH && up == ForgeDirection.EAST )
client/texture/FlipableIcon.java → client/texture/FlippableIcon.java
+106 -106
View File
@@ -1,106 +1,106 @@
package appeng.client.texture;
import net.minecraft.util.IIcon;
public class FlipableIcon implements IIcon
{
protected IIcon original;
boolean flip_u;
boolean flip_v;
public FlipableIcon(IIcon o) {
if ( o == null )
throw new RuntimeException( "Cannot create a wrapper icon with a null icon." );
original = o;
flip_u = false;
flip_v = false;
}
@Override
public int getIconWidth()
{
return original.getIconWidth();
}
@Override
public int getIconHeight()
{
return original.getIconHeight();
}
@Override
public float getMinU()
{
if ( flip_u )
return original.getMaxU();
return original.getMinU();
}
@Override
public float getMaxU()
{
if ( flip_u )
return original.getMinU();
return original.getMaxU();
}
@Override
public float getInterpolatedU(double px)
{
if ( flip_u )
return original.getInterpolatedU( 16 - px );
return original.getInterpolatedU( px );
}
@Override
public float getMinV()
{
if ( flip_v )
return original.getMaxV();
return original.getMinV();
}
@Override
public float getMaxV()
{
if ( flip_v )
return original.getMinV();
return original.getMaxV();
}
@Override
public float getInterpolatedV(double px)
{
if ( flip_v )
return original.getInterpolatedV( 16 - px );
return original.getInterpolatedV( px );
}
@Override
public String getIconName()
{
return original.getIconName();
}
public IIcon getOriginal()
{
return original;
}
public void setFlip(boolean u, boolean v)
{
flip_u = u;
flip_v = v;
}
public int setFlip(int orientation)
{
flip_u = (orientation & 8) == 8;
flip_v = (orientation & 16) == 16;
return orientation & 7;
}
}
package appeng.client.texture;
import net.minecraft.util.IIcon;
public class FlippableIcon implements IIcon
{
protected IIcon original;
boolean flip_u;
boolean flip_v;
public FlippableIcon(IIcon o) {
if ( o == null )
throw new RuntimeException( "Cannot create a wrapper icon with a null icon." );
original = o;
flip_u = false;
flip_v = false;
}
@Override
public int getIconWidth()
{
return original.getIconWidth();
}
@Override
public int getIconHeight()
{
return original.getIconHeight();
}
@Override
public float getMinU()
{
if ( flip_u )
return original.getMaxU();
return original.getMinU();
}
@Override
public float getMaxU()
{
if ( flip_u )
return original.getMinU();
return original.getMaxU();
}
@Override
public float getInterpolatedU(double px)
{
if ( flip_u )
return original.getInterpolatedU( 16 - px );
return original.getInterpolatedU( px );
}
@Override
public float getMinV()
{
if ( flip_v )
return original.getMaxV();
return original.getMinV();
}
@Override
public float getMaxV()
{
if ( flip_v )
return original.getMinV();
return original.getMaxV();
}
@Override
public float getInterpolatedV(double px)
{
if ( flip_v )
return original.getInterpolatedV( 16 - px );
return original.getInterpolatedV( px );
}
@Override
public String getIconName()
{
return original.getIconName();
}
public IIcon getOriginal()
{
return original;
}
public void setFlip(boolean u, boolean v)
{
flip_u = u;
flip_v = v;
}
public int setFlip(int orientation)
{
flip_u = (orientation & 8) == 8;
flip_v = (orientation & 16) == 16;
return orientation & 7;
}
}
client/texture/TmpFlipableIcon.java → client/texture/TmpFlippableIcon.java
+37 -37
View File
@@ -1,37 +1,37 @@
package appeng.client.texture;
import net.minecraft.init.Blocks;
import net.minecraft.util.IIcon;
public class TmpFlipableIcon extends FlipableIcon
{
private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block );
public TmpFlipableIcon() {
super( nullIcon );
}
public void setOriginal(IIcon i)
{
setFlip( false, false );
while (i instanceof FlipableIcon)
{
FlipableIcon fi = (FlipableIcon) i;
if ( fi.flip_u )
this.flip_u = !this.flip_u;
if ( fi.flip_v )
this.flip_v = !this.flip_v;
i = fi.getOriginal();
}
if ( i == null )
original = nullIcon;
else
original = i;
}
}
package appeng.client.texture;
import net.minecraft.init.Blocks;
import net.minecraft.util.IIcon;
public class TmpFlippableIcon extends FlippableIcon
{
private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block );
public TmpFlippableIcon() {
super( nullIcon );
}
public void setOriginal(IIcon i)
{
setFlip( false, false );
while (i instanceof FlippableIcon)
{
FlippableIcon fi = (FlippableIcon) i;
if ( fi.flip_u )
this.flip_u = !this.flip_u;
if ( fi.flip_v )
this.flip_v = !this.flip_v;
i = fi.getOriginal();
}
if ( i == null )
original = nullIcon;
else
original = i;
}
}