Merge pull request #579 from ArikSquad/feat/npc-refactor

Unified HypixelNPC

Author: Swofty-Developments

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/TypeDeepCavernsLoader.java

@@ -9,9 +9,9 @@
 import net.swofty.proxyapi.redis.ServiceToClient;
 import net.swofty.type.deepcaverns.tab.DeepCavernsServerModule;
 import net.swofty.type.generic.SkyBlockTypeLoader;
-import net.swofty.type.generic.entity.animalnpc.HypixelAnimalNPC;
+
 import net.swofty.type.generic.entity.npc.HypixelNPC;
-import net.swofty.type.generic.entity.villager.HypixelVillagerNPC;
+
 import net.swofty.type.generic.event.HypixelEventClass;
 import net.swofty.type.generic.tab.TablistManager;
 import net.swofty.type.generic.tab.TablistModule;
@@ -80,14 +80,10 @@ public List<HypixelEventClass> getCustomEvents() {
 
 	@Override
 	public List<HypixelNPC> getNPCs() {
-		List<HypixelNPC> npcs = new ArrayList<>();
-
-		npcs.addAll(SkyBlockGenericLoader.loopThroughPackage(
-				"net.swofty.type.deepcaverns.npcs",
-				HypixelNPC.class
-		).toList());
-
-		return npcs;
+        return new ArrayList<>(SkyBlockGenericLoader.loopThroughPackage(
+                "net.swofty.type.deepcaverns.npcs",
+                HypixelNPC.class
+        ).toList());
 	}
 
 	@Override
@@ -100,19 +96,6 @@ public List<ProxyToClient> getProxyRedisListeners() {
 		return List.of();
 	}
 
-	@Override
-	public List<HypixelVillagerNPC> getVillagerNPCs() {
-		return new ArrayList<>(SkyBlockGenericLoader.loopThroughPackage(
-				"net.swofty.type.deepcaverns.villagers",
-				HypixelVillagerNPC.class
-		).toList());
-	}
-
-	@Override
-	public List<HypixelAnimalNPC> getAnimalNPCs() {
-		return new ArrayList<>();
-	}
-
 	@Override
 	public List<ServiceType> getRequiredServices() {
 		return new ArrayList<>(List.of(ServiceType.DATA_MUTEX));

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/npcs/NPCLapisMiner.java

@@ -3,15 +3,15 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
-import net.swofty.type.generic.entity.npc.HypixelNPC;
-import net.swofty.type.generic.entity.npc.NPCParameters;
 import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.generic.entity.npc.HypixelNPC;
+import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class NPCLapisMiner extends HypixelNPC {
 
 	public NPCLapisMiner() {
-		super(new NPCParameters() {
+		super(new HumanConfiguration() {
 			@Override
 			public String[] holograms(HypixelPlayer player) {
 				return new String[]{"Lapis Miner", "§e§lCLICK"};
@@ -40,7 +40,7 @@ public boolean looking() {
 	}
 
 	@Override
-	public void onClick(PlayerClickNPCEvent event) {
+	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
 		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
 				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/npcs/NPCLiftOperator.java

@@ -3,19 +3,17 @@
 import net.minestom.server.coordinate.Pos;
 import net.swofty.type.deepcaverns.gui.GUILiftOperator;
 import net.swofty.type.generic.data.datapoints.DatapointToggles;
-import net.swofty.type.generic.entity.npc.NPCDialogue;
-import net.swofty.type.generic.entity.npc.NPCParameters;
+import net.swofty.type.generic.entity.npc.HypixelNPC;
+import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
 import net.swofty.type.generic.user.HypixelPlayer;
-import net.swofty.type.skyblockgeneric.mission.MissionData;
-import net.swofty.type.skyblockgeneric.mission.missions.MissionTalkToLiftOperator;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 import java.util.stream.Stream;
 
-public class NPCLiftOperator extends NPCDialogue {
+public class NPCLiftOperator extends HypixelNPC {
 
 	public NPCLiftOperator() {
-		super(new NPCParameters() {
+		super(new HumanConfiguration() {
 			@Override
 			public String[] holograms(HypixelPlayer player) {
 				return new String[]{"Lift Operator", "§e§lCLICK"};
@@ -71,7 +69,7 @@ public boolean looking() {
 	}
 
 	@Override
-	public void onClick(PlayerClickNPCEvent e) {
+	public void onClick(NPCInteractEvent e) {
 		SkyBlockPlayer player = (SkyBlockPlayer) e.player();
 		if (isInDialogue(player)) return;
 		boolean hasSpokenBefore = player.getToggles().get(DatapointToggles.Toggles.ToggleType.HAS_SPOKEN_TO_LIFT_OPERATOR);
@@ -87,7 +85,7 @@ public void onClick(PlayerClickNPCEvent e) {
 	}
 
 	@Override
-	public NPCDialogue.DialogueSet[] getDialogueSets(HypixelPlayer player) {
+	public DialogueSet[] dialogues(HypixelPlayer player) {
 		return Stream.of(
 				DialogueSet.builder()
 						.key("hello").lines(new String[]{
@@ -97,6 +95,6 @@ public NPCDialogue.DialogueSet[] getDialogueSets(HypixelPlayer player) {
 								"Be careful not to fall down the shaft though, it's a long fall!",
 								"Good luck on your adventures."
 						}).build()
-		).toArray(NPCDialogue.DialogueSet[]::new);
+		).toArray(DialogueSet[]::new);
 	}
 }

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/npcs/NPCRedstoneMiner.java

@@ -3,15 +3,15 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
-import net.swofty.type.generic.entity.npc.HypixelNPC;
-import net.swofty.type.generic.entity.npc.NPCParameters;
 import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.generic.entity.npc.HypixelNPC;
+import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class NPCRedstoneMiner extends HypixelNPC {
 
 	public NPCRedstoneMiner() {
-		super(new NPCParameters() {
+		super(new HumanConfiguration() {
 			@Override
 			public String[] holograms(HypixelPlayer player) {
 				return new String[]{"Redstone Miner", "§e§lCLICK"};
@@ -40,7 +40,7 @@ public boolean looking() {
 	}
 
 	@Override
-	public void onClick(PlayerClickNPCEvent event) {
+	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
 		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
 				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/npcs/NPCRhys.java

@@ -3,15 +3,15 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.minestom.server.coordinate.Pos;
-import net.swofty.type.generic.entity.npc.HypixelNPC;
-import net.swofty.type.generic.entity.npc.NPCParameters;
 import net.swofty.type.generic.user.HypixelPlayer;
+import net.swofty.type.generic.entity.npc.HypixelNPC;
+import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 
 public class NPCRhys extends HypixelNPC {
 
 	public NPCRhys() {
-		super(new NPCParameters() {
+		super(new HumanConfiguration() {
 			@Override
 			public String[] holograms(HypixelPlayer player) {
 				return new String[]{"Rhys", "§e§lCLICK"};
@@ -40,7 +40,7 @@ public boolean looking() {
 	}
 
 	@Override
-	public void onClick(PlayerClickNPCEvent event) {
+	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
 		player.sendMessage(Component.text("§cThis Feature is not there yet. §aOpen a Pull request HERE to get it added quickly!")
 				.clickEvent(ClickEvent.openUrl("https://github.com/Swofty-Developments/HypixelSkyBlock")));

type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/npcs/NPCWalter.java

@@ -4,9 +4,9 @@
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.item.ItemStack;
 import net.swofty.type.deepcaverns.gui.GUIShopWalter;
-import net.swofty.type.generic.entity.npc.NPCDialogue;
+import net.swofty.type.generic.entity.npc.HypixelNPC;
 import net.swofty.type.generic.entity.npc.NPCOption;
-import net.swofty.type.generic.entity.npc.NPCParameters;
+import net.swofty.type.generic.entity.npc.configuration.HumanConfiguration;
 import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.generic.utility.MathUtility;
 import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
@@ -16,10 +16,10 @@
 import java.util.Collections;
 import java.util.stream.Stream;
 
-public class NPCWalter extends NPCDialogue {
+public class NPCWalter extends HypixelNPC {
 
 	public NPCWalter() {
-		super(new NPCParameters() {
+		super(new HumanConfiguration() {
 			@Override
 			public String[] holograms(HypixelPlayer player) {
 				return new String[]{"Walter", "§e§lCLICK"};
@@ -48,7 +48,7 @@ public boolean looking() {
 	}
 
 	@Override
-	public void onClick(PlayerClickNPCEvent event) {
+	public void onClick(NPCInteractEvent event) {
 		SkyBlockPlayer player = (SkyBlockPlayer) event.player();
 		if (isInDialogue(player)) return;
 
@@ -75,7 +75,7 @@ public void onClick(PlayerClickNPCEvent event) {
 	}
 
 	@Override
-	public NPCDialogue.DialogueSet[] getDialogueSets(HypixelPlayer player) {
+	public DialogueSet[] dialogues(HypixelPlayer player) {
 		return Stream.of(
 				DialogueSet.builder()
 						.key("none").lines(new String[]{
@@ -97,6 +97,6 @@ public NPCDialogue.DialogueSet[] getDialogueSets(HypixelPlayer player) {
 						.key("donate_cube_no_requirements").lines(new String[]{ // when donating the cube without requirements met
 								"Mmh... you're missing something to become a Platinum-level donor...",
 						}).abiPhone(true).build()
-		).toArray(NPCDialogue.DialogueSet[]::new);
+		).toArray(DialogueSet[]::new);
 	}
 }

type.dungeonhub/src/main/java/net/swofty/type/dungeonhub/TypeDungeonHubLoader.java

@@ -9,9 +9,7 @@
 import net.swofty.proxyapi.redis.ServiceToClient;
 import net.swofty.type.dungeonhub.tab.DungeonServerModule;
 import net.swofty.type.generic.SkyBlockTypeLoader;
-import net.swofty.type.generic.entity.animalnpc.HypixelAnimalNPC;
 import net.swofty.type.generic.entity.npc.HypixelNPC;
-import net.swofty.type.generic.entity.villager.HypixelVillagerNPC;
 import net.swofty.type.generic.event.HypixelEventClass;
 import net.swofty.type.generic.tab.TablistManager;
 import net.swofty.type.generic.tab.TablistModule;
@@ -82,14 +80,10 @@ public List<HypixelEventClass> getCustomEvents() {
 
     @Override
     public List<HypixelNPC> getNPCs() {
-        List<HypixelNPC> npcs = new ArrayList<>();
-
-        npcs.addAll(SkyBlockGenericLoader.loopThroughPackage(
+        return new ArrayList<>(SkyBlockGenericLoader.loopThroughPackage(
                 "net.swofty.type.dungeonhub.npcs",
                 HypixelNPC.class
         ).toList());
-
-        return npcs;
     }
 
     @Override
@@ -107,22 +101,6 @@ public List<ServiceType> getRequiredServices() {
         return List.of(ServiceType.ITEM_TRACKER, ServiceType.DATA_MUTEX);
     }
 
-    @Override
-    public List<HypixelVillagerNPC> getVillagerNPCs() {
-        return new ArrayList<>(SkyBlockGenericLoader.loopThroughPackage(
-                "net.swofty.type.dungeonhub.villagers",
-                HypixelVillagerNPC.class
-        ).toList());
-    }
-
-    @Override
-    public List<HypixelAnimalNPC> getAnimalNPCs() {
-        return new ArrayList<>(SkyBlockGenericLoader.loopThroughPackage(
-                "net.swofty.type.dungeonhub.animalnpcs",
-                HypixelAnimalNPC.class
-        ).toList());
-    }
-
     @Override
     public @Nullable CustomWorlds getMainInstance() {
         return CustomWorlds.SKYBLOCK_DUNGEON_HUB;