From 9d288e9d09259f6d9889fbf69177192e4cb3d2f9 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 3 Mar 2025 18:44:05 -0500 Subject: [PATCH] Remove ScrollGroup Packet --- .../kamkeel/npcs/network/PacketHandler.java | 1 - .../packets/data/large/ScrollDataPacket.java | 10 ++- .../packets/data/large/ScrollGroupPacket.java | 61 ------------------- .../packets/data/large/ScrollListPacket.java | 10 ++- .../packets/request/DimensionsGetPacket.java | 3 +- .../dialog/DialogCategoriesGetPacket.java | 3 +- .../dialog/DialogCategoryRemovePacket.java | 3 +- .../dialog/DialogCategorySavePacket.java | 3 +- .../request/linked/LinkedGetAllPacket.java | 5 +- .../request/linked/LinkedNPCAddPacket.java | 3 +- .../request/linked/LinkedNPCRemovePacket.java | 3 +- .../NaturalSpawnGetAllPacket.java | 3 +- .../NaturalSpawnRemovePacket.java | 3 +- .../naturalspawns/NaturalSpawnSavePacket.java | 3 +- .../java/noppes/npcs/NoppesUtilServer.java | 38 ++++++------ .../java/noppes/npcs/client/NoppesUtil.java | 21 +++---- .../client/gui/GuiNPCFactionSelection.java | 3 +- .../npcs/client/gui/GuiNpcDimension.java | 3 +- .../npcs/client/gui/GuiNpcRemoteEditor.java | 3 +- .../npcs/client/gui/SubGuiClonerNPCTags.java | 3 +- .../client/gui/SubGuiClonerQuickTags.java | 3 +- .../npcs/client/gui/SubGuiNpcDimensions.java | 3 +- .../client/gui/SubGuiNpcFactionOptions.java | 3 +- .../gui/advanced/GuiNPCAdvancedLinkedNpc.java | 3 +- .../gui/advanced/GuiNPCFactionSetup.java | 3 +- .../client/gui/advanced/GuiNPCTagSetup.java | 3 +- .../gui/global/GuiNPCManageAnimations.java | 3 +- .../client/gui/global/GuiNPCManageBanks.java | 3 +- .../gui/global/GuiNPCManageDialogs.java | 56 ++++++++--------- .../gui/global/GuiNPCManageEffects.java | 3 +- .../gui/global/GuiNPCManageFactions.java | 3 +- .../client/gui/global/GuiNPCManageLinked.java | 3 +- .../client/gui/global/GuiNPCManageQuest.java | 52 ++++++++-------- .../client/gui/global/GuiNPCManageTags.java | 3 +- .../gui/global/GuiNPCManageTransporters.java | 3 +- .../gui/global/GuiNpcManagePlayerData.java | 3 +- .../gui/global/GuiNpcManageRecipes.java | 3 +- .../gui/global/GuiNpcNaturalSpawns.java | 3 +- .../gui/player/GuiTransportSelection.java | 3 +- .../client/gui/roles/GuiNpcBankSetup.java | 3 +- .../client/gui/roles/GuiNpcTransporter.java | 3 +- .../npcs/client/gui/util/IScrollData.java | 4 +- .../npcs/client/gui/util/IScrollGroup.java | 9 --- .../noppes/npcs/constants/EnumScrollData.java | 9 +++ 44 files changed, 169 insertions(+), 203 deletions(-) delete mode 100644 src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java delete mode 100644 src/main/java/noppes/npcs/client/gui/util/IScrollGroup.java create mode 100644 src/main/java/noppes/npcs/constants/EnumScrollData.java diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index d2929e35d..18260ee29 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -400,7 +400,6 @@ public class PacketHandler { // Data | Large Packets DATA_PACKET.registerPacket(new ClonerPacket()); - DATA_PACKET.registerPacket(new ScrollGroupPacket()); DATA_PACKET.registerPacket(new ScrollDataPacket()); DATA_PACKET.registerPacket(new ScrollListPacket()); DATA_PACKET.registerPacket(new SyncPacket()); diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java index 53fe29e7c..ff9693251 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java @@ -10,6 +10,7 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.client.NoppesUtil; +import noppes.npcs.constants.EnumScrollData; import java.io.IOException; import java.util.Map; @@ -18,16 +19,18 @@ public final class ScrollDataPacket extends LargeAbstractPacket { public static final String packetName = "Large|ScrollData"; private Map data; + private EnumScrollData dataType; public ScrollDataPacket() { } - public ScrollDataPacket(Map data) { + public ScrollDataPacket(Map data, EnumScrollData dataType) { this.data = data; + this.dataType = dataType; } - public static void sendScrollData(EntityPlayerMP player, Map map) { - ScrollDataPacket packet = new ScrollDataPacket(map); + public static void sendScrollData(EntityPlayerMP player, Map map, EnumScrollData type) { + ScrollDataPacket packet = new ScrollDataPacket(map, type); PacketHandler.Instance.sendToPlayer(packet, player); } @@ -44,6 +47,7 @@ public final class ScrollDataPacket extends LargeAbstractPacket { @Override protected byte[] getData() throws IOException { ByteBuf buffer = Unpooled.buffer(); + buffer.writeInt(this.dataType.ordinal()); buffer.writeInt(data.size()); for (Map.Entry entry : data.entrySet()) { buffer.writeInt(entry.getValue()); diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java deleted file mode 100644 index 376d8be5e..000000000 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java +++ /dev/null @@ -1,61 +0,0 @@ -package kamkeel.npcs.network.packets.data.large; - -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 net.minecraft.entity.player.EntityPlayerMP; -import noppes.npcs.client.NoppesUtil; - -import java.io.IOException; -import java.util.Map; - -public final class ScrollGroupPacket extends LargeAbstractPacket { - public static final String packetName = "Large|ScrollGroup"; - - private Map data; - - public ScrollGroupPacket() { - } - - public ScrollGroupPacket(Map data) { - this.data = data; - } - - public static void sendScrollGroup(EntityPlayerMP player, Map map) { - ScrollGroupPacket packet = new ScrollGroupPacket(map); - PacketHandler.Instance.sendToPlayer(packet, player); - } - - @Override - public Enum getType() { - return EnumDataPacket.SCROLL_GROUP; - } - - @Override - public PacketChannel getChannel() { - return PacketHandler.DATA_PACKET; - } - - @Override - protected byte[] getData() throws IOException { - ByteBuf buffer = Unpooled.buffer(); - buffer.writeInt(data.size()); - for (Map.Entry entry : data.entrySet()) { - buffer.writeInt(entry.getValue()); - ByteBufUtils.writeString(buffer, entry.getKey()); - } - byte[] bytes = new byte[buffer.readableBytes()]; - buffer.readBytes(bytes); - return bytes; - } - - @Override - protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException { - NoppesUtil.setScrollGroup(data); - } -} diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java index a78d71b3f..558b96292 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java @@ -10,6 +10,7 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.client.NoppesUtil; +import noppes.npcs.constants.EnumScrollData; import java.io.IOException; import java.util.List; @@ -18,16 +19,18 @@ public final class ScrollListPacket extends LargeAbstractPacket { public static final String packetName = "Large|ScrollList"; private List data; + private EnumScrollData enumScrollData; public ScrollListPacket() { } - public ScrollListPacket(List data) { + public ScrollListPacket(List data, EnumScrollData enumScrollData) { this.data = data; + this.enumScrollData = enumScrollData; } - public static void sendList(EntityPlayerMP player, List list) { - ScrollListPacket packet = new ScrollListPacket(list); + public static void sendList(EntityPlayerMP player, List list, EnumScrollData enumScrollData) { + ScrollListPacket packet = new ScrollListPacket(list, enumScrollData); PacketHandler.Instance.sendToPlayer(packet, player); } @@ -44,6 +47,7 @@ public final class ScrollListPacket extends LargeAbstractPacket { @Override protected byte[] getData() throws IOException { ByteBuf buffer = Unpooled.buffer(); + buffer.writeInt(enumScrollData.ordinal()); buffer.writeInt(data.size()); for (String entry : data) { ByteBufUtils.writeString(buffer, entry); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java index 2d64a8f63..9b33d7d65 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java @@ -12,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.WorldProvider; import net.minecraftforge.common.DimensionManager; +import noppes.npcs.constants.EnumScrollData; import java.io.IOException; import java.util.HashMap; @@ -44,7 +45,7 @@ public final class DimensionsGetPacket extends AbstractPacket { WorldProvider provider = DimensionManager.createProviderFor(id); map.put(provider.getDimensionName(), id); } - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, map); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, map, EnumScrollData.OPTIONAL); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java index fb9ae8f84..772dfed26 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoriesGetPacket.java @@ -12,6 +12,7 @@ import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.DialogController; import java.io.IOException; @@ -43,6 +44,6 @@ public final class DialogCategoriesGetPacket extends AbstractPacket { if (!PacketUtil.verifyItemPacket(player, EnumItemPacketType.WAND, EnumItemPacketType.BLOCK)) return; - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll()); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll(), EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java index 47986f566..6623c3af4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java @@ -13,6 +13,7 @@ import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.DialogController; import java.io.IOException; @@ -59,6 +60,6 @@ public final class DialogCategoryRemovePacket extends AbstractPacket { return; int id = in.readInt(); DialogController.Instance.removeCategory(id); - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll()); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll(), EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java index fb58afcef..ab3d87abe 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.data.DialogCategory; @@ -61,6 +62,6 @@ public final class DialogCategorySavePacket extends AbstractPacket { DialogCategory category = new DialogCategory(); category.readNBT(compound); DialogController.Instance.saveCategory(category); - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll()); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll(), EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java index 0b75d46a9..ceba1f7fd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java @@ -10,6 +10,7 @@ import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.LinkedItemController; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.data.LinkedItem; @@ -56,7 +57,7 @@ public final class LinkedGetAllPacket extends AbstractPacket { for (LinkedNpcController.LinkedData d : LinkedNpcController.Instance.list) { list.put(d.name, 0); } - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, list); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, list, EnumScrollData.OPTIONAL); if (npc != null) { ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, npc.linkedName); } @@ -65,7 +66,7 @@ public final class LinkedGetAllPacket extends AbstractPacket { for (LinkedItem linkedItem : LinkedItemController.getInstance().linkedItems.values()) { list.put(linkedItem.name, linkedItem.id); } - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, list); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, list, EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCAddPacket.java index 9f927c7b1..e7a81c85d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCAddPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCAddPacket.java @@ -14,6 +14,7 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; @@ -66,6 +67,6 @@ public final class LinkedNPCAddPacket extends AbstractPacket { for (LinkedData d : LinkedNpcController.Instance.list) { list.add(d.name); } - ScrollListPacket.sendList((EntityPlayerMP) player, list); + ScrollListPacket.sendList((EntityPlayerMP) player, list, EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCRemovePacket.java index 21109b6a0..bb2a99022 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedNPCRemovePacket.java @@ -14,6 +14,7 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.LinkedNpcController; import java.io.IOException; @@ -65,6 +66,6 @@ public final class LinkedNPCRemovePacket extends AbstractPacket { for (LinkedNpcController.LinkedData d : LinkedNpcController.Instance.list) { list.add(d.name); } - ScrollListPacket.sendList((EntityPlayerMP) player, list); + ScrollListPacket.sendList((EntityPlayerMP) player, list, EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java index 5058f5e00..4a0b504a5 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java @@ -12,6 +12,7 @@ import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.SpawnController; import java.io.IOException; @@ -43,6 +44,6 @@ public final class NaturalSpawnGetAllPacket extends AbstractPacket { return; if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll()); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll(), EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java index 56116b24d..0590d8f10 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java @@ -13,6 +13,7 @@ import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.SpawnController; import java.io.IOException; @@ -57,6 +58,6 @@ public final class NaturalSpawnRemovePacket extends AbstractPacket { return; int id = in.readInt(); SpawnController.Instance.removeSpawnData(id); - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll()); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll(), EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java index 92521afef..162acdbbe 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.SpawnController; import noppes.npcs.controllers.data.SpawnData; @@ -62,6 +63,6 @@ public final class NaturalSpawnSavePacket extends AbstractPacket { SpawnData data = new SpawnData(); data.readNBT(compound); SpawnController.Instance.saveSpawnData(data); - ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll()); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll(), EnumScrollData.OPTIONAL); } } diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 41ae71b34..38bc0b1ba 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -45,6 +45,7 @@ import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.containers.ContainerManageRecipes; import noppes.npcs.controllers.*; @@ -62,7 +63,6 @@ import java.text.DecimalFormat; import java.util.*; import static kamkeel.npcs.network.packets.data.large.ScrollDataPacket.sendScrollData; -import static kamkeel.npcs.network.packets.data.large.ScrollGroupPacket.sendScrollGroup; public class NoppesUtilServer { private static HashMap editingQuests = new HashMap(); @@ -114,7 +114,7 @@ public class NoppesUtilServer { for(Faction faction : FactionController.getInstance().factions.values()){ map.put(faction.name, faction.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendAnimationDataAll(EntityPlayerMP player) { @@ -122,7 +122,7 @@ public class NoppesUtilServer { for(Animation animation : AnimationController.getInstance().animations.values()){ map.put(animation.name, animation.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendTagDataAll(EntityPlayerMP player) { @@ -130,7 +130,7 @@ public class NoppesUtilServer { for(Tag tag : TagController.getInstance().tags.values()){ map.put(tag.name, tag.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendBankDataAll(EntityPlayerMP player) { @@ -138,7 +138,7 @@ public class NoppesUtilServer { for(Bank bank : BankController.getInstance().banks.values()){ map.put(bank.name, bank.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static NBTTagCompound writeItem(ItemStack item, NBTTagCompound nbt){ @@ -322,7 +322,7 @@ public class NoppesUtilServer { if(list == null || list.isEmpty()) return; - ScrollListPacket.sendList((EntityPlayerMP)player, list); + ScrollListPacket.sendList((EntityPlayerMP)player, list, EnumScrollData.OPTIONAL); } public static void sendOpenGuiNoDelay(final EntityPlayer player, @@ -344,7 +344,7 @@ public class NoppesUtilServer { if(list == null || list.isEmpty()) return; - ScrollListPacket.sendList((EntityPlayerMP)player, list); + ScrollListPacket.sendList((EntityPlayerMP)player, list, EnumScrollData.OPTIONAL); } @@ -454,7 +454,7 @@ public class NoppesUtilServer { for(QuestCategory category : QuestController.Instance.categories.values()){ map.put(category.title, category.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendPlayerData(EnumPlayerData type, EntityPlayerMP player, String name) throws IOException { @@ -527,7 +527,7 @@ public class NoppesUtilServer { } } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void removePlayerData(ByteBuf buffer, EntityPlayerMP player) throws IOException { @@ -616,7 +616,7 @@ public class NoppesUtilServer { map.put(recipe.name, recipe.id); } } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendDialogData(EntityPlayerMP player, DialogCategory category) { @@ -626,7 +626,7 @@ public class NoppesUtilServer { for(Dialog dialog : category.dialogs.values()){ map.put(dialog.title, dialog.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendDialogGroup(EntityPlayerMP player, DialogCategory category) { @@ -637,7 +637,7 @@ public class NoppesUtilServer { map.put(dialog.title, dialog.id); } - sendScrollGroup(player, map); + sendScrollData(player, map, EnumScrollData.DIALOG_GROUP); } public static void sendQuestData(EntityPlayerMP player, QuestCategory category) { @@ -647,7 +647,7 @@ public class NoppesUtilServer { for(Quest quest : category.quests.values()){ map.put(quest.title, quest.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendQuestGroup(EntityPlayerMP player, QuestCategory category) { @@ -658,7 +658,7 @@ public class NoppesUtilServer { map.put(quest.title, quest.id); } - sendScrollGroup(player, map); + sendScrollData(player, map, EnumScrollData.QUEST_GROUP); } public static void sendCustomEffectDataAll(EntityPlayerMP player) { @@ -666,7 +666,7 @@ public class NoppesUtilServer { for (CustomEffect effect : CustomEffectController.getInstance().getCustomEffects().values()) { map.put(effect.name, effect.id); } - ScrollDataPacket.sendScrollData(player, map); + ScrollDataPacket.sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendLinkedItemDataAll(EntityPlayerMP player) { @@ -674,7 +674,7 @@ public class NoppesUtilServer { for (LinkedItem linkedItem : LinkedItemController.getInstance().linkedItems.values()) { map.put(linkedItem.name, linkedItem.id); } - ScrollDataPacket.sendScrollData(player, map); + ScrollDataPacket.sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendTransportCategoryData(EntityPlayerMP player) { @@ -682,7 +682,7 @@ public class NoppesUtilServer { for(TransportCategory category : TransportController.getInstance().categories.values()){ map.put(category.title, category.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendTransportData(EntityPlayerMP player, int categoryid) { @@ -693,7 +693,7 @@ public class NoppesUtilServer { for(TransportLocation transport : category.locations.values()){ map.put(transport.name, transport.id); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } @@ -800,7 +800,7 @@ public class NoppesUtilServer { map.put(s + " : " + npc.display.name, npc.getEntityId()); } - sendScrollData(player, map); + sendScrollData(player, map, EnumScrollData.OPTIONAL); } public static void sendGuiError(EntityPlayer player, int i) { diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java index 4ac30d82c..1c2e2f663 100644 --- a/src/main/java/noppes/npcs/client/NoppesUtil.java +++ b/src/main/java/noppes/npcs/client/NoppesUtil.java @@ -19,6 +19,7 @@ import noppes.npcs.client.gui.player.GuiDialogInteract; import noppes.npcs.client.gui.player.GuiQuestCompletion; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumGuiType; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.SkinOverlay; @@ -138,6 +139,8 @@ public class NoppesUtil { Vector data = new Vector(); String line; + EnumScrollData dataType = EnumScrollData.values()[buffer.readInt()]; + try { int size = buffer.readInt(); for(int i = 0; i < size; i++){ @@ -147,24 +150,12 @@ public class NoppesUtil { } - ((IScrollData)gui).setData(data,null); + ((IScrollData)gui).setData(data,null, dataType); } private static HashMap data = new HashMap(); private static HashMap group = new HashMap(); - public static void addScrollGroup(ByteBuf buffer) { - try { - int size = buffer.readInt(); - for(int i = 0; i < size; i++){ - int id = buffer.readInt(); - String name = ByteBufUtils.readString(buffer); - group.put(name, id); - } - } catch (Exception ignored) { - } - } - public static void setScrollGroup(ByteBuf buffer) { GuiScreen gui = Minecraft.getMinecraft().currentScreen; if(gui == null) @@ -193,6 +184,8 @@ public class NoppesUtil { GuiScreen gui = Minecraft.getMinecraft().currentScreen; if(gui == null) return; + + EnumScrollData dataType = EnumScrollData.values()[buffer.readInt()]; try { int size = buffer.readInt(); for(int i = 0; i < size; i++){ @@ -209,7 +202,7 @@ public class NoppesUtil { gui = (GuiScreen) ((GuiContainerNPCInterface)gui).getSubGui(); } if(gui instanceof IScrollData) - ((IScrollData)gui).setData(new Vector(data.keySet()), data); + ((IScrollData)gui).setData(new Vector(data.keySet()), data, dataType); data = new HashMap(); } diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java index 01eef3728..450dfb846 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import java.util.HashMap; @@ -81,7 +82,7 @@ public class GuiNPCFactionSelection extends GuiNPCInterface implements IScrollDa } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { this.data = data; this.slot.setList(list); if(factionId >= 0) diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java index ce7b8d3e1..7f6a88a72 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import java.util.HashMap; import java.util.Vector; @@ -82,7 +83,7 @@ public class GuiNpcDimension extends GuiNPCInterface implements IScrollData{ } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { scroll.setList(list); this.data = data; } diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java index ecf243d6d..5eb74dde9 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java @@ -9,6 +9,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -151,7 +152,7 @@ public class GuiNpcRemoteEditor extends GuiNPCInterface implements IScrollData, public void save() {} @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { this.data = data; scroll.resetScroll(); scroll.setList(getNPCSearch()); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java index 22b0dfff1..05c38b5b8 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java @@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -103,7 +104,7 @@ public class SubGuiClonerNPCTags extends SubGuiInterface implements IGuiData,ISc } @Override - public void setData(Vector list, HashMap data) + public void setData(Vector list, HashMap data, EnumScrollData type) { allTags.addAll(data.keySet()); allTags.sort(String.CASE_INSENSITIVE_ORDER); diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java index 835f9455d..514547d88 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java @@ -3,6 +3,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import java.util.*; @@ -110,7 +111,7 @@ public class SubGuiClonerQuickTags extends SubGuiInterface implements IScrollDat } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { } diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java index 066a797f6..2bc34cbbc 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java @@ -4,6 +4,7 @@ import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.DimensionsGetPacket; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.SpawnData; import java.util.*; @@ -96,7 +97,7 @@ public class SubGuiNpcDimensions extends SubGuiInterface implements IScrollData } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { this.allDimensions.setList(list); this.dimensionMap = data; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java index 7d1d2fdd9..95ee03f5f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java @@ -5,6 +5,7 @@ import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.FactionOptions; import java.util.HashMap; @@ -130,7 +131,7 @@ public class SubGuiNpcFactionOptions extends SubGuiInterface implements IScrollD } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { GuiCustomScroll scroll = getScroll(0); String name = scroll.getSelected(); this.data = data; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java index 4d71c789b..360ead177 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java @@ -6,6 +6,7 @@ import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -51,7 +52,7 @@ public class GuiNPCAdvancedLinkedNpc extends GuiNPCInterface2 implements IScroll } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { this.data = new ArrayList(list); initGui(); } diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java index 314e2cb92..4f3da362b 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiNpcFactionOptions; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import java.util.HashMap; @@ -65,7 +66,7 @@ public class GuiNPCFactionSetup extends GuiNPCInterface2 implements IScrollData, } @Override - public void setData(Vector list, HashMap data) + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = npc.getFaction().name; this.data = data; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java index ad91240de..ea54cf0db 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java @@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -82,7 +83,7 @@ public class GuiNPCTagSetup extends GuiNPCInterface2 implements IScrollData,ICus } @Override - public void setData(Vector list, HashMap data) + public void setData(Vector list, HashMap data, EnumScrollData type) { allTags.addAll(data.keySet()); allTags.sort(String.CASE_INSENSITIVE_ORDER); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java index 3b6766cad..81b24e3df 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java @@ -12,6 +12,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.Frame; @@ -215,7 +216,7 @@ public class GuiNPCManageAnimations extends GuiModelInterface2 implements IScrol } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = scrollAnimations.getSelected(); this.data = data; scrollAnimations.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java index 0b0b693f5..b08e9ccdc 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java @@ -9,6 +9,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.controllers.data.Bank; import noppes.npcs.entity.EntityNPCInterface; @@ -172,7 +173,7 @@ public class GuiNPCManageBanks extends GuiContainerNPCInterface2 implements IScr } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = scroll.getSelected(); this.data = data; scroll.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java index dc0e9bfbc..a83197789 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java @@ -11,6 +11,7 @@ import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.SubGuiNpcDialog; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; import noppes.npcs.entity.EntityNPCInterface; @@ -20,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Vector; -public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGroup, IScrollData, ISubGuiListener,ICustomScrollListener, IGuiData, GuiYesNoCallback +public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollData, ISubGuiListener,ICustomScrollListener, IGuiData, GuiYesNoCallback { private GuiCustomScroll catScroll; public GuiCustomScroll dialogScroll; @@ -483,41 +484,36 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou public void save() {} @Override - public void setData(Vector list, HashMap data) { - String name = catScroll.getSelected(); - this.catData = data; - catScroll.setList(getCatSearch()); - if(name != null){ - catScroll.setSelected(name); - getCategory(false); - } else { - catScroll.setSelected(prevCatName); - getCategory(true); - } + public void setData(Vector list, HashMap data, EnumScrollData type) { + if(type == EnumScrollData.DIALOG_GROUP){ + String name = dialogScroll.getSelected(); + this.dialogData = data; + dialogScroll.setList(getDiagSearch()); + if(name != null){ + dialogScroll.setSelected(name); + getDialog(false); + } else { + dialogScroll.setSelected(prevDialogName); + getDialog(true); + } + } else { + String name = catScroll.getSelected(); + this.catData = data; + catScroll.setList(getCatSearch()); + if(name != null){ + catScroll.setSelected(name); + getCategory(false); + } else { + catScroll.setSelected(prevCatName); + getCategory(true); + } + } initGui(); } @Override public void setSelected(String selected) {} - @Override - public void setScrollGroup(Vector list, HashMap data) { - String name = dialogScroll.getSelected(); - this.dialogData = data; - dialogScroll.setList(getDiagSearch()); - if(name != null){ - dialogScroll.setSelected(name); - getDialog(false); - } else { - dialogScroll.setSelected(prevDialogName); - getDialog(true); - } - initGui(); - } - - @Override - public void setSelectedGroup(String selected) {} - @Override public void confirmClicked(boolean result, int id) { NoppesUtil.openGUI(player, this); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java index d0da71469..64819f236 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java @@ -18,6 +18,7 @@ import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEffectGeneral; import noppes.npcs.client.gui.util.*; import noppes.npcs.client.renderer.ImageData; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.data.CustomEffect; import noppes.npcs.entity.EntityNPCInterface; @@ -221,7 +222,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = scrollEffects.getSelected(); this.data = data; scrollEffects.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java index 427543a42..3a8c05c1a 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java @@ -14,6 +14,7 @@ import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.SubGuiNpcFactionPoints; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Faction; import noppes.npcs.entity.EntityNPCInterface; @@ -167,7 +168,7 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = scrollFactions.getSelected(); this.data = data; scrollFactions.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java index 4a11ef336..f9265493c 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java @@ -21,6 +21,7 @@ import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.item.SubGuiLinkedItem; import noppes.npcs.client.gui.util.*; import noppes.npcs.client.renderer.ImageData; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; @@ -529,7 +530,7 @@ public class GuiNPCManageLinked extends GuiNPCInterface2 implements IScrollData, } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = scroll.getSelected(); this.data = data; scroll.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java index d51341fb3..e12b5fc1e 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java @@ -12,6 +12,7 @@ import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.SubGuiNpcQuest; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; import noppes.npcs.entity.EntityNPCInterface; @@ -21,7 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Vector; -public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollGroup, IScrollData, ISubGuiListener, ICustomScrollListener, IGuiData, GuiYesNoCallback { +public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollData, ISubGuiListener, ICustomScrollListener, IGuiData, GuiYesNoCallback { private GuiCustomScroll catScroll; public GuiCustomScroll questScroll; @@ -459,16 +460,29 @@ public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollGroup, public void save() {} @Override - public void setData(Vector list, HashMap data) { - String name = catScroll.getSelected(); - this.catData = data; - catScroll.setList(getCatSearch()); - if (name != null) { - catScroll.setSelected(name); - getCategory(false); + public void setData(Vector list, HashMap data, EnumScrollData type) { + if(type == EnumScrollData.QUEST_GROUP){ + String name = questScroll.getSelected(); + this.questData = data; + questScroll.setList(getQuestSearch()); + if (name != null) { + questScroll.setSelected(name); + getQuest(false); + } else { + questScroll.setSelected(prevQuestName); + getQuest(true); + } } else { - catScroll.setSelected(prevCatName); - getCategory(true); + String name = catScroll.getSelected(); + this.catData = data; + catScroll.setList(getCatSearch()); + if (name != null) { + catScroll.setSelected(name); + getCategory(false); + } else { + catScroll.setSelected(prevCatName); + getCategory(true); + } } initGui(); } @@ -476,24 +490,6 @@ public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollGroup, @Override public void setSelected(String selected) {} - @Override - public void setScrollGroup(Vector list, HashMap data) { - String name = questScroll.getSelected(); - this.questData = data; - questScroll.setList(getQuestSearch()); - if (name != null) { - questScroll.setSelected(name); - getQuest(false); - } else { - questScroll.setSelected(prevQuestName); - getQuest(true); - } - initGui(); - } - - @Override - public void setSelectedGroup(String selected) {} - @Override public void confirmClicked(boolean result, int id) { NoppesUtil.openGUI(player, this); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java index bd1d2a500..71a5c54c3 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java @@ -9,6 +9,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Tag; import noppes.npcs.entity.EntityNPCInterface; @@ -136,7 +137,7 @@ public class GuiNPCManageTags extends GuiNPCInterface2 implements IScrollData,IC @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = scrollTags.getSelected(); this.data = data; scrollTags.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java index 198248660..57835c9ae 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTransporters.java @@ -13,6 +13,7 @@ import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNPCStringSlot; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import java.util.HashMap; @@ -124,7 +125,7 @@ public class GuiNPCManageTransporters extends GuiNPCInterface implements IScroll } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { this.data = data; slot.setList(list); } diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java index 74dd37de2..84b2e975b 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java @@ -11,6 +11,7 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.SubGuiPlayerData; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPlayerData; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -128,7 +129,7 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements GuiYesNo // IScrollData interface. @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { playerData.clear(); playerData.putAll(data); playerScroll.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java index 54c048512..1189a2208 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java @@ -14,6 +14,7 @@ import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiNpcAvailability; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumGuiType; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageRecipes; import noppes.npcs.controllers.data.RecipeAnvil; import noppes.npcs.controllers.data.RecipeCarpentry; @@ -312,7 +313,7 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS } } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = scroll.getSelected(); this.data = data; scroll.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java index e73b4cdf1..5239f5e5b 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java @@ -13,6 +13,7 @@ import noppes.npcs.client.gui.SubGuiNpcBiomes; import noppes.npcs.client.gui.SubGuiNpcDimensions; import noppes.npcs.client.gui.SubGuiSpawningOptions; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.SpawnData; import noppes.npcs.entity.EntityNPCInterface; @@ -211,7 +212,7 @@ public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, I } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = scrollNaturalSpawns.getSelected(); this.data = data; scrollNaturalSpawns.setList(getSearchList()); diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java index df217675a..49d1eed04 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; @@ -87,7 +88,7 @@ public class GuiTransportSelection extends GuiNPCInterface implements ITopButton public void save() { } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { scroll.setList(list); } @Override diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java index 1483c9aba..50619dd0f 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBankSetup.java @@ -9,6 +9,7 @@ import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Bank; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleBank; @@ -46,7 +47,7 @@ public class GuiNpcBankSetup extends GuiNPCInterface2 implements IScrollData,ICu } @Override - public void setData(Vector list, HashMap data) + public void setData(Vector list, HashMap data, EnumScrollData type) { String name = null; Bank bank = role.getBank(); diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java index 15da59255..ce3a680a6 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java @@ -7,6 +7,7 @@ import kamkeel.npcs.network.packets.request.transport.TransportSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.util.*; +import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; @@ -66,7 +67,7 @@ public class GuiNpcTransporter extends GuiNPCInterface2 implements IScrollData, PacketClient.sendClient(new TransportSavePacket(cat, location.writeNBT())); } @Override - public void setData(Vector list, HashMap data) { + public void setData(Vector list, HashMap data, EnumScrollData type) { this.data = data; this.scroll.setList(list); } diff --git a/src/main/java/noppes/npcs/client/gui/util/IScrollData.java b/src/main/java/noppes/npcs/client/gui/util/IScrollData.java index 318ca6fd3..cacac8359 100644 --- a/src/main/java/noppes/npcs/client/gui/util/IScrollData.java +++ b/src/main/java/noppes/npcs/client/gui/util/IScrollData.java @@ -1,9 +1,11 @@ package noppes.npcs.client.gui.util; +import noppes.npcs.constants.EnumScrollData; + import java.util.HashMap; import java.util.Vector; public interface IScrollData { - public void setData(Vector list,HashMap data); + public void setData(Vector list, HashMap data, EnumScrollData type); public void setSelected(String selected); } diff --git a/src/main/java/noppes/npcs/client/gui/util/IScrollGroup.java b/src/main/java/noppes/npcs/client/gui/util/IScrollGroup.java deleted file mode 100644 index 64dc88510..000000000 --- a/src/main/java/noppes/npcs/client/gui/util/IScrollGroup.java +++ /dev/null @@ -1,9 +0,0 @@ -package noppes.npcs.client.gui.util; - -import java.util.HashMap; -import java.util.Vector; - -public interface IScrollGroup { - public void setScrollGroup(Vector list,HashMap data); - public void setSelectedGroup(String selected); -} diff --git a/src/main/java/noppes/npcs/constants/EnumScrollData.java b/src/main/java/noppes/npcs/constants/EnumScrollData.java new file mode 100644 index 000000000..52a9575f1 --- /dev/null +++ b/src/main/java/noppes/npcs/constants/EnumScrollData.java @@ -0,0 +1,9 @@ +package noppes.npcs.constants; + +public enum EnumScrollData { + OPTIONAL, + MAGIC, + MAGIC_CYCLES, + DIALOG_GROUP, + QUEST_GROUP +}