More Reworking

This commit is contained in:
Kam committed 2025-01-30 12:16:16 -05:00
1 parent a1f10db0de
commit 43b0e7c23b
10 files changed
+50 -54

No files matched your search

@@ -30,7 +30,6 @@ public final class PacketHandler {
public static final PacketChannel INFO_PACKET = new PacketChannel("CNPC+|Info", EnumPacketType.INFO);
public static final PacketChannel DATA_PACKET = new PacketChannel("CNPC+|Data", EnumPacketType.DATA);
public static final PacketChannel CLIENT_PACKET = new PacketChannel("CNPC+|Client", EnumPacketType.CLIENT);
public static final PacketChannel LARGE_PACKET = new PacketChannel("CNPC+|Large", EnumPacketType.LARGE);
private static final List<PacketChannel> packetChannels = new ArrayList<>();
@@ -39,23 +38,12 @@ public final class PacketHandler {
packetChannels.add(INFO_PACKET);
packetChannels.add(DATA_PACKET);
packetChannels.add(CLIENT_PACKET);
packetChannels.add(LARGE_PACKET);
this.registerChannels();
this.registerLargePackets();
this.registerClientPackets();
}
public void registerLargePackets(){
// Large Packets
LARGE_PACKET.registerPacket(new LargeScrollGroupPacket());
LARGE_PACKET.registerPacket(new LargeScrollDataPacket());
LARGE_PACKET.registerPacket(new LargeScrollListPacket());
LARGE_PACKET.registerPacket(new LargeSyncPacket());
LARGE_PACKET.registerPacket(new LargeGuiDataPacket());
LARGE_PACKET.registerPacket(new LargePartyDataPacket());
}
public void registerClientPackets(){
// Client Packets
CLIENT_PACKET.registerPacket(new AchievementPacket());
@@ -75,7 +63,6 @@ public final class PacketHandler {
CLIENT_PACKET.registerPacket(new VillagerListPacket());
// Client | GUI Packets
CLIENT_PACKET.registerPacket(new GuiClonerPacket());
CLIENT_PACKET.registerPacket(new GuiClosePacket());
CLIENT_PACKET.registerPacket(new GuiOpenPacket());
CLIENT_PACKET.registerPacket(new GuiErrorPacket());
@@ -83,7 +70,7 @@ public final class PacketHandler {
CLIENT_PACKET.registerPacket(new GuiTeleporterPacket());
CLIENT_PACKET.registerPacket(new GuiWaypointPacket());
CLIENT_PACKET.registerPacket(new IsGuiOpenPacket());
CLIENT_PACKET.registerPacket(new OpenBookPacket());
CLIENT_PACKET.registerPacket(new GuiOpenBookPacket());
// Client | NPC Packets
CLIENT_PACKET.registerPacket(new DeleteNpcPacket());
@@ -96,6 +83,15 @@ public final class PacketHandler {
CLIENT_PACKET.registerPacket(new ScriptedParticlePacket());
CLIENT_PACKET.registerPacket(new ScriptOverlayClosePacket());
CLIENT_PACKET.registerPacket(new ScriptOverlayDataPacket());
// Client | Large Packets
CLIENT_PACKET.registerPacket(new LargeClonerPacket());
CLIENT_PACKET.registerPacket(new LargeScrollGroupPacket());
CLIENT_PACKET.registerPacket(new LargeScrollDataPacket());
CLIENT_PACKET.registerPacket(new LargeScrollListPacket());
CLIENT_PACKET.registerPacket(new LargeSyncPacket());
CLIENT_PACKET.registerPacket(new LargeGuiDataPacket());
CLIENT_PACKET.registerPacket(new LargePartyDataPacket());
}
private void registerChannels() {
@@ -2,54 +2,56 @@ package kamkeel.npcs.network.enums;
// Packets to the Client
public enum EnumClientPacket {
// Synchronization
SYNC,
CONFIG_COMMAND,
// Messages
CHAT_ALERT,
ACHIEVEMENT,
CHATBUBBLE,
SOUND,
PARTY_MESSAGE,
SYNCRECIPES_ADD,
SYNCRECIPES_WORKBENCH,
DIALOG,
QUEST_COMPLETION,
// NPC
EDIT_NPC,
PLAY_SOUND,
PLAY_MUSIC,
UPDATE_NPC,
ROLE,
GUI,
SCRIPTED_PARTICLE,
PARTICLE,
ROLE_NPC,
DELETE_NPC,
CLONE_NPC,
// Data
SCROLL_LIST,
SCROLL_DATA,
SCROLL_GROUP,
SCROLL_SELECTED,
PARTY_DATA,
// GUI
GUI_OPEN,
GUI_REDSTONE,
GUI_WAYPOINT,
GUI_TELEPORTER,
GUI_BOOK,
GUI_DATA,
GUI_ERROR,
GUI_CLOSE,
VILLAGER_LIST,
CHATBUBBLE,
SYNCRECIPES_CARPENTRYBENCH,
CLONE,
TELEPORTER,
OPEN_BOOK,
CONFIG,
ISGUIOPEN,
SCRIPT_OVERLAY_DATA,
SCRIPT_OVERLAY_CLOSE,
SWING_PLAYER_ARM,
UPDATE_ITEM,
// Visual
SCRIPTED_PARTICLE,
PARTICLE,
PLAYER_UPDATE_SKIN_OVERLAYS,
UPDATE_ANIMATIONS,
SCRIPT_OVERLAY_DATA,
SCRIPT_OVERLAY_CLOSE,
OVERLAY_QUEST_TRACKING,
DISABLE_MOUSE_INPUT,
SYNC_WEAPON,
MARK_DATA,
SYNC_ADD, SYNC_END, SYNC_UPDATE, SYNC_REMOVE, SYNC_PLAYER,
SYNC_CONFIG,
DBC_FORM,
LARGE_NBT_PART, LARGE_NBT_END,
PARTY_DATA
// Other
VILLAGER_LIST,
SWING_PLAYER_ARM,
DISABLE_MOUSE_INPUT,
}
@@ -10,8 +10,6 @@ import kamkeel.npcs.network.enums.EnumClientPacket;
import kamkeel.npcs.network.enums.EnumConfigOperation;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.Server;
import noppes.npcs.client.ClientProxy;
import noppes.npcs.config.ConfigClient;
import noppes.npcs.client.ClientProxy.FontContainer;
@@ -34,7 +32,7 @@ public final class ConfigCommandPacket extends AbstractPacket {
@Override
public Enum getType() {
return EnumClientPacket.CONFIG;
return EnumClientPacket.CONFIG_COMMAND;
}
@Override
@@ -39,7 +39,7 @@ public final class LargePartyDataPacket extends LargeAbstractPacket {
@Override
public PacketChannel getChannel() {
return PacketHandler.LARGE_PACKET;
return PacketHandler.CLIENT_PACKET;
}
@Override
@@ -32,7 +32,7 @@ public final class LargeScrollDataPacket extends LargeAbstractPacket {
@Override
public PacketChannel getChannel() {
return PacketHandler.LARGE_PACKET;
return PacketHandler.CLIENT_PACKET;
}
@Override
@@ -31,7 +31,7 @@ public final class LargeScrollGroupPacket extends LargeAbstractPacket {
@Override
public PacketChannel getChannel() {
return PacketHandler.LARGE_PACKET;
return PacketHandler.CLIENT_PACKET;
}
@Override
@@ -31,7 +31,7 @@ public final class LargeScrollListPacket extends LargeAbstractPacket {
@Override
public PacketChannel getChannel() {
return PacketHandler.LARGE_PACKET;
return PacketHandler.CLIENT_PACKET;
}
@Override
@@ -47,7 +47,7 @@ public final class LargeSyncPacket extends LargeAbstractPacket {
@Override
public PacketChannel getChannel() {
return PacketHandler.LARGE_PACKET; // Or whichever channel you want.
return PacketHandler.CLIENT_PACKET;
}
@Override
@@ -30,7 +30,7 @@ public final class RolePacket extends AbstractPacket {
@Override
public Enum getType() {
return EnumClientPacket.ROLE;
return EnumClientPacket.ROLE_NPC;
}
@Override
@@ -1,5 +1,7 @@
package noppes.npcs.blocks;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.packets.client.gui.GuiOpenBookPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
@@ -10,9 +12,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import noppes.npcs.CustomItems;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.Server;
import noppes.npcs.blocks.tiles.TileBook;
import noppes.npcs.constants.EnumPacketClient;
public class BlockBook extends BlockRotated{
@@ -32,8 +32,8 @@ public class BlockBook extends BlockRotated{
if (currentItem != null && currentItem.getItem() == CustomItems.wand && CustomNpcsPermissions.hasPermission(player, CustomNpcsPermissions.EDIT_BOOK)) {
((TileBook)tile).book.func_150996_a(Items.writable_book);
}
Server.sendData((EntityPlayerMP)player, EnumPacketClient.OPEN_BOOK, i, j, k, ((TileBook)tile).book.writeToNBT(new NBTTagCompound()));
return true;
PacketHandler.Instance.sendToPlayer(new GuiOpenBookPacket(i, j, k, ((TileBook)tile).book.writeToNBT(new NBTTagCompound())), (EntityPlayerMP) player);
return true;
}
@Override