Remove ScrollGroup Packet

This commit is contained in:
Kam committed 2025-03-03 18:44:05 -05:00
1 parent f5ee7451f5
commit 9d288e9d09
44 files changed
+169 -203

No files matched your search

@@ -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());
@@ -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<String, Integer> data;
private EnumScrollData dataType;
public ScrollDataPacket() {
}
public ScrollDataPacket(Map<String, Integer> data) {
public ScrollDataPacket(Map<String, Integer> data, EnumScrollData dataType) {
this.data = data;
this.dataType = dataType;
}
public static void sendScrollData(EntityPlayerMP player, Map<String, Integer> map) {
ScrollDataPacket packet = new ScrollDataPacket(map);
public static void sendScrollData(EntityPlayerMP player, Map<String, Integer> 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<String, Integer> entry : data.entrySet()) {
buffer.writeInt(entry.getValue());
@@ -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<String, Integer> data;
public ScrollGroupPacket() {
}
public ScrollGroupPacket(Map<String, Integer> data) {
this.data = data;
}
public static void sendScrollGroup(EntityPlayerMP player, Map<String, Integer> 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<String, Integer> 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);
}
}
@@ -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<String> data;
private EnumScrollData enumScrollData;
public ScrollListPacket() {
}
public ScrollListPacket(List<String> data) {
public ScrollListPacket(List<String> data, EnumScrollData enumScrollData) {
this.data = data;
this.enumScrollData = enumScrollData;
}
public static void sendList(EntityPlayerMP player, List<String> list) {
ScrollListPacket packet = new ScrollListPacket(list);
public static void sendList(EntityPlayerMP player, List<String> 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);
@@ -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);
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
+19 -19
View File
@@ -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<String,Quest> editingQuests = new HashMap<String,Quest>();
@@ -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) {
@@ -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<String> data = new Vector<String>();
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<String,Integer> data = new HashMap<String,Integer>();
private static HashMap<String,Integer> group = new HashMap<String,Integer>();
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<String>(data.keySet()), data);
((IScrollData)gui).setData(new Vector<String>(data.keySet()), data, dataType);
data = new HashMap<String,Integer>();
}
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
this.data = data;
this.slot.setList(list);
if(factionId >= 0)
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
scroll.setList(list);
this.data = data;
}
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
this.data = data;
scroll.resetScroll();
scroll.setList(getNPCSearch());
@@ -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<String> list, HashMap<String, Integer> data)
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type)
{
allTags.addAll(data.keySet());
allTags.sort(String.CASE_INSENSITIVE_ORDER);
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
}
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
this.allDimensions.setList(list);
this.dimensionMap = data;
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
GuiCustomScroll scroll = getScroll(0);
String name = scroll.getSelected();
this.data = data;
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
this.data = new ArrayList<String>(list);
initGui();
}
@@ -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<String> list, HashMap<String, Integer> data)
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type)
{
String name = npc.getFaction().name;
this.data = data;
@@ -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<String> list, HashMap<String, Integer> data)
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type)
{
allTags.addAll(data.keySet());
allTags.sort(String.CASE_INSENSITIVE_ORDER);
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
String name = scrollAnimations.getSelected();
this.data = data;
scrollAnimations.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
String name = scroll.getSelected();
this.data = data;
scroll.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> 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<String> list, HashMap<String, Integer> 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<String> list, HashMap<String, Integer> 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);
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
String name = scrollEffects.getSelected();
this.data = data;
scrollEffects.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
String name = scrollFactions.getSelected();
this.data = data;
scrollFactions.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
String name = scroll.getSelected();
this.data = data;
scroll.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> data) {
String name = catScroll.getSelected();
this.catData = data;
catScroll.setList(getCatSearch());
if (name != null) {
catScroll.setSelected(name);
getCategory(false);
public void setData(Vector<String> list, HashMap<String, Integer> 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<String> list, HashMap<String, Integer> 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);
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
String name = scrollTags.getSelected();
this.data = data;
scrollTags.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
this.data = data;
slot.setList(list);
}
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
playerData.clear();
playerData.putAll(data);
playerScroll.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
String name = scroll.getSelected();
this.data = data;
scroll.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
String name = scrollNaturalSpawns.getSelected();
this.data = data;
scrollNaturalSpawns.setList(getSearchList());
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
scroll.setList(list);
}
@Override
@@ -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<String> list, HashMap<String, Integer> data)
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type)
{
String name = null;
Bank bank = role.getBank();
@@ -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<String> list, HashMap<String, Integer> data) {
public void setData(Vector<String> list, HashMap<String, Integer> data, EnumScrollData type) {
this.data = data;
this.scroll.setList(list);
}
@@ -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<String> list,HashMap<String,Integer> data);
public void setData(Vector<String> list, HashMap<String,Integer> data, EnumScrollData type);
public void setSelected(String selected);
}
@@ -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<String> list,HashMap<String,Integer> data);
public void setSelectedGroup(String selected);
}
@@ -0,0 +1,9 @@
package noppes.npcs.constants;
public enum EnumScrollData {
OPTIONAL,
MAGIC,
MAGIC_CYCLES,
DIALOG_GROUP,
QUEST_GROUP
}