From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../jewelrycraft/network/PacketHandler.java | 32 +++++++-------------- .../jewelrycraft/network/PacketKeyPressEvent.java | 14 +++------ .../network/PacketRequestPlayerInfo.java | 10 ++----- .../jewelrycraft/network/PacketRequestSetSlot.java | 13 +++------ .../network/PacketSendClientPlayerInfo.java | 6 ++-- .../network/PacketSendServerPlayerInfo.java | 33 ++++++++-------------- .../network/PacketSendServerPlayersInfo.java | 17 ++++------- 7 files changed, 39 insertions(+), 86 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/network') diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java index c9fefa3..fe65843 100755 --- a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java @@ -9,30 +9,18 @@ import darkknight.jewelrycraft.util.Variables; public class PacketHandler { public static void preInit(FMLPreInitializationEvent e) { - JewelrycraftMod.netWrapper = NetworkRegistry.INSTANCE - .newSimpleChannel(Variables.MODID); - JewelrycraftMod.netWrapper.registerMessage( - PacketKeyPressEvent.class, - PacketKeyPressEvent.class, 3, Side.SERVER); - JewelrycraftMod.netWrapper.registerMessage( - PacketRequestPlayerInfo.class, - PacketRequestPlayerInfo.class, 4, + JewelrycraftMod.netWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Variables.MODID); + JewelrycraftMod.netWrapper.registerMessage(PacketKeyPressEvent.class, PacketKeyPressEvent.class, 3, Side.SERVER); - JewelrycraftMod.netWrapper.registerMessage( - PacketSendClientPlayerInfo.class, - PacketSendClientPlayerInfo.class, 5, - Side.CLIENT); - JewelrycraftMod.netWrapper.registerMessage( - PacketSendServerPlayersInfo.class, - PacketSendServerPlayersInfo.class, 6, - Side.CLIENT); - JewelrycraftMod.netWrapper.registerMessage( - PacketRequestSetSlot.class, - PacketRequestSetSlot.class, 7, + JewelrycraftMod.netWrapper.registerMessage(PacketRequestPlayerInfo.class, PacketRequestPlayerInfo.class, 4, Side.SERVER); - JewelrycraftMod.netWrapper.registerMessage( - PacketSendServerPlayerInfo.class, - PacketSendServerPlayerInfo.class, 8, + JewelrycraftMod.netWrapper.registerMessage(PacketSendClientPlayerInfo.class, PacketSendClientPlayerInfo.class, + 5, Side.CLIENT); + JewelrycraftMod.netWrapper.registerMessage(PacketSendServerPlayersInfo.class, PacketSendServerPlayersInfo.class, + 6, Side.CLIENT); + JewelrycraftMod.netWrapper.registerMessage(PacketRequestSetSlot.class, PacketRequestSetSlot.class, 7, Side.SERVER); + JewelrycraftMod.netWrapper.registerMessage(PacketSendServerPlayerInfo.class, 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 d90cf1a..1ef3fb9 100755 --- a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java @@ -7,8 +7,7 @@ import darkknight.jewelrycraft.JewelrycraftMod; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -public class PacketKeyPressEvent implements IMessage, - IMessageHandler { +public class PacketKeyPressEvent implements IMessage, IMessageHandler { public int actionID; /** @@ -30,19 +29,14 @@ public class PacketKeyPressEvent implements IMessage, * @return */ @Override - public IMessage onMessage(PacketKeyPressEvent message, - MessageContext ctx) { + public IMessage onMessage(PacketKeyPressEvent message, MessageContext ctx) { 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 393647f..f2afc1b 100755 --- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java @@ -7,8 +7,7 @@ import darkknight.jewelrycraft.util.PlayerUtils; import darkknight.jewelrycraft.util.Variables; import io.netty.buffer.ByteBuf; -public class PacketRequestPlayerInfo implements IMessage, - IMessageHandler { +public class PacketRequestPlayerInfo implements IMessage, IMessageHandler { /** * @@ -22,12 +21,9 @@ public class PacketRequestPlayerInfo implements IMessage, * @return */ @Override - public IMessage onMessage(PacketRequestPlayerInfo message, - MessageContext ctx) { + public IMessage onMessage(PacketRequestPlayerInfo message, MessageContext ctx) { return new PacketSendClientPlayerInfo( - PlayerUtils.getModPlayerPersistTag(ctx - .getServerHandler().playerEntity, - Variables.MODID)); + 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 d335b6a..b7fd8eb 100755 --- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java @@ -15,8 +15,7 @@ import net.minecraft.item.ItemStack; * @author Sorin * */ -public class PacketRequestSetSlot implements IMessage, - IMessageHandler { +public class PacketRequestSetSlot implements IMessage, IMessageHandler { ItemStack stack; public PacketRequestSetSlot() { @@ -32,14 +31,10 @@ public class PacketRequestSetSlot implements IMessage, * @return */ @Override - public IMessage onMessage(PacketRequestSetSlot message, - MessageContext ctx) { + public IMessage onMessage(PacketRequestSetSlot message, MessageContext ctx) { if (ctx.getServerHandler().playerEntity.openContainer instanceof ContainerJewelryModifier) { - ((ContainerJewelryModifier) ctx - .getServerHandler().playerEntity.openContainer).modInv - .setInventorySlotContents( - 36, - message.stack); + ((ContainerJewelryModifier) ctx.getServerHandler().playerEntity.openContainer).modInv + .setInventorySlotContents(36, message.stack); } return null; } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java index 21000de..fea1d9b 100755 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java @@ -8,8 +8,7 @@ import darkknight.jewelrycraft.events.ScreenHandler; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; -public class PacketSendClientPlayerInfo implements IMessage, - IMessageHandler { +public class PacketSendClientPlayerInfo implements IMessage, IMessageHandler { public NBTTagCompound tagCompound; /** @@ -31,8 +30,7 @@ public class PacketSendClientPlayerInfo implements IMessage, * @return */ @Override - public IMessage onMessage(PacketSendClientPlayerInfo message, - MessageContext ctx) { + public IMessage onMessage(PacketSendClientPlayerInfo message, MessageContext ctx) { ScreenHandler.tagCache = message.tagCompound; return null; } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java index bf3ce1a..52df853 100755 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java @@ -10,16 +10,14 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -public class PacketSendServerPlayerInfo implements IMessage, - IMessageHandler { - public NBTTagCompound tagCompound; - public String curse, action; +public class PacketSendServerPlayerInfo implements IMessage, IMessageHandler { + public NBTTagCompound tagCompound; + public String curse, action; /** * @param tagCompound */ - public PacketSendServerPlayerInfo(String action, String curse, - NBTTagCompound tagCompound) { + public PacketSendServerPlayerInfo(String action, String curse, NBTTagCompound tagCompound) { this.tagCompound = tagCompound; this.curse = curse; this.action = action; @@ -37,22 +35,13 @@ public class PacketSendServerPlayerInfo implements IMessage, * @return */ @Override - public IMessage onMessage(PacketSendServerPlayerInfo message, - MessageContext ctx) { - EntityPlayerMP serverPlayer = ctx - .getServerHandler().playerEntity; - NBTTagCompound playerInfo = PlayerUtils - .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")); + public IMessage onMessage(PacketSendServerPlayerInfo message, MessageContext ctx) { + EntityPlayerMP serverPlayer = ctx.getServerHandler().playerEntity; + NBTTagCompound playerInfo = PlayerUtils.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")); return null; } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java index 5b67e59..836dabc 100755 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java @@ -21,8 +21,7 @@ import net.minecraft.server.MinecraftServer; * @author Sorin * */ -public class PacketSendServerPlayersInfo implements IMessage, - IMessageHandler { +public class PacketSendServerPlayersInfo implements IMessage, IMessageHandler { public PacketSendServerPlayersInfo() { } @@ -33,8 +32,7 @@ public class PacketSendServerPlayersInfo implements IMessage, * @return */ @Override - public IMessage onMessage(PacketSendServerPlayersInfo message, - MessageContext ctx) { + public IMessage onMessage(PacketSendServerPlayersInfo message, MessageContext ctx) { return null; } @@ -55,17 +53,12 @@ public class PacketSendServerPlayersInfo implements IMessage, */ @Override public void toBytes(ByteBuf buf) { - Iterator players = MinecraftServer - .getServer() - .getConfigurationManager().playerEntityList - .iterator(); + Iterator 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); } -- cgit v1.2.3