Merge remote-tracking branch 'origin/master'

4 files changed, 10 insertions, 17 deletions

diff --git a/src/main/java/at/lorenz/mod/LorenzMod.java b/src/main/java/at/lorenz/mod/LorenzMod.java
index b9f9d7ad6..fb6986293 100644
--- a/src/main/java/at/lorenz/mod/LorenzMod.java
+++ b/src/main/java/at/lorenz/mod/LorenzMod.java
@@ -12,6 +12,8 @@ import at.lorenz.mod.misc.CurrentPetDisplay;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.thatgravyboat.skyblockhud_2.commands.Commands;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraftforge.common.MinecraftForge;
@@ -21,16 +23,13 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-
 @Mod(modid = LorenzMod.MODID, version = LorenzMod.VERSION)
 public class LorenzMod {
 
     public static final String MODID = "lorenzmod";
     public static final String VERSION = "0.2.1";
 
-//    public static SBHConfig config; //TODO delete
+    //    public static SBHConfig config; //TODO delete
 
     public static Features feature;
     private File configFile;
@@ -85,22 +84,20 @@ public class LorenzMod {
 
         //
         //        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new NpcDialogue());
-//        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new Textures());
+        //        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new Textures());
         //
         configDirectory = new File("mods/LorenzMod/config");
         try {
             //noinspection ResultOfMethodCallIgnored
             configDirectory.mkdir();
-        } catch (Exception ignored) {
-        }
+        } catch (Exception ignored) {}
 
         configFile = new File(configDirectory, "config.json");
 
         if (configFile.exists()) {
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8))) {
                 feature = gson.fromJson(reader, Features.class);
-            } catch (Exception ignored) {
-            }
+            } catch (Exception ignored) {}
         }
 
         if (feature == null) {
@@ -118,8 +115,7 @@ public class LorenzMod {
             try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8))) {
                 writer.write(gson.toJson(feature));
             }
-        } catch (IOException ignored) {
-        }
+        } catch (IOException ignored) {}
     }
 
     //    @EventHandler
diff --git a/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java
index b30f7924c..4a87b53b2 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java
@@ -1,5 +1,4 @@
 package com.thatgravyboat.skyblockhud_2.core.config;
-
 //public class Config {
 //
 //    public void executeRunnable(String runnableId) {}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java
index fefe65470..ff7a2607e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java
@@ -1,9 +1,9 @@
 package com.thatgravyboat.skyblockhud_2.handlers;
 
+import at.lorenz.mod.LorenzMod;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
 import com.google.gson.*;
-import at.lorenz.mod.LorenzMod;
 import com.thatgravyboat.skyblockhud_2.api.events.ProfileJoinedEvent;
 import com.thatgravyboat.skyblockhud_2.api.events.ProfileSwitchedEvent;
 import com.thatgravyboat.skyblockhud_2.mixins.GuiChestAccessor;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java b/src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java
index d17636c7c..4bbadeba8 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java
@@ -5,7 +5,6 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
@@ -26,7 +25,7 @@ public class Textures implements IResourceManagerReloadListener {
     public static void setTexture(int selected) {
         if (selected >= styles.size() || selected < 0) {
             texture = DEFAULT_TEXTURE;
-//            LorenzMod.config.misc.style = 0;
+            //            LorenzMod.config.misc.style = 0;
         } else {
             texture = styles.get(selected);
         }
@@ -52,7 +51,6 @@ public class Textures implements IResourceManagerReloadListener {
                 }
             }
         } catch (Exception ignored) {}
-
-//        if (LorenzMod.config != null) setTexture(LorenzMod.config.misc.style);
+        //        if (LorenzMod.config != null) setTexture(LorenzMod.config.misc.style);
     }
 }