Skip to content

Commit

Permalink
Fix wtf code merge.
Browse files Browse the repository at this point in the history 
Removed extra brackets from StatCollector references (PLEASE check this before PRs), replaced TContent references with TRepo as needed.
  • Loading branch information
Sunstrike committed Dec 1, 2013
1 parent eb7975e commit 08fd425
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 57 deletions.
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java
View file
Expand Up @@ -288,7 +288,7 @@ public List getLiquidTooltip (FluidStack liquid, boolean par2)
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
Expand Down
38 changes: 19 additions & 19 deletions src/main/java/tconstruct/client/gui/PartCrafterGui.java
View file
Expand Up @@ -49,9 +49,9 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2)

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 ()
Expand Down Expand Up @@ -94,10 +94,10 @@ void drawMaterialInformation ()
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");
Expand All @@ -111,16 +111,16 @@ void drawMaterialInformation ()
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)
Expand All @@ -132,17 +132,17 @@ public static String getHarvestLevelName (int num)
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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/client/gui/SmelteryGui.java
View file
Expand Up @@ -273,7 +273,7 @@ public List getLiquidTooltip (FluidStack liquid, boolean par2)
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
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/tconstruct/client/gui/StencilTableGui.java
View file
Expand Up @@ -16,6 +16,7 @@

import tconstruct.blocks.logic.StencilTableLogic;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import tconstruct.inventory.PatternShaperContainer;

import cpw.mods.fml.common.network.PacketDispatcher;
Expand Down Expand Up @@ -70,8 +71,8 @@ public void initGui ()
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++)
//{
Expand All @@ -85,7 +86,7 @@ public void initGui ()
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)
Expand All @@ -95,18 +96,18 @@ protected void actionPerformed (GuiButton button)
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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/client/gui/ToolForgeGui.java
View file
Expand Up @@ -85,8 +85,8 @@ void resetGui ()
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)
Expand Down

0 comments on commit 08fd425

Please sign in to comment.