Merge remote-tracking branch 'origin/master'

8 files changed, 6 insertions, 11 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
index 90027ce4e..f65d575f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Features.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -1,12 +1,12 @@
 package at.hannibal2.skyhanni.config;
 
+import at.hannibal2.skyhanni.SkyHanniMod;
+import at.hannibal2.skyhanni.config.config.ConfigEditor;
 import at.hannibal2.skyhanni.config.core.GuiElement;
 import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import at.hannibal2.skyhanni.config.core.config.annotations.*;
 import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor;
-import at.hannibal2.skyhanni.SkyHanniMod;
-import at.hannibal2.skyhanni.config.config.ConfigEditor;
 import com.google.gson.annotations.Expose;
 import net.minecraft.client.Minecraft;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java
index dbf4e12c9..74e65d0f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java
@@ -1,8 +1,8 @@
 package at.hannibal2.skyhanni.config.commands;
 
 import at.hannibal2.skyhanni.SkyHanniMod;
-import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper;
 import at.hannibal2.skyhanni.config.config.ConfigEditor;
+import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper;
 import net.minecraft.command.ICommandSender;
 import net.minecraftforge.client.ClientCommandHandler;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/config/ConfigEditor.java b/src/main/java/at/hannibal2/skyhanni/config/config/ConfigEditor.java
index 72e46ad1d..f7fc63896 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/config/ConfigEditor.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/config/ConfigEditor.java
@@ -12,7 +12,6 @@ import at.hannibal2.skyhanni.config.core.util.lerp.LerpUtils;
 import at.hannibal2.skyhanni.config.core.util.lerp.LerpingInteger;
 import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
 import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
-
 import com.google.common.collect.Lists;
 import java.awt.*;
 import java.net.URI;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorButton.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorButton.java
index 78e96abfe..6fc4ff98c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorButton.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorButton.java
@@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.config.core.config.gui;
 
 import static at.hannibal2.skyhanni.config.GuiTextures.button_tex;
 
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
 import at.hannibal2.skyhanni.config.Features;
+import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
 import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
 import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDraggableList.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDraggableList.java
index 5b6313626..e276cfd94 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDraggableList.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDraggableList.java
@@ -4,11 +4,10 @@ import static at.hannibal2.skyhanni.config.GuiTextures.DELETE;
 import static at.hannibal2.skyhanni.config.GuiTextures.button_tex;
 
 import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.utils.Utils;
 import at.hannibal2.skyhanni.config.core.util.lerp.LerpUtils;
 import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
 import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
-
+import at.hannibal2.skyhanni.config.utils.Utils;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.java
index 7708c4ccd..ce86a46ea 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.java
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.config.core.config.gui;
 
 import at.hannibal2.skyhanni.config.core.config.Position;
 import at.hannibal2.skyhanni.config.utils.Utils;
-
 import java.io.IOException;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/struct/ConfigProcessor.java b/src/main/java/at/hannibal2/skyhanni/config/core/config/struct/ConfigProcessor.java
index cce96b5b5..2e87d36a0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/struct/ConfigProcessor.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/struct/ConfigProcessor.java
@@ -1,9 +1,8 @@
 package at.hannibal2.skyhanni.config.core.config.struct;
 
-import at.hannibal2.skyhanni.config.core.config.annotations.*;
 import at.hannibal2.skyhanni.config.Features;
+import at.hannibal2.skyhanni.config.core.config.annotations.*;
 import at.hannibal2.skyhanni.config.core.config.gui.*;
-
 import com.google.gson.annotations.Expose;
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/util/GuiElementSlider.java b/src/main/java/at/hannibal2/skyhanni/config/core/util/GuiElementSlider.java
index 8f6c837a8..f59d6bb8d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/util/GuiElementSlider.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/util/GuiElementSlider.java
@@ -4,7 +4,6 @@ import static at.hannibal2.skyhanni.config.GuiTextures.*;
 
 import at.hannibal2.skyhanni.config.core.GuiElement;
 import at.hannibal2.skyhanni.config.utils.Utils;
-
 import java.util.function.Consumer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;