- cursors

- move guiv2 to launcher
- add force letsencrypt support (without modifying keystore directly)
^ very cool

Signed-off-by: syeyoung <cyoung06@naver.com>

24 files changed, 916 insertions, 199 deletions

diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/LetsEncrypt.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/LetsEncrypt.java
new file mode 100644
index 00000000..7d75d571
--- /dev/null
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/LetsEncrypt.java
@@ -0,0 +1,78 @@
+/*
+ * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+ * Copyright (C) 2023  cyoung06 (syeyoung)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package kr.syeyoung.dungeonsguide.launcher;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Objects;
+
+// Smh minecraft default launcher letsencrypt
+public class LetsEncrypt {
+    public static SSLSocketFactory LETS_ENCRYPT;
+
+    static {
+        try {
+            LETS_ENCRYPT = letsEncryptAddedFactory();
+        } catch (KeyStoreException | IOException | CertificateException | NoSuchAlgorithmException |
+                 KeyManagementException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static SSLSocketFactory letsEncryptAddedFactory() throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException, KeyManagementException {
+        String keyStoreLocation = System.getProperty( "javax.net.ssl.trustStore", Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts").toString());
+        String keyStorePassword = System.getProperty( "javax.net.ssl.trustStorePassword", "" ); // You might ask, "THE DEFAULT PASSWORD IS changeit". But in fact, just loading keystore does not require a key!! https://stackoverflow.com/a/42363257
+        String keyStoreType = System.getProperty("javax.net.ssl.trustStoreType", KeyStore.getDefaultType());
+
+        char[] charArr = keyStorePassword.isEmpty() ? null : keyStorePassword.toCharArray();
+
+        KeyStore keyStore = KeyStore.getInstance(keyStoreType);
+        try (InputStream readStream = Files.newInputStream(Paths.get(keyStoreLocation))) {
+            keyStore.load(readStream, charArr);
+        }
+
+        if (keyStore.getCertificate("ISRGRootX1") == null) {
+            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            try (InputStream caInput = LetsEncrypt.class.getResourceAsStream("/isrgrootx1.der")) {
+                Certificate crt = cf.generateCertificate(caInput);
+                keyStore.setCertificateEntry("ISRGRootX1", crt);
+            }
+        }
+
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        tmf.init(keyStore);
+
+        SSLContext context = SSLContext.getInstance( "TLS" );
+        context.init( null, tmf.getTrustManagers(), null);
+        return context.getSocketFactory();
+    }
+}
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/DgAuthUtil.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/DgAuthUtil.java
index 2c59dd2c..d1abadca 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/DgAuthUtil.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/auth/DgAuthUtil.java
@@ -21,6 +21,7 @@ package kr.syeyoung.dungeonsguide.launcher.auth;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.exceptions.AuthenticationException;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
+import kr.syeyoung.dungeonsguide.launcher.LetsEncrypt;
 import kr.syeyoung.dungeonsguide.launcher.Main;
 import kr.syeyoung.dungeonsguide.launcher.auth.token.AuthToken;
 import kr.syeyoung.dungeonsguide.launcher.auth.token.DGAuthToken;
@@ -37,6 +38,7 @@ import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
+import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
@@ -97,7 +99,8 @@ public class DgAuthUtil {
     public static String requestAuth() throws IOException {
         GameProfile profile = Minecraft.getMinecraft().getSession().getProfile();
 
-        HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/auth/v2/requestAuth").openConnection();
+        HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/auth/v2/requestAuth").openConnection();
+        connection.setSSLSocketFactory(LetsEncrypt.LETS_ENCRYPT);
         connection.setRequestProperty("User-Agent", "DungeonsGuide/4.0");
         connection.setRequestProperty("Content-Type", "application/json");
         connection.setConnectTimeout(1000);
@@ -147,7 +150,8 @@ public class DgAuthUtil {
      * @throws AuthServerException when auth server throws error
      */
     public static AuthToken verifyAuth(String tempToken, byte[] encSecret) throws IOException {
-        HttpURLConnection urlConnection = (HttpURLConnection) new URL(Main.DOMAIN + "/auth/v2/authenticate").openConnection();
+        HttpsURLConnection urlConnection = (HttpsURLConnection) new URL(Main.DOMAIN + "/auth/v2/authenticate").openConnection();
+        urlConnection.setSSLSocketFactory(LetsEncrypt.LETS_ENCRYPT);
         urlConnection.setRequestMethod("POST");
         urlConnection.setRequestProperty("User-Agent", "DungeonsGuide/4.0");
         urlConnection.setRequestProperty("Content-Type", "application/json");
@@ -173,7 +177,8 @@ public class DgAuthUtil {
     }
 
     public static AuthToken acceptNewPrivacyPolicy(String tempToken, long version) throws IOException {
-        HttpURLConnection urlConnection = (HttpURLConnection) new URL(Main.DOMAIN + "/auth/v2/acceptPrivacyPolicy").openConnection();
+        HttpsURLConnection urlConnection = (HttpsURLConnection) new URL(Main.DOMAIN + "/auth/v2/acceptPrivacyPolicy").openConnection();
+        urlConnection.setSSLSocketFactory(LetsEncrypt.LETS_ENCRYPT);
         urlConnection.setRequestMethod("POST");
         urlConnection.setRequestProperty("User-Agent", "DungeonsGuide/4.0");
         urlConnection.setRequestProperty("Content-Type", "application/json");
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateRetrieverUtil.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateRetrieverUtil.java
index 0414129c..ef282f1e 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateRetrieverUtil.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateRetrieverUtil.java
@@ -18,6 +18,7 @@
 
 package kr.syeyoung.dungeonsguide.launcher.branch;
 
+import kr.syeyoung.dungeonsguide.launcher.LetsEncrypt;
 import kr.syeyoung.dungeonsguide.launcher.Main;
 import kr.syeyoung.dungeonsguide.launcher.auth.AuthManager;
 import kr.syeyoung.dungeonsguide.launcher.exceptions.AssetNotFoundException;
@@ -29,6 +30,7 @@ import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -47,7 +49,8 @@ public class UpdateRetrieverUtil {
     }
 
     public static List<UpdateBranch> getUpdateBranches() throws IOException {
-        HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/updates/").openConnection();
+        HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/updates/").openConnection();
+        connection.setSSLSocketFactory(LetsEncrypt.LETS_ENCRYPT);
         connection.setRequestProperty("User-Agent", "DungeonsGuide/4.0");
         connection.setRequestProperty("Authorization", "Bearer "+ AuthManager.getInstance().getWorkingTokenOrThrow());
         connection.setRequestMethod("GET");
@@ -78,7 +81,8 @@ public class UpdateRetrieverUtil {
     }
 
     public static List<Update> getLatestUpdates(long branchId, int page) throws IOException {
-        HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/updates/"+branchId+"/?page="+page).openConnection();
+        HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/updates/"+branchId+"/?page="+page).openConnection();
+        connection.setSSLSocketFactory(LetsEncrypt.LETS_ENCRYPT);
         connection.setRequestProperty("User-Agent", "DungeonsGuide/4.0");
         connection.setRequestMethod("GET");
         connection.setConnectTimeout(1000);
@@ -120,7 +124,8 @@ public class UpdateRetrieverUtil {
     }
 
     public static Update getUpdate(long branchId, long updateId) throws IOException {
-        HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/updates/"+branchId+"/"+updateId).openConnection();
+        HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/updates/"+branchId+"/"+updateId).openConnection();
+        connection.setSSLSocketFactory(LetsEncrypt.LETS_ENCRYPT);
         connection.setRequestProperty("User-Agent", "DungeonsGuide/4.0");
         connection.setRequestProperty("Authorization", "Bearer "+ AuthManager.getInstance().getWorkingTokenOrThrow());
         connection.setRequestMethod("GET");
@@ -162,7 +167,8 @@ public class UpdateRetrieverUtil {
 
 
         try {
-            HttpURLConnection connection = (HttpURLConnection) new URL(Main.DOMAIN + "/updates/" + update.getBranchId() + "/" + update.getId() + "/" + asset.getAssetId()).openConnection();
+            HttpsURLConnection connection = (HttpsURLConnection) new URL(Main.DOMAIN + "/updates/" + update.getBranchId() + "/" + update.getId() + "/" + asset.getAssetId()).openConnection();
+            connection.setSSLSocketFactory(LetsEncrypt.LETS_ENCRYPT);
             connection.setRequestProperty("User-Agent", "DungeonsGuide/4.0");
             connection.setRequestMethod("GET");
             connection.setRequestProperty("Authorization", "Bearer " + AuthManager.getInstance().getWorkingTokenOrThrow());
@@ -181,7 +187,8 @@ public class UpdateRetrieverUtil {
                 throw new ResponseParsingException(payload, e);
             }
             try {
-                connection = (HttpURLConnection) new URL(url).openConnection();
+                connection = (HttpsURLConnection) new URL(url).openConnection();
+                connection.setSSLSocketFactory(LetsEncrypt.LETS_ENCRYPT);
                 connection.setRequestProperty("User-Agent", "DungeonsGuide/4.0");
                 connection.setConnectTimeout(1000);
                 connection.setReadTimeout(5000);
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/Context.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/Context.java
index b59c2c2b..a5ac459b 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/Context.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/Context.java
@@ -21,7 +21,6 @@ package kr.syeyoung.dungeonsguide.launcher.guiv2;
 import java.util.HashMap;
 import java.util.Map;
 
-// TODO: get rid of this and change it with tree walking.
 public class Context {
     public Map<String, Object> CONTEXT = new HashMap<>();
 
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/DomElement.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/DomElement.java
index 9487b21c..90f17921 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/DomElement.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/DomElement.java
@@ -27,7 +27,7 @@ import kr.syeyoung.dungeonsguide.launcher.guiv2.primitive.Rect;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.primitive.Size;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.DrawNothingRenderer;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.Renderer;
-import kr.syeyoung.dungeonsguide.mod.utils.cursor.EnumCursor;
+import kr.syeyoung.dungeonsguide.launcher.util.cursor.EnumCursor;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/GuiScreenAdapter.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/GuiScreenAdapter.java
index 03c60397..d4d46834 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/GuiScreenAdapter.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/GuiScreenAdapter.java
@@ -22,8 +22,8 @@ import kr.syeyoung.dungeonsguide.launcher.guiv2.primitive.ConstraintBox;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.primitive.Rect;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.primitive.Size;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.RenderingContext;
-import kr.syeyoung.dungeonsguide.mod.utils.cursor.EnumCursor;
-import kr.syeyoung.dungeonsguide.mod.utils.cursor.GLCursors;
+import kr.syeyoung.dungeonsguide.launcher.util.cursor.EnumCursor;
+import kr.syeyoung.dungeonsguide.launcher.util.cursor.GLCursors;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/RootDom.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/RootDom.java
index d7c732f3..a759f982 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/RootDom.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/RootDom.java
@@ -20,7 +20,7 @@ package kr.syeyoung.dungeonsguide.launcher.guiv2;
 
 import kr.syeyoung.dungeonsguide.launcher.guiv2.layouter.SingleChildPassingLayouter;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.SingleChildRenderer;
-import kr.syeyoung.dungeonsguide.mod.utils.cursor.EnumCursor;
+import kr.syeyoung.dungeonsguide.launcher.util.cursor.EnumCursor;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/Button.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/Button.java
index 73b0e21d..77ceb167 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/Button.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/Button.java
@@ -29,7 +29,7 @@ import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.AnnotatedWidget;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Bind;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Export;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Passthrough;
-import kr.syeyoung.dungeonsguide.mod.utils.cursor.EnumCursor;
+import kr.syeyoung.dungeonsguide.launcher.util.cursor.EnumCursor;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/CircularRect.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/CircularRect.java
index 18738d42..24f74963 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/CircularRect.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/CircularRect.java
@@ -27,8 +27,8 @@ import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.RenderingContext;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.SingleChildRenderer;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.AnnotatedExportOnlyWidget;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Export;
-import kr.syeyoung.dungeonsguide.mod.shader.ShaderManager;
-import kr.syeyoung.dungeonsguide.mod.shader.ShaderProgram;
+import kr.syeyoung.dungeonsguide.launcher.shader.ShaderManager;
+import kr.syeyoung.dungeonsguide.launcher.shader.ShaderProgram;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.opengl.GL20;
 
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/CompatLayer.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/CompatLayer.java
deleted file mode 100644
index 69ad5652..00000000
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/CompatLayer.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
- * Copyright (C) 2023  cyoung06 (syeyoung)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package kr.syeyoung.dungeonsguide.launcher.guiv2.elements;
-
-import kr.syeyoung.dungeonsguide.mod.gui.MPanel;
-import kr.syeyoung.dungeonsguide.mod.gui.elements.MTooltip;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.DomElement;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.Widget;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.elements.popups.AbsLocationPopup;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.elements.popups.PopupMgr;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.layouter.Layouter;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.primitive.ConstraintBox;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.primitive.Size;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.Renderer;
-import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.RenderingContext;
-import kr.syeyoung.dungeonsguide.mod.utils.cursor.EnumCursor;
-import net.minecraft.client.Minecraft;
-import org.lwjgl.opengl.GL11;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class CompatLayer extends Widget implements Layouter, Renderer {
-    private MPanel panel;
-    private Rectangle force;
-
-    public CompatLayer(MPanel panel) {
-        this(panel, null);
-    }
-
-    List<AbsLocationPopup> tooltips = new ArrayList<>();
-    public CompatLayer(MPanel panel, Rectangle force) {
-        this.panel = panel;
-        this.force = force;
-        panel.setParent(new MPanel() {
-            @Override
-            public void setCursor(EnumCursor enumCursor) {
-                getDomElement().setCursor(enumCursor);
-            }
-
-            @Override
-            public int getTooltipsOpen() {
-                return 0;
-            }
-
-            @Override
-            public void openTooltip(MTooltip mPanel) {
-                Rectangle bounds = mPanel.getBounds();
-                AbsLocationPopup absLocationPopup = new AbsLocationPopup(bounds.getX(), bounds.getY(), new CompatLayer(mPanel, bounds), true);
-                PopupMgr.getPopupMgr(getDomElement()).openPopup(absLocationPopup, (a) -> {tooltips.remove(absLocationPopup);});
-                tooltips.add(absLocationPopup);
-            }
-        });
-    }
-
-    @Override
-    public void onUnmount() {
-        super.onUnmount();
-        tooltips.forEach(PopupMgr.getPopupMgr(getDomElement())::closePopup);
-    }
-
-    @Override
-    public List<Widget> build(DomElement buildContext) {
-        return Collections.emptyList();
-    }
-
-
-
-    @Override
-    public boolean mouseClicked(int absMouseX, int absMouseY, double relMouseX, double relMouseY, int mouseButton) {
-        getDomElement().obtainFocus();
-        double scale = getDomElement().getAbsBounds().getWidth() / getDomElement().getSize().getWidth();
-        return panel.mouseClicked0( (int)(absMouseX / scale), (int)(absMouseY / scale), (int)relMouseX,(int) relMouseY, mouseButton);
-    }
-
-    @Override
-    public void mouseClickMove(int absMouseX, int absMouseY, double relMouseX, double relMouseY, int clickedMouseButton, long timeSinceLastClick) {
-        double scale = getDomElement().getAbsBounds().getWidth() / getDomElement().getSize().getWidth();
-        panel.mouseClickMove0( (int)(absMouseX / scale), (int)(absMouseY / scale),  (int)relMouseX, (int)relMouseY, clickedMouseButton, timeSinceLastClick);
-    }
-
-    @Override
-    public void mouseReleased(int absMouseX, int absMouseY, double relMouseX, double relMouseY, int state) {
-        double scale = getDomElement().getAbsBounds().getWidth() / getDomElement().getSize().getWidth();
-        panel.mouseReleased0( (int)(absMouseX / scale), (int)(absMouseY / scale), (int)relMouseX,(int) relMouseY, state);
-    }
-
-    @Override
-    public boolean mouseMoved(int absMouseX, int absMouseY, double relMouseX0, double relMouseY0) {
-        double scale = getDomElement().getAbsBounds().getWidth() / getDomElement().getSize().getWidth();
-        panel.mouseMoved0( (int)(absMouseX / scale), (int)(absMouseY / scale), (int)relMouseX0, (int)relMouseY0);
-        return true;
-    }
-
-    @Override
-    public boolean mouseScrolled(int absMouseX, int absMouseY, double relMouseX0, double relMouseY0, int scrollAmount) {
-        double scale = getDomElement().getAbsBounds().getWidth() / getDomElement().getSize().getWidth();
-        panel.mouseScrolled0( (int)(absMouseX / scale), (int)(absMouseY / scale), (int)relMouseX0, (int)relMouseY0, scrollAmount);
-        return true;
-    }
-
-    @Override
-    public void keyPressed(char typedChar, int keyCode) {
-        panel.keyPressed0(typedChar, keyCode);
-    }
-
-    @Override
-    public void keyReleased(char typedChar, int keyCode) {
-        panel.keyReleased0(typedChar, keyCode);
-    }
-
-    @Override
-    public void keyHeld(char typedChar, int keyCode) {
-        panel.keyHeld0(typedChar, keyCode);
-    }
-
-    @Override
-    public Size layout(DomElement buildContext, ConstraintBox constraintBox) {
-        Dimension dimension = force == null ? panel.getPreferredSize() : force.getSize();
-        panel.resize((int) constraintBox.getMaxWidth(), (int) constraintBox.getMaxHeight());
-        if (panel.getBounds().getWidth() != 0) dimension = panel.getSize();
-
-        panel.setBounds(new Rectangle(0,0, (int) dimension.getWidth(), (int) dimension.getHeight()));
-        return new Size(dimension.getWidth(), dimension.getHeight());
-    }
-
-    @Override
-    public void doRender(int absMouseX, int absMouseY, double relMouseX, double relMouseY, float partialTicks, RenderingContext context, DomElement buildContext) {
-        double scale = getDomElement().getAbsBounds().getWidth() / getDomElement().getSize().getWidth();
-
-        Rectangle originalRect = context.currentClip();
-        Rectangle rectangle = originalRect == null ? null : originalRect.getBounds();
-        boolean isNotNull = rectangle != null;
-        if (rectangle == null) rectangle = new Rectangle(0,0,Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight);
-
-        rectangle.y = Minecraft.getMinecraft().displayHeight - rectangle.y - rectangle.height;
-        rectangle.width /= scale;
-        rectangle.height /= scale;
-        rectangle.x /= scale;
-        rectangle.y /= scale;
-
-//        System.out.println(rectangle);
-        panel.render0(scale, new Point((int) (getDomElement().getAbsBounds().getX() / scale), (int) (getDomElement().getAbsBounds().getY() /scale)),
-                rectangle, (int)(absMouseX / scale), (int)(absMouseY / scale), (int)relMouseX, (int)relMouseY, partialTicks);
-
-        if (isNotNull) {
-            GL11.glEnable(GL11.GL_SCISSOR_TEST);
-            GL11.glScissor(originalRect.x, originalRect.y, originalRect.width, originalRect.height);
-        }
-    }
-}
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/RoundRect.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/RoundRect.java
index 217972e5..051bbe4b 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/RoundRect.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/RoundRect.java
@@ -26,8 +26,8 @@ import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.RenderingContext;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.SingleChildRenderer;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.AnnotatedExportOnlyWidget;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Export;
-import kr.syeyoung.dungeonsguide.mod.shader.ShaderManager;
-import kr.syeyoung.dungeonsguide.mod.shader.ShaderProgram;
+import kr.syeyoung.dungeonsguide.launcher.shader.ShaderManager;
+import kr.syeyoung.dungeonsguide.launcher.shader.ShaderProgram;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.opengl.GL20;
 
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/TextField.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/TextField.java
index 5cc977c8..dff6da58 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/TextField.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/TextField.java
@@ -29,7 +29,7 @@ import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.Renderer;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.renderer.RenderingContext;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.AnnotatedExportOnlyWidget;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Export;
-import kr.syeyoung.dungeonsguide.mod.utils.cursor.EnumCursor;
+import kr.syeyoung.dungeonsguide.launcher.util.cursor.EnumCursor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/ToggleButton.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/ToggleButton.java
index 8b4e7256..78814199 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/ToggleButton.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/ToggleButton.java
@@ -29,7 +29,7 @@ import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.AnnotatedWidget;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Bind;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Export;
 import kr.syeyoung.dungeonsguide.launcher.guiv2.xml.annotations.Passthrough;
-import kr.syeyoung.dungeonsguide.mod.utils.cursor.EnumCursor;
+import kr.syeyoung.dungeonsguide.launcher.util.cursor.EnumCursor;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/image/ImageTexture.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/image/ImageTexture.java
index e5ceec72..79ca20c9 100644
--- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/image/ImageTexture.java
+++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/elements/image/ImageTexture.java
@@ -19,7 +19,6 @@
 package kr.syeyoung.dungeonsguide.launcher.guiv2.elements.image;
 
 
-import kr.syeyoung.dungeonsguide.mod.DungeonsGuide;
 import lombok.Data;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
@@ -148,9 +147,9 @@ public class ImageTexture {
         tessellator.draw();
     }
 
-    public static final ExecutorService executorService = Executors.newFixedThreadPool(3, DungeonsGuide.THREAD_FACTORY);
+    public static final ExecutorService executorService = Executors.newFixedThreadPool(3);
     public static final Map<String, ImageTexture> imageMap = new HashMap<>(