Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

1 files changed, 18 insertions, 9 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java
index 751e48a1c..2c5189bbc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java
@@ -25,7 +25,7 @@ public class DevConfig {
     public boolean debugEnabled = false;
 
     @Expose
-    @ConfigOption(name = "Command Logging", desc = "Logs stack trace information into the console when a command gets sent to hypixel. (by any mod or the player)")
+    @ConfigOption(name = "Command Logging", desc = "Logs stack trace information into the console when a command gets sent to Hypixel. (by any mod or the player)")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean commandLogs = false;
@@ -33,7 +33,7 @@ public class DevConfig {
     @Expose
     @ConfigOption(
             name = "Mod Menu Log",
-            desc = "Enables debug messages when the currently opened gui changes, with the path to the gui class. " +
+            desc = "Enables debug messages when the currently opened GUI changes, with the path to the gui class. " +
                     "Useful for adding more mods to quick mod menu switch."
     )
     @ConfigEditorBoolean
@@ -47,19 +47,25 @@ public class DevConfig {
     public boolean showInternalName = false;
 
     @Expose
-    @ConfigOption(name = "Show NPC Price", desc = "Show NPC price in item lore.")
+    @ConfigOption(name = "Show empty internal names", desc = "Shows internal name even for items with none.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
-    public boolean showNpcPrice = false;
+    public boolean showEmptyNames = false;
 
     @Expose
-    @ConfigOption(name = "Show empty internal names", desc = "Shows internal name even for items with none.")
+    @ConfigOption(name = "Copy Internal Name", desc = "Copies the internal name of an item on key press in the clipboard.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    @ConfigAccordionId(id = 0)
+    public int copyInternalName = Keyboard.KEY_NONE;
+
+    @Expose
+    @ConfigOption(name = "Show NPC Price", desc = "Show NPC price in item lore.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
-    public boolean showEmptyNames = false;
+    public boolean showNpcPrice = false;
 
     @Expose
-    @ConfigOption(name = "Show item UUID", desc = "Show the Unique Identifier of items. in the lore.")
+    @ConfigOption(name = "Show item UUID", desc = "Show the Unique Identifier of items in the lore.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean showItemUuid = false;
@@ -71,13 +77,13 @@ public class DevConfig {
     public int copyNBTDataCompressed = Keyboard.KEY_NONE;
 
     @Expose
-    @ConfigOption(name = "Copy Rng Meter", desc = "Copies internal names and maxed xp needed from rng meter inventories in json format into the clipboard.")
+    @ConfigOption(name = "Copy Rng Meter", desc = "Copies internal names and maxed XP needed from rng meter inventories as json to clipboard.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean copyRngMeter = false;
 
     @Expose
-    @ConfigOption(name = "Copy Bestiary Data", desc = "Copies the besiary data from the inventory as json in clipboard.")
+    @ConfigOption(name = "Copy Bestiary Data", desc = "Copies the besiary data from the inventory as json to clipboard.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean copyBestiaryData = false;
@@ -121,6 +127,9 @@ public class DevConfig {
     public Position debugPos = new Position(10, 10, false, true);
 
     @Expose
+    public Position debugLocationPos = new Position(1, 160, false, true);
+
+    @Expose
     @ConfigOption(name = "Minecraft Console", desc = "")
     @ConfigEditorAccordion(id = 1)
     public boolean minecraftConsole = false;