From 34abdcd933db9ec7fdae5af040142ba5d4a4d474 Mon Sep 17 00:00:00 2001 From: Brian Ricketts Date: Wed, 9 Jan 2013 15:27:34 -0600 Subject: [PATCH] Fixed merge errors --- src/minecraft/assemblyline/client/gui/GuiEncoder.java | 11 ++++++++++- .../common/machine/encoder/TileEntityEncoder.java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/minecraft/assemblyline/client/gui/GuiEncoder.java b/src/minecraft/assemblyline/client/gui/GuiEncoder.java index 72caec646..0101f2de2 100644 --- a/src/minecraft/assemblyline/client/gui/GuiEncoder.java +++ b/src/minecraft/assemblyline/client/gui/GuiEncoder.java @@ -23,7 +23,7 @@ import org.lwjgl.opengl.GL11; import universalelectricity.prefab.TranslationHelper; import universalelectricity.prefab.network.PacketManager; import assemblyline.common.AssemblyLine; -import assemblyline.common.machine.armbot.Command; +import assemblyline.common.machine.command.Command; import assemblyline.common.machine.encoder.ContainerEncoder; import assemblyline.common.machine.encoder.IInventoryWatcher; import assemblyline.common.machine.encoder.ItemDisk; @@ -63,6 +63,7 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher super.initGui(); this.allowUserInput = true; + Keyboard.enableRepeatEvents(true); this.containerWidth = (this.width - this.xSize) / 2; this.containerHeight = (this.height - this.ySize) / 2; @@ -390,6 +391,14 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher this.minCommand = 0; } } + + @Override + public void onGuiClosed() + { + super.onGuiClosed(); + Keyboard.enableRepeatEvents(false); + } + @Override public void inventoryChanged() diff --git a/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java index 3b3c8928c..aeb24005a 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java +++ b/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java @@ -11,7 +11,7 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; import universalelectricity.prefab.network.IPacketReceiver; import universalelectricity.prefab.tile.TileEntityAdvanced; -import assemblyline.common.machine.armbot.Command; +import assemblyline.common.machine.command.Command; import com.google.common.io.ByteArrayDataInput;