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

Removed Localization Stuff.

Browse Source 
Added Logging Option.
Logging of Exceptions is now done via AELogger
This commit is contained in:
AlgorithmX2
2014-02-07 14:37:22 -06:00
parent e18dac1437
commit b57804be06
49 changed files with 212 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/gui/AEBaseGui.java
+8 -8
View File
@@ -119,7 +119,7 @@ public abstract class AEBaseGui extends GuiContainer
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
@@ -148,7 +148,7 @@ public abstract class AEBaseGui extends GuiContainer
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
@@ -198,7 +198,7 @@ public abstract class AEBaseGui extends GuiContainer
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
@@ -522,10 +522,10 @@ public abstract class AEBaseGui extends GuiContainer
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() );
tessellator.addVertexWithUV( (double) (par1 + 0), (double) (par2 + par6), (double) this.zLevel, (double) ((float) (par3 + 0) * f),
(double) ((float) (par4 + par6) * f1) );
tessellator.addVertexWithUV( (double) (par1 + par5), (double) (par2 + par6), (double) this.zLevel,
(double) ((float) (par3 + par5) * f), (double) ((float) (par4 + par6) * f1) );
tessellator.addVertexWithUV( (double) (par1 + par5), (double) (par2 + 0), (double) this.zLevel,
(double) ((float) (par3 + par5) * f), (double) ((float) (par4 + 0) * f1) );
tessellator.addVertexWithUV( (double) (par1 + par5), (double) (par2 + par6), (double) this.zLevel, (double) ((float) (par3 + par5) * f),
(double) ((float) (par4 + par6) * f1) );
tessellator.addVertexWithUV( (double) (par1 + par5), (double) (par2 + 0), (double) this.zLevel, (double) ((float) (par3 + par5) * f),
(double) ((float) (par4 + 0) * f1) );
tessellator.addVertexWithUV( (double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) ((float) (par3 + 0) * f),
(double) ((float) (par4 + 0) * f1) );
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, 1.0f );
@@ -554,7 +554,7 @@ public abstract class AEBaseGui extends GuiContainer
}
catch (Exception err)
{
err.printStackTrace();
AELog.error( err );
}
}
((AppEngSlot) s).isValid = isValid ? hasCalculatedValidness.Valid : hasCalculatedValidness.Invalid;
client/gui/implementations/GuiChest.java
+2 -1
View File
@@ -7,6 +7,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.container.implementations.ContainerChest;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.packets.PacketSwitchGuis;
@@ -31,7 +32,7 @@ public class GuiChest extends AEBaseGui
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
}
client/gui/implementations/GuiCondenser.java
+2 -1
View File
@@ -13,6 +13,7 @@ import appeng.client.gui.widgets.GuiImgButton;
import appeng.client.gui.widgets.GuiProgressBar;
import appeng.client.gui.widgets.GuiProgressBar.Direction;
import appeng.container.implementations.ContainerCondenser;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.packets.PacketConfigButton;
import appeng.tile.misc.TileCondenser;
@@ -46,7 +47,7 @@ public class GuiCondenser extends AEBaseGui
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
}
client/gui/implementations/GuiDrive.java
+2 -1
View File
@@ -7,6 +7,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.container.implementations.ContainerDrive;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.packets.PacketSwitchGuis;
@@ -31,7 +32,7 @@ public class GuiDrive extends AEBaseGui
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
}
client/gui/implementations/GuiIOPort.java
+2 -1
View File
@@ -14,6 +14,7 @@ import appeng.api.config.RedstoneMode;
import appeng.api.config.Settings;
import appeng.client.gui.widgets.GuiImgButton;
import appeng.container.implementations.ContainerIOPort;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.packets.PacketConfigButton;
import appeng.tile.storage.TileIOPort;
@@ -83,7 +84,7 @@ public class GuiIOPort extends GuiUpgradeable
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
client/gui/implementations/GuiLevelEmitter.java
+3 -2
View File
@@ -11,6 +11,7 @@ import appeng.api.config.Settings;
import appeng.api.config.Upgrades;
import appeng.client.gui.widgets.GuiImgButton;
import appeng.container.implementations.ContainerLevelEmitter;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.packets.PacketValueConfig;
import appeng.parts.automation.PartLevelEmitter;
@@ -115,7 +116,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
@@ -152,7 +153,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
else
client/gui/implementations/GuiPriority.java
+5 -5
View File
@@ -11,6 +11,7 @@ import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.container.AEBaseContainer;
import appeng.container.implementations.ContainerPriority;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.packets.PacketSwitchGuis;
@@ -97,7 +98,7 @@ public class GuiPriority extends AEBaseGui
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
@@ -147,7 +148,7 @@ public class GuiPriority extends AEBaseGui
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
@@ -156,8 +157,7 @@ public class GuiPriority extends AEBaseGui
{
if ( !this.checkHotbarKeys( key ) )
{
if ( (key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character ))
&& priority.textboxKeyTyped( character, key ) )
if ( (key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character )) && priority.textboxKeyTyped( character, key ) )
{
try
{
@@ -180,7 +180,7 @@ public class GuiPriority extends AEBaseGui
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
else
client/gui/implementations/GuiSecurity.java
+8 -7
View File
@@ -8,6 +8,7 @@ import appeng.api.config.SortOrder;
import appeng.api.storage.IStorageMonitorable;
import appeng.client.gui.widgets.GuiToggleButton;
import appeng.container.implementations.ContainerSecurity;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.packets.PacketValueConfig;
import cpw.mods.fml.common.network.PacketDispatcher;
@@ -30,11 +31,11 @@ public class GuiSecurity extends GuiMEMonitorable
super.initGui();
int top = this.guiTop + this.ySize - 116;
buttonList.add( inject = new GuiToggleButton( this.guiLeft + 56 + 18 * 0, top, 11 * 16 + 0, 12 * 16 + 0, SecurityPermissions.INJECT
.getUnlocalizedName(), SecurityPermissions.INJECT.getUnlocalizedTip() ) );
buttonList.add( inject = new GuiToggleButton( this.guiLeft + 56 + 18 * 0, top, 11 * 16 + 0, 12 * 16 + 0, SecurityPermissions.INJECT.getUnlocalizedName(),
SecurityPermissions.INJECT.getUnlocalizedTip() ) );
buttonList.add( extract = new GuiToggleButton( this.guiLeft + 56 + 18 * 1, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT
.getUnlocalizedName(), SecurityPermissions.EXTRACT.getUnlocalizedTip() ) );
buttonList.add( extract = new GuiToggleButton( this.guiLeft + 56 + 18 * 1, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT.getUnlocalizedName(),
SecurityPermissions.EXTRACT.getUnlocalizedTip() ) );
buttonList.add( craft = new GuiToggleButton( this.guiLeft + 56 + 18 * 2, top, 11 * 16 + 2, 12 * 16 + 2, SecurityPermissions.CRAFT.getUnlocalizedName(),
SecurityPermissions.CRAFT.getUnlocalizedTip() ) );
@@ -42,8 +43,8 @@ public class GuiSecurity extends GuiMEMonitorable
buttonList.add( build = new GuiToggleButton( this.guiLeft + 56 + 18 * 3, top, 11 * 16 + 3, 12 * 16 + 3, SecurityPermissions.BUILD.getUnlocalizedName(),
SecurityPermissions.BUILD.getUnlocalizedTip() ) );
buttonList.add( security = new GuiToggleButton( this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, SecurityPermissions.SECURITY
.getUnlocalizedName(), SecurityPermissions.SECURITY.getUnlocalizedTip() ) );
buttonList.add( security = new GuiToggleButton( this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, SecurityPermissions.SECURITY.getUnlocalizedName(),
SecurityPermissions.SECURITY.getUnlocalizedTip() ) );
}
protected void actionPerformed(net.minecraft.client.gui.GuiButton btn)
@@ -71,7 +72,7 @@ public class GuiSecurity extends GuiMEMonitorable
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
client/gui/implementations/GuiStorageBus.java
+3 -2
View File
@@ -13,6 +13,7 @@ import appeng.api.config.Settings;
import appeng.client.gui.widgets.GuiImgButton;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.container.implementations.ContainerStorageBus;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.packets.PacketConfigButton;
@@ -77,7 +78,7 @@ public class GuiStorageBus extends GuiUpgradeable
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
try
@@ -90,7 +91,7 @@ public class GuiStorageBus extends GuiUpgradeable
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
client/gui/implementations/GuiUpgradeable.java
+2 -1
View File
@@ -15,6 +15,7 @@ import appeng.api.implementations.IUpgradeableHost;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiImgButton;
import appeng.container.implementations.ContainerUpgradeable;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.packets.PacketConfigButton;
import appeng.parts.automation.PartImportBus;
@@ -76,7 +77,7 @@ public class GuiUpgradeable extends AEBaseGui
}
catch (IOException e)
{
e.printStackTrace();
AELog.error( e );
}
}
client/render/RenderBlocksWorkaround.java
+2 -1
View File
@@ -8,6 +8,7 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.Icon;
import net.minecraftforge.common.ForgeDirection;
import appeng.core.AELog;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -161,7 +162,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
}
catch (Throwable t)
{
t.printStackTrace();
AELog.error( t );
// meh
}
return false;
client/render/TESRWrapper.java
+3 -3
View File
@@ -9,8 +9,8 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import appeng.block.AEBaseBlock;
import appeng.core.AELog;
import appeng.tile.AEBaseTile;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -61,9 +61,9 @@ public class TESRWrapper extends TileEntitySpecialRenderer
}
catch (Throwable t)
{
FMLLog.severe( "Hi, Looks like there was a crash while rendering something..." );
AELog.severe( "Hi, Looks like there was a crash while rendering something..." );
t.printStackTrace();
FMLLog.severe( "MC will now crash ( probobly )!" );
AELog.severe( "MC will now crash ( probobly )!" );
throw new RuntimeException( t );
}
client/render/blocks/RenderBlockCharger.java
+2 -1
View File
@@ -19,6 +19,7 @@ import appeng.block.AEBaseBlock;
import appeng.block.misc.BlockCharger;
import appeng.client.render.BaseBlockRender;
import appeng.client.texture.ExtraTextures;
import appeng.core.AELog;
import appeng.tile.AEBaseTile;
import appeng.util.Platform;
@@ -146,7 +147,7 @@ public class RenderBlockCharger extends BaseBlockRender
}
catch (Exception err)
{
err.printStackTrace();
AELog.error( err );
}
GL11.glPopMatrix();
client/render/blocks/RenderStorageMonitor.java
+4 -5
View File
@@ -15,6 +15,7 @@ import appeng.api.implementations.parts.IPartStorageMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.core.AELog;
import appeng.tile.AEBaseTile;
public class RenderStorageMonitor extends BaseBlockRender
@@ -25,8 +26,7 @@ public class RenderStorageMonitor extends BaseBlockRender
}
@Override
public void renderTile(AEBaseBlock blk, AEBaseTile tile, Tessellator tess, double x, double y, double z, float f,
RenderBlocks rinstance)
public void renderTile(AEBaseBlock blk, AEBaseTile tile, Tessellator tess, double x, double y, double z, float f, RenderBlocks rinstance)
{
IPartStorageMonitor monitor = (IPartStorageMonitor) tile;
IAEItemStack is = ((IAEItemStack) monitor.getDisplayed());
@@ -50,8 +50,7 @@ public class RenderStorageMonitor extends BaseBlockRender
int k = sis.itemID;
Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null);
if ( sis.getItemSpriteNumber() == 0 && block != null
&& RenderBlocks.renderItemIn3d( Block.blocksList[k].getRenderType() ) )
if ( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( Block.blocksList[k].getRenderType() ) )
{
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
@@ -72,7 +71,7 @@ public class RenderStorageMonitor extends BaseBlockRender
}
catch (Exception err)
{
err.printStackTrace();
AELog.error( err );
}
GL11.glPopMatrix();