From 0ef6a00aa79f022e5bd56b3f77e6861bbecf6d94 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Thu, 13 Aug 2015 21:12:11 +0100 Subject: Added a new structure, a new curse, achievements, challenges, curses entry in the guide; reworked liquids to be tile entities, cleaned the structures code, potion code and... you know what? I improved and changed so much stuff that I literally forgot what I did... --- .../network/PacketClearColorCache.java | 44 -------- .../jewelrycraft/network/PacketHandler.java | 46 ++++---- .../network/PacketRequestLiquidData.java | 81 -------------- .../network/PacketSendClientPlayerInfo.java | 116 ++++++++++----------- .../jewelrycraft/network/PacketSendLiquidData.java | 96 ----------------- .../network/PacketSendServerPlayerInfo.java | 71 +++++++++++++ 6 files changed, 151 insertions(+), 303 deletions(-) delete mode 100644 src/main/java/darkknight/jewelrycraft/network/PacketClearColorCache.java delete mode 100644 src/main/java/darkknight/jewelrycraft/network/PacketRequestLiquidData.java delete mode 100644 src/main/java/darkknight/jewelrycraft/network/PacketSendLiquidData.java create mode 100644 src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java (limited to 'src/main/java/darkknight/jewelrycraft/network') diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketClearColorCache.java b/src/main/java/darkknight/jewelrycraft/network/PacketClearColorCache.java deleted file mode 100644 index 4d8351c..0000000 --- a/src/main/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/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java index 0ec7db4..db24ead 100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java @@ -1,24 +1,22 @@ -package darkknight.jewelrycraft.network; - -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import darkknight.jewelrycraft.JewelrycraftMod; -import darkknight.jewelrycraft.util.Variables; - -public class PacketHandler -{ - - public static void preInit(FMLPreInitializationEvent e) - { - JewelrycraftMod.netWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Variables.MODID); - JewelrycraftMod.netWrapper.registerMessage(PacketRequestLiquidData.class, PacketRequestLiquidData.class, 0, Side.SERVER); - JewelrycraftMod.netWrapper.registerMessage(PacketSendLiquidData.class, PacketSendLiquidData.class, 1, Side.CLIENT); - JewelrycraftMod.netWrapper.registerMessage(PacketClearColorCache.class, PacketClearColorCache.class, 2, Side.CLIENT); - JewelrycraftMod.netWrapper.registerMessage(PacketKeyPressEvent.class, PacketKeyPressEvent.class, 3, Side.SERVER); - JewelrycraftMod.netWrapper.registerMessage(PacketRequestPlayerInfo.class, PacketRequestPlayerInfo.class, 4, 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, Side.SERVER); - } -} +package darkknight.jewelrycraft.network; + +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; +import darkknight.jewelrycraft.JewelrycraftMod; +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, 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, Side.SERVER); + JewelrycraftMod.netWrapper.registerMessage(PacketSendServerPlayerInfo.class, PacketSendServerPlayerInfo.class, 8, Side.SERVER); + } +} diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestLiquidData.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestLiquidData.java deleted file mode 100644 index 52440e2..0000000 --- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestLiquidData.java +++ /dev/null @@ -1,81 +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 == 2){ - int itemID, itemDamage; - try{ - itemID = Integer.parseInt(splitData[0]); - itemDamage = Integer.parseInt(splitData[1]); - replyPacket = new PacketSendLiquidData(message, itemID, itemDamage); - } - 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/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java index 05567a0..5c391cd 100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java @@ -1,58 +1,58 @@ -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 PacketSendClientPlayerInfo implements IMessage, IMessageHandler -{ - public NBTTagCompound tagCompound; - - /** - * @param tagCompound - */ - public PacketSendClientPlayerInfo(NBTTagCompound tagCompound) - { - this.tagCompound = tagCompound; - } - - /** - * - */ - public PacketSendClientPlayerInfo() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendClientPlayerInfo 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); - } -} +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 PacketSendClientPlayerInfo implements IMessage, IMessageHandler +{ + public NBTTagCompound tagCompound; + + /** + * @param tagCompound + */ + public PacketSendClientPlayerInfo(NBTTagCompound tagCompound) + { + this.tagCompound = tagCompound; + } + + /** + * + */ + public PacketSendClientPlayerInfo() + {} + + /** + * @param message + * @param ctx + * @return + */ + @Override + public IMessage onMessage(PacketSendClientPlayerInfo 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); + } +} diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendLiquidData.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendLiquidData.java deleted file mode 100644 index dcb265b..0000000 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendLiquidData.java +++ /dev/null @@ -1,96 +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; - - /** - * - */ - public PacketSendLiquidData() - {} - - /** - * @param packet - * @param itemID - * @param itemMeta - * @param color - */ - public PacketSendLiquidData(PacketRequestLiquidData packet, int itemID, int itemMeta) - { - dimID = packet.dimID; - x = packet.x; - y = packet.y; - z = packet.z; - this.itemID = itemID; - this.itemMeta = itemMeta; - } - - /** - * @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) - { - this.dimID = dimID; - this.x = x; - this.y = y; - this.z = z; - this.itemID = itemID; - this.itemMeta = itemMeta; - } - - /** - * @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(); - } - - /** - * @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); - } - - /** - * @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); - 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/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java new file mode 100644 index 0000000..afefb65 --- /dev/null +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java @@ -0,0 +1,71 @@ +package darkknight.jewelrycraft.network; + +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.util.PlayerUtils; +import darkknight.jewelrycraft.util.Variables; +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; + + /** + * @param tagCompound + */ + public PacketSendServerPlayerInfo(String action, String curse, NBTTagCompound tagCompound) + { + this.tagCompound = tagCompound; + this.curse = curse; + this.action = action; + } + + /** + * + */ + public PacketSendServerPlayerInfo() + {} + + /** + * @param message + * @param ctx + * @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")); + return null; + } + + /** + * @param buf + */ + @Override + public void fromBytes(ByteBuf buf) + { + tagCompound = ByteBufUtils.readTag(buf); + curse = ByteBufUtils.readUTF8String(buf); + action = ByteBufUtils.readUTF8String(buf); + } + + /** + * @param buf + */ + @Override + public void toBytes(ByteBuf buf) + { + ByteBufUtils.writeTag(buf, tagCompound); + ByteBufUtils.writeUTF8String(buf, curse); + ByteBufUtils.writeUTF8String(buf, action); + } +} -- cgit v1.2.3