Added 2 new subcommands to crystal waypoints, Added medals shown in farmhouse, Added config option to stop auto flipping of rpg hud, Added option so if exp bar is still being rendered it should hide when holding drill to not overlay them and keep a consistent hud

1 files changed, 60 insertions, 12 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CrystalWaypoints.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/CrystalWaypoints.java
index 079e108..0932ab1 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CrystalWaypoints.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/CrystalWaypoints.java
@@ -1,14 +1,21 @@
 package com.thatgravyboat.skyblockhud.handlers;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.thatgravyboat.skyblockhud.SkyblockHud;
 import com.thatgravyboat.skyblockhud.Utils;
 import com.thatgravyboat.skyblockhud.api.events.LocationChangeEvent;
 import com.thatgravyboat.skyblockhud.commands.SimpleCommand;
 import com.thatgravyboat.skyblockhud.location.LocationCategory;
 import com.thatgravyboat.skyblockhud.location.LocationHandler;
+import com.thatgravyboat.skyblockhud.location.Locations;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.BlockPos;
@@ -21,15 +28,13 @@ public class CrystalWaypoints {
 
     public static final HashMap<String, BlockPos> waypoints = new HashMap<>();
 
+    private static final Set<Locations> IMPORTANT_WAYPOINTS = Sets.newHashSet(Locations.GOBLINQUEENSDEN, Locations.LOSTPRECURSORCITY, Locations.JUNGLETEMPLE, Locations.MINESOFDIVAN);
+
     @SubscribeEvent
     public void onRenderLast(RenderWorldLastEvent event) {
-        waypoints.forEach(
-            (text, pos) -> {
-                GlStateManager.disableCull();
-                GlStateManager.disableDepth();
-                Utils.renderWaypointText(text, pos, event.partialTicks);
-            }
-        );
+        GlStateManager.disableCull();
+        GlStateManager.disableDepth();
+        waypoints.forEach((text, pos) -> Utils.renderWaypointText(text, pos, event.partialTicks));
         GlStateManager.enableCull();
         GlStateManager.enableDepth();
     }
@@ -39,6 +44,14 @@ public class CrystalWaypoints {
         if (!event.newLocation.getCategory().equals(LocationCategory.CRYSTALHOLLOWS)) {
             waypoints.clear();
         }
+        else if (!waypoints.containsKey("Crystal Nucleus") && SkyblockHud.config.mining.autoWaypoint){
+            waypoints.put("Crystal Nucleus", new BlockPos(512.5,106.5,512.5));
+        }
+        if (IMPORTANT_WAYPOINTS.contains(event.newLocation) && SkyblockHud.config.mining.autoWaypoint){
+            if (!waypoints.containsKey(event.newLocation.getDisplayName())){
+                waypoints.put(event.newLocation.getDisplayName(), Minecraft.getMinecraft().thePlayer.getPosition());
+            }
+        }
     }
 
     public static class WaypointCommand extends SimpleCommand {
@@ -49,15 +62,18 @@ public class CrystalWaypoints {
                 new ProcessCommandRunnable() {
                     @Override
                     public void processCommand(ICommandSender sender, String[] args) {
+                        if (args.length == 0) return;
                         String subCommand = args[0].toLowerCase();
                         String name = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
                         switch (subCommand) {
                             case "add":
                                 if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.CRYSTALHOLLOWS)) {
-                                    if (!CrystalWaypoints.waypoints.containsKey(name)) {
+                                    if (!CrystalWaypoints.waypoints.containsKey(name) && name.length() > 1) {
                                         CrystalWaypoints.waypoints.put(name, sender.getPosition().add(0.5, 0.5, 0.5));
+                                    } else if (name.length() < 2) {
+                                        sbhMessage(sender, "Waypoint name needs to be longer than 1");
                                     } else {
-                                        sender.addChatMessage(new ChatComponentText("[" + EnumChatFormatting.RED + EnumChatFormatting.BOLD + "SkyBlockHud" + EnumChatFormatting.RESET + "] : " + EnumChatFormatting.GRAY + "Waypoint already exists!"));
+                                        sbhMessage(sender, "Waypoint already exists!");
                                     }
                                 }
                                 break;
@@ -66,29 +82,61 @@ public class CrystalWaypoints {
                                     if (CrystalWaypoints.waypoints.containsKey(name)) {
                                         CrystalWaypoints.waypoints.remove(name);
                                     } else {
-                                        sender.addChatMessage(new ChatComponentText("[" + EnumChatFormatting.RED + EnumChatFormatting.BOLD + "SkyBlockHud" + EnumChatFormatting.RESET + "] : " + EnumChatFormatting.GRAY + "Waypoint doesnt exist!"));
+                                        sbhMessage(sender, "Waypoint doesnt exist!");
                                     }
                                 }
                                 break;
                             case "clear":
                                 CrystalWaypoints.waypoints.clear();
                                 break;
+                            case "addat":
+                                if (LocationHandler.getCurrentLocation().getCategory().equals(LocationCategory.CRYSTALHOLLOWS)) {
+                                    name = String.join(" ", Arrays.copyOfRange(args, 4, args.length));
+                                    try {
+                                        if (!CrystalWaypoints.waypoints.containsKey(name)) {
+                                            CrystalWaypoints.waypoints.put(name, parseBlockPos(sender, args, 1, true));
+                                        } else if (name.length() < 2) {
+                                            sbhMessage(sender, "Waypoint name needs to be longer than 1");
+                                        } else {
+                                            sbhMessage(sender, "Waypoint already exists!");
+                                        }
+                                    }catch (Exception e){
+                                        sbhMessage(sender, "Error!");
+                                    }
+                                }
+                                break;
+                            case "copy":
+                                BlockPos pos = waypoints.get(name);
+                                if (pos == null) {
+                                    sbhMessage(sender, "No waypoint with that name!");
+                                    break;
+                                }
+                                StringSelection clipboard = new StringSelection(name + " : ("+pos.getX()+"/"+pos.getY()+"/"+pos.getZ()+")");
+                                Toolkit.getDefaultToolkit().getSystemClipboard().setContents(clipboard, clipboard);
+                                break;
                         }
                     }
                 },
                 new TabCompleteRunnable() {
                     @Override
                     public List<String> tabComplete(ICommandSender sender, String[] args, BlockPos pos) {
-                        if (args.length == 2 && args[0].equalsIgnoreCase("remove")) {
+                        if (args.length == 2 && (args[0].equalsIgnoreCase("remove") || args[0].equalsIgnoreCase("copy"))) {
                             return getListOfStringsMatchingLastWord(args, waypoints.keySet());
                         }
                         if (args.length == 1) {
-                            return getListOfStringsMatchingLastWord(args, Lists.newArrayList("add", "clear", "remove"));
+                            return getListOfStringsMatchingLastWord(args, Lists.newArrayList("add", "clear", "remove", "copy", "addat"));
+                        }
+                        if (args.length > 1 && args[0].equalsIgnoreCase("addat")){
+                            return func_175771_a(args, 1, pos);
                         }
                         return null;
                     }
                 }
             );
         }
+
+        private static void sbhMessage(ICommandSender sender, String message){
+            sender.addChatMessage(new ChatComponentText("[" + EnumChatFormatting.RED + EnumChatFormatting.BOLD + "SkyBlockHud" + EnumChatFormatting.RESET + "] : " + EnumChatFormatting.GRAY + message));
+        }
     }
 }