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

Ported to 1.7

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-08 19:34:52 -06:00
parent 30c1deb8cf
commit d50c7f6312
328 changed files with 2209 additions and 2311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/texture/CableBusTextures.java
+6 -6
View File
@@ -2,7 +2,7 @@ package appeng.client.texture;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -72,7 +72,7 @@ public enum CableBusTextures
ItemPartLevelEmitterOn("ItemPart.LevelEmitterOn.png"), PartTransitionPlaneBack("PartTransitionPlaneBack");
final private String name;
public Icon icon;
public IIcon IIcon;
public static ResourceLocation GuiTexture(String string)
{
@@ -88,18 +88,18 @@ public enum CableBusTextures
this.name = name;
}
public Icon getIcon()
public IIcon getIcon()
{
return icon;
return IIcon;
}
public void registerIcon(TextureMap map)
{
icon = map.registerIcon( "appliedenergistics2:" + name );
IIcon = map.registerIcon( "appliedenergistics2:" + name );
}
@SideOnly(Side.CLIENT)
public static Icon getMissing()
public static IIcon getMissing()
{
return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture )).getAtlasSprite( "missingno" );
}
client/texture/ExtraTextures.java
+6 -6
View File
@@ -2,7 +2,7 @@ package appeng.client.texture;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -53,7 +53,7 @@ public enum ExtraTextures
BlockMESecurityOn("BlockMESecurityOn");
final private String name;
public Icon icon;
public IIcon IIcon;
public static ResourceLocation GuiTexture(String string)
{
@@ -69,18 +69,18 @@ public enum ExtraTextures
this.name = name;
}
public Icon getIcon()
public IIcon getIcon()
{
return icon;
return IIcon;
}
public void registerIcon(TextureMap map)
{
icon = map.registerIcon( "appliedenergistics2:" + name );
IIcon = map.registerIcon( "appliedenergistics2:" + name );
}
@SideOnly(Side.CLIENT)
public static Icon getMissing()
public static IIcon getMissing()
{
return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture )).getAtlasSprite( "missingno" );
}
client/texture/FlipableIcon.java
+5 -5
View File
@@ -1,15 +1,15 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
public class FlipableIcon implements Icon
public class FlipableIcon implements IIcon
{
protected Icon original;
protected IIcon original;
boolean flip_u;
boolean flip_v;
public FlipableIcon(Icon o) {
public FlipableIcon(IIcon o) {
original = o;
flip_u = false;
flip_v = false;
@@ -81,7 +81,7 @@ public class FlipableIcon implements Icon
return original.getIconName();
}
public Icon getOriginal()
public IIcon getOriginal()
{
return original;
}
client/texture/FullIcon.java
+4 -4
View File
@@ -1,15 +1,15 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class FullIcon implements Icon
public class FullIcon implements IIcon
{
private Icon p;
private IIcon p;
public FullIcon(Icon o) {
public FullIcon(IIcon o) {
p = o;
}
client/texture/OffsetIcon.java
+4 -4
View File
@@ -1,18 +1,18 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class OffsetIcon implements Icon
public class OffsetIcon implements IIcon
{
final float offsetX;
final float offsetY;
private Icon p;
private IIcon p;
public OffsetIcon(Icon o, float x, float y) {
public OffsetIcon(IIcon o, float x, float y) {
p = o;
offsetX = x;
offsetY = y;
client/texture/TaughtIcon.java
+4 -4
View File
@@ -1,17 +1,17 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TaughtIcon implements Icon
public class TaughtIcon implements IIcon
{
final float tightness;
private Icon p;
private IIcon p;
public TaughtIcon(Icon o, float tightness) {
public TaughtIcon(IIcon o, float tightness) {
p = o;
this.tightness = tightness;
}
client/texture/TmpFlipableIcon.java
+2 -2
View File
@@ -1,6 +1,6 @@
package appeng.client.texture;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
public class TmpFlipableIcon extends FlipableIcon
{
@@ -9,7 +9,7 @@ public class TmpFlipableIcon extends FlipableIcon
super( null );
}
public void setOriginal(Icon i)
public void setOriginal(IIcon i)
{
while (i instanceof FlipableIcon)
i = ((FlipableIcon) i).getOriginal();