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
}
@@ -1,4 +1,4 @@
package noppes.npcs.client.gui.test;
package kamkeel.npcs.network.packets.data;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@@ -8,10 +8,12 @@ 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 PlayerDataSendPacketNew extends LargeAbstractPacket {
public final class PlayerDataInfoPacket extends LargeAbstractPacket {
public static final String packetName = "Large|PlayerDataSendNew";
private String playerName;
@@ -28,13 +30,13 @@ public final class PlayerDataSendPacketNew extends LargeAbstractPacket {
private Map<String, Integer> bankData;
private Map<String, Integer> factionData;
public PlayerDataSendPacketNew() {}
public PlayerDataInfoPacket() {}
public PlayerDataSendPacketNew(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) {
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;
@@ -96,6 +98,6 @@ public final class PlayerDataSendPacketNew extends LargeAbstractPacket {
@Override
protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException {
NoppesUtilClientNew.handlePlayerData(data, player);
NoppesUtil.handlePlayerData(data, player);
}
}
@@ -1,4 +1,4 @@
package noppes.npcs.client.gui.test;
package kamkeel.npcs.network.packets.request.playerdata;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
@@ -8,22 +8,23 @@ 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 PlayerDataGetPacketNew extends AbstractPacket {
public final class PlayerDataGetInfoPacket extends AbstractPacket {
public static final String packetName = "Request|PlayerDataGetNew";
private String playerName;
public PlayerDataGetPacketNew() {}
public PlayerDataGetInfoPacket() {}
public PlayerDataGetPacketNew(String playerName) {
public PlayerDataGetInfoPacket(String playerName) {
this.playerName = playerName;
}
@Override
public Enum getType() {
return EnumRequestPacket.PlayerDataGet;
return EnumRequestPacket.PlayerDataInfo;
}
@Override
@@ -42,6 +43,6 @@ public final class PlayerDataGetPacketNew extends AbstractPacket {
return;
String playerName = ByteBufUtils.readString(in);
NoppesUtilServerNew.sendPlayerData(playerName, (EntityPlayerMP) player);
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
@@ -1,4 +1,4 @@
package noppes.npcs.client.gui.test;
package kamkeel.npcs.network.packets.request.playerdata;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
@@ -8,20 +8,21 @@ 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 PlayerDataRemovePacketNew extends AbstractPacket {
public final class PlayerDataRemoveInfoPacket extends AbstractPacket {
public static final String packetName = "Request|PlayerDataRemoveNew";
private String playerName;
private EnumPlayerData tabType;
private int value;
public PlayerDataRemovePacketNew() {}
public PlayerDataRemoveInfoPacket() {}
public PlayerDataRemovePacketNew(String playerName, EnumPlayerData tabType, int selectedKey) {
public PlayerDataRemoveInfoPacket(String playerName, EnumPlayerData tabType, int selectedKey) {
this.playerName = playerName;
this.tabType = tabType;
this.value = selectedKey;
@@ -51,6 +52,6 @@ public final class PlayerDataRemovePacketNew extends AbstractPacket {
String playerName = ByteBufUtils.readString(in);
int tabType = in.readInt();
int value = in.readInt();
NoppesUtilServerNew.removePlayerData(playerName, tabType, value, (EntityPlayerMP) player);
NoppesUtilServer.removePlayerDataInfo(playerName, tabType, value, (EntityPlayerMP) player);
}
}
@@ -3,6 +3,7 @@ package noppes.npcs;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.controllers.SyncController;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.packets.data.PlayerDataInfoPacket;
import kamkeel.npcs.network.packets.data.gui.GuiClosePacket;
import kamkeel.npcs.network.packets.data.gui.GuiErrorPacket;
import kamkeel.npcs.network.packets.data.gui.GuiOpenPacket;
@@ -975,4 +976,142 @@ public class NoppesUtilServer {
sb.append(seconds).append(" second").append(seconds == 1 ? "" : "s");
return sb.toString();
}
/**
* Retrieves the player's data from the existing PlayerDataController and sends
* a large packet to the client containing all the maps, including categories.
*/
public static void sendPlayerDataInfo(String playerName, EntityPlayerMP player) {
PlayerData playerdata;
EntityPlayer pl = MinecraftServer.getServer().getConfigurationManager().func_152612_a(playerName);
if(pl == null)
playerdata = PlayerDataController.Instance.getDataFromUsername(playerName);
else
playerdata = PlayerDataController.Instance.getPlayerData(pl);
// Assemble quest maps:
Map<String, Integer> questActiveMap = new HashMap<>();
Map<String, Integer> questFinishedMap = new HashMap<>();
Map<String, Integer> questCategoriesMap = new HashMap<>();
QuestController qc = QuestController.Instance;
PlayerQuestData qData = playerdata.questData;
for (Integer questId : qData.activeQuests.keySet()) {
if(!qc.quests.containsKey(questId))
continue;
Quest quest = qc.quests.get(questId);
questActiveMap.put(quest.category.title + ": " + quest.title, questId);
if (!questCategoriesMap.containsKey(quest.category.title))
questCategoriesMap.put(quest.category.title, quest.category.id);
}
for (Integer questId : qData.finishedQuests.keySet()) {
if(!qc.quests.containsKey(questId))
continue;
Quest quest = qc.quests.get(questId);
questFinishedMap.put(quest.category.title + ": " + quest.title, questId);
if (!questCategoriesMap.containsKey(quest.category.title))
questCategoriesMap.put(quest.category.title, quest.category.id);
}
// Assemble dialog maps:
Map<String, Integer> dialogReadMap = new HashMap<>();
Map<String, Integer> dialogCategoriesMap = new HashMap<>();
PlayerDialogData dData = playerdata.dialogData;
for (Integer dialogId : dData.dialogsRead) {
if(!DialogController.Instance.dialogs.containsKey(dialogId))
continue;
Dialog dialog = DialogController.Instance.dialogs.get(dialogId);
dialogReadMap.put(dialog.category.title + ": " + dialog.title, dialogId);
if (!dialogCategoriesMap.containsKey(dialog.category.title))
dialogCategoriesMap.put(dialog.category.title, dialog.category.id);
}
// Assemble transport maps:
Map<String, Integer> transportLocationsMap = new HashMap<>();
Map<String, Integer> transportCategoriesMap = new HashMap<>();
PlayerTransportData tData = playerdata.transportData;
TransportController tc = TransportController.getInstance();
for (Integer id : tData.transports) {
TransportLocation location = tc.getTransport(id);
if(location == null)
continue;
transportLocationsMap.put(location.category.title + ": " + location.name, id);
if (!transportCategoriesMap.containsKey(location.category.title))
transportCategoriesMap.put(location.category.title, location.category.id);
}
// Assemble bank map:
Map<String, Integer> bankMap = new HashMap<>();
PlayerBankData bData = playerdata.bankData;
BankController bc = BankController.getInstance();
for (Integer bankId : bData.banks.keySet()) {
if(!bc.banks.containsKey(bankId))
continue;
Bank bank = bc.banks.get(bankId);
bankMap.put(bank.name, bankId);
}
// Assemble faction map:
Map<String, Integer> factionMap = new HashMap<>();
PlayerFactionData fData = playerdata.factionData;
FactionController fc = FactionController.getInstance();
for (Integer factionId : fData.factionData.keySet()) {
if(!fc.factions.containsKey(factionId))
continue;
Faction faction = fc.factions.get(factionId);
factionMap.put(faction.name + "(" + fData.getFactionPoints(factionId) + ")", factionId);
}
// Send the full packet with categories, active/finished data, dialogs, transports, banks, and factions.
PlayerDataInfoPacket packet = new PlayerDataInfoPacket(playerName,
questCategoriesMap, questActiveMap, questFinishedMap,
dialogCategoriesMap, dialogReadMap,
transportCategoriesMap, transportLocationsMap,
bankMap, factionMap);
PacketHandler.Instance.sendToPlayer(packet, player);
}
/**
* Removes a specific data entry from the player's data.
*
* The tabType parameter is used as follows:
* 0: Quest – remove from both activeQuests and finishedQuests.
* 1: Dialog – remove from dialogsRead.
* 2: Transport – remove from transports.
* 3: Bank – remove from banks.
* 4: Factions – remove from factionData.
*
* The selectedKey is expected to be the string representation of the entry's ID.
*/
public static void removePlayerDataInfo(String playerName, int tabType, int value, EntityPlayerMP player) {
EntityPlayer pl = MinecraftServer.getServer().getConfigurationManager().func_152612_a(playerName);
PlayerData playerdata;
if(pl == null)
playerdata = PlayerDataController.Instance.getDataFromUsername(playerName);
else
playerdata = PlayerDataController.Instance.getPlayerData(pl);
if(tabType == 0) { // Quest removal
playerdata.questData.activeQuests.remove(value);
playerdata.questData.finishedQuests.remove(value);
}
if(tabType == 1) { // Dialog removal
playerdata.dialogData.dialogsRead.remove(value);
}
if(tabType == 2) { // Transport removal
playerdata.transportData.transports.remove(value);
}
if(tabType == 3) { // Bank removal
playerdata.bankData.banks.remove(value);
}
if(tabType == 4) { // Faction removal
playerdata.factionData.factionData.remove(value);
}
playerdata.save();
if(pl != null) {
SyncController.syncPlayer((EntityPlayerMP) pl);
}
// Resend the updated data to the client.
sendPlayerDataInfo(playerName, player);
}
}
@@ -17,6 +17,7 @@ import net.minecraft.util.Util;
import noppes.npcs.CustomNpcs;
import noppes.npcs.client.gui.player.GuiDialogInteract;
import noppes.npcs.client.gui.player.GuiQuestCompletion;
import noppes.npcs.client.gui.util.IPlayerDataInfo;
import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
import noppes.npcs.client.gui.util.GuiNPCInterface;
import noppes.npcs.client.gui.util.IScrollData;
@@ -32,6 +33,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
public class NoppesUtil {
@@ -258,4 +260,60 @@ public class NoppesUtil {
public static void isGUIOpen(boolean isGUIOpen) {
PacketClient.sendClient(new IsGuiOpenInform(isGUIOpen));
}
/**
* Handles the incoming large packet with full player data.
* The packet writes:
* - player name (String)
* - questCategories, questActive, questFinished (maps)
* - dialogCategories, dialogRead (maps)
* - transportCategories, transportLocations (maps)
* - bankData, factionData (maps)
*
* The existing PlayerDataController functions are used on the server side;
* here we simply update the active SubGuiPlayerDataNew if present.
*/
public static void handlePlayerData(ByteBuf data, EntityPlayer player) throws IOException {
String playerName = ByteBufUtils.readString(data);
Map<String, Integer> questCategories = readMap(data);
Map<String, Integer> questActive = readMap(data);
Map<String, Integer> questFinished = readMap(data);
Map<String, Integer> dialogCategories = readMap(data);
Map<String, Integer> dialogRead = readMap(data);
Map<String, Integer> transportCategories = readMap(data);
Map<String, Integer> transportLocations = readMap(data);
Map<String, Integer> bankData = readMap(data);
Map<String, Integer> factionData = readMap(data);
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if(gui == null)
return;
if(gui instanceof GuiNPCInterface && ((GuiNPCInterface)gui).hasSubGui()){
gui = (GuiScreen) ((GuiNPCInterface)gui).getSubGui();
}
if(gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface)gui).hasSubGui()){
gui = (GuiScreen) ((GuiContainerNPCInterface)gui).getSubGui();
}
if (gui instanceof IPlayerDataInfo) {
IPlayerDataInfo info = (IPlayerDataInfo) gui;
info.setQuestData(questCategories, questActive, questFinished);
info.setDialogData(dialogCategories, dialogRead);
info.setTransportData(transportCategories, transportLocations);
info.setBankData(bankData);
info.setFactionData(factionData);
}
}
private static Map<String, Integer> readMap(ByteBuf data) {
int size = data.readInt();
Map<String, Integer> map = new HashMap<>();
for (int i = 0; i < size; i++) {
String key = ByteBufUtils.readString(data);
int value = data.readInt();
map.put(key, value);
}
return map;
}
}
File diff suppressed because it is too large. Load diff
@@ -1,13 +1,12 @@
package noppes.npcs.client.gui.global;
import kamkeel.npcs.network.PacketClient;
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 net.minecraft.client.gui.GuiYesNo;
import net.minecraft.client.gui.GuiYesNoCallback;
import noppes.npcs.client.gui.SubGuiPlayerData;
import noppes.npcs.client.gui.test.SubGuiPlayerDataNew;
import noppes.npcs.client.gui.util.*;
import noppes.npcs.constants.EnumPlayerData;
import net.minecraft.util.StatCollector;
@@ -29,7 +28,7 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements GuiYesNo
public GuiNpcManagePlayerData(EntityNPCInterface npcInterface) {
super(npcInterface);
// Request the complete list of players.
PacketClient.sendClient(new PlayerDataGetPacket(EnumPlayerData.Players, ""));
PacketClient.sendClient(new PlayerDataGetNamesPacket(EnumPlayerData.Players, ""));
}
@Override
@@ -101,7 +100,7 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements GuiYesNo
}
if (id == 1) {
if (selectedPlayer != null) {
setSubGui(new SubGuiPlayerDataNew(selectedPlayer));
setSubGui(new SubGuiPlayerData(selectedPlayer));
}
}
if (id == 2) {
@@ -1,74 +0,0 @@
package noppes.npcs.client.gui.test;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.client.gui.util.GuiContainerNPCInterface;
import noppes.npcs.client.gui.util.GuiNPCInterface;
import noppes.npcs.client.gui.util.IScrollData;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
public class NoppesUtilClientNew {
/**
* Handles the incoming large packet with full player data.
* The packet writes:
* - player name (String)
* - questCategories, questActive, questFinished (maps)
* - dialogCategories, dialogRead (maps)
* - transportCategories, transportLocations (maps)
* - bankData, factionData (maps)
*
* The existing PlayerDataController functions are used on the server side;
* here we simply update the active SubGuiPlayerDataNew if present.
*/
public static void handlePlayerData(ByteBuf data, EntityPlayer player) throws IOException {
String playerName = ByteBufUtils.readString(data);
Map<String, Integer> questCategories = readMap(data);
Map<String, Integer> questActive = readMap(data);
Map<String, Integer> questFinished = readMap(data);
Map<String, Integer> dialogCategories = readMap(data);
Map<String, Integer> dialogRead = readMap(data);
Map<String, Integer> transportCategories = readMap(data);
Map<String, Integer> transportLocations = readMap(data);
Map<String, Integer> bankData = readMap(data);
Map<String, Integer> factionData = readMap(data);
GuiScreen gui = Minecraft.getMinecraft().currentScreen;
if(gui == null)
return;
if(gui instanceof GuiNPCInterface && ((GuiNPCInterface)gui).hasSubGui()){
gui = (GuiScreen) ((GuiNPCInterface)gui).getSubGui();
}
if(gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface)gui).hasSubGui()){
gui = (GuiScreen) ((GuiContainerNPCInterface)gui).getSubGui();
}
if (gui instanceof IPlayerDataInfo) {
IPlayerDataInfo info = (IPlayerDataInfo) gui;
info.setQuestData(questCategories, questActive, questFinished);
info.setDialogData(dialogCategories, dialogRead);
info.setTransportData(transportCategories, transportLocations);
info.setBankData(bankData);
info.setFactionData(factionData);
}
}
private static Map<String, Integer> readMap(ByteBuf data) {
int size = data.readInt();
Map<String, Integer> map = new HashMap<>();
for (int i = 0; i < size; i++) {
String key = ByteBufUtils.readString(data);
int value = data.readInt();
map.put(key, value);
}
return map;
}
}
@@ -1,155 +0,0 @@
package noppes.npcs.client.gui.test;
import kamkeel.npcs.controllers.SyncController;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import kamkeel.npcs.network.PacketHandler;
import noppes.npcs.controllers.*;
import noppes.npcs.controllers.data.*;
import noppes.npcs.config.ConfigMain;
import net.minecraft.nbt.NBTTagCompound;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
public class NoppesUtilServerNew {
/**
* Retrieves the player's data from the existing PlayerDataController and sends
* a large packet to the client containing all the maps, including categories.
*/
public static void sendPlayerData(String playerName, EntityPlayerMP player) {
PlayerData playerdata;
EntityPlayer pl = MinecraftServer.getServer().getConfigurationManager().func_152612_a(playerName);
if(pl == null)
playerdata = PlayerDataController.Instance.getDataFromUsername(playerName);
else
playerdata = PlayerDataController.Instance.getPlayerData(pl);
// Assemble quest maps:
Map<String, Integer> questActiveMap = new HashMap<>();
Map<String, Integer> questFinishedMap = new HashMap<>();
Map<String, Integer> questCategoriesMap = new HashMap<>();
QuestController qc = QuestController.Instance;
PlayerQuestData qData = playerdata.questData;
for (Integer questId : qData.activeQuests.keySet()) {
if(!qc.quests.containsKey(questId))
continue;
Quest quest = qc.quests.get(questId);
questActiveMap.put(quest.category.title + ": " + quest.title, questId);
if (!questCategoriesMap.containsKey(quest.category.title))
questCategoriesMap.put(quest.category.title, quest.category.id);
}
for (Integer questId : qData.finishedQuests.keySet()) {
if(!qc.quests.containsKey(questId))
continue;
Quest quest = qc.quests.get(questId);
questFinishedMap.put(quest.category.title + ": " + quest.title, questId);
if (!questCategoriesMap.containsKey(quest.category.title))
questCategoriesMap.put(quest.category.title, quest.category.id);
}
// Assemble dialog maps:
Map<String, Integer> dialogReadMap = new HashMap<>();
Map<String, Integer> dialogCategoriesMap = new HashMap<>();
PlayerDialogData dData = playerdata.dialogData;
for (Integer dialogId : dData.dialogsRead) {
if(!DialogController.Instance.dialogs.containsKey(dialogId))
continue;
Dialog dialog = DialogController.Instance.dialogs.get(dialogId);
dialogReadMap.put(dialog.category.title + ": " + dialog.title, dialogId);
if (!dialogCategoriesMap.containsKey(dialog.category.title))
dialogCategoriesMap.put(dialog.category.title, dialog.category.id);
}
// Assemble transport maps:
Map<String, Integer> transportLocationsMap = new HashMap<>();
Map<String, Integer> transportCategoriesMap = new HashMap<>();
PlayerTransportData tData = playerdata.transportData;
TransportController tc = TransportController.getInstance();
for (Integer id : tData.transports) {
TransportLocation location = tc.getTransport(id);
if(location == null)
continue;
transportLocationsMap.put(location.category.title + ": " + location.name, id);
if (!transportCategoriesMap.containsKey(location.category.title))
transportCategoriesMap.put(location.category.title, location.category.id);
}
// Assemble bank map:
Map<String, Integer> bankMap = new HashMap<>();
PlayerBankData bData = playerdata.bankData;
BankController bc = BankController.getInstance();
for (Integer bankId : bData.banks.keySet()) {
if(!bc.banks.containsKey(bankId))
continue;
Bank bank = bc.banks.get(bankId);
bankMap.put(bank.name, bankId);
}
// Assemble faction map:
Map<String, Integer> factionMap = new HashMap<>();
PlayerFactionData fData = playerdata.factionData;
FactionController fc = FactionController.getInstance();
for (Integer factionId : fData.factionData.keySet()) {
if(!fc.factions.containsKey(factionId))
continue;
Faction faction = fc.factions.get(factionId);
factionMap.put(faction.name + "(" + fData.getFactionPoints(factionId) + ")", factionId);
}
// Send the full packet with categories, active/finished data, dialogs, transports, banks, and factions.
PlayerDataSendPacketNew packet = new PlayerDataSendPacketNew(playerName,
questCategoriesMap, questActiveMap, questFinishedMap,
dialogCategoriesMap, dialogReadMap,
transportCategoriesMap, transportLocationsMap,
bankMap, factionMap);
PacketHandler.Instance.sendToPlayer(packet, player);
}
/**
* Removes a specific data entry from the player's data.
*
* The tabType parameter is used as follows:
* 0: Quest – remove from both activeQuests and finishedQuests.
* 1: Dialog – remove from dialogsRead.
* 2: Transport – remove from transports.
* 3: Bank – remove from banks.
* 4: Factions – remove from factionData.
*
* The selectedKey is expected to be the string representation of the entry's ID.
*/
public static void removePlayerData(String playerName, int tabType, int value, EntityPlayerMP player) {
EntityPlayer pl = MinecraftServer.getServer().getConfigurationManager().func_152612_a(playerName);
PlayerData playerdata;
if(pl == null)
playerdata = PlayerDataController.Instance.getDataFromUsername(playerName);
else
playerdata = PlayerDataController.Instance.getPlayerData(pl);
if(tabType == 0) { // Quest removal
playerdata.questData.activeQuests.remove(value);
playerdata.questData.finishedQuests.remove(value);
}
if(tabType == 1) { // Dialog removal
playerdata.dialogData.dialogsRead.remove(value);
}
if(tabType == 2) { // Transport removal
playerdata.transportData.transports.remove(value);
}
if(tabType == 3) { // Bank removal
playerdata.bankData.banks.remove(value);
}
if(tabType == 4) { // Faction removal
playerdata.factionData.factionData.remove(value);
}
playerdata.save();
if(pl != null) {
SyncController.syncPlayer((EntityPlayerMP) pl);
}
// Resend the updated data to the client.
sendPlayerData(playerName, player);
}
}
@@ -1,9 +0,0 @@
package noppes.npcs.client.gui.test;
public enum PlayerDataTab {
QUEST,
DIALOG,
TRANSPORT,
BANK,
FACTION;
}
@@ -1,864 +0,0 @@
package noppes.npcs.client.gui.test;
import kamkeel.npcs.network.PacketClient;
import noppes.npcs.client.CustomNpcResourceListener;
import noppes.npcs.client.gui.util.*;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.util.StatCollector;
import noppes.npcs.constants.EnumPlayerData;
import org.lwjgl.input.Mouse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class SubGuiPlayerDataNew extends SubGuiInterface implements IPlayerDataInfo, ICustomScrollListener {
// Tabs: 10 = Quest, 11 = Dialog, 12 = Transport, 13 = Bank, 14 = Faction.
private int currentTab = 10;
// View mode: 0 = Categorical (3 or 2 scrolls), 1 = Compact (2 or 1 scroll).
private int viewMode = 0;
// Quest Tab components:
protected GuiCustomScroll questCatScroll, questActiveScroll, questFinishedScroll;
private String questCatSearch = "", questActiveSearch = "", questFinishedSearch = "";
private HashMap<String, Integer> questCatData = new HashMap<>();
private HashMap<String, Integer> questActiveData = new HashMap<>();
private HashMap<String, Integer> questFinishedData = new HashMap<>();
private String selectedQuestCategory = "";
// Dialog Tab components:
protected GuiCustomScroll dialogCatScroll, dialogReadScroll, dialogCompactScroll;
private String dialogCatSearch = "", dialogReadSearch = "", dialogCompactSearch = "";
private HashMap<String, Integer> dialogCatData = new HashMap<>();
private HashMap<String, Integer> dialogReadData = new HashMap<>();
private String selectedDialogCategory = "";
// Transport Tab components:
protected GuiCustomScroll transCatScroll, transLocScroll, transCompactScroll;
private String transCatSearch = "", transLocSearch = "", transCompactSearch = "";
private HashMap<String, Integer> transCatData = new HashMap<>();
private HashMap<String, Integer> transLocData = new HashMap<>();
private String selectedTransCategory = "";
// Bank and Faction tabs – separate data and one scroll:
protected GuiCustomScroll singleScroll;
private String singleSearch = "";
private HashMap<String, Integer> bankData = new HashMap<>();
private HashMap<String, Integer> factionData = new HashMap<>();
// Divider/resizing variables for categorical mode.
// For Quest tab: in categorical mode we use 2 dividers (3 scrolls)
// In compact mode for Quests we use one divider between the two scrolls.
private int dividerOffset1 = 0; // In categorical: width of left scroll; in compact for quests: width of left scroll.
private int dividerOffset2 = 0; // Only for Quest categorical mode.
private final int dividerWidth = 5;
private final int minScrollWidth = 50;
private boolean isResizing = false;
private int resizingDivider = 0;
private int initialDragX = 0;
// Layout constants.
private final int leftPadding = 6;
private final int rightPadding = 6;
private final int scrollTopOffset = 30;
private final int verticalGapAboveTF = 3;
private final int textFieldHeight = 20;
private final int verticalGapBelowTF = 3;
// The player name for which we are displaying data.
private String playerName;
public SubGuiPlayerDataNew(String playerName) {
this.playerName = playerName;
xSize = 420;
ySize = 215;
setBackground("menubg.png");
closeOnEsc = true;
PacketClient.sendClient(new PlayerDataGetPacketNew(playerName));
}
@Override
public void handleMouseInput() {
super.handleMouseInput();
}
@Override
public void initGui() {
super.initGui();
// Top tab buttons:
GuiMenuTopButton btnQuest = new GuiMenuTopButton(10, guiLeft + 4, guiTop - 10, StatCollector.translateToLocal("tab.quests"));
GuiMenuTopButton btnDialog = new GuiMenuTopButton(11, btnQuest.xPosition + btnQuest.getWidth(), guiTop - 10, StatCollector.translateToLocal("tab.dialog"));
GuiMenuTopButton btnTransport = new GuiMenuTopButton(12, btnDialog.xPosition + btnDialog.getWidth(), guiTop - 10, StatCollector.translateToLocal("tab.transport"));
GuiMenuTopButton btnBank = new GuiMenuTopButton(13, btnTransport.xPosition + btnTransport.getWidth(), guiTop - 10, StatCollector.translateToLocal("tab.bank"));
GuiMenuTopButton btnFaction = new GuiMenuTopButton(14, btnBank.xPosition + btnBank.getWidth(), guiTop - 10, StatCollector.translateToLocal("tab.faction"));
GuiMenuTopButton close = new GuiMenuTopButton(-5, guiLeft + xSize - 22, guiTop - 10, "X");
btnQuest.active = (currentTab == 10);
btnDialog.active = (currentTab == 11);
btnTransport.active = (currentTab == 12);
btnBank.active = (currentTab == 13);
btnFaction.active = (currentTab == 14);
addTopButton(btnQuest);
addTopButton(btnDialog);
addTopButton(btnTransport);
addTopButton(btnBank);
addTopButton(btnFaction);
addTopButton(close);
// Mode toggle button (50px wide)
if (currentTab == 10 || currentTab == 11 || currentTab == 12) {
String modeText = viewMode == 0 ? StatCollector.translateToLocal("view.categorical") : StatCollector.translateToLocal("view.compact");
addButton(new GuiNpcButton(20, guiLeft + xSize - 60, guiTop + 10, 50, 20, modeText));
}
guiTop += 7;
// Initialize components for the current tab:
switch (currentTab) {
case 10: initQuestTab(); break;
case 11: initDialogTab(); break;
case 12: initTransportTab(); break;
case 13:
case 14: initSingleTab(); break;
}
// Delete button (50px wide)
addButton(new GuiNpcButton(30, guiLeft + xSize - 60, guiTop + ySize - 30, 50, 20, StatCollector.translateToLocal("button.delete")));
}
private int getScrollHeight() {
return ySize - (scrollTopOffset + verticalGapAboveTF + textFieldHeight + verticalGapBelowTF);
}
private int getTextFieldY() {
return guiTop + scrollTopOffset + getScrollHeight() + verticalGapAboveTF;
}
// Init Quest Tab.
private void initQuestTab() {
int regionLeft = guiLeft + leftPadding;
int regionRight = guiLeft + xSize - rightPadding;
int availableWidth = regionRight - regionLeft;
int scrollHeight = getScrollHeight();
if (viewMode == 0) { // Categorical: 3 scrolls.
if (!isResizing) {
dividerOffset1 = (availableWidth - 2 * dividerWidth) / 3;
dividerOffset2 = dividerOffset1 + dividerWidth + (availableWidth - 2 * dividerWidth) / 3;
}
if (questCatScroll == null) questCatScroll = new GuiCustomScroll(this, 0, 0);
questCatScroll.guiLeft = regionLeft;
questCatScroll.guiTop = guiTop + scrollTopOffset;
questCatScroll.setSize(dividerOffset1, scrollHeight);
questCatScroll.setList(new ArrayList<>(questCatData.keySet()));
questCatScroll.selected = -1;
questCatSearch = "";
addScroll(questCatScroll);
addLabel(new GuiNpcLabel(1000, "Categories", regionLeft, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
if (questFinishedScroll == null) questFinishedScroll = new GuiCustomScroll(this, 1, 0);
questFinishedScroll.guiLeft = regionLeft + dividerOffset1 + dividerWidth;
questFinishedScroll.guiTop = guiTop + scrollTopOffset;
questFinishedScroll.setSize(dividerOffset2 - dividerOffset1 - dividerWidth, scrollHeight);
questFinishedScroll.setList(new ArrayList<>());
questFinishedScroll.selected = -1;
questFinishedSearch = "";
addScroll(questFinishedScroll);
addLabel(new GuiNpcLabel(1001, "Finished", regionLeft + dividerOffset1 + dividerWidth, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
if (questActiveScroll == null)
questActiveScroll = new GuiCustomScroll(this, 2, 0);
questActiveScroll.guiLeft = regionLeft + dividerOffset2 + dividerWidth;
questActiveScroll.guiTop = guiTop + scrollTopOffset;
questActiveScroll.setSize(regionRight - (regionLeft + dividerOffset2 + dividerWidth), scrollHeight);
questActiveScroll.setList(new ArrayList<>());
questActiveScroll.selected = -1;
questActiveSearch = "";
addScroll(questActiveScroll);
addLabel(new GuiNpcLabel(1002, "Active", regionLeft + dividerOffset2 + dividerWidth, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
addTextField(new GuiNpcTextField(55, this, fontRendererObj, regionLeft, getTextFieldY(), dividerOffset1, textFieldHeight, questCatSearch));
addTextField(new GuiNpcTextField(56, this, fontRendererObj, regionLeft + dividerOffset1 + dividerWidth, getTextFieldY(), dividerOffset2 - dividerOffset1 - dividerWidth, textFieldHeight, questFinishedSearch));
addTextField(new GuiNpcTextField(57, this, fontRendererObj, regionLeft + dividerOffset2 + dividerWidth, getTextFieldY(), regionRight - (regionLeft + dividerOffset2 + dividerWidth), textFieldHeight, questActiveSearch));
} else { // Compact: 2 scrolls with resizable divider.
// Default divider for compact mode.
if (!isResizing) {
dividerOffset1 = (availableWidth - dividerWidth) / 2;
}
if (questFinishedScroll == null) questFinishedScroll = new GuiCustomScroll(this, 1, 0);
questFinishedScroll.guiLeft = regionLeft;
questFinishedScroll.guiTop = guiTop + scrollTopOffset;
questFinishedScroll.setSize(dividerOffset1, scrollHeight);
questFinishedScroll.setList(new ArrayList<>(questFinishedData.keySet()));
questFinishedSearch = "";
addScroll(questFinishedScroll);
addLabel(new GuiNpcLabel(1003, "Finished", regionLeft, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
if (questActiveScroll == null) questActiveScroll = new GuiCustomScroll(this, 2, 0);
questActiveScroll.guiLeft = regionLeft + dividerOffset1 + dividerWidth;
questActiveScroll.guiTop = guiTop + scrollTopOffset;
questActiveScroll.setSize(availableWidth - dividerOffset1 - dividerWidth, scrollHeight);
questActiveScroll.setList(new ArrayList<>(questActiveData.keySet()));
questActiveSearch = "";
addScroll(questActiveScroll);
addLabel(new GuiNpcLabel(1004, "Active", regionLeft + dividerOffset1 + dividerWidth, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
addTextField(new GuiNpcTextField(55, this, fontRendererObj, regionLeft, getTextFieldY(), dividerOffset1, textFieldHeight, questFinishedSearch));
addTextField(new GuiNpcTextField(56, this, fontRendererObj, regionLeft + dividerOffset1 + dividerWidth, getTextFieldY(), availableWidth - dividerOffset1 - dividerWidth, textFieldHeight, questActiveSearch));
}
}
private void initDialogTab() {
int regionLeft = guiLeft + leftPadding;
int regionRight = guiLeft + xSize - rightPadding;
int availableWidth = regionRight - regionLeft;
int scrollHeight = getScrollHeight();
if (viewMode == 0) { // Categorical: 2 scrolls.
if (!isResizing) {
dividerOffset1 = (availableWidth - dividerWidth) / 2;
}
if (dialogCatScroll == null) dialogCatScroll = new GuiCustomScroll(this, 0, 0);
dialogCatScroll.guiLeft = regionLeft;
dialogCatScroll.guiTop = guiTop + scrollTopOffset;
dialogCatScroll.setSize(dividerOffset1, scrollHeight);
dialogCatScroll.setList(new ArrayList<>(dialogCatData.keySet()));
addScroll(dialogCatScroll);
addLabel(new GuiNpcLabel(2000, "Categories", regionLeft, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
if (dialogReadScroll == null) dialogReadScroll = new GuiCustomScroll(this, 1, 0);
dialogReadScroll.guiLeft = regionLeft + dividerOffset1 + dividerWidth;
dialogReadScroll.guiTop = guiTop + scrollTopOffset;
dialogReadScroll.setSize(availableWidth - dividerOffset1 - dividerWidth, scrollHeight);
dialogReadScroll.setList(new ArrayList<>(dialogReadData.keySet()));
addScroll(dialogReadScroll);
addLabel(new GuiNpcLabel(2001, "Read", regionLeft + dividerOffset1 + dividerWidth, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
addTextField(new GuiNpcTextField(55, this, fontRendererObj, regionLeft, getTextFieldY(), dividerOffset1, textFieldHeight, dialogCatSearch));
addTextField(new GuiNpcTextField(56, this, fontRendererObj, regionLeft + dividerOffset1 + dividerWidth, getTextFieldY(), availableWidth - dividerOffset1 - dividerWidth, textFieldHeight, dialogReadSearch));
} else { // Compact: 1 scroll – no divider.
if (dialogCompactScroll == null) dialogCompactScroll = new GuiCustomScroll(this, 5, 0);
dialogCompactScroll.guiLeft = regionLeft;
dialogCompactScroll.guiTop = guiTop + scrollTopOffset;
dialogCompactScroll.setSize(availableWidth, scrollHeight);
dialogCompactScroll.setList(new ArrayList<>(dialogReadData.keySet()));
addScroll(dialogCompactScroll);
addLabel(new GuiNpcLabel(2002, "All", regionLeft, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
addTextField(new GuiNpcTextField(55, this, fontRendererObj, regionLeft, getTextFieldY(), availableWidth, textFieldHeight, dialogCompactSearch));
}
}
private void initTransportTab() {
int regionLeft = guiLeft + leftPadding;
int regionRight = guiLeft + xSize - rightPadding;
int availableWidth = regionRight - regionLeft;
int scrollHeight = getScrollHeight();
if (viewMode == 0) { // Categorical: 2 scrolls.
if (!isResizing) {
dividerOffset1 = (availableWidth - dividerWidth) / 2;
}
if (transCatScroll == null) transCatScroll = new GuiCustomScroll(this, 3, 0);
transCatScroll.guiLeft = regionLeft;
transCatScroll.guiTop = guiTop + scrollTopOffset;
transCatScroll.setSize(dividerOffset1, scrollHeight);
transCatScroll.setList(new ArrayList<>(transCatData.keySet()));
addScroll(transCatScroll);
addLabel(new GuiNpcLabel(3000, "Categories", regionLeft, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
if (transLocScroll == null) transLocScroll = new GuiCustomScroll(this, 4, 0);
transLocScroll.guiLeft = regionLeft + dividerOffset1 + dividerWidth;
transLocScroll.guiTop = guiTop + scrollTopOffset;
transLocScroll.setSize(availableWidth - dividerOffset1 - dividerWidth, scrollHeight);
transLocScroll.setList(new ArrayList<>(transLocData.keySet()));
addScroll(transLocScroll);
addLabel(new GuiNpcLabel(3001, "Locations", regionLeft + dividerOffset1 + dividerWidth, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
addTextField(new GuiNpcTextField(60, this, fontRendererObj, regionLeft, getTextFieldY(), dividerOffset1, textFieldHeight, transCatSearch));
addTextField(new GuiNpcTextField(61, this, fontRendererObj, regionLeft + dividerOffset1 + dividerWidth, getTextFieldY(), availableWidth - dividerOffset1 - dividerWidth, textFieldHeight, transLocSearch));
} else { // Compact: 1 scroll – no divider.
if (transCompactScroll == null) transCompactScroll = new GuiCustomScroll(this, 5, 0);
transCompactScroll.guiLeft = regionLeft;
transCompactScroll.guiTop = guiTop + scrollTopOffset;
transCompactScroll.setSize(availableWidth, scrollHeight);
transCompactScroll.setList(new ArrayList<>(transLocData.keySet()));
addScroll(transCompactScroll);
addLabel(new GuiNpcLabel(3002, "All", regionLeft, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
addTextField(new GuiNpcTextField(60, this, fontRendererObj, regionLeft, getTextFieldY(), availableWidth, textFieldHeight, transCompactSearch));
}
}
private void initSingleTab() {
int regionLeft = guiLeft + leftPadding;
int regionRight = guiLeft + xSize - rightPadding;
int availableWidth = regionRight - regionLeft;
int scrollHeight = getScrollHeight();
if (singleScroll == null) singleScroll = new GuiCustomScroll(this, 0, 0);
singleScroll.guiLeft = regionLeft;
singleScroll.guiTop = guiTop + scrollTopOffset;
if (currentTab == 13) {
singleScroll.setSize(availableWidth, scrollHeight);
singleScroll.setList(new ArrayList<>(bankData.keySet()));
addLabel(new GuiNpcLabel(4000, "Bank", regionLeft, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
} else {
singleScroll.setSize(availableWidth, scrollHeight);
singleScroll.setList(new ArrayList<>(factionData.keySet()));
addLabel(new GuiNpcLabel(4000, "Faction", regionLeft, guiTop + 15, CustomNpcResourceListener.DefaultTextColor));
}
addScroll(singleScroll);
addTextField(new GuiNpcTextField(70, this, fontRendererObj, regionLeft, getTextFieldY(), availableWidth, textFieldHeight, singleSearch));
}
@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
super.drawScreen(mouseX, mouseY, partialTicks);
int scrollHeight = getScrollHeight();
int regionLeft = guiLeft + leftPadding;
int regionRight = guiLeft + xSize - rightPadding;
int availableWidth = regionRight - regionLeft;
// In compact mode for Quests (2-scroll) draw divider.
if (currentTab == 10 && viewMode != 0 && !hasSubGui()) {
int dividerX = regionLeft + dividerOffset1;
drawRect(dividerX, guiTop + scrollTopOffset, dividerX + dividerWidth, guiTop + scrollTopOffset + scrollHeight, 0xFF707070);
}
// In categorical mode, draw dividers.
if (currentTab == 10 && viewMode == 0 && !hasSubGui()) {
int dividerX1 = regionLeft + dividerOffset1;
int dividerX2 = regionLeft + dividerOffset2;
drawRect(dividerX1, guiTop + scrollTopOffset, dividerX1 + dividerWidth, guiTop + scrollTopOffset + scrollHeight, 0xFF707070);
drawRect(dividerX2, guiTop + scrollTopOffset, dividerX2 + dividerWidth, guiTop + scrollTopOffset + scrollHeight, 0xFF707070);
} else if ((currentTab == 11 || currentTab == 12) && viewMode == 0 && !hasSubGui()) {
int dividerX = regionLeft + dividerOffset1;
drawRect(dividerX, guiTop + scrollTopOffset, dividerX + dividerWidth, guiTop + scrollTopOffset + scrollHeight, 0xFF707070);
}
// Do not draw any divider for compact mode in Dialog/Transport.
}
@Override
public void mouseClicked(int mouseX, int mouseY, int mouseButton) {
int hitMargin = 3;
int regionTop = guiTop + scrollTopOffset;
int regionBottom = regionTop + getScrollHeight();
int regionLeft = guiLeft + leftPadding;
int availableWidth = (guiLeft + xSize - rightPadding) - regionLeft;
if (!hasSubGui() && mouseY >= regionTop && mouseY <= regionBottom) {
if (viewMode == 0) {
if (currentTab == 10) { // Categorical: 3 scrolls.
int dividerX1 = regionLeft + dividerOffset1;
int dividerX2 = regionLeft + dividerOffset2;
if (mouseX >= dividerX1 - hitMargin && mouseX <= dividerX1 + dividerWidth + hitMargin) {
isResizing = true;
resizingDivider = 1;
initialDragX = mouseX;
return;
} else if (mouseX >= dividerX2 - hitMargin && mouseX <= dividerX2 + dividerWidth + hitMargin) {
isResizing = true;
resizingDivider = 2;
initialDragX = mouseX;
return;
}
} else if (currentTab == 11 || currentTab == 12) { // Categorical for Dialog/Transport.
int dividerX = regionLeft + dividerOffset1;
if (mouseX >= dividerX - hitMargin && mouseX <= dividerX + dividerWidth + hitMargin) {
isResizing = true;
resizingDivider = 1;
initialDragX = mouseX;
return;
}
}
} else { // Compact mode.
if (currentTab == 10) { // Compact mode for Quests (2 scrolls)
// Use dividerOffset1 as the divider between the two scrolls.
int defaultWidth = (availableWidth - dividerWidth) / 2;
if (!isResizing) dividerOffset1 = defaultWidth;
int dividerX = regionLeft + dividerOffset1;
if (mouseX >= dividerX - hitMargin && mouseX <= dividerX + dividerWidth + hitMargin) {
isResizing = true;
resizingDivider = 1;
initialDragX = mouseX;
return;
}
}
// For Dialog/Transport compact, there's no divider.
}
}
super.mouseClicked(mouseX, mouseY, mouseButton);
}
@Override
public void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
int regionLeft = guiLeft + leftPadding;
int regionRight = guiLeft + xSize - rightPadding;
int availableWidth = regionRight - regionLeft;
if (isResizing) {
int dx = mouseX - initialDragX;
initialDragX = mouseX;
// For Quest tab:
if (currentTab == 10) {
if (viewMode == 0) { // Categorical (3 scrolls)
if (resizingDivider == 1) {
dividerOffset1 += dx;
int maxOffset = dividerOffset2 - dividerWidth - minScrollWidth;
if (dividerOffset1 < minScrollWidth) dividerOffset1 = minScrollWidth;
if (dividerOffset1 > maxOffset) dividerOffset1 = maxOffset;
questCatScroll.setSize(dividerOffset1, getScrollHeight());
questFinishedScroll.guiLeft = regionLeft + dividerOffset1 + dividerWidth;
questFinishedScroll.setSize(dividerOffset2 - dividerOffset1 - dividerWidth, getScrollHeight());
questActiveScroll.guiLeft = regionLeft + dividerOffset2 + dividerWidth;
questActiveScroll.setSize(availableWidth - (dividerOffset2 + dividerWidth), getScrollHeight());
// Update textfields and labels.
GuiNpcTextField tf55 = getTextField(55);
if(tf55 != null) { tf55.xPosition = regionLeft; tf55.width = dividerOffset1; }
GuiNpcTextField tf56 = getTextField(56);
if(tf56 != null) { tf56.xPosition = regionLeft + dividerOffset1 + dividerWidth; tf56.width = dividerOffset2 - dividerOffset1 - dividerWidth; }
GuiNpcTextField tf57 = getTextField(57);
if(tf57 != null) { tf57.xPosition = regionLeft + dividerOffset2 + dividerWidth; tf57.width = availableWidth - (dividerOffset2 + dividerWidth); }
GuiNpcLabel lbl1000 = getLabel(1000);
if(lbl1000 != null) { lbl1000.x = regionLeft; }
GuiNpcLabel lbl1001 = getLabel(1001);
if(lbl1001 != null) { lbl1001.x = regionLeft + dividerOffset1 + dividerWidth; }
GuiNpcLabel lbl1002 = getLabel(1002);
if(lbl1002 != null) { lbl1002.x = regionLeft + dividerOffset2 + dividerWidth; }
} else if (resizingDivider == 2) {
dividerOffset2 += dx;
int minOffset = dividerOffset1 + dividerWidth + minScrollWidth;
int maxOffset = availableWidth - minScrollWidth;
if (dividerOffset2 < minOffset) dividerOffset2 = minOffset;
if (dividerOffset2 > maxOffset) dividerOffset2 = maxOffset;
questFinishedScroll.setSize(dividerOffset2 - dividerOffset1 - dividerWidth, getScrollHeight());
questActiveScroll.guiLeft = regionLeft + dividerOffset2 + dividerWidth;
questActiveScroll.setSize(availableWidth - (dividerOffset2 + dividerWidth), getScrollHeight());
GuiNpcTextField tf56 = getTextField(56);
if(tf56 != null) { tf56.xPosition = regionLeft + dividerOffset1 + dividerWidth; tf56.width = dividerOffset2 - dividerOffset1 - dividerWidth; }
GuiNpcTextField tf57 = getTextField(57);
if(tf57 != null) { tf57.xPosition = regionLeft + dividerOffset2 + dividerWidth; tf57.width = availableWidth - (dividerOffset2 + dividerWidth); }
GuiNpcLabel lbl1001 = getLabel(1001);
if(lbl1001 != null) { lbl1001.x = regionLeft + dividerOffset1 + dividerWidth; }
GuiNpcLabel lbl1002 = getLabel(1002);
if(lbl1002 != null) { lbl1002.x = regionLeft + dividerOffset2 + dividerWidth; }
}
} else { // Compact mode for Quests (2 scrolls)
if (resizingDivider == 1) {
dividerOffset1 += dx;
if (dividerOffset1 < minScrollWidth) dividerOffset1 = minScrollWidth;
if (dividerOffset1 > availableWidth - dividerWidth - minScrollWidth)
dividerOffset1 = availableWidth - dividerWidth - minScrollWidth;
questFinishedScroll.setSize(dividerOffset1, getScrollHeight());
questActiveScroll.guiLeft = regionLeft + dividerOffset1 + dividerWidth;
questActiveScroll.setSize(availableWidth - dividerOffset1 - dividerWidth, getScrollHeight());
// Update textfields and labels.
GuiNpcTextField tf55 = getTextField(55);
if(tf55 != null) { tf55.xPosition = regionLeft; tf55.width = dividerOffset1; }
GuiNpcTextField tf56 = getTextField(56);
if(tf56 != null) { tf56.xPosition = regionLeft + dividerOffset1 + dividerWidth; tf56.width = availableWidth - dividerOffset1 - dividerWidth; }
GuiNpcLabel lbl1003 = getLabel(1003);
if(lbl1003 != null) { lbl1003.x = regionLeft; }
GuiNpcLabel lbl1004 = getLabel(1004);
if(lbl1004 != null) { lbl1004.x = regionLeft + dividerOffset1 + dividerWidth; }
}
}
}
return;
}
super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
}
@Override
protected void mouseMovedOrUp(int mouseX, int mouseY, int state) {
if (isResizing) {
isResizing = false;
resizingDivider = 0;
return;
}
super.mouseMovedOrUp(mouseX, mouseY, state);
}
@Override
public void keyTyped(char c, int i) {
super.keyTyped(c, i);
GuiNpcTextField tf;
if (currentTab == 10) {
if (viewMode == 0) {
tf = getTextField(55);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!questCatSearch.equals(newText)) {
questCatSearch = newText;
if (questCatScroll != null) {
if (selectedQuestCategory.isEmpty())
questCatScroll.setList(new ArrayList<>());
else
questCatScroll.setList(filterList(questCatData, questCatSearch));
}
}
}
tf = getTextField(56);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!questFinishedSearch.equals(newText)) {
questFinishedSearch = newText;
if (questFinishedScroll != null)
questFinishedScroll.setList(
selectedQuestCategory.isEmpty() ?
new ArrayList<>() :
filterAndTrimListByCategory(questFinishedData, selectedQuestCategory, questFinishedSearch)
);
}
}
tf = getTextField(57);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!questActiveSearch.equals(newText)) {
questActiveSearch = newText;
if (questActiveScroll != null)
questActiveScroll.setList(
selectedQuestCategory.isEmpty() ?
new ArrayList<>() :
filterAndTrimListByCategory(questActiveData, selectedQuestCategory, questActiveSearch)
);
}
}
} else {
tf = getTextField(55);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!questFinishedSearch.equals(newText)) {
questFinishedSearch = newText;
if (questFinishedScroll != null)
questFinishedScroll.setList(filterList(questFinishedData, questFinishedSearch));
}
}
tf = getTextField(56);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!questActiveSearch.equals(newText)) {
questActiveSearch = newText;
if (questActiveScroll != null)
questActiveScroll.setList(filterList(questActiveData, questActiveSearch));
}
}
}
} else if (currentTab == 11) {
if (viewMode == 0) {
tf = getTextField(55);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!dialogCatSearch.equals(newText)) {
dialogCatSearch = newText;
if (dialogCatScroll != null)
dialogCatScroll.setList(selectedDialogCategory.isEmpty() ?
new ArrayList<>() :
filterList(dialogCatData, dialogCatSearch));
}
}
tf = getTextField(56);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!dialogReadSearch.equals(newText)) {
dialogReadSearch = newText;
if (dialogReadScroll != null)
dialogReadScroll.setList(
selectedDialogCategory.isEmpty() ?
new ArrayList<>() :
filterAndTrimListByCategory(dialogReadData, selectedDialogCategory, dialogReadSearch)
);
}
}
} else {
tf = getTextField(55);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!dialogCompactSearch.equals(newText)) {
dialogCompactSearch = newText;
if (dialogCompactScroll != null)
dialogCompactScroll.setList(filterList(dialogReadData, dialogCompactSearch));
}
}
}
} else if (currentTab == 12) {
if (viewMode == 0) {
tf = getTextField(60);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!transCatSearch.equals(newText)) {
transCatSearch = newText;
if (transCatScroll != null)
transCatScroll.setList(selectedTransCategory.isEmpty() ?
new ArrayList<>() :
filterList(transCatData, transCatSearch));
}
}
tf = getTextField(61);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!transLocSearch.equals(newText)) {
transLocSearch = newText;
if (transLocScroll != null)
transLocScroll.setList(
selectedTransCategory.isEmpty() ?
new ArrayList<>() :
filterAndTrimListByCategory(transLocData, selectedTransCategory, transLocSearch)
);
}
}
} else {
tf = getTextField(60);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!transCompactSearch.equals(newText)) {
transCompactSearch = newText;
if (transCompactScroll != null)
transCompactScroll.setList(filterList(transLocData, transCompactSearch));
}
}
}
} else if (currentTab == 13 || currentTab == 14) {
tf = getTextField(70);
if (tf != null && tf.isFocused()) {
String newText = tf.getText().toLowerCase();
if (!singleSearch.equals(newText)) {
singleSearch = newText;
if (singleScroll != null)
singleScroll.setList(filterList(currentTab == 13 ? bankData : factionData, singleSearch));
}
}
}
}
private List<String> filterList(HashMap<String, Integer> data, String search) {
List<String> list = new ArrayList<>();
for (String key : data.keySet()) {
if (key.toLowerCase().contains(search)) {
list.add(key);
}
}
return list;
}
private List<String> filterAndTrimListByCategory(HashMap<String, Integer> data, String category, String search) {
List<String> list = new ArrayList<>();
String prefix = category + ":";
for (String key : data.keySet()) {
if (key.startsWith(prefix)) {
String trimmed = key.substring(prefix.length()).trim();
if (trimmed.toLowerCase().contains(search)) {
list.add(trimmed);
}
}
}
return list;
}
@Override
public void actionPerformed(GuiButton button) {
if(button.id == -5){
close();
return;
}
if (button.id >= 10 && button.id <= 14) {
currentTab = button.id;
initGui();
return;
}
if (button.id == 20) {
viewMode = (viewMode == 0) ? 1 : 0;
initGui();
} else if (button.id == 30) {
Integer selectedID = null;
EnumPlayerData tabType = null;
if (currentTab == 10) {
if(viewMode == 0){
if(questCatScroll.getSelected() == null)
return;
if (questActiveScroll.getSelected() != null) {
selectedID = questActiveData.get(questCatScroll.getSelected() + ": " + questActiveScroll.getSelected());
if(selectedID != null){
questActiveScroll.list.remove(questActiveScroll.selected);
questActiveData.remove(questCatScroll.getSelected() + ": " + questActiveScroll.getSelected());
}
tabType = EnumPlayerData.Quest;
} else if (questFinishedScroll.getSelected() != null) {
selectedID = questFinishedData.get(questCatScroll.getSelected() + ": " + questFinishedScroll.getSelected());
if(selectedID != null){
questFinishedScroll.list.remove(questFinishedScroll.selected);
questFinishedData.remove(questCatScroll.getSelected() + ": " + questFinishedScroll.getSelected());
}
tabType = EnumPlayerData.Quest;
}
} else {
if (questActiveScroll.getSelected() != null) {
selectedID = questActiveData.get(questActiveScroll.getSelected());
if(selectedID != null){
questActiveScroll.list.remove(questActiveScroll.selected);
questActiveData.remove(questActiveScroll.getSelected());
}
tabType = EnumPlayerData.Quest;
} else if (questFinishedScroll.getSelected() != null) {
selectedID = questFinishedData.get(questFinishedScroll.getSelected());
if(selectedID != null){
questFinishedScroll.list.remove(questFinishedScroll.selected);
questFinishedData.remove(questFinishedScroll.getSelected());
}
tabType = EnumPlayerData.Quest;
}
}
} else if (currentTab == 11) {
if (viewMode == 0) {
if (dialogReadScroll.getSelected() != null && dialogCatScroll.getSelected() != null) {
selectedID = dialogReadData.get(dialogCatScroll.getSelected() + ": " + dialogReadScroll.getSelected());
if(selectedID != null){
dialogReadScroll.list.remove(dialogReadScroll.selected);
dialogReadData.remove(dialogCatScroll.getSelected() + ": " + dialogReadScroll.getSelected());
}
tabType = EnumPlayerData.Dialog;
}
} else {
if (dialogCompactScroll.getSelected() != null) {
selectedID = dialogReadData.get(dialogCompactScroll.getSelected());
if(selectedID != null){
dialogCompactScroll.list.remove(dialogCompactScroll.selected);
dialogReadData.remove(dialogCompactScroll.getSelected());
}
tabType = EnumPlayerData.Dialog;
}
}
} else if (currentTab == 12) {
if (viewMode == 0) {
if (transLocScroll.getSelected() != null && transCatScroll.getSelected() != null) {
selectedID = transLocData.get(transCatScroll.getSelected() + ": " + transLocScroll.getSelected());
if(selectedID != null){
transLocScroll.list.remove(transLocScroll.selected);
transLocData.remove(transCatScroll.getSelected() + ": " + transLocScroll.getSelected());
}
tabType = EnumPlayerData.Transport;
}
} else {
if (transCompactScroll.getSelected() != null) {
selectedID = transLocData.get(transCompactScroll.getSelected());
if(selectedID != null){
transCompactScroll.list.remove(transCompactScroll.selected);
transLocData.remove(transCompactScroll.getSelected());
}
tabType = EnumPlayerData.Transport;
}
}
} else if (currentTab == 13) {
if (singleScroll.getSelected() != null) {
selectedID = bankData.get(singleScroll.getSelected());
if(selectedID != null){
singleScroll.list.remove(singleScroll.selected);
bankData.remove(singleScroll.getSelected());
}
tabType = EnumPlayerData.Bank;
}
} else if (currentTab == 14) {
if (singleScroll.getSelected() != null) {
selectedID = factionData.get(singleScroll.getSelected());
if(selectedID != null){
singleScroll.list.remove(singleScroll.selected);
bankData.remove(singleScroll.getSelected());
}
tabType = EnumPlayerData.Factions;
}
}
if (selectedID != null) {
PacketClient.sendClient(new PlayerDataRemovePacketNew(playerName, tabType, selectedID));
}
}
}
@Override
public void setQuestData(Map<String, Integer> questCategories, Map<String, Integer> questActive, Map<String, Integer> questFinished) {
this.questCatData = new HashMap<>(questCategories);
this.questActiveData = new HashMap<>(questActive);
this.questFinishedData = new HashMap<>(questFinished);
if (questCatScroll != null) {
questCatScroll.setList(new ArrayList<>(questCatData.keySet()));
}
}
@Override
public void setDialogData(Map<String, Integer> dialogCategories, Map<String, Integer> dialogRead) {
this.dialogCatData = new HashMap<>(dialogCategories);
this.dialogReadData = new HashMap<>(dialogRead);
if (dialogCatScroll != null) {
dialogCatScroll.setList(new ArrayList<>(dialogCatData.keySet()));
}
if (dialogReadScroll != null) {
dialogReadScroll.setList(new ArrayList<>(dialogReadData.keySet()));
}
if (dialogCompactScroll != null) {
List<String> merged = new ArrayList<>(dialogReadData.keySet());
dialogCompactScroll.setList(merged);
}
}
@Override
public void setTransportData(Map<String, Integer> transportCategories, Map<String, Integer> transportLocations) {
this.transCatData = new HashMap<>(transportCategories);
this.transLocData = new HashMap<>(transportLocations);
if (transCatScroll != null) {
transCatScroll.setList(new ArrayList<>(transCatData.keySet()));
}
if (transLocScroll != null) {
transLocScroll.setList(new ArrayList<>(transLocData.keySet()));
}
if (transCompactScroll != null) {
List<String> merged = new ArrayList<>(transLocData.keySet());
transCompactScroll.setList(merged);
}
}
@Override
public void setBankData(Map<String, Integer> bankData) {
this.bankData = new HashMap<>(bankData);
if (singleScroll != null && currentTab == 13) {
singleScroll.setList(new ArrayList<>(this.bankData.keySet()));
}
}
@Override
public void setFactionData(Map<String, Integer> factionData) {
this.factionData = new HashMap<>(factionData);
if (singleScroll != null && currentTab == 14) {
singleScroll.setList(new ArrayList<>(this.factionData.keySet()));
}
}
@Override
public void customScrollClicked(int i, int j, int k, GuiCustomScroll guiCustomScroll) {
if (guiCustomScroll == questCatScroll) {
selectedQuestCategory = questCatScroll.getSelected();
questFinishedScroll.resetScroll();
questActiveScroll.resetScroll();
if (!selectedQuestCategory.isEmpty()) {
questFinishedScroll.setList(filterAndTrimListByCategory(questFinishedData, selectedQuestCategory, questFinishedSearch));
questActiveScroll.setList(filterAndTrimListByCategory(questActiveData, selectedQuestCategory, questActiveSearch));
} else {
questFinishedScroll.setList(new ArrayList<>());
questActiveScroll.setList(new ArrayList<>());
}
} else if (guiCustomScroll == dialogCatScroll) {
selectedDialogCategory = dialogCatScroll.getSelected();
dialogReadScroll.resetScroll();
if (!selectedDialogCategory.isEmpty()) {
dialogReadScroll.setList(filterAndTrimListByCategory(dialogReadData, selectedDialogCategory, dialogReadSearch));
} else {
dialogReadScroll.setList(new ArrayList<>());
}
} else if (guiCustomScroll == transCatScroll) {
selectedTransCategory = transCatScroll.getSelected();
transLocScroll.resetScroll();
if (!selectedTransCategory.isEmpty()) {
transLocScroll.setList(filterAndTrimListByCategory(transLocData, selectedTransCategory, transLocSearch));
} else {
transLocScroll.setList(new ArrayList<>());
}
} else if (guiCustomScroll == questActiveScroll) {
questFinishedScroll.selected = -1;
} else if (guiCustomScroll == questFinishedScroll) {
questActiveScroll.selected = -1;
}
}
}
@@ -1,4 +1,4 @@
package noppes.npcs.client.gui.test;
package noppes.npcs.client.gui.util;
import java.util.Map;