Fixed Bug: #0260 - Hotbar Keys + Inscriber

core/AppEng.java

@@ -1,6 +1,7 @@
 package appeng.core;
 
 import java.io.File;
+import java.util.concurrent.TimeUnit;
 
 import appeng.core.crash.CrashEnhancement;
 import appeng.core.crash.CrashInfo;
@@ -14,6 +15,9 @@ import appeng.server.AECommand;
 import appeng.services.Profiler;
 import appeng.services.VersionChecker;
 import appeng.util.Platform;
+
+import com.google.common.base.Stopwatch;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -108,6 +112,7 @@ public class AppEng
 	@EventHandler
 	void PreInit(FMLPreInitializationEvent event)
 	{
+		Stopwatch star = Stopwatch.createStarted();
 		configPath = event.getModConfigurationDirectory().getPath() + File.separator + "AppliedEnergistics2" + File.separator;
 
 		AEConfig.instance = new AEConfig( configPath );
@@ -136,23 +141,25 @@ public class AppEng
 			startService( "AE2 VersionChecker", new Thread( VersionChecker.instance = new VersionChecker() ) );
 		}
 
-		AELog.info( "PreInit ( end )" );
+		AELog.info( "PreInit ( end " + star.elapsed( TimeUnit.MILLISECONDS ) + "ms )" );
 	}
 
 	@EventHandler
 	void Init(FMLInitializationEvent event)
 	{
+		Stopwatch star = Stopwatch.createStarted();
 		AELog.info( "Init" );
 
 		Registration.instance.Init( event );
 		integrationModules.init();
 
-		AELog.info( "Init ( end )" );
+		AELog.info( "Init ( end " + star.elapsed( TimeUnit.MILLISECONDS ) + "ms )" );
 	}
 
 	@EventHandler
 	void PostInit(FMLPostInitializationEvent event)
 	{
+		Stopwatch star = Stopwatch.createStarted();
 		AELog.info( "PostInit" );
 
 		Registration.instance.PostInit( event );
@@ -163,7 +170,7 @@ public class AppEng
 		NetworkRegistry.INSTANCE.registerGuiHandler( this, GuiBridge.GUI_Handler );
 		NetworkHandler.instance = new NetworkHandler( "AE2" );
 
-		AELog.info( "PostInit ( end )" );
+		AELog.info( "PostInit ( end " + star.elapsed( TimeUnit.MILLISECONDS ) + "ms )" );
 	}
 
 	@EventHandler

core/sync/AppEngPacketHandlerBase.java

@@ -20,6 +20,7 @@ import appeng.core.sync.packets.PacketMultiPart;
 import appeng.core.sync.packets.PacketNewStorageDimension;
 import appeng.core.sync.packets.PacketPartPlacement;
 import appeng.core.sync.packets.PacketProgressBar;
+import appeng.core.sync.packets.PacketSwapSlots;
 import appeng.core.sync.packets.PacketSwitchGuis;
 import appeng.core.sync.packets.PacketTransitionEffect;
 import appeng.core.sync.packets.PacketValueConfig;
@@ -61,7 +62,9 @@ public class AppEngPacketHandlerBase
 
 		PACKET_NEW_STORAGE_DIMENSION(PacketNewStorageDimension.class),
 
-		PACKET_SWITCH_GUIS(PacketSwitchGuis.class);
+		PACKET_SWITCH_GUIS(PacketSwitchGuis.class),
+
+		PACKET_SWAP_SLOTS(PacketSwapSlots.class);
 
 		final public Class pc;
 		final public Constructor con;

core/sync/packets/PacketSwapSlots.java

@@ -0,0 +1,44 @@
+package appeng.core.sync.packets;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+import java.io.IOException;
+
+import net.minecraft.entity.player.EntityPlayer;
+import appeng.container.AEBaseContainer;
+import appeng.core.sync.AppEngPacket;
+import appeng.core.sync.network.INetworkInfo;
+
+public class PacketSwapSlots extends AppEngPacket
+{
+
+	int slotA, slotB;
+
+	// automatic.
+	public PacketSwapSlots(ByteBuf stream) throws IOException {
+		slotA = stream.readInt();
+		slotB = stream.readInt();
+	}
+
+	@Override
+	public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player)
+	{
+		if ( player != null && player.openContainer instanceof AEBaseContainer )
+		{
+			((AEBaseContainer) player.openContainer).swapSlotContents( slotA, slotB );
+		}
+	}
+
+	// api
+	public PacketSwapSlots(int slotA, int slotB) throws IOException {
+
+		ByteBuf data = Unpooled.buffer();
+
+		data.writeInt( getPacketID() );
+		data.writeInt( this.slotA = slotA );
+		data.writeInt( this.slotB = slotB );
+
+		configureWrite( data );
+	}
+}