Full Refactor and Now it looks better 💯

This commit is contained in:
Kam committed 2025-02-20 00:41:45 -05:00
1 parent 98e886703c
commit e15e72d478
15 files changed
+1073 -1887

No files matched your search

@@ -53,7 +53,7 @@ import kamkeel.npcs.network.packets.request.npc.*;
import kamkeel.npcs.network.packets.request.party.*;
import kamkeel.npcs.network.packets.request.pather.MovingPathGetPacket;
import kamkeel.npcs.network.packets.request.pather.MovingPathSavePacket;
import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetPacket;
import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetNamesPacket;
import kamkeel.npcs.network.packets.request.playerdata.PlayerDataMapRegenPacket;
import kamkeel.npcs.network.packets.request.playerdata.PlayerDataRemovePacket;
import kamkeel.npcs.network.packets.request.profile.*;
@@ -82,9 +82,9 @@ import noppes.npcs.CustomNpcs;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.LogWriter;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.client.gui.test.PlayerDataGetPacketNew;
import noppes.npcs.client.gui.test.PlayerDataRemovePacketNew;
import noppes.npcs.client.gui.test.PlayerDataSendPacketNew;
import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetInfoPacket;
import kamkeel.npcs.network.packets.request.playerdata.PlayerDataRemoveInfoPacket;
import kamkeel.npcs.network.packets.data.PlayerDataInfoPacket;
import noppes.npcs.config.ConfigMain;
import noppes.npcs.entity.EntityNPCInterface;
@@ -230,12 +230,10 @@ public class PacketHandler {
// PlayerData Packets
REQUEST_PACKET.registerPacket(new PlayerDataGetPacket());
// REQUEST_PACKET.registerPacket(new PlayerDataRemovePacket());
REQUEST_PACKET.registerPacket(new PlayerDataGetPacketNew());
REQUEST_PACKET.registerPacket(new PlayerDataRemovePacketNew());
REQUEST_PACKET.registerPacket(new PlayerDataGetNamesPacket());
REQUEST_PACKET.registerPacket(new PlayerDataRemovePacket());
REQUEST_PACKET.registerPacket(new PlayerDataGetInfoPacket());
REQUEST_PACKET.registerPacket(new PlayerDataRemoveInfoPacket());
REQUEST_PACKET.registerPacket(new PlayerDataMapRegenPacket());
// Main Menu Packets
@@ -355,9 +353,6 @@ public class PacketHandler {
}
public void registerDataPackets(){
DATA_PACKET.registerPacket(new PlayerDataSendPacketNew());
// Data Packets
DATA_PACKET.registerPacket(new LoginPacket());
DATA_PACKET.registerPacket(new AchievementPacket());
@@ -375,6 +370,7 @@ public class PacketHandler {
DATA_PACKET.registerPacket(new SwingPlayerArmPacket());
DATA_PACKET.registerPacket(new UpdateAnimationsPacket());
DATA_PACKET.registerPacket(new VillagerListPacket());
DATA_PACKET.registerPacket(new PlayerDataInfoPacket());
// Data | GUI Packets
DATA_PACKET.registerPacket(new GuiClosePacket());
@@ -136,7 +136,9 @@ public enum EnumRequestPacket {
QuestCategoryGet,
PlayerDataGet,
PlayerDataInfo,
PlayerDataGetNames,
PlayerDataDelete,
PlayerDataRemove,
PlayerDataMapRegen,
@@ -186,5 +188,12 @@ public enum EnumRequestPacket {
ColorSet,
ColorBrush,
ProfileGet, ProfileGetAll, ProfileGetInfo, ProfileCreate, ProfileRemove, ProfileRename, ProfileChange, PlayerDataGetOld,
ProfileGet,
ProfileGetAll,
ProfileGetInfo,
ProfileCreate,
ProfileRemove,
ProfileRename,
ProfileChange
}
@@ -0,0 +1,103 @@
package kamkeel.npcs.network.packets.data;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import kamkeel.npcs.network.LargeAbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumDataPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.client.NoppesUtil;
import java.io.IOException;
import java.util.Map;
public final class PlayerDataInfoPacket extends LargeAbstractPacket {
public static final String packetName = "Large|PlayerDataSendNew";
private String playerName;
private Map<String, Integer> questCategories;
private Map<String, Integer> questActive;
private Map<String, Integer> questFinished;
private Map<String, Integer> dialogCategories;
private Map<String, Integer> dialogRead;
private Map<String, Integer> transportCategories;
private Map<String, Integer> transportLocations;
private Map<String, Integer> bankData;
private Map<String, Integer> factionData;
public PlayerDataInfoPacket() {}
public PlayerDataInfoPacket(String playerName,
Map<String, Integer> questCategories, Map<String, Integer> questActive, Map<String, Integer> questFinished,
Map<String, Integer> dialogCategories, Map<String, Integer> dialogRead,
Map<String, Integer> transportCategories, Map<String, Integer> transportLocations,
Map<String, Integer> bankData, Map<String, Integer> factionData) {
this.playerName = playerName;
this.questCategories = questCategories;
this.questActive = questActive;
this.questFinished = questFinished;
this.dialogCategories = dialogCategories;
this.dialogRead = dialogRead;
this.transportCategories = transportCategories;
this.transportLocations = transportLocations;
this.bankData = bankData;
this.factionData = factionData;
}
@Override
public Enum getType() {
return EnumDataPacket.PLAYER_DATA;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.DATA_PACKET;
}
@Override
protected byte[] getData() throws IOException {
ByteBuf buffer = Unpooled.buffer();
// Write player name:
ByteBufUtils.writeString(buffer, playerName);
// Write quest data maps:
writeMap(buffer, questCategories);
writeMap(buffer, questActive);
writeMap(buffer, questFinished);
// Write dialog data maps:
writeMap(buffer, dialogCategories);
writeMap(buffer, dialogRead);
// Write transport data maps:
writeMap(buffer, transportCategories);
writeMap(buffer, transportLocations);
// Write bank data map:
writeMap(buffer, bankData);
// Write faction data map:
writeMap(buffer, factionData);
byte[] bytes = new byte[buffer.readableBytes()];
buffer.readBytes(bytes);
return bytes;
}
private void writeMap(ByteBuf buffer, Map<String, Integer> map) {
if (map != null) {
buffer.writeInt(map.size());
for (Map.Entry<String, Integer> entry : map.entrySet()) {
ByteBufUtils.writeString(buffer, entry.getKey());
buffer.writeInt(entry.getValue());
}
} else {
buffer.writeInt(0);
}
}
@Override
protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
NoppesUtil.handlePlayerData(data, player);
}
}
@@ -0,0 +1,48 @@
package kamkeel.npcs.network.packets.request.playerdata;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.NoppesUtilServer;
import java.io.IOException;
public final class PlayerDataGetInfoPacket extends AbstractPacket {
public static final String packetName = "Request|PlayerDataGetNew";
private String playerName;
public PlayerDataGetInfoPacket() {}
public PlayerDataGetInfoPacket(String playerName) {
this.playerName = playerName;
}
@Override
public Enum getType() {
return EnumRequestPacket.PlayerDataInfo;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.REQUEST_PACKET;
}
@Override
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.writeString(out, playerName);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP))
return;
String playerName = ByteBufUtils.readString(in);
NoppesUtilServer.sendPlayerDataInfo(playerName, (EntityPlayerMP) player);
}
}
@@ -17,22 +17,22 @@ import noppes.npcs.constants.EnumPlayerData;
import java.io.IOException;
public final class PlayerDataGetPacket extends AbstractPacket {
public final class PlayerDataGetNamesPacket extends AbstractPacket {
public static String packetName = "Request|PlayerDataGet";
private EnumPlayerData playerData;
private String name;
public PlayerDataGetPacket() {}
public PlayerDataGetNamesPacket() {}
public PlayerDataGetPacket(EnumPlayerData playerData, String name) {
public PlayerDataGetNamesPacket(EnumPlayerData playerData, String name) {
this.playerData = playerData;
this.name = name;
}
@Override
public Enum getType() {
return EnumRequestPacket.PlayerDataGetOld;
return EnumRequestPacket.PlayerDataGetNames;
}
@Override
@@ -0,0 +1,57 @@
package kamkeel.npcs.network.packets.request.playerdata;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.constants.EnumPlayerData;
import java.io.IOException;
public final class PlayerDataRemoveInfoPacket extends AbstractPacket {
public static final String packetName = "Request|PlayerDataRemoveNew";
private String playerName;
private EnumPlayerData tabType;
private int value;
public PlayerDataRemoveInfoPacket() {}
public PlayerDataRemoveInfoPacket(String playerName, EnumPlayerData tabType, int selectedKey) {
this.playerName = playerName;
this.tabType = tabType;
this.value = selectedKey;
}
@Override
public Enum getType() {
return EnumRequestPacket.PlayerDataRemove;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.REQUEST_PACKET;
}
@Override
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.writeString(out, playerName);
out.writeInt(tabType.ordinal());
out.writeInt(this.value);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP))
return;
String playerName = ByteBufUtils.readString(in);
int tabType = in.readInt();
int value = in.readInt();
NoppesUtilServer.removePlayerDataInfo(playerName, tabType, value, (EntityPlayerMP) player);
}
}