upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-10-26 14:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wtf code merge.

Browse Source 
Removed extra brackets from StatCollector references (PLEASE check this before PRs), replaced TContent references with TRepo as needed.
This commit is contained in:
Sunstrike committed 2013-12-01 21:42:03 +00:00
1 parent eb7975e442
commit 08fd425c8f
6 files changed
+58 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java
+1 -1
View File
@@ -288,7 +288,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui
ArrayList list = new ArrayList();
if (liquid.fluidID == -37)
{
list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1"));
list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1")));
list.add("mB: " + liquid.amount);
}
else
src/main/java/tconstruct/client/gui/PartCrafterGui.java
+19 -19
View File
@@ -49,9 +49,9 @@ public class PartCrafterGui extends NewContainerGui
void drawDefaultInformation ()
{
title = "\u00A7n"+ (StatCollector.translateToLocal("gui.partcrafter2");
title = "\u00A7n" + StatCollector.translateToLocal("gui.partcrafter2");
this.drawCenteredString(fontRenderer, title, xSize + 63, 8, 16777215);
fontRenderer.drawSplitString((StatCollector.translateToLocal("gui.partcrafter3"), xSize + 8, 24, 115, 16777215);
fontRenderer.drawSplitString(StatCollector.translateToLocal("gui.partcrafter3"), xSize + 8, 24, 115, 16777215);
}
void drawMaterialInformation ()
@@ -94,10 +94,10 @@ public class PartCrafterGui extends NewContainerGui
if (hasTop)
{
this.drawCenteredString(fontRenderer, title, xSize + 63, offset, 16777215);
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), xSize + 8, offset + 16, 16777215);
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215);
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215);
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), xSize + 8, offset + 16, 16777215);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215);
int attack = topEnum.attack();
String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9");
@@ -111,16 +111,16 @@ public class PartCrafterGui extends NewContainerGui
if (hasBottom)
{
this.drawCenteredString(fontRenderer, otherTitle, xSize + 63, offset, 16777215);
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), xSize + 8, offset + 16, 16777215);
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215);
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215);
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), xSize + 8, offset + 16, 16777215);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215);
int attack = bottomEnum.attack();
String heart = attack == 2 ? (StatCollector.translateToLocal("gui.partcrafter8") : (StatCollector.translateToLocal("gui.partcrafter9");
String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9");
if (attack % 2 == 0)
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff);
else
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff);
}
if (!hasTop && !hasBottom)
@@ -132,17 +132,17 @@ public class PartCrafterGui extends NewContainerGui
switch (num)
{
case 0:
return (StatCollector.translateToLocal("gui.partcrafter.mining1");
return StatCollector.translateToLocal("gui.partcrafter.mining1");
case 1:
return (StatCollector.translateToLocal("gui.partcrafter.mining2");
return StatCollector.translateToLocal("gui.partcrafter.mining2");
case 2:
return (StatCollector.translateToLocal("gui.partcrafter.mining3");
return StatCollector.translateToLocal("gui.partcrafter.mining3");
case 3:
return (StatCollector.translateToLocal("gui.partcrafter.mining4");
return StatCollector.translateToLocal("gui.partcrafter.mining4");
case 4:
return (StatCollector.translateToLocal("gui.partcrafter.mining5");
return StatCollector.translateToLocal("gui.partcrafter.mining5");
case 5:
return (StatCollector.translateToLocal("gui.partcrafter.mining6");
return StatCollector.translateToLocal("gui.partcrafter.mining6");
default:
return String.valueOf(num);
}
src/main/java/tconstruct/client/gui/SmelteryGui.java
+1 -1
View File
@@ -273,7 +273,7 @@ public class SmelteryGui extends NewContainerGui
ArrayList list = new ArrayList();
if (liquid.fluidID == -37)
{
list.add("\u00A7f"+(StatCollector.translateToLocal("gui.smeltery1"));
list.add("\u00A7f"+StatCollector.translateToLocal("gui.smeltery1"));
list.add("mB: " + liquid.amount);
}
else
src/main/java/tconstruct/client/gui/StencilTableGui.java
+7 -6
View File
@@ -16,6 +16,7 @@ import org.lwjgl.opengl.GL11;
import tconstruct.blocks.logic.StencilTableLogic;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import tconstruct.inventory.PatternShaperContainer;
import cpw.mods.fml.common.network.PacketDispatcher;
@@ -70,8 +71,8 @@ public class StencilTableGui extends GuiContainer
GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.texture); // Repair
repairButton.enabled = false;
this.buttonList.add(repairButton);*/
this.buttonList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, (StatCollector.translateToLocal("gui.stenciltable1")));
this.buttonList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, (StatCollector.translateToLocal("gui.stenciltable1")));
this.buttonList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, StatCollector.translateToLocal("gui.stenciltable1")));
this.buttonList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, StatCollector.translateToLocal("gui.stenciltable1")));
//for (int iter = 0; iter < TConstructContent.patternOutputs.length; iter++)
//{
@@ -85,7 +86,7 @@ public class StencilTableGui extends GuiContainer
protected void actionPerformed (GuiButton button)
{
ItemStack pattern = logic.getStackInSlot(0);
if (pattern != null && pattern.getItem() == TContent.blankPattern)
if (pattern != null && pattern.getItem() == TRepo.blankPattern)
{
int meta = pattern.getItemDamage();
if (meta == 0)
@@ -95,18 +96,18 @@ public class StencilTableGui extends GuiContainer
patternIndex++;
if (patternIndex == 21)
patternIndex++;
if (patternIndex >= TContent.patternOutputs.length - 1)
if (patternIndex >= TRepo.patternOutputs.length - 1)
patternIndex = 0;
}
else if (button.id == 1)
{
patternIndex--;
if (patternIndex < 0)
patternIndex = TContent.patternOutputs.length - 2;
patternIndex = TRepo.patternOutputs.length - 2;
if (patternIndex == 21)
patternIndex--;
}
ItemStack stack = new ItemStack(TContent.woodPattern, 1, patternIndex + 1);
ItemStack stack = new ItemStack(TRepo.woodPattern, 1, patternIndex + 1);
logic.setInventorySlotContents(1, stack);
updateServer(stack);
}
src/main/java/tconstruct/client/gui/ToolForgeGui.java
+2 -2
View File
@@ -85,8 +85,8 @@ public class ToolForgeGui extends ToolStationGui
setSlotType(0);
iconX = new int[] { 0, 1, 2, 13 };
iconY = new int[] { 13, 13, 13, 13 };
title = "\u00A7n"+(StatCollector.translateToLocal("gui.toolforge1");
body = (StatCollector.translateToLocal("gui.toolforge2");
title = "\u00A7n"+StatCollector.translateToLocal("gui.toolforge1");
body = StatCollector.translateToLocal("gui.toolforge2");
}
void setSlotType (int type)
src/main/java/tconstruct/client/gui/ToolStationGui.java
+28 -28
View File
@@ -197,14 +197,14 @@ public class ToolStationGui extends NewContainerGui
{
if (maxDur >= 10000)
{
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff);
offset++;
fontRenderer.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff);
offset++;
}
else
{
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff);
offset++;
}
}
@@ -220,17 +220,17 @@ public class ToolStationGui extends NewContainerGui
if (attack < 1)
attack = 1;
String heart = attack == 2 ? (StatCollector.translateToLocal("gui.partcrafter9") : (StatCollector.translateToLocal("gui.partcrafter10");
String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10");
if (attack % 2 == 0)
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff);
else
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff);
offset++;
if (stoneboundDamage != 0)
{
heart = stoneboundDamage == 2 ? (StatCollector.translateToLocal("gui.partcrafter9") : (StatCollector.translateToLocal("gui.partcrafter10");
String bloss = stoneboundDamage > 0 ? (StatCollector.translateToLocal("gui.toolstation4") : (StatCollector.translateToLocal("gui.toolstation5");
heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10");
String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5");
this.fontRenderer.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff);
offset++;
}
@@ -244,9 +244,9 @@ public class ToolStationGui extends NewContainerGui
int drawSpeed = tags.getInteger("DrawSpeed");
float flightSpeed = tags.getFloat("FlightSpeed");
float trueDraw = drawSpeed / 20f * flightSpeed;
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff);
offset++;
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff);
offset++;
offset++;
}
@@ -262,7 +262,7 @@ public class ToolStationGui extends NewContainerGui
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff);
offset++;
String heart = attack == 2 ? (StatCollector.translateToLocal("gui.partcrafter9") : (StatCollector.translateToLocal("gui.partcrafter10");
String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10");
if (attack % 2 == 0)
this.fontRenderer.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff);
else
@@ -277,9 +277,9 @@ public class ToolStationGui extends NewContainerGui
offset++;
offset++;
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff);
offset++;
this.fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff);
this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff);
offset++;
/*this.fontRenderer.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff);
offset++;*/
@@ -297,18 +297,18 @@ public class ToolStationGui extends NewContainerGui
float trueSpeed = mineSpeed + stoneboundSpeed;
float trueSpeed2 = mineSpeed + stoneboundSpeed;
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff);
offset++;
fontRenderer.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff);
offset++;
if (stoneboundSpeed != 0)
{
String bloss = stoneboundSpeed > 0 ? (StatCollector.translateToLocal("gui.toolstation4") : (StatCollector.translateToLocal("gui.toolstation5");
String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5");
fontRenderer.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff);
offset++;
}
offset++;
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff);
offset++;
fontRenderer
.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff);
@@ -346,15 +346,15 @@ public class ToolStationGui extends NewContainerGui
trueSpeed += stoneboundSpeed;
if (trueSpeed < 0)
trueSpeed = 0;
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation14")rs") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff);
offset++;
if (stoneboundSpeed != 0)
{
String bloss = stoneboundSpeed > 0 ? (StatCollector.translateToLocal("gui.toolstation4") : (StatCollector.translateToLocal("gui.toolstation5");
String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5");
fontRenderer.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff);
offset++;
}
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff);
offset++;
offset++;
}
@@ -362,20 +362,20 @@ public class ToolStationGui extends NewContainerGui
{
float mineSpeed = tags.getInteger("MiningSpeed");
float trueSpeed = mineSpeed / (100f);
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff);
offset++;
offset++;
}
int modifiers = tags.getInteger("Modifie;
int modifiers = tags.getInteger("Modifiers");
if (modifiers > 0)
{
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff);
offset++;
}
if (tags.hasKey("Tooltip1"))
{
fontRenderer.drawString((StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff);
fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff);
}
boolean displayToolTips = true;
@@ -405,17 +405,17 @@ public class ToolStationGui extends NewContainerGui
switch (num)
{
case 0:
return (StatCollector.translateToLocal("gui.partcrafter.mining1");
return StatCollector.translateToLocal("gui.partcrafter.mining1");
case 1:
return (StatCollector.translateToLocal("gui.partcrafter.mining2");
return StatCollector.translateToLocal("gui.partcrafter.mining2");
case 2:
return (StatCollector.translateToLocal("gui.partcrafter.mining3");
return StatCollector.translateToLocal("gui.partcrafter.mining3");
case 3:
return (StatCollector.translateToLocal("gui.partcrafter.mining4"); //Mithril
return StatCollector.translateToLocal("gui.partcrafter.mining4"); //Mithril
case 4:
return (StatCollector.translateToLocal("gui.partcrafter.mining5");
return StatCollector.translateToLocal("gui.partcrafter.mining5");
case 5:
return (StatCollector.translateToLocal("gui.partcrafter.mining6");
return StatCollector.translateToLocal("gui.partcrafter.mining6");
default:
return String.valueOf(num);
}