From 6312636fd9a4d0f56dc7c9ff474a99d879bcb4e9 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Mon, 23 Mar 2015 14:51:06 +0000 Subject: Reworked the whole repo. --- .../network/PacketClearColorCache.java | 44 --------- .../jewelrycraft/network/PacketHandler.java | 4 - .../jewelrycraft/network/PacketKeyPressEvent.java | 59 ------------ .../network/PacketRequestLiquidData.java | 82 ----------------- .../network/PacketRequestPlayerInfo.java | 42 --------- .../jewelrycraft/network/PacketSendCurseStats.java | 71 --------------- .../jewelrycraft/network/PacketSendLiquidData.java | 100 --------------------- .../jewelrycraft/network/PacketSendPlayerInfo.java | 58 ------------ 8 files changed, 460 deletions(-) delete mode 100644 java/darkknight/jewelrycraft/network/PacketClearColorCache.java delete mode 100644 java/darkknight/jewelrycraft/network/PacketHandler.java delete mode 100644 java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java delete mode 100644 java/darkknight/jewelrycraft/network/PacketRequestLiquidData.java delete mode 100644 java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java delete mode 100644 java/darkknight/jewelrycraft/network/PacketSendCurseStats.java delete mode 100644 java/darkknight/jewelrycraft/network/PacketSendLiquidData.java delete mode 100644 java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java (limited to 'java/darkknight/jewelrycraft/network') diff --git a/java/darkknight/jewelrycraft/network/PacketClearColorCache.java b/java/darkknight/jewelrycraft/network/PacketClearColorCache.java deleted file mode 100644 index 4d8351c..0000000 --- a/java/darkknight/jewelrycraft/network/PacketClearColorCache.java +++ /dev/null @@ -1,44 +0,0 @@ -package darkknight.jewelrycraft.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.JewelrycraftMod; - -public class PacketClearColorCache implements IMessage, IMessageHandler -{ - - /** - * - */ - public PacketClearColorCache() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketClearColorCache message, MessageContext ctx) - { - JewelrycraftMod.clientData = new NBTTagCompound(); - return null; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - {} - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - {} -} diff --git a/java/darkknight/jewelrycraft/network/PacketHandler.java b/java/darkknight/jewelrycraft/network/PacketHandler.java deleted file mode 100644 index 3cbea83..0000000 --- a/java/darkknight/jewelrycraft/network/PacketHandler.java +++ /dev/null @@ -1,4 +0,0 @@ -package darkknight.jewelrycraft.network; - -public class PacketHandler -{} diff --git a/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java b/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java deleted file mode 100644 index 13d0969..0000000 --- a/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java +++ /dev/null @@ -1,59 +0,0 @@ -package darkknight.jewelrycraft.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.JewelrycraftMod; - -public class PacketKeyPressEvent implements IMessage, IMessageHandler -{ - public int actionID; - - /** - * @param id - */ - public PacketKeyPressEvent(int id) - { - actionID = id; - } - - /** - * - */ - public PacketKeyPressEvent() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - 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, (int)sender.posZ); - return null; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - actionID = buf.readInt(); - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(actionID); - } -} diff --git a/java/darkknight/jewelrycraft/network/PacketRequestLiquidData.java b/java/darkknight/jewelrycraft/network/PacketRequestLiquidData.java deleted file mode 100644 index ebcfdf4..0000000 --- a/java/darkknight/jewelrycraft/network/PacketRequestLiquidData.java +++ /dev/null @@ -1,82 +0,0 @@ -package darkknight.jewelrycraft.network; - -import io.netty.buffer.ByteBuf; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.JewelrycraftMod; - -public class PacketRequestLiquidData implements IMessage, IMessageHandler -{ - int dimID, x, y, z; - - /** - * - */ - public PacketRequestLiquidData() - {} - - /** - * @param dimID - * @param x - * @param y - * @param z - */ - public PacketRequestLiquidData(int dimID, int x, int y, int z) - { - this.dimID = dimID; - this.x = x; - this.y = y; - this.z = z; - } - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketRequestLiquidData message, MessageContext ctx) - { - String data = JewelrycraftMod.saveData.getString(message.x + " " + message.y + " " + message.z + " " + message.dimID); - String[] splitData = data.split(":"); - IMessage replyPacket = null; - if (splitData.length == 3){ - int itemID, itemDamage, color; - try{ - itemID = Integer.parseInt(splitData[0]); - itemDamage = Integer.parseInt(splitData[1]); - color = Integer.parseInt(splitData[2]); - replyPacket = new PacketSendLiquidData(message, itemID, itemDamage, color); - } - catch(Exception e){ - e.printStackTrace(); - } - } - return replyPacket; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - dimID = buf.readInt(); - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(dimID); - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } -} diff --git a/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java b/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java deleted file mode 100644 index 8491132..0000000 --- a/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java +++ /dev/null @@ -1,42 +0,0 @@ -package darkknight.jewelrycraft.network; - -import io.netty.buffer.ByteBuf; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.util.PlayerUtils; - -public class PacketRequestPlayerInfo implements IMessage, IMessageHandler -{ - - /** - * - */ - public PacketRequestPlayerInfo() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketRequestPlayerInfo message, MessageContext ctx) - { - return new PacketSendPlayerInfo(PlayerUtils.getModPlayerPersistTag(ctx.getServerHandler().playerEntity, "Jewelrycraft")); - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - {} - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - {} -} diff --git a/java/darkknight/jewelrycraft/network/PacketSendCurseStats.java b/java/darkknight/jewelrycraft/network/PacketSendCurseStats.java deleted file mode 100644 index 3457235..0000000 --- a/java/darkknight/jewelrycraft/network/PacketSendCurseStats.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * - */ -package darkknight.jewelrycraft.network; - -import java.util.Iterator; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import io.netty.buffer.ByteBuf; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.events.PlayerRenderHandler; -import darkknight.jewelrycraft.lib.Reference; -import darkknight.jewelrycraft.util.PlayerUtils; - -/** - * @author Sorin - * - */ -public class PacketSendCurseStats implements IMessage, IMessageHandler -{ - public PacketSendCurseStats() - { - - } - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendCurseStats message, MessageContext ctx) - { - return null; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - String temp = ByteBufUtils.readUTF8String(buf); - if (temp != "") - PlayerRenderHandler.infamyCache = temp.split(";"); - else - PlayerRenderHandler.infamyCache = new String[] { }; - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - Iterator players = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator(); - String infamyPlayers = ""; - while (players.hasNext()) - { - EntityPlayer current = players.next(); - if(PlayerUtils.getModPlayerPersistTag(current, "Jewelrycraft").getInteger(Reference.MODNAME + ":" + "Infamy") > 0) - infamyPlayers = infamyPlayers + (infamyPlayers == "" ? "" : ";") + current.getDisplayName(); - } - ByteBufUtils.writeUTF8String(buf, infamyPlayers); - } -} diff --git a/java/darkknight/jewelrycraft/network/PacketSendLiquidData.java b/java/darkknight/jewelrycraft/network/PacketSendLiquidData.java deleted file mode 100644 index bad14e7..0000000 --- a/java/darkknight/jewelrycraft/network/PacketSendLiquidData.java +++ /dev/null @@ -1,100 +0,0 @@ -package darkknight.jewelrycraft.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.JewelrycraftMod; - -public class PacketSendLiquidData implements IMessage, IMessageHandler -{ - int dimID, x, y, z, itemID, itemMeta, color; - - /** - * - */ - public PacketSendLiquidData() - {} - - /** - * @param packet - * @param itemID - * @param itemMeta - * @param color - */ - public PacketSendLiquidData(PacketRequestLiquidData packet, int itemID, int itemMeta, int color) - { - dimID = packet.dimID; - x = packet.x; - y = packet.y; - z = packet.z; - this.itemID = itemID; - this.itemMeta = itemMeta; - this.color = color; - } - - /** - * @param dimID - * @param x - * @param y - * @param z - * @param itemID - * @param itemMeta - * @param color - */ - public PacketSendLiquidData(int dimID, int x, int y, int z, int itemID, int itemMeta, int color) - { - this.dimID = dimID; - this.x = x; - this.y = y; - this.z = z; - this.itemID = itemID; - this.itemMeta = itemMeta; - this.color = color; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - dimID = buf.readInt(); - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - itemID = buf.readInt(); - itemMeta = buf.readInt(); - color = buf.readInt(); - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(dimID); - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(itemID); - buf.writeInt(itemMeta); - buf.writeInt(color); - } - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendLiquidData message, MessageContext ctx) - { - JewelrycraftMod.clientData.setString(message.x + " " + message.y + " " + message.z + " " + message.dimID, message.itemID + ":" + message.itemMeta + ":" + message.color); - Minecraft.getMinecraft().theWorld.getBlock(message.x, message.y, message.z); - Minecraft.getMinecraft().theWorld.markBlockForUpdate(message.x, message.y, message.z); - return null; - } -} diff --git a/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java b/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java deleted file mode 100644 index e2f66a0..0000000 --- a/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java +++ /dev/null @@ -1,58 +0,0 @@ -package darkknight.jewelrycraft.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.events.ScreenHandler; - -public class PacketSendPlayerInfo implements IMessage, IMessageHandler -{ - public NBTTagCompound tagCompound; - - /** - * @param tagCompound - */ - public PacketSendPlayerInfo(NBTTagCompound tagCompound) - { - this.tagCompound = tagCompound; - } - - /** - * - */ - public PacketSendPlayerInfo() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendPlayerInfo message, MessageContext ctx) - { - ScreenHandler.tagCache = message.tagCompound; - return null; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - tagCompound = ByteBufUtils.readTag(buf); - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - ByteBufUtils.writeTag(buf, tagCompound); - } -} -- cgit v1.2.3