From 8d2728a26d25bc2f0708113a086a6b3ee95d7c61 Mon Sep 17 00:00:00 2001 From: Xamora64 <49618907+Xamora64@users.noreply.github.com> Date: Wed, 25 Sep 2024 00:24:14 +0200 Subject: [PATCH] Remove useless packet --- build.gradle | 2 +- .../network/client/NetworkDeleteItemC.java | 66 ------------------- .../java/xamora/gp_dbc/proxy/CommonProxy.java | 2 - .../java/xamora/gp_dbc/utils/PlayerUtils.java | 14 +--- 4 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 src/main/java/xamora/gp_dbc/network/client/NetworkDeleteItemC.java diff --git a/build.gradle b/build.gradle index 0915403..bd54876 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'forge' sourceCompatibility = 1.8 targetCompatibility = 1.8 -version = "0.0.2" +version = "1.0.0" group = "xamora.gp_dbc" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "gp_dbc" diff --git a/src/main/java/xamora/gp_dbc/network/client/NetworkDeleteItemC.java b/src/main/java/xamora/gp_dbc/network/client/NetworkDeleteItemC.java deleted file mode 100644 index 6443bf0..0000000 --- a/src/main/java/xamora/gp_dbc/network/client/NetworkDeleteItemC.java +++ /dev/null @@ -1,66 +0,0 @@ -package xamora.gp_dbc.network.client; - -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 cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import static xamora.gp_dbc.utils.PlayerUtils.*; - -public class NetworkDeleteItemC implements IMessage { - - private String toSend; - - public NetworkDeleteItemC() { - } - - public NetworkDeleteItemC(String toSend) { - this.toSend = toSend; - } - - @Override - public void toBytes(ByteBuf buf) { - ByteBufUtils.writeUTF8String(buf, toSend); - } - - @Override - public void fromBytes(ByteBuf buf) { - toSend = ByteBufUtils.readUTF8String(buf); - } - - public static class MyMessageHandlerC implements - IMessageHandler { - - @SideOnly(Side.CLIENT) - @Override - public IMessage onMessage(NetworkDeleteItemC message, - MessageContext ctx) { - - String[] split = message.toSend.split("~"); - //String key = split[0]; - String item_name = split[0]; - - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - ItemStack current_stack = player.getHeldItem(); - if (!current_stack.getDisplayName().equals(item_name)) - return null; - - int number = 1; - - try { - number = Integer.parseInt(split[1]); - } catch (Exception e) { - return null; - } - - removeCurrentItem(number); - return null; - } - } -} diff --git a/src/main/java/xamora/gp_dbc/proxy/CommonProxy.java b/src/main/java/xamora/gp_dbc/proxy/CommonProxy.java index 8b47fbc..35c426a 100644 --- a/src/main/java/xamora/gp_dbc/proxy/CommonProxy.java +++ b/src/main/java/xamora/gp_dbc/proxy/CommonProxy.java @@ -9,7 +9,6 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; import xamora.gp_dbc.Main; import xamora.gp_dbc.network.client.NetworkCriminalTrackerC; -import xamora.gp_dbc.network.client.NetworkDeleteItemC; import xamora.gp_dbc.network.client.NetworkHandcuffedC; import xamora.gp_dbc.network.client.NetworkJailManagerC; import xamora.gp_dbc.network.server.NetworkJailManager; @@ -31,7 +30,6 @@ public class CommonProxy { // Server to Client network.registerMessage(NetworkHandcuffedC.MyMessageHandlerC.class, NetworkHandcuffedC.class, i++, Side.CLIENT); - network.registerMessage(NetworkDeleteItemC.MyMessageHandlerC.class, NetworkDeleteItemC.class, i++, Side.CLIENT); network.registerMessage(NetworkJailManagerC.MyMessageHandlerC.class, NetworkJailManagerC.class, i++, Side.CLIENT); network.registerMessage(NetworkCriminalTrackerC.MyMessageHandlerC.class, NetworkCriminalTrackerC.class, i++, Side.CLIENT); diff --git a/src/main/java/xamora/gp_dbc/utils/PlayerUtils.java b/src/main/java/xamora/gp_dbc/utils/PlayerUtils.java index 9ff34fa..e8c435c 100644 --- a/src/main/java/xamora/gp_dbc/utils/PlayerUtils.java +++ b/src/main/java/xamora/gp_dbc/utils/PlayerUtils.java @@ -2,7 +2,6 @@ package xamora.gp_dbc.utils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import xamora.gp_dbc.network.client.NetworkDeleteItemC; import xamora.gp_dbc.proxy.CommonProxy; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -39,7 +38,8 @@ public class PlayerUtils { else player.inventory.setInventorySlotContents(player.inventory.currentItem, null); - CommonProxy.network.sendTo(new NetworkDeleteItemC(stack.getDisplayName() + "~" + number), (EntityPlayerMP) player); + player.inventory.markDirty(); + //CommonProxy.network.sendTo(new NetworkDeleteItemC(stack.getDisplayName() + "~" + number), (EntityPlayerMP) player); } @SideOnly(Side.SERVER) @@ -56,14 +56,4 @@ public class PlayerUtils { return world.getEntitiesWithinAABB(EntityPlayer.class, aabb); } - @SideOnly(Side.CLIENT) - public static void removeCurrentItem(int number) { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - ItemStack stack = player.getHeldItem(); - - if (stack.stackSize > number) - player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(stack.getItem(), stack.stackSize - number)); - else - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); - } }