From eb323c77eccb180f66b20c1e722e7664f57e576d Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Sat, 12 Jan 2013 23:10:19 +0800 Subject: [PATCH] Added Armbot recipe --- src/minecraft/assemblyline/client/gui/GuiEncoder.java | 9 +++++---- src/minecraft/assemblyline/common/AssemblyLine.java | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/minecraft/assemblyline/client/gui/GuiEncoder.java b/src/minecraft/assemblyline/client/gui/GuiEncoder.java index 1421766c5..2926b9677 100644 --- a/src/minecraft/assemblyline/client/gui/GuiEncoder.java +++ b/src/minecraft/assemblyline/client/gui/GuiEncoder.java @@ -170,25 +170,26 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher this.fontRenderer.drawString("^", 0, 0, 0xFFFFFF); glPopMatrix(); - if (commands != null) + if (this.commands != null) { - drawCommands(); + this.drawCommands(); } - commandField.drawTextBox(); + this.commandField.drawTextBox(); } private void drawCommands() { int relativeCommand; String command; + for (int i = minCommand; i < minCommand + MAX_COMMANDS; i++) { if (i >= 0 && i < this.commands.size()) { relativeCommand = i - minCommand; command = this.commands.get(i).toUpperCase(); - drawCommand(command, 8, 56 + relativeCommand * (fontRenderer.FONT_HEIGHT + 4), this.selCommand == i); + drawCommand(command, 8, 46 + relativeCommand * (fontRenderer.FONT_HEIGHT + 4), this.selCommand == i); } } } diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index 23ac55410..0755c7486 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -127,11 +127,14 @@ public class AssemblyLine System.out.println(NAME + " Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " languages."); + // Armbot + GameRegistry.addRecipe(new ShapedOreRecipe(blockArmbot, new Object[] { "II ", " I ", "SCS", 'S', "plateSteel", 'C', "advancedCircuit", 'I', "ingotSteel" })); + // Disk - GameRegistry.addRecipe(new ShapedOreRecipe(itemDisk, new Object[] { "III", "ICI", "III", 'I', Item.ingotIron, 'C', "advancedCircuit" })); + GameRegistry.addRecipe(new ShapedOreRecipe(itemDisk, new Object[] { "III", "ICI", "III", 'I', itemImprint, 'C', "advancedCircuit" })); // Encoder - GameRegistry.addRecipe(new ShapedOreRecipe(blockEncoder, new Object[] { "S S", "SCS", "SSS", 'S', "ingotSteel", 'C', "eliteCircuit" })); + GameRegistry.addRecipe(new ShapedOreRecipe(blockEncoder, new Object[] { "S S", "SCS", "SSS", 'S', "ingotSteel", 'C', "advancedCircuit" })); // Imprint GameRegistry.addRecipe(new ShapedOreRecipe(itemImprint, new Object[] { "R", "P", "I", 'P', Item.paper, 'R', Item.redstone, 'I', new ItemStack(Item.dyePowder, 1, 0) })); @@ -156,7 +159,7 @@ public class AssemblyLine UETab.setItemStack(new ItemStack(blockConveyorBelt)); } - + public static void printSidedData(String data) { System.out.print(FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT ? "[C]" : "[S]");