Merge remote-tracking branch 'origin/master'

6 files changed, 15 insertions, 8 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
index e49644bf..ba96777f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
@@ -151,7 +151,7 @@ public class CustomItemEffects {
                 if(NotEnoughUpdates.INSTANCE.config.itemOverlays.smoothTpMillis <= 0
                         || Minecraft.getMinecraft().gameSettings.thirdPersonView != 0) return;
 
-                boolean aote = NotEnoughUpdates.INSTANCE.config.itemOverlays.enableSmoothAOTE && internal.equals("ASPECT_OF_THE_END");
+                boolean aote = NotEnoughUpdates.INSTANCE.config.itemOverlays.enableSmoothAOTE && (internal.equals("ASPECT_OF_THE_END") || internal.equals("ASPECT_OF_THE_VOID"));
                 boolean hyp = NotEnoughUpdates.INSTANCE.config.itemOverlays.enableSmoothHyperion && shadowWarp;
                 if(aote || hyp) {
                     aoteUseMillis = System.currentTimeMillis();
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
index 62a3a5d1..7769c274 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
@@ -752,7 +752,7 @@ public class PetInfoOverlay extends TextOverlay {
                                             break;
                                         }
                                     }
-                                    if(!foundDespawn && config.selectedPet == petIndex) {
+                                    if(foundDespawn && config.selectedPet == petIndex) {
                                         clearPet();
                                     }
                                 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java
index ea3ee04b..92e9ca27 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java
@@ -107,7 +107,7 @@ public class ItemOverlays {
     @Expose

     @ConfigOption(

             name = "Enable Smooth AOTE",

-            desc = "Teleport smoothly to your destination when using AOTE"

+            desc = "Teleport smoothly to your destination when using AOTE or AOTV"

     )

     @ConfigEditorBoolean

     @ConfigAccordionId(id = 2)

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java
index 8e2f60d8..157da202 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java
@@ -108,12 +108,13 @@ public class Mining {
     @ConfigEditorDraggableList(

             exampleText = {"\u00a73Goblin Slayer: \u00a7626.5%\n\u00a73Lucky Raffle: \u00a7c0.0%",

                     "\u00a73Mithril Powder: \u00a726,243",

+                    "\u00a73Gemstone Powder: \u00a7d6,243",

                     "\u00a73Forge 1) \u00a79Diamonite\u00a77: \u00a7aReady!",

                     "\u00a73Forge 2) \u00a77EMPTY\n\u00a73Forge 3) \u00a77EMPTY\n\u00a73Forge 4) \u00a77EMPTY",

                     "\u00a73Pickaxe CD: \u00a7a78s"}

     )

     @ConfigAccordionId(id = 2)

-    public List<Integer> dwarvenText = new ArrayList<>(Arrays.asList(0, 1, 4, 2, 3));

+    public List<Integer> dwarvenText = new ArrayList<>(Arrays.asList(0, 1, 4, 2, 3, 5));

 

     @Expose

     @ConfigOption(

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
index f9853cb1..6ce5bb8c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
@@ -157,13 +157,14 @@ public class MiningOverlay extends TextOverlay {
 
         if(!NotEnoughUpdates.INSTANCE.config.mining.dwarvenOverlay) return;
         if(SBInfo.getInstance().getLocation() == null) return;
-        if(!SBInfo.getInstance().getLocation().equals("mining_3")) return;
+        if(!SBInfo.getInstance().getLocation().equals("mining_3") && !SBInfo.getInstance().getLocation().equals("crystal_hollows")) return;
 
         overlayStrings = new ArrayList<>();
         commissionProgress.clear();
         List<String> forgeStrings = new ArrayList<>();
         List<String> forgeStringsEmpty = new ArrayList<>();
         String mithrilPowder = null;
+        String gemstonePowder = null;
 
         boolean commissions = false;
         boolean forges = false;
@@ -173,6 +174,9 @@ public class MiningOverlay extends TextOverlay {
             if(name.contains("Mithril Powder:")) {
                 mithrilPowder = DARK_AQUA+Utils.trimIgnoreColour(name).replaceAll("\u00a7[f|F|r]", "");
             }
+            if(name.contains("Gemstone Powder:")) {
+                gemstonePowder = DARK_AQUA+Utils.trimIgnoreColour(name).replaceAll("\u00a7[f|F|r]", "");
+            }
             if(name.equals(RESET.toString()+BLUE+BOLD+"Forges"+RESET)) {
                 commissions = false;
                 forges = true;
@@ -268,10 +272,12 @@ public class MiningOverlay extends TextOverlay {
                 case 1:
                     overlayStrings.add(mithrilPowder); break;
                 case 2:
-                    overlayStrings.addAll(forgeStrings); break;
+                    overlayStrings.add(gemstonePowder); break;
                 case 3:
-                    overlayStrings.addAll(forgeStringsEmpty); break;
+                    overlayStrings.addAll(forgeStrings); break;
                 case 4:
+                    overlayStrings.addAll(forgeStringsEmpty); break;
+                case 5:
                     overlayStrings.add(pickaxeCooldown); break;
             }
         }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
index 62da3260..49fa18d9 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
@@ -699,7 +699,7 @@ public class ProfileViewer {
             Level level_skill_mining = getLevel(levelingArray, experience_skill_mining, getCap(leveling, "mining"), false);

             Level level_skill_foraging = getLevel(levelingArray, experience_skill_foraging, getCap(leveling, "foraging"), false);

             Level level_skill_enchanting = getLevel(levelingArray, experience_skill_enchanting, getCap(leveling, "enchanting"),  false);

-            Level level_skill_carpentry = getLevel(levelingArray, experience_skill_carpentry,getCap(leveling, "carpetry"),  false);

+            Level level_skill_carpentry = getLevel(levelingArray, experience_skill_carpentry,getCap(leveling, "carpentry"),  false);

             Level level_skill_farming = getLevel(levelingArray, experience_skill_farming, farmingCap, false);

             Level level_skill_combat = getLevel(levelingArray, experience_skill_combat, getCap(leveling, "combat"), false);

             Level level_skill_fishing = getLevel(levelingArray, experience_skill_fishing, getCap(leveling, "fishing"), false);