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

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2

Browse source
This commit is contained in:
AlgorithmX2 2014-05-08 14:43:30 -05:00
commit 5675f5c5fd
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/texture/FlipableIcon.java
View file

@ -10,10 +10,10 @@ public class FlipableIcon implements IIcon
boolean flip_v;
public FlipableIcon(IIcon o) {
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." );
original = o;
flip_u = false;
flip_v = false;

10
client/texture/TmpFlipableIcon.java
View file

@ -1,12 +1,15 @@
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( null );
super( nullIcon );
}
public void setOriginal(IIcon i)
@ -14,7 +17,10 @@ public class TmpFlipableIcon extends FlipableIcon
while (i instanceof FlipableIcon)
i = ((FlipableIcon) i).getOriginal();
original = i;
if ( i == null )
original = nullIcon;
else
original = i;
}
}

2
parts/CableBusContainer.java
View file

@ -603,7 +603,7 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
throw new RuntimeException( "Invalid Stream For CableBus Container." );
}
}
else
else if ( getPart( side ) != null )
removePart( side, false );
}