tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed merge errors

Browse source
This commit is contained in:
Brian Ricketts 2013-01-09 15:27:34 -06:00
parent 2a7c9ff03c
commit 34abdcd933
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/minecraft/assemblyline/client/gui/GuiEncoder.java
View file

@ -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()

2
src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java
View file

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