Remove useless packet
This commit is contained in:
parent
4b2c8703e6
commit
8d2728a26d
|
@ -24,7 +24,7 @@ apply plugin: 'forge'
|
||||||
sourceCompatibility = 1.8
|
sourceCompatibility = 1.8
|
||||||
targetCompatibility = 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
|
group = "xamora.gp_dbc" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
archivesBaseName = "gp_dbc"
|
archivesBaseName = "gp_dbc"
|
||||||
|
|
||||||
|
|
|
@ -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<NetworkDeleteItemC, IMessage> {
|
|
||||||
|
|
||||||
@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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -9,7 +9,6 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import xamora.gp_dbc.Main;
|
import xamora.gp_dbc.Main;
|
||||||
import xamora.gp_dbc.network.client.NetworkCriminalTrackerC;
|
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.NetworkHandcuffedC;
|
||||||
import xamora.gp_dbc.network.client.NetworkJailManagerC;
|
import xamora.gp_dbc.network.client.NetworkJailManagerC;
|
||||||
import xamora.gp_dbc.network.server.NetworkJailManager;
|
import xamora.gp_dbc.network.server.NetworkJailManager;
|
||||||
|
@ -31,7 +30,6 @@ public class CommonProxy {
|
||||||
|
|
||||||
// Server to Client
|
// Server to Client
|
||||||
network.registerMessage(NetworkHandcuffedC.MyMessageHandlerC.class, NetworkHandcuffedC.class, i++, Side.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(NetworkJailManagerC.MyMessageHandlerC.class, NetworkJailManagerC.class, i++, Side.CLIENT);
|
||||||
network.registerMessage(NetworkCriminalTrackerC.MyMessageHandlerC.class, NetworkCriminalTrackerC.class, i++, Side.CLIENT);
|
network.registerMessage(NetworkCriminalTrackerC.MyMessageHandlerC.class, NetworkCriminalTrackerC.class, i++, Side.CLIENT);
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package xamora.gp_dbc.utils;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import xamora.gp_dbc.network.client.NetworkDeleteItemC;
|
|
||||||
import xamora.gp_dbc.proxy.CommonProxy;
|
import xamora.gp_dbc.proxy.CommonProxy;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
@ -39,7 +38,8 @@ public class PlayerUtils {
|
||||||
else
|
else
|
||||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
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)
|
@SideOnly(Side.SERVER)
|
||||||
|
@ -56,14 +56,4 @@ public class PlayerUtils {
|
||||||
return world.getEntitiesWithinAABB(EntityPlayer.class, aabb);
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue