added warping commands for every mvp+ exclusive location

10 files changed, 342 insertions, 154 deletions

diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index deb5c3b..619b6e6 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -1,6 +1,7 @@
 package me.Danker;
 
 import me.Danker.commands.*;
+import me.Danker.commands.warp.*;
 import me.Danker.events.ChestSlotClickedEvent;
 import me.Danker.events.GuiChestBackgroundDrawnEvent;
 import me.Danker.events.RenderOverlay;
@@ -157,7 +158,6 @@ public class DankersSkyblockMod {
         ClientCommandHandler.instance.registerCommand(new DHelpCommand());
         ClientCommandHandler.instance.registerCommand(new DankerGuiCommand());
         ClientCommandHandler.instance.registerCommand(new DisplayCommand());
-        ClientCommandHandler.instance.registerCommand(new DungeonsCommand());
         ClientCommandHandler.instance.registerCommand(new FairySoulsCommand());
         ClientCommandHandler.instance.registerCommand(new GetkeyCommand());
         ClientCommandHandler.instance.registerCommand(new GuildOfCommand());
@@ -177,6 +177,15 @@ public class DankersSkyblockMod {
         ClientCommandHandler.instance.registerCommand(new SlayerCommand());
         ClientCommandHandler.instance.registerCommand(new ToggleCommand());
 
+
+        ClientCommandHandler.instance.registerCommand(new Crypt());
+        ClientCommandHandler.instance.registerCommand(new DarkAuction());
+        ClientCommandHandler.instance.registerCommand(new Dragon());
+        ClientCommandHandler.instance.registerCommand(new DungeonHub());
+        ClientCommandHandler.instance.registerCommand(new HowlingCave());
+        ClientCommandHandler.instance.registerCommand(new Magma());
+        ClientCommandHandler.instance.registerCommand(new SpidersNest());
+
         configDirectory = event.getModConfigurationDirectory().toString();
     }
 
diff --git a/src/main/java/me/Danker/commands/DHelpCommand.java b/src/main/java/me/Danker/commands/DHelpCommand.java
index 8d47576..c405d22 100644
--- a/src/main/java/me/Danker/commands/DHelpCommand.java
+++ b/src/main/java/me/Danker/commands/DHelpCommand.java
@@ -49,7 +49,6 @@ public class DHelpCommand extends CommandBase {
 													EnumChatFormatting.GOLD + PetsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get pets of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + BankCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get bank and purse coins of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + ArmourCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get armour of a person. If no name is provided, it checks yours.\n" +
-													EnumChatFormatting.GOLD + DungeonsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get dungeon levels of a person. If no name is provided, it checks yours.\n" +
 													EnumChatFormatting.GOLD + ImportFishingCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Imports your fishing stats from your latest profile to your fishing tracker using the API.\n" +
 													EnumChatFormatting.GOLD + SkyblockPlayersCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find how many players are on each Skyblock island.\n" +
 													EnumChatFormatting.GOLD + SkillTrackerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for skill xp/hour.\n" +
diff --git a/src/main/java/me/Danker/commands/DungeonsCommand.java b/src/main/java/me/Danker/commands/DungeonsCommand.java
deleted file mode 100644
index 92779dc..0000000
--- a/src/main/java/me/Danker/commands/DungeonsCommand.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package me.Danker.commands;
-
-import com.google.gson.JsonObject;
-import me.Danker.DankersSkyblockMod;
-import me.Danker.handlers.APIHandler;
-import me.Danker.handlers.ConfigHandler;
-import me.Danker.utils.Utils;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.event.HoverEvent;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.List;
-
-public class DungeonsCommand extends CommandBase {
-
-	@Override
-	public String getCommandName() {
-		return "dungeons";
-	}
-
-	@Override
-	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " [name]";
-	}
-
-	public static String usage(ICommandSender arg0) {
-		return new DungeonsCommand().getCommandUsage(arg0);
-	}
-
-	@Override
-	public int getRequiredPermissionLevel() {
-		return 0;
-	}
-	
-	@Override
-	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
-		if (args.length == 1) {
-			return Utils.getMatchingPlayers(args[0]);
-		}
-		return null;
-	}
-
-	@Override
-	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
-		// MULTI THREAD DRIFTING
-		new Thread(() -> {
-			EntityPlayer player = (EntityPlayer) arg0;
-			
-			// Check key
-			String key = ConfigHandler.getString("api", "APIKey");
-			if (key.equals("")) {
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "API key not set. Use /setkey."));
-			}
-			
-			// Get UUID for Hypixel API requests
-			String username;
-			String uuid;
-			if (arg1.length == 0) {
-				username = player.getName();
-				uuid = player.getUniqueID().toString().replaceAll("[\\-]", "");
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Checking dungeon stats of " + DankersSkyblockMod.SECONDARY_COLOUR + username));
-			} else {
-				username = arg1[0];
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Checking dungeon stats of " + DankersSkyblockMod.SECONDARY_COLOUR + username));
-				uuid = APIHandler.getUUID(username);
-			}
-			
-			// Find stats of latest profile
-			String latestProfile = APIHandler.getLatestProfileID(uuid, key);
-			if (latestProfile == null) return;
-			
-			String profileURL = "https://api.hypixel.net/skyblock/profile?profile=" + latestProfile + "&key=" + key;
-			System.out.println("Fetching profile...");
-			JsonObject profileResponse = APIHandler.getResponse(profileURL);
-			if (!profileResponse.get("success").getAsBoolean()) {
-				String reason = profileResponse.get("cause").getAsString();
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "Failed with reason: " + reason));
-				return;
-			}
-
-			String playerURL = "https://api.hypixel.net/player?uuid=" + uuid + "&key=" + key;
-			System.out.println("Fetching player data...");
-			JsonObject playerResponse = APIHandler.getResponse(playerURL);
-			if(!playerResponse.get("success").getAsBoolean()){
-				String reason = playerResponse.get("cause").getAsString();
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "This player has not played on Hypixel."));
-			}
-			
-			System.out.println("Fetching dungeon stats...");
-			JsonObject dungeonsObject = profileResponse.get("profile").getAsJsonObject().get("members").getAsJsonObject().get(uuid).getAsJsonObject().get("dungeons").getAsJsonObject();
-			if (!dungeonsObject.get("dungeon_types").getAsJsonObject().get("catacombs").getAsJsonObject().has("experience")) {
-				player.addChatMessage(new ChatComponentText(DankersSkyblockMod.ERROR_COLOUR + "This player has not played dungeons."));
-				return;
-			}
-
-			JsonObject catacombsObject = dungeonsObject.get("dungeon_types").getAsJsonObject().get("catacombs").getAsJsonObject();
-			double catacombs = Utils.xpToDungeonsLevel(catacombsObject.get("experience").getAsDouble());
-			double healer = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("healer").getAsJsonObject().get("experience").getAsDouble());
-			double mage = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("mage").getAsJsonObject().get("experience").getAsDouble());
-			double berserk = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("berserk").getAsJsonObject().get("experience").getAsDouble());
-			double archer = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("archer").getAsJsonObject().get("experience").getAsDouble());
-			double tank = Utils.xpToDungeonsLevel(dungeonsObject.get("player_classes").getAsJsonObject().get("tank").getAsJsonObject().get("experience").getAsDouble());
-			String selectedClass = Utils.capitalizeString(dungeonsObject.get("selected_dungeon_class").getAsString());
-			int secrets = playerResponse.get("player").getAsJsonObject().get("achievements").getAsJsonObject().get("skyblock_treasure_hunter").getAsInt();
-
-			int highestFloor = catacombsObject.get("highest_tier_completed").getAsInt();
-			JsonObject completionObj = catacombsObject.get("tier_completions").getAsJsonObject();
-
-			String delimiter = DankersSkyblockMod.DELIMITER_COLOUR + "" + EnumChatFormatting.BOLD + "-------------------";
-
-			ChatComponentText classLevels = new ChatComponentText(
-					EnumChatFormatting.GOLD + " Selected Class: " + selectedClass + "\n\n" +
-						 EnumChatFormatting.RED + " Catacombs Level: " + catacombs + "\n" +
-						 EnumChatFormatting.YELLOW + " Healer Level: " + healer + "\n" +
-						 EnumChatFormatting.LIGHT_PURPLE + " Mage Level: " + mage + "\n" +
-						 EnumChatFormatting.RED + " Berserk Level: " + berserk + "\n" +
-						 EnumChatFormatting.GREEN + " Archer Level: " + archer + "\n" +
-						 EnumChatFormatting.BLUE + " Tank Level: " + tank + "\n\n" +
-						 EnumChatFormatting.WHITE + " Secrets Found: " + secrets + "\n\n");
-
-			StringBuilder completionsHoverString = new StringBuilder();
-
-			for (int i = 0; i <= highestFloor; i++) {
-				completionsHoverString
-						.append(EnumChatFormatting.GOLD)
-						.append(i == 0 ? "Entrance: " : "Floor " + i + ": ")
-						.append(EnumChatFormatting.RESET)
-						.append(completionObj.get(String.valueOf(i)).getAsInt())
-						.append(i < highestFloor ? "\n": "");
-			}
-
-			ChatComponentText completions = new ChatComponentText(EnumChatFormatting.GOLD + " Highest Floor Completed: " + highestFloor);
-
-			completions.setChatStyle(completions.getChatStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText(completionsHoverString.toString()))));
-
-
-			player.addChatMessage(
-					new ChatComponentText(delimiter)
-					.appendText("\n")
-					.appendSibling(classLevels)
-					.appendSibling(completions)
-					.appendText("\n")
-					.appendSibling(new ChatComponentText(delimiter))
-				);
-		}).start();
-	}
-}
diff --git a/src/main/java/me/Danker/commands/warp/Crypt.java b/src/main/java/me/Danker/commands/warp/Crypt.java
new file mode 100644
index 0000000..88f286b
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/Crypt.java
@@ -0,0 +1,47 @@
+package me.Danker.commands.warp;
+
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
+import java.util.List;
+
+public class Crypt extends CommandBase {
+    @Override
+    public String getCommandName() {
+        return "crypt";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName();
+    }
+
+    public static String usage(ICommandSender arg0) {
+        return new me.Danker.commands.warp.Crypt().getCommandUsage(arg0);
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (!Utils.inSkyblock) return;
+        EntityPlayer player = ((EntityPlayer) sender);
+        // MULTI THREAD DRIFTING
+        new Thread(() -> {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp crypt");
+        }).start();
+    }
+}
diff --git a/src/main/java/me/Danker/commands/warp/DarkAuction.java b/src/main/java/me/Danker/commands/warp/DarkAuction.java
new file mode 100644
index 0000000..40218d8
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/DarkAuction.java
@@ -0,0 +1,48 @@
+package me.Danker.commands.warp;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
+import java.util.List;
+
+public class DarkAuction extends CommandBase {
+    @Override
+    public String getCommandName() {
+        return "da";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName();
+    }
+
+    public static String usage(ICommandSender arg0) {
+        return new me.Danker.commands.warp.DarkAuction().getCommandUsage(arg0);
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (!Utils.inSkyblock) return;
+        EntityPlayer player = ((EntityPlayer) sender);
+        // MULTI THREAD DRIFTING
+        new Thread(() -> {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp da");
+        }).start();
+    }
+}
diff --git a/src/main/java/me/Danker/commands/warp/Dragon.java b/src/main/java/me/Danker/commands/warp/Dragon.java
new file mode 100644
index 0000000..f36bef1
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/Dragon.java
@@ -0,0 +1,48 @@
+package me.Danker.commands.warp;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
+import java.util.List;
+
+public class Dragon extends CommandBase {
+    @Override
+    public String getCommandName() {
+        return "drag";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName();
+    }
+
+    public static String usage(ICommandSender arg0) {
+        return new me.Danker.commands.warp.DarkAuction().getCommandUsage(arg0);
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (!Utils.inSkyblock) return;
+        EntityPlayer player = ((EntityPlayer) sender);
+        // MULTI THREAD DRIFTING
+        new Thread(() -> {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp drag");
+        }).start();
+    }
+}
diff --git a/src/main/java/me/Danker/commands/warp/DungeonHub.java b/src/main/java/me/Danker/commands/warp/DungeonHub.java
new file mode 100644
index 0000000..cc1c082
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/DungeonHub.java
@@ -0,0 +1,48 @@
+package me.Danker.commands.warp;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
+import java.util.List;
+
+public class DungeonHub extends CommandBase {
+    @Override
+    public String getCommandName() {
+        return "dun";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName();
+    }
+
+    public static String usage(ICommandSender arg0) {
+        return new me.Danker.commands.warp.DungeonHub().getCommandUsage(arg0);
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (!Utils.inSkyblock) return;
+        EntityPlayer player = ((EntityPlayer) sender);
+        // MULTI THREAD DRIFTING
+        new Thread(() -> {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp dungeon_hub");
+        }).start();
+    }
+}
diff --git a/src/main/java/me/Danker/commands/warp/HowlingCave.java b/src/main/java/me/Danker/commands/warp/HowlingCave.java
new file mode 100644
index 0000000..4cdcf97
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/HowlingCave.java
@@ -0,0 +1,47 @@
+package me.Danker.commands.warp;
+
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
+import java.util.List;
+
+public class HowlingCave extends CommandBase {
+    @Override
+    public String getCommandName() {
+        return "howl";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName();
+    }
+
+    public static String usage(ICommandSender arg0) {
+        return new me.Danker.commands.warp.HowlingCave().getCommandUsage(arg0);
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (!Utils.inSkyblock) return;
+        EntityPlayer player = ((EntityPlayer) sender);
+        // MULTI THREAD DRIFTING
+        new Thread(() -> {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp howl");
+        }).start();
+    }
+}
diff --git a/src/main/java/me/Danker/commands/warp/Magma.java b/src/main/java/me/Danker/commands/warp/Magma.java
new file mode 100644
index 0000000..96ead00
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/Magma.java
@@ -0,0 +1,47 @@
+package me.Danker.commands.warp;
+
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
+import java.util.List;
+
+public class Magma extends CommandBase {
+    @Override
+    public String getCommandName() {
+        return "magma";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName();
+    }
+
+    public static String usage(ICommandSender arg0) {
+        return new me.Danker.commands.warp.Magma().getCommandUsage(arg0);
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (!Utils.inSkyblock) return;
+        EntityPlayer player = ((EntityPlayer) sender);
+        // MULTI THREAD DRIFTING
+        new Thread(() -> {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp magma");
+        }).start();
+    }
+}
diff --git a/src/main/java/me/Danker/commands/warp/SpidersNest.java b/src/main/java/me/Danker/commands/warp/SpidersNest.java
new file mode 100644
index 0000000..2f091ad
--- /dev/null
+++ b/src/main/java/me/Danker/commands/warp/SpidersNest.java
@@ -0,0 +1,47 @@
+package me.Danker.commands.warp;
+
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
+import java.util.List;
+
+public class SpidersNest extends CommandBase {
+    @Override
+    public String getCommandName() {
+        return "nest";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName();
+    }
+
+    public static String usage(ICommandSender arg0) {
+        return new me.Danker.commands.warp.SpidersNest().getCommandUsage(arg0);
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
+        return null;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) throws CommandException {
+        if (!Utils.inSkyblock) return;
+        EntityPlayer player = ((EntityPlayer) sender);
+        // MULTI THREAD DRIFTING
+        new Thread(() -> {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp nest");
+        }).start();
+    }
+}