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
block/AEBaseBlock.java
+15 -15
View File
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import appeng.client.texture.FlippableIcon;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@@ -36,7 +37,6 @@ import appeng.block.networking.BlockCableBus;
import appeng.client.render.BaseBlockRender; import appeng.client.render.BaseBlockRender;
import appeng.client.render.BlockRenderInfo; import appeng.client.render.BlockRenderInfo;
import appeng.client.render.WorldRender; import appeng.client.render.WorldRender;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.MissingIcon; import appeng.client.texture.MissingIcon;
import appeng.core.features.AEFeature; import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler; import appeng.core.features.AEFeatureHandler;
@@ -94,11 +94,11 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private FlipableIcon optionaIcon(IIconRegister ir, String Name, IIcon substitute) private FlippableIcon optionaIcon(IIconRegister ir, String Name, IIcon substitute)
{ {
// if the input is an flippable IIcon find the original. // if the input is an flippable IIcon find the original.
while (substitute instanceof FlipableIcon) while (substitute instanceof FlippableIcon)
substitute = ((FlipableIcon) substitute).getOriginal(); substitute = ((FlippableIcon) substitute).getOriginal();
if ( substitute != null ) if ( substitute != null )
{ {
@@ -110,15 +110,15 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc ); IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc );
if ( res != null ) if ( res != null )
return new FlipableIcon( ir.registerIcon( Name ) ); return new FlippableIcon( ir.registerIcon( Name ) );
} }
catch (Throwable e) catch (Throwable e)
{ {
return new FlipableIcon( substitute ); return new FlippableIcon( substitute );
} }
} }
return new FlipableIcon( ir.registerIcon( Name ) ); return new FlippableIcon( ir.registerIcon( Name ) );
} }
@Override @Override
@@ -126,13 +126,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public void registerBlockIcons(IIconRegister iconRegistry) public void registerBlockIcons(IIconRegister iconRegistry)
{ {
BlockRenderInfo info = getRendererInstance(); BlockRenderInfo info = getRendererInstance();
FlipableIcon topIcon; FlippableIcon topIcon;
FlipableIcon bottomIcon; FlippableIcon bottomIcon;
FlipableIcon sideIcon; FlippableIcon sideIcon;
FlipableIcon eastIcon; FlippableIcon eastIcon;
FlipableIcon westIcon; FlippableIcon westIcon;
FlipableIcon southIcon; FlippableIcon southIcon;
FlipableIcon northIcon; FlippableIcon northIcon;
this.blockIcon = topIcon = optionaIcon( iconRegistry, this.getTextureName(), null ); this.blockIcon = topIcon = optionaIcon( iconRegistry, this.getTextureName(), null );
bottomIcon = optionaIcon( iconRegistry, this.getTextureName() + "Bottom", topIcon ); bottomIcon = optionaIcon( iconRegistry, this.getTextureName() + "Bottom", topIcon );
@@ -148,7 +148,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public void registerNoIcons() public void registerNoIcons()
{ {
BlockRenderInfo info = getRendererInstance(); BlockRenderInfo info = getRendererInstance();
FlipableIcon i = new FlipableIcon( new MissingIcon( this ) ); FlippableIcon i = new FlippableIcon( new MissingIcon( this ) );
info.updateIcons( i, i, i, i, i, i ); info.updateIcons( i, i, i, i, i, i );
} }
client/render/BlockRenderInfo.java
+16 -16
View File
@@ -1,9 +1,9 @@
package appeng.client.render; package appeng.client.render;
import appeng.client.texture.FlippableIcon;
import appeng.client.texture.TmpFlippableIcon;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.TmpFlipableIcon;
public class BlockRenderInfo public class BlockRenderInfo
{ {
@@ -15,21 +15,21 @@ public class BlockRenderInfo
final public BaseBlockRender rendererInstance; final public BaseBlockRender rendererInstance;
private boolean useTmp = false; private boolean useTmp = false;
private TmpFlipableIcon tmpTopIcon = new TmpFlipableIcon(); private TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon();
private TmpFlipableIcon tmpBottomIcon = new TmpFlipableIcon(); private TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon();
private TmpFlipableIcon tmpSouthIcon = new TmpFlipableIcon(); private TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon();
private TmpFlipableIcon tmpNorthIcon = new TmpFlipableIcon(); private TmpFlippableIcon tmpNorthIcon = new TmpFlippableIcon();
private TmpFlipableIcon tmpEastIcon = new TmpFlipableIcon(); private TmpFlippableIcon tmpEastIcon = new TmpFlippableIcon();
private TmpFlipableIcon tmpWestIcon = new TmpFlipableIcon(); private TmpFlippableIcon tmpWestIcon = new TmpFlippableIcon();
private FlipableIcon topIcon = null; private FlippableIcon topIcon = null;
private FlipableIcon bottomIcon = null; private FlippableIcon bottomIcon = null;
private FlipableIcon southIcon = null; private FlippableIcon southIcon = null;
private FlipableIcon northIcon = null; private FlippableIcon northIcon = null;
private FlipableIcon eastIcon = null; private FlippableIcon eastIcon = null;
private FlipableIcon westIcon = 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; topIcon = Top;
bottomIcon = Bottom; bottomIcon = Bottom;
@@ -67,7 +67,7 @@ public class BlockRenderInfo
useTmp = true; useTmp = true;
} }
public FlipableIcon getTexture(ForgeDirection dir) public FlippableIcon getTexture(ForgeDirection dir)
{ {
if ( useTmp ) 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 java.util.EnumSet;
import appeng.client.texture.FlippableIcon;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@@ -15,7 +16,6 @@ import appeng.api.util.AEColor;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender; import appeng.client.render.BaseBlockRender;
import appeng.client.texture.ExtraBlockTextures; import appeng.client.texture.ExtraBlockTextures;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.OffsetIcon; import appeng.client.texture.OffsetIcon;
import appeng.tile.storage.TileChest; import appeng.tile.storage.TileChest;
import appeng.util.Platform; import appeng.util.Platform;
@@ -68,7 +68,7 @@ public class RenderMEChest extends BaseBlockRender
Tessellator.instance.setBrightness( b ); Tessellator.instance.setBrightness( b );
Tessellator.instance.setColorOpaque_I( 0xffffff ); 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) ) if ( forward == ForgeDirection.EAST && (up == ForgeDirection.NORTH || up == ForgeDirection.SOUTH) )
fico.setFlip( true, false ); fico.setFlip( true, false );
else if ( forward == ForgeDirection.NORTH && up == ForgeDirection.EAST ) else if ( forward == ForgeDirection.NORTH && up == ForgeDirection.EAST )
client/texture/FlipableIcon.java → client/texture/FlippableIcon.java
+2 -2
View File
@@ -2,14 +2,14 @@ package appeng.client.texture;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
public class FlipableIcon implements IIcon public class FlippableIcon implements IIcon
{ {
protected IIcon original; protected IIcon original;
boolean flip_u; boolean flip_u;
boolean flip_v; boolean flip_v;
public FlipableIcon(IIcon o) { public FlippableIcon(IIcon o) {
if ( o == null ) if ( o == null )
throw new RuntimeException( "Cannot create a wrapper icon with a null icon." ); throw new RuntimeException( "Cannot create a wrapper icon with a null icon." );
client/texture/TmpFlipableIcon.java → client/texture/TmpFlippableIcon.java
+4 -4
View File
@@ -3,12 +3,12 @@ package appeng.client.texture;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
public class TmpFlipableIcon extends FlipableIcon public class TmpFlippableIcon extends FlippableIcon
{ {
private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block ); private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block );
public TmpFlipableIcon() { public TmpFlippableIcon() {
super( nullIcon ); super( nullIcon );
} }
@@ -16,9 +16,9 @@ public class TmpFlipableIcon extends FlipableIcon
{ {
setFlip( false, false ); setFlip( false, false );
while (i instanceof FlipableIcon) while (i instanceof FlippableIcon)
{ {
FlipableIcon fi = (FlipableIcon) i; FlippableIcon fi = (FlippableIcon) i;
if ( fi.flip_u ) if ( fi.flip_u )
this.flip_u = !this.flip_u; this.flip_u = !this.flip_u;
parts/networking/PartCable.java
+3 -3
View File
@@ -1,5 +1,6 @@
package appeng.parts.networking; package appeng.parts.networking;
import appeng.client.texture.FlippableIcon;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.io.IOException; import java.io.IOException;
@@ -33,7 +34,6 @@ import appeng.api.util.AEColor;
import appeng.api.util.IReadOnlyCollection; import appeng.api.util.IReadOnlyCollection;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
import appeng.client.texture.CableBusTextures; import appeng.client.texture.CableBusTextures;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.TaughtIcon; import appeng.client.texture.TaughtIcon;
import appeng.items.parts.ItemMultiPart; import appeng.items.parts.ItemMultiPart;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
@@ -648,7 +648,7 @@ public class PartCable extends AEBasePart implements IPartCable
if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST )
{ {
AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST );
ico.setFlip( false, true ); ico.setFlip( false, true );
} }
@@ -721,7 +721,7 @@ public class PartCable extends AEBasePart implements IPartCable
if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST )
{ {
AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST );
ico.setFlip( false, true ); ico.setFlip( false, true );
} }
parts/networking/PartCableSmart.java
+7 -7
View File
@@ -2,6 +2,7 @@ package appeng.parts.networking;
import java.util.EnumSet; import java.util.EnumSet;
import appeng.client.texture.FlippableIcon;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@@ -22,7 +23,6 @@ import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
import appeng.api.util.AEColor; import appeng.api.util.AEColor;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.OffsetIcon; import appeng.client.texture.OffsetIcon;
import appeng.client.texture.TaughtIcon; import appeng.client.texture.TaughtIcon;
import appeng.util.Platform; import appeng.util.Platform;
@@ -213,7 +213,7 @@ public class PartCableSmart extends PartCable
if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST )
{ {
AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST );
ico.setFlip( false, true ); ico.setFlip( false, true );
} }
@@ -298,7 +298,7 @@ public class PartCableSmart extends PartCable
renderer.uvRotateNorth = 0; renderer.uvRotateNorth = 0;
AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST );
ico.setFlip( false, true ); ico.setFlip( false, true );
renderer.setRenderBounds( 0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0 ); renderer.setRenderBounds( 0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0 );
@@ -306,11 +306,11 @@ public class PartCableSmart extends PartCable
Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 );
FlipableIcon fpA = new FlipableIcon( defa ); FlippableIcon fpA = new FlippableIcon( defa );
FlipableIcon fpB = new FlipableIcon( defb ); FlippableIcon fpB = new FlippableIcon( defb );
fpA = new FlipableIcon( defa ); fpA = new FlippableIcon( defa );
fpB = new FlipableIcon( defb ); fpB = new FlippableIcon( defb );
fpA.setFlip( true, false ); fpA.setFlip( true, false );
fpB.setFlip( true, false ); fpB.setFlip( true, false );
parts/networking/PartDenseCable.java
+6 -6
View File
@@ -2,6 +2,7 @@ package appeng.parts.networking;
import java.util.EnumSet; import java.util.EnumSet;
import appeng.client.texture.FlippableIcon;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@@ -26,7 +27,6 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEColor; import appeng.api.util.AEColor;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
import appeng.client.texture.CableBusTextures; import appeng.client.texture.CableBusTextures;
import appeng.client.texture.FlipableIcon;
import appeng.client.texture.OffsetIcon; import appeng.client.texture.OffsetIcon;
import appeng.client.texture.TaughtIcon; import appeng.client.texture.TaughtIcon;
import appeng.util.Platform; import appeng.util.Platform;
@@ -402,7 +402,7 @@ public class PartDenseCable extends PartCable
renderer.uvRotateNorth = 0; renderer.uvRotateNorth = 0;
AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST );
ico.setFlip( false, true ); ico.setFlip( false, true );
renderer.setRenderBounds( 0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0 ); renderer.setRenderBounds( 0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0 );
@@ -410,11 +410,11 @@ public class PartDenseCable extends PartCable
Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 );
FlipableIcon fpA = new FlipableIcon( defa ); FlippableIcon fpA = new FlippableIcon( defa );
FlipableIcon fpB = new FlipableIcon( defb ); FlippableIcon fpB = new FlippableIcon( defb );
fpA = new FlipableIcon( defa ); fpA = new FlippableIcon( defa );
fpB = new FlipableIcon( defb ); fpB = new FlippableIcon( defb );
fpA.setFlip( true, false ); fpA.setFlip( true, false );
fpB.setFlip( true, false ); fpB.setFlip( true, false );