Formatting pass

6 files changed, 45 insertions, 28 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java
index f98c14a..c9fefa3 100755
--- a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java
@@ -9,25 +9,30 @@ import darkknight.jewelrycraft.util.Variables;
 public class PacketHandler {

 

 	public static void preInit(FMLPreInitializationEvent e) {

-		JewelrycraftMod.netWrapper =

-				NetworkRegistry.INSTANCE.newSimpleChannel(Variables.MODID);

+		JewelrycraftMod.netWrapper = NetworkRegistry.INSTANCE

+				.newSimpleChannel(Variables.MODID);

 		JewelrycraftMod.netWrapper.registerMessage(

-				PacketKeyPressEvent.class, PacketKeyPressEvent.class, 3,

-				Side.SERVER);

+				PacketKeyPressEvent.class,

+				PacketKeyPressEvent.class, 3, Side.SERVER);

 		JewelrycraftMod.netWrapper.registerMessage(

 				PacketRequestPlayerInfo.class,

-				PacketRequestPlayerInfo.class, 4, Side.SERVER);

+				PacketRequestPlayerInfo.class, 4,

+				Side.SERVER);

 		JewelrycraftMod.netWrapper.registerMessage(

 				PacketSendClientPlayerInfo.class,

-				PacketSendClientPlayerInfo.class, 5, Side.CLIENT);

+				PacketSendClientPlayerInfo.class, 5,

+				Side.CLIENT);

 		JewelrycraftMod.netWrapper.registerMessage(

 				PacketSendServerPlayersInfo.class,

-				PacketSendServerPlayersInfo.class, 6, Side.CLIENT);

+				PacketSendServerPlayersInfo.class, 6,

+				Side.CLIENT);

 		JewelrycraftMod.netWrapper.registerMessage(

-				PacketRequestSetSlot.class, PacketRequestSetSlot.class, 7,

+				PacketRequestSetSlot.class,

+				PacketRequestSetSlot.class, 7,

 				Side.SERVER);

 		JewelrycraftMod.netWrapper.registerMessage(

 				PacketSendServerPlayerInfo.class,

-				PacketSendServerPlayerInfo.class, 8, Side.SERVER);

+				PacketSendServerPlayerInfo.class, 8,

+				Side.SERVER);

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java
index 107ffd8..d90cf1a 100755
--- a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java
@@ -35,12 +35,14 @@ public class PacketKeyPressEvent implements IMessage,
 		EntityPlayer sender = ctx.getServerHandler().playerEntity;

 		// Jewelry inventory

 		if (message.actionID == 0)

-			sender.openGui(JewelrycraftMod.instance, 2, sender.worldObj,

-					(int) sender.posX, (int) sender.posY,

+			sender.openGui(JewelrycraftMod.instance, 2,

+					sender.worldObj, (int) sender.posX,

+					(int) sender.posY,

 					(int) sender.posZ);

 		if (message.actionID == 1)

-			sender.openGui(JewelrycraftMod.instance, 4, sender.worldObj,

-					(int) sender.posX, (int) sender.posY,

+			sender.openGui(JewelrycraftMod.instance, 4,

+					sender.worldObj, (int) sender.posX,

+					(int) sender.posY,

 					(int) sender.posZ);

 		return null;

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java
index e3c3564..393647f 100755
--- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java
@@ -25,8 +25,8 @@ public class PacketRequestPlayerInfo implements IMessage,
 	public IMessage onMessage(PacketRequestPlayerInfo message,

 			MessageContext ctx) {

 		return new PacketSendClientPlayerInfo(

-				PlayerUtils.getModPlayerPersistTag(

-						ctx.getServerHandler().playerEntity,

+				PlayerUtils.getModPlayerPersistTag(ctx

+						.getServerHandler().playerEntity,

 						Variables.MODID));

 	}

 

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java
index bf6c1aa..d335b6a 100755
--- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java
@@ -37,7 +37,9 @@ public class PacketRequestSetSlot implements IMessage,
 		if (ctx.getServerHandler().playerEntity.openContainer instanceof ContainerJewelryModifier) {

 			((ContainerJewelryModifier) ctx

 					.getServerHandler().playerEntity.openContainer).modInv

-							.setInventorySlotContents(36, message.stack);

+							.setInventorySlotContents(

+									36,

+									message.stack);

 		}

 		return null;

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java
index da18c17..bf3ce1a 100755
--- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java
@@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagCompound;
 public class PacketSendServerPlayerInfo implements IMessage,

 		IMessageHandler<PacketSendServerPlayerInfo, IMessage> {

 	public NBTTagCompound	tagCompound;

-	public String			curse, action;

+	public String		curse, action;

 

 	/**

 	 * @param tagCompound

@@ -39,16 +39,20 @@ public class PacketSendServerPlayerInfo implements IMessage,
 	@Override

 	public IMessage onMessage(PacketSendServerPlayerInfo message,

 			MessageContext ctx) {

-		EntityPlayerMP serverPlayer = ctx.getServerHandler().playerEntity;

+		EntityPlayerMP serverPlayer = ctx

+				.getServerHandler().playerEntity;

 		NBTTagCompound playerInfo = PlayerUtils

-				.getModPlayerPersistTag(serverPlayer, Variables.MODID);

+				.getModPlayerPersistTag(serverPlayer,

+						Variables.MODID);

 		playerInfo.setInteger(message.curse,

 				message.action.equals("remove") ? 0 : 1);

-		playerInfo.setInteger("activeCurses",

-				message.tagCompound.getInteger("activeCurses"));

-		System.out.println(message.action + " " + message.curse + " "

-				+ message.tagCompound.getInteger(curse) + " "

-				+ message.tagCompound.getInteger("activeCurses"));

+		playerInfo.setInteger("activeCurses", message.tagCompound

+				.getInteger("activeCurses"));

+		System.out.println(message.action + " " + message.curse

+				+ " "

+				+ message.tagCompound.getInteger(curse)

+				+ " " + message.tagCompound.getInteger(

+						"activeCurses"));

 		return null;

 	}

 

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java
index 1785741..5b67e59 100755
--- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java
@@ -55,13 +55,17 @@ public class PacketSendServerPlayersInfo implements IMessage,
 	 */

 	@Override

 	public void toBytes(ByteBuf buf) {

-		Iterator<EntityPlayer> players = MinecraftServer.getServer()

-				.getConfigurationManager().playerEntityList.iterator();

+		Iterator<EntityPlayer> players = MinecraftServer

+				.getServer()

+				.getConfigurationManager().playerEntityList

+						.iterator();

 		NBTTagCompound nbt = new NBTTagCompound();

 		while (players.hasNext()) {

 			EntityPlayer current = players.next();

-			nbt.setTag(current.getDisplayName(), PlayerUtils

-					.getModPlayerPersistTag(current, Variables.MODID));

+			nbt.setTag(current.getDisplayName(),

+					PlayerUtils.getModPlayerPersistTag(

+							current,

+							Variables.MODID));

 		}

 		ByteBufUtils.writeTag(buf, nbt);

 	}