Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated to Forge 9.10.1.849 (mmm delicious MCP names...), and properly

Browse source 
translated/formatted version checker strings
This commit is contained in:
pahimar 2013-09-03 21:33:10 -04:00
parent 06f40198a3
commit b6cf52f48f
27 changed files with 56 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java
View file

@ -51,7 +51,7 @@ public class GuiAlchemicalBag extends GuiContainer {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
// this.mc.getTextureManager().bindTexture(...) // this.mc.getTextureManager().bindTexture(...)
this.mc.func_110434_K().func_110577_a(Textures.GUI_ALCHEMICAL_STORAGE); this.mc.getTextureManager().bindTexture(Textures.GUI_ALCHEMICAL_STORAGE);
int xStart = (width - xSize) / 2; int xStart = (width - xSize) / 2;
int yStart = (height - ySize) / 2; int yStart = (height - ySize) / 2;

3
common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java
View file

@ -48,8 +48,7 @@ public class GuiAlchemicalChest extends GuiContainer {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
// this.mc.getTextureManager().bindTexture(...) this.mc.getTextureManager().bindTexture(Textures.GUI_ALCHEMICAL_STORAGE);
this.mc.func_110434_K().func_110577_a(Textures.GUI_ALCHEMICAL_STORAGE);
int xStart = (width - xSize) / 2; int xStart = (width - xSize) / 2;
int yStart = (height - ySize) / 2; int yStart = (height - ySize) / 2;

2
common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java
View file

@ -48,7 +48,7 @@ public class GuiAludel extends GuiContainer {
protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.func_110434_K().func_110577_a(Textures.GUI_ALUDEL); this.mc.getTextureManager().bindTexture(Textures.GUI_ALUDEL);
int xStart = (width - xSize) / 2; int xStart = (width - xSize) / 2;
int yStart = (height - ySize) / 2; int yStart = (height - ySize) / 2;
this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize);

3
common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java
View file

@ -48,8 +48,7 @@ public class GuiCalcinator extends GuiContainer {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
//this.mc.getTextureManager().bindTexture(...) this.mc.getTextureManager().bindTexture(Textures.GUI_CALCINATOR);
this.mc.func_110434_K().func_110577_a(Textures.GUI_CALCINATOR);
int xStart = (width - xSize) / 2; int xStart = (width - xSize) / 2;
int yStart = (height - ySize) / 2; int yStart = (height - ySize) / 2;

2
common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java
View file

@ -48,7 +48,7 @@ public class GuiGlassBell extends GuiContainer {
protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.func_110434_K().func_110577_a(Textures.GUI_GLASS_BELL); this.mc.getTextureManager().bindTexture(Textures.GUI_GLASS_BELL);
int xStart = (width - xSize) / 2; int xStart = (width - xSize) / 2;
int yStart = (height - ySize) / 2; int yStart = (height - ySize) / 2;
this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize);

2
common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java
View file

@ -52,7 +52,7 @@ public class GuiPortableCrafting extends GuiContainer {
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.func_110434_K().func_110577_a(Textures.GUI_PORTABLE_CRAFTING); this.mc.getTextureManager().bindTexture(Textures.GUI_PORTABLE_CRAFTING);
int var5 = (width - xSize) / 2; int var5 = (width - xSize) / 2;
int var6 = (height - ySize) / 2; int var6 = (height - ySize) / 2;
this.drawTexturedModalRect(var5, var6, 0, 0, xSize, ySize); this.drawTexturedModalRect(var5, var6, 0, 0, xSize, ySize);

2
common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java
View file

@ -34,7 +34,7 @@ public class GuiPortableTransmutation extends GuiContainer {
protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.func_110434_K().func_110577_a(Textures.GUI_PORTABLE_TRANSMUTATION); this.mc.getTextureManager().bindTexture(Textures.GUI_PORTABLE_TRANSMUTATION);
int var5 = (width - xSize) / 2; int var5 = (width - xSize) / 2;
int var6 = (height - ySize) / 2; int var6 = (height - ySize) / 2;
this.drawTexturedModalRect(var5, var6, 0, 0, xSize, ySize); this.drawTexturedModalRect(var5, var6, 0, 0, xSize, ySize);

4
common/com/pahimar/ee3/client/renderer/RenderUtils.java
View file

@ -32,7 +32,7 @@ public class RenderUtils {
RenderBlocks renderBlocks = new RenderBlocks(); RenderBlocks renderBlocks = new RenderBlocks();
Block block = Block.blocksList[stack.itemID]; Block block = Block.blocksList[stack.itemID];
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.VANILLA_BLOCK_TEXTURE_SHEET); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.VANILLA_BLOCK_TEXTURE_SHEET);
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslatef(x - 2, y + 3, -3.0F + zLevel); GL11.glTranslatef(x - 2, y + 3, -3.0F + zLevel);
GL11.glScalef(10.0F, 10.0F, 10.0F); GL11.glScalef(10.0F, 10.0F, 10.0F);
@ -60,7 +60,7 @@ public class RenderUtils {
Icon icon = itemStack.getIconIndex(); Icon icon = itemStack.getIconIndex();
GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING);
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.VANILLA_ITEM_TEXTURE_SHEET); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.VANILLA_ITEM_TEXTURE_SHEET);
int overlayColour = itemStack.getItem().getColorFromItemStack(itemStack, 0); int overlayColour = itemStack.getItem().getColorFromItemStack(itemStack, 0);
float red = (overlayColour >> 16 & 255) / 255.0F; float red = (overlayColour >> 16 & 255) / 255.0F;
float green = (overlayColour >> 8 & 255) / 255.0F; float green = (overlayColour >> 8 & 255) / 255.0F;

2
common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java
View file

@ -70,7 +70,7 @@ public class ItemAlchemicalChestRenderer implements IItemRenderer {
private void renderAlchemicalChest(float x, float y, float z) { private void renderAlchemicalChest(float x, float y, float z) {
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_ALCHEMICAL_CHEST); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST);
GL11.glPushMatrix(); //start GL11.glPushMatrix(); //start
GL11.glTranslatef(x, y, z); //size GL11.glTranslatef(x, y, z); //size
GL11.glRotatef(180, 1, 0, 0); GL11.glRotatef(180, 1, 0, 0);

2
common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java
View file

@ -79,7 +79,7 @@ public class ItemAludelRenderer implements IItemRenderer {
GL11.glRotatef(-90F, 1F, 0, 0); GL11.glRotatef(-90F, 1F, 0, 0);
// Bind texture // Bind texture
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_ALUDEL); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL);
// Render // Render
modelAludel.render(); modelAludel.render();

2
common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java
View file

@ -79,7 +79,7 @@ public class ItemCalcinatorRenderer implements IItemRenderer {
GL11.glRotatef(-90F, 1F, 0, 0); GL11.glRotatef(-90F, 1F, 0, 0);
// Bind texture // Bind texture
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_CALCINATOR); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_CALCINATOR);
// Render // Render
modelCalcinator.render(); modelCalcinator.render();

2
common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java
View file

@ -79,7 +79,7 @@ public class ItemGlassBellRenderer implements IItemRenderer {
GL11.glRotatef(-90F, 1F, 0, 0); GL11.glRotatef(-90F, 1F, 0, 0);
// Bind texture // Bind texture
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_GLASS_BELL); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_GLASS_BELL);
// Render // Render
modelGlassBell.render(); modelGlassBell.render();

2
common/com/pahimar/ee3/client/renderer/item/ItemRenderingTankRenderer.java
View file

@ -66,7 +66,7 @@ public class ItemRenderingTankRenderer implements IItemRenderer {
GL11.glTranslatef(x, y, z); GL11.glTranslatef(x, y, z);
// Bind texture // Bind texture
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_RENDERING_TANK); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_RENDERING_TANK);
// Render // Render
modelRenderingTank.render(); modelRenderingTank.render();

2
common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java
View file

@ -42,7 +42,7 @@ public class TileEntityAlchemicalChestRenderer extends
direction = ForgeDirection.getOrientation(tileAlchemicalChest.getBlockMetadata()); direction = ForgeDirection.getOrientation(tileAlchemicalChest.getBlockMetadata());
} }
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_ALCHEMICAL_CHEST); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST);
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(GL12.GL_RESCALE_NORMAL);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

2
common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java
View file

@ -63,7 +63,7 @@ public class TileEntityAludelRenderer extends TileEntitySpecialRenderer {
scaleTranslateRotate(x, y, z, tileAludel.getOrientation()); scaleTranslateRotate(x, y, z, tileAludel.getOrientation());
// Bind texture // Bind texture
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_ALUDEL); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL);
// Render // Render
modelAludel.render(); modelAludel.render();

2
common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java
View file

@ -42,7 +42,7 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer {
GL11.glRotatef(-90F, 1F, 0F, 0F); GL11.glRotatef(-90F, 1F, 0F, 0F);
// Bind texture // Bind texture
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_CALCINATOR); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_CALCINATOR);
// Render // Render
modelCalcinator.renderPart("Calcinator"); modelCalcinator.renderPart("Calcinator");

2
common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java
View file

@ -66,7 +66,7 @@ public class TileEntityGlassBellRenderer extends TileEntitySpecialRenderer {
renderGlassBellByOrientation(x, y, z, tileGlassBell.getOrientation()); renderGlassBellByOrientation(x, y, z, tileGlassBell.getOrientation());
// Bind texture // Bind texture
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_GLASS_BELL); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_GLASS_BELL);
modelGlassBell.render(); modelGlassBell.render();

2
common/com/pahimar/ee3/client/renderer/tileentity/TileEntityRenderingTankRenderer.java
View file

@ -34,7 +34,7 @@ public class TileEntityRenderingTankRenderer extends TileEntitySpecialRenderer {
//GL11.glRotatef(90F, 0F, 1F, 0F); //GL11.glRotatef(90F, 0F, 1F, 0F);
// Bind texture // Bind texture
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_RENDERING_TANK); FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_RENDERING_TANK);
// Render // Render
modelRenderingTank.render(); modelRenderingTank.render();

16
common/com/pahimar/ee3/command/CommandOverlay.java
View file

@ -51,14 +51,14 @@ public class CommandOverlay {
ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION = true; ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION = true;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, Strings.TRUE); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, Strings.TRUE);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_TURNED_ON)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_OVERLAY_TURNED_ON));
} }
private static void processOffCommand(ICommandSender commandSender) { private static void processOffCommand(ICommandSender commandSender) {
ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION = false; ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION = false;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, Strings.FALSE); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, Strings.FALSE);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_TURNED_OFF)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_OVERLAY_TURNED_OFF));
} }
private static void processScaleCommand(ICommandSender commandSender, String[] args) { private static void processScaleCommand(ICommandSender commandSender, String[] args) {
@ -73,7 +73,7 @@ public class CommandOverlay {
else { else {
ConfigurationSettings.TARGET_BLOCK_OVERLAY_SCALE = scale; ConfigurationSettings.TARGET_BLOCK_OVERLAY_SCALE = scale;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_SCALE_CONFIGNAME, args[1]); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_SCALE_CONFIGNAME, args[1]);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_SCALE_UPDATED)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_OVERLAY_SCALE_UPDATED));
} }
} }
catch (Exception e) { catch (Exception e) {
@ -97,7 +97,7 @@ public class CommandOverlay {
else { else {
ConfigurationSettings.TARGET_BLOCK_OVERLAY_OPACITY = opacity; ConfigurationSettings.TARGET_BLOCK_OVERLAY_OPACITY = opacity;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_OPACITY_CONFIGNAME, args[1]); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_OPACITY_CONFIGNAME, args[1]);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_OPACITY_UPDATED)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_OVERLAY_OPACITY_UPDATED));
} }
} }
catch (Exception e) { catch (Exception e) {
@ -119,22 +119,22 @@ public class CommandOverlay {
if (yPosition.equalsIgnoreCase(Commands.COMMAND_TOP) && xPosition.equalsIgnoreCase(Commands.COMMAND_LEFT)) { if (yPosition.equalsIgnoreCase(Commands.COMMAND_TOP) && xPosition.equalsIgnoreCase(Commands.COMMAND_LEFT)) {
ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 0; ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 0;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "0"); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "0");
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_POSITION_TOP_LEFT)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_OVERLAY_POSITION_TOP_LEFT));
} }
else if (yPosition.equalsIgnoreCase(Commands.COMMAND_TOP) && xPosition.equalsIgnoreCase(Commands.COMMAND_RIGHT)) { else if (yPosition.equalsIgnoreCase(Commands.COMMAND_TOP) && xPosition.equalsIgnoreCase(Commands.COMMAND_RIGHT)) {
ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 1; ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 1;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "1"); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "1");
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_POSITION_TOP_RIGHT)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_OVERLAY_POSITION_TOP_RIGHT));
} }
else if (yPosition.equalsIgnoreCase(Commands.COMMAND_BOTTOM) && xPosition.equalsIgnoreCase(Commands.COMMAND_LEFT)) { else if (yPosition.equalsIgnoreCase(Commands.COMMAND_BOTTOM) && xPosition.equalsIgnoreCase(Commands.COMMAND_LEFT)) {
ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 2; ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 2;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "2"); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "2");
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_LEFT)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_LEFT));
} }
else if (yPosition.equalsIgnoreCase(Commands.COMMAND_BOTTOM) && xPosition.equalsIgnoreCase(Commands.COMMAND_RIGHT)) { else if (yPosition.equalsIgnoreCase(Commands.COMMAND_BOTTOM) && xPosition.equalsIgnoreCase(Commands.COMMAND_RIGHT)) {
ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 3; ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 3;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "3"); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "3");
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_RIGHT)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_RIGHT));
} }
else else
throw new WrongUsageException(Commands.COMMAND_OVERLAY_POSITION_USAGE, new Object[0]); throw new WrongUsageException(Commands.COMMAND_OVERLAY_POSITION_USAGE, new Object[0]);

4
common/com/pahimar/ee3/command/CommandParticles.java
View file

@ -44,13 +44,13 @@ public class CommandParticles {
ConfigurationSettings.ENABLE_PARTICLE_FX = true; ConfigurationSettings.ENABLE_PARTICLE_FX = true;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, Strings.TRUE); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, Strings.TRUE);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_PARTICLES_TURNED_ON)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_PARTICLES_TURNED_ON));
} }
private static void processOffCommand(ICommandSender commandSender) { private static void processOffCommand(ICommandSender commandSender) {
ConfigurationSettings.ENABLE_PARTICLE_FX = false; ConfigurationSettings.ENABLE_PARTICLE_FX = false;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, Strings.FALSE); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, Strings.FALSE);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_PARTICLES_TURNED_OFF)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_PARTICLES_TURNED_OFF));
} }
} }

6
common/com/pahimar/ee3/command/CommandSounds.java
View file

@ -46,20 +46,20 @@ public class CommandSounds {
ConfigurationSettings.ENABLE_SOUNDS = Commands.ALL; ConfigurationSettings.ENABLE_SOUNDS = Commands.ALL;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.ALL); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.ALL);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_SOUNDS_SET_TO_ALL)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_SOUNDS_SET_TO_ALL));
} }
private static void processSelfCommand(ICommandSender commandSender) { private static void processSelfCommand(ICommandSender commandSender) {
ConfigurationSettings.ENABLE_SOUNDS = Commands.SELF; ConfigurationSettings.ENABLE_SOUNDS = Commands.SELF;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.SELF); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.SELF);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_SOUNDS_SET_TO_SELF)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_SOUNDS_SET_TO_SELF));
} }
private static void processOffCommand(ICommandSender commandSender) { private static void processOffCommand(ICommandSender commandSender) {
ConfigurationSettings.ENABLE_SOUNDS = Commands.OFF; ConfigurationSettings.ENABLE_SOUNDS = Commands.OFF;
ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.OFF); ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.OFF);
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_SOUNDS_TURNED_OFF)); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(Commands.COMMAND_SOUNDS_TURNED_OFF));
} }
} }

2
common/com/pahimar/ee3/command/CommandVersion.java
View file

@ -40,7 +40,7 @@ public class CommandVersion {
private static void processVersionCommand(ICommandSender commandSender) { private static void processVersionCommand(ICommandSender commandSender) {
commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(VersionHelper.getResultMessage())); commandSender.sendChatToPlayer(ChatMessageComponent.createFromTranslationKey(VersionHelper.getResultMessage()));
} }
private static void processChangelogCommand(ICommandSender commandSender) { private static void processChangelogCommand(ICommandSender commandSender) {

2
common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java
View file

@ -155,7 +155,7 @@ public class DrawBlockHighlightHandler {
float pulseTransparency = getPulseValue() * maxTransparency / 3000f; float pulseTransparency = getPulseValue() * maxTransparency / 3000f;
FMLClientHandler.instance().getClient().renderEngine.func_110577_a(texture); FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture);
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(GL12.GL_RESCALE_NORMAL);

30
common/com/pahimar/ee3/core/util/VersionHelper.java
View file

@ -4,7 +4,7 @@ import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.util.Properties; import java.util.Properties;
import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.StatCollector;
import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Configuration;
import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationHandler;
@ -131,40 +131,40 @@ public class VersionHelper implements Runnable {
public static String getResultMessage() { public static String getResultMessage() {
if (result == UNINITIALIZED) if (result == UNINITIALIZED) {
return new ChatMessageComponent().func_111080_a(Strings.UNINITIALIZED_MESSAGE, new Object[0]).toString(); return StatCollector.translateToLocal(Strings.UNINITIALIZED_MESSAGE);
}
else if (result == CURRENT) { else if (result == CURRENT) {
return new ChatMessageComponent().func_111080_a(Strings.CURRENT_MESSAGE, new Object[] { remoteVersion, Loader.instance().getMCVersionString() }).toString(); return StatCollector.translateToLocalFormatted(Strings.CURRENT_MESSAGE, Reference.MOD_NAME, Loader.instance().getMCVersionString());
} }
else if (result == OUTDATED && remoteVersion != null && remoteUpdateLocation != null) { else if (result == OUTDATED && remoteVersion != null && remoteUpdateLocation != null) {
return new ChatMessageComponent().func_111080_a(Strings.OUTDATED_MESSAGE, new Object[] { Reference.MOD_NAME, remoteVersion, Loader.instance().getMCVersionString(), remoteUpdateLocation }).toString(); return StatCollector.translateToLocalFormatted(Strings.OUTDATED_MESSAGE, Reference.MOD_NAME, remoteVersion, Loader.instance().getMCVersionString(), remoteUpdateLocation);
} }
else if (result == OUTDATED && remoteVersion != null && remoteUpdateLocation != null) { else if (result == OUTDATED && remoteVersion != null && remoteUpdateLocation != null) {
return new ChatMessageComponent().func_111080_a(Strings.OUTDATED_MESSAGE, new Object[] { Reference.MOD_NAME, remoteVersion, Loader.instance().getMCVersionString(), remoteUpdateLocation }).toString(); return StatCollector.translateToLocalFormatted(Strings.OUTDATED_MESSAGE, Reference.MOD_NAME, remoteVersion, Loader.instance().getMCVersionString(), remoteUpdateLocation);
} }
else if (result == ERROR) { else if (result == ERROR) {
return new ChatMessageComponent().func_111080_a(Strings.GENERAL_ERROR_MESSAGE, new Object[0]).toString(); return StatCollector.translateToLocal(Strings.GENERAL_ERROR_MESSAGE);
} }
else if (result == FINAL_ERROR) { else if (result == FINAL_ERROR) {
return new ChatMessageComponent().func_111080_a(Strings.FINAL_ERROR_MESSAGE, new Object[0]).toString(); return StatCollector.translateToLocal(Strings.FINAL_ERROR_MESSAGE);
} }
else if (result == MC_VERSION_NOT_FOUND) { else if (result == MC_VERSION_NOT_FOUND) {
return new ChatMessageComponent().func_111080_a(Strings.MC_VERSION_NOT_FOUND, new Object[] { Reference.MOD_NAME, Loader.instance().getMCVersionString() }).toString(); return StatCollector.translateToLocalFormatted(Strings.MC_VERSION_NOT_FOUND, Reference.MOD_NAME, Loader.instance().getMCVersionString());
} }
else { else {
result = ERROR; result = ERROR;
return new ChatMessageComponent().func_111080_a(Strings.GENERAL_ERROR_MESSAGE, new Object[0]).toString(); return StatCollector.translateToLocal(Strings.GENERAL_ERROR_MESSAGE);
} }
} }
public static String getResultMessageForClient() { public static String getResultMessageForClient() {
return new ChatMessageComponent().func_111080_a(Strings.OUTDATED_MESSAGE, return StatCollector.translateToLocalFormatted(Strings.OUTDATED_MESSAGE,
new Object[] { Colours.TEXT_COLOUR_PREFIX_YELLOW + Reference.MOD_NAME + Colours.TEXT_COLOUR_PREFIX_WHITE, Colours.TEXT_COLOUR_PREFIX_YELLOW + Reference.MOD_NAME + Colours.TEXT_COLOUR_PREFIX_WHITE,
Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteVersion + Colours.TEXT_COLOUR_PREFIX_WHITE, Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteVersion + Colours.TEXT_COLOUR_PREFIX_WHITE,
Colours.TEXT_COLOUR_PREFIX_YELLOW + Loader.instance().getMCVersionString() + Colours.TEXT_COLOUR_PREFIX_WHITE, Colours.TEXT_COLOUR_PREFIX_YELLOW + Loader.instance().getMCVersionString() + Colours.TEXT_COLOUR_PREFIX_WHITE,
Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteUpdateLocation + Colours.TEXT_COLOUR_PREFIX_WHITE }) Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteUpdateLocation + Colours.TEXT_COLOUR_PREFIX_WHITE);
.toString();
} }
public static byte getResult() { public static byte getResult() {
@ -177,7 +177,7 @@ public class VersionHelper implements Runnable {
int count = 0; int count = 0;
LogHelper.info(new ChatMessageComponent().func_111080_a(Strings.VERSION_CHECK_INIT_LOG_MESSAGE, new Object[] { REMOTE_VERSION_XML_FILE }).toString()); LogHelper.info(StatCollector.translateToLocalFormatted(Strings.VERSION_CHECK_INIT_LOG_MESSAGE, REMOTE_VERSION_XML_FILE));
try { try {
while (count < Reference.VERSION_CHECK_ATTEMPTS - 1 && (result == UNINITIALIZED || result == ERROR)) { while (count < Reference.VERSION_CHECK_ATTEMPTS - 1 && (result == UNINITIALIZED || result == ERROR)) {

8
common/com/pahimar/ee3/item/CustomWrappedStack.java
View file

@ -218,7 +218,7 @@ public class CustomWrappedStack {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
if (itemStack != null) { if (itemStack != null) {
stringBuilder.append(String.format("%sxitemStack[%s:%s:%s:%s]", this.stackSize, itemStack.itemID, itemStack.getItemDamage(), itemStack.getItemName(), itemStack.getItem().getClass().getCanonicalName())); stringBuilder.append(String.format("%sxitemStack[%s:%s:%s:%s]", this.stackSize, itemStack.itemID, itemStack.getItemDamage(), itemStack.getUnlocalizedName(), itemStack.getItem().getClass().getCanonicalName()));
} }
else if (oreStack != null) { else if (oreStack != null) {
stringBuilder.append(String.format("%dxoreDictionary.%s", stackSize, oreStack.oreName)); stringBuilder.append(String.format("%dxoreDictionary.%s", stackSize, oreStack.oreName));
@ -238,7 +238,7 @@ public class CustomWrappedStack {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
if (itemStack != null) { if (itemStack != null) {
stringBuilder.append(String.format("%sxitemStack[%s:%s:%s:%s]", this.stackSize, itemStack.itemID, itemStack.getItemDamage(), itemStack.getItemName(), itemStack.getItem().getClass().getCanonicalName())); stringBuilder.append(String.format("%sxitemStack[%s:%s:%s:%s]", this.stackSize, itemStack.itemID, itemStack.getItemDamage(), itemStack.getUnlocalizedName(), itemStack.getItem().getClass().getCanonicalName()));
} }
else if (oreStack != null) { else if (oreStack != null) {
stringBuilder.append(String.format("%dxoreDictionary.%s", stackSize, oreStack.oreName)); stringBuilder.append(String.format("%dxoreDictionary.%s", stackSize, oreStack.oreName));
@ -268,8 +268,8 @@ public class CustomWrappedStack {
} }
try { try {
if (itemStack.getItemName() != null) { if (itemStack.getUnlocalizedName() != null) {
hashCode = 37 * hashCode + itemStack.getItemName().hashCode(); hashCode = 37 * hashCode + itemStack.getUnlocalizedName().hashCode();
} }
} catch (ArrayIndexOutOfBoundsException e) { } catch (ArrayIndexOutOfBoundsException e) {

2
common/com/pahimar/ee3/lib/Reference.java
View file

@ -19,7 +19,7 @@ public class Reference {
public static final String MOD_NAME = "Equivalent Exchange 3"; public static final String MOD_NAME = "Equivalent Exchange 3";
public static final String VERSION_NUMBER = "@VERSION@ (build @BUILD_NUMBER@)"; public static final String VERSION_NUMBER = "@VERSION@ (build @BUILD_NUMBER@)";
public static final String CHANNEL_NAME = MOD_ID; public static final String CHANNEL_NAME = MOD_ID;
public static final String DEPENDENCIES = "required-after:Forge@[7.7.1.650,)"; public static final String DEPENDENCIES = "required-after:Forge@[9.10.1.849,)";
public static final String FINGERPRINT = "@FINGERPRINT@"; public static final String FINGERPRINT = "@FINGERPRINT@";
public static final int SECOND_IN_TICKS = 20; public static final int SECOND_IN_TICKS = 20;
public static final int SHIFTED_ID_RANGE_CORRECTION = 256; public static final int SHIFTED_ID_RANGE_CORRECTION = 256;

4
common/com/pahimar/ee3/lib/Textures.java
View file

@ -23,8 +23,8 @@ public class Textures {
public static final String EFFECTS_LOCATION = "textures/effects/"; public static final String EFFECTS_LOCATION = "textures/effects/";
// Item/Block sprite sheets // Item/Block sprite sheets
public static final ResourceLocation VANILLA_BLOCK_TEXTURE_SHEET = TextureMap.field_110575_b; public static final ResourceLocation VANILLA_BLOCK_TEXTURE_SHEET = TextureMap.locationBlocksTexture;
public static final ResourceLocation VANILLA_ITEM_TEXTURE_SHEET = TextureMap.field_110576_c; public static final ResourceLocation VANILLA_ITEM_TEXTURE_SHEET = TextureMap.locationItemsTexture;
// Armor sprite sheets // Armor sprite sheets