aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorLorenz <ESs95s3P5z8Pheb>2022-07-08 23:14:38 +0200
committerLorenz <ESs95s3P5z8Pheb>2022-07-08 23:14:38 +0200
commit5ac4f2123f2750a6a8d8a6ad1bb9c6e0177c270e (patch)
tree7072b749b90aca2fd2c9e24f6c13129e799a520d /src/main/java/com
parent7d94a011aa7887893f3c6d24622c5277f4f0a8d0 (diff)
parent3bd7c17ca84115c3f47c3cea010169e3b596a63c (diff)
downloadskyhanni-5ac4f2123f2750a6a8d8a6ad1bb9c6e0177c270e.tar.gz
skyhanni-5ac4f2123f2750a6a8d8a6ad1bb9c6e0177c270e.tar.bz2
skyhanni-5ac4f2123f2750a6a8d8a6ad1bb9c6e0177c270e.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud_2/core/config/Config.java1
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud_2/handlers/WarpHandler.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud_2/textures/Textures.java6
3 files changed, 3 insertions, 6 deletions
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);
}
}