aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/shedaniel/rei/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/me/shedaniel/rei/network')
-rw-r--r--src/main/java/me/shedaniel/rei/network/CreateItemsMessage.java38
-rw-r--r--src/main/java/me/shedaniel/rei/network/CreateItemsPacket.java49
-rw-r--r--src/main/java/me/shedaniel/rei/network/DeleteItemsMessage.java27
-rw-r--r--src/main/java/me/shedaniel/rei/network/DeleteItemsPacket.java34
4 files changed, 83 insertions, 65 deletions
diff --git a/src/main/java/me/shedaniel/rei/network/CreateItemsMessage.java b/src/main/java/me/shedaniel/rei/network/CreateItemsMessage.java
deleted file mode 100644
index 4d1f2c3b9..000000000
--- a/src/main/java/me/shedaniel/rei/network/CreateItemsMessage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package me.shedaniel.rei.network;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.text.ChatType;
-import net.minecraft.util.text.TextComponentTranslation;
-import org.dimdev.rift.network.Message;
-import org.dimdev.rift.network.ServerMessageContext;
-
-public class CreateItemsMessage extends Message {
-
- private ItemStack stack;
-
- public CreateItemsMessage(ItemStack stack) {
- this.stack = stack;
- }
-
- @Override
- public void write(PacketBuffer buffer) {
- buffer.writeItemStack(stack);
- }
-
- @Override
- public void read(PacketBuffer buffer) {
- stack = buffer.readItemStack();
- }
-
- @Override
- public void process(ServerMessageContext context) {
- EntityPlayerMP player = context.getSender();
- if (player.inventory.addItemStackToInventory(stack.copy()))
- player.sendMessage(new TextComponentTranslation("text.rei.cheat_items", stack.getDisplayName().getFormattedText(), stack.getCount(), player.getName()), ChatType.SYSTEM);
- else
- player.sendMessage(new TextComponentTranslation("text.rei.failed_cheat_items"), ChatType.SYSTEM);
- }
-
-}
diff --git a/src/main/java/me/shedaniel/rei/network/CreateItemsPacket.java b/src/main/java/me/shedaniel/rei/network/CreateItemsPacket.java
new file mode 100644
index 000000000..003ea09fe
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/network/CreateItemsPacket.java
@@ -0,0 +1,49 @@
+package me.shedaniel.rei.network;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.util.text.ChatType;
+import net.minecraft.util.text.TextComponentTranslation;
+import org.dimdev.rift.network.Message;
+import org.dimdev.rift.network.ServerMessageContext;
+
+import java.io.IOException;
+
+public class CreateItemsPacket implements Packet<INetHandlerPlayServer> {
+
+ private ItemStack stack;
+
+ public CreateItemsPacket() {
+ }
+
+ public CreateItemsPacket(ItemStack stack) {
+ this.stack = stack;
+ }
+
+ @Override
+ public void readPacketData(PacketBuffer packetBuffer) throws IOException {
+ stack = ItemStack.read(packetBuffer.readCompoundTag());
+ }
+
+ @Override
+ public void writePacketData(PacketBuffer packetBuffer) throws IOException {
+ NBTTagCompound tag = new NBTTagCompound();
+ stack.write(tag);
+ packetBuffer.writeCompoundTag(tag);
+ }
+
+ @Override
+ public void processPacket(INetHandlerPlayServer iNetHandlerPlayServer) {
+ NetHandlerPlayServer server = (NetHandlerPlayServer) iNetHandlerPlayServer;
+ EntityPlayerMP player = server.player;
+ if (player.inventory.addItemStackToInventory(stack.copy()))
+ player.sendMessage(new TextComponentTranslation("text.rei.cheat_items", stack.getDisplayName().getFormattedText(), stack.getCount(), player.getScoreboardName()), ChatType.SYSTEM);
+ else player.sendMessage(new TextComponentTranslation("text.rei.failed_cheat_items"), ChatType.SYSTEM);
+ }
+
+}
diff --git a/src/main/java/me/shedaniel/rei/network/DeleteItemsMessage.java b/src/main/java/me/shedaniel/rei/network/DeleteItemsMessage.java
deleted file mode 100644
index dc982e9f6..000000000
--- a/src/main/java/me/shedaniel/rei/network/DeleteItemsMessage.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.shedaniel.rei.network;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.PacketBuffer;
-import org.dimdev.rift.network.Message;
-import org.dimdev.rift.network.ServerMessageContext;
-
-public class DeleteItemsMessage extends Message {
-
- @Override
- public void write(PacketBuffer buffer) {
-
- }
-
- @Override
- public void read(PacketBuffer buffer) {
-
- }
-
- @Override
- public void process(ServerMessageContext context) {
- EntityPlayerMP player = context.getSender();
- if (!player.inventory.getItemStack().isEmpty())
- player.inventory.setItemStack(ItemStack.EMPTY);
- }
-}
diff --git a/src/main/java/me/shedaniel/rei/network/DeleteItemsPacket.java b/src/main/java/me/shedaniel/rei/network/DeleteItemsPacket.java
new file mode 100644
index 000000000..503f8ce66
--- /dev/null
+++ b/src/main/java/me/shedaniel/rei/network/DeleteItemsPacket.java
@@ -0,0 +1,34 @@
+package me.shedaniel.rei.network;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.Packet;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.play.INetHandlerPlayServer;
+
+import java.io.IOException;
+
+public class DeleteItemsPacket implements Packet<INetHandlerPlayServer> {
+
+ @Override
+ public void readPacketData(PacketBuffer packetBuffer) throws IOException {
+
+ }
+
+ @Override
+ public void writePacketData(PacketBuffer packetBuffer) throws IOException {
+
+ }
+
+ @Override
+ public void processPacket(INetHandlerPlayServer iNetHandlerPlayServer) {
+ NetHandlerPlayServer server = (NetHandlerPlayServer) iNetHandlerPlayServer;
+ EntityPlayerMP player = server.player;
+
+ if (!player.inventory.getItemStack().isEmpty()) {
+ player.inventory.setItemStack(ItemStack.EMPTY);
+ }
+ }
+
+}