Fix wtf code merge.

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

No files matched your search

@@ -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);
}