progress

3 files changed, 13 insertions, 14 deletions

diff --git a/build.gradle b/build.gradle
index f51bae14..84994348 100755
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "1.0"
+version = "2.0"
 group= "kr.syeyoung.dungeonsguide" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "dungeonsguide"
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/a.java b/src/main/java/kr/syeyoung/dungeonsguide/a.java
index 38014622..6fc6cb7e 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/a.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/a.java
@@ -43,7 +43,8 @@ public class a
 
     @EventHandler
     public void a(FMLPreInitializationEvent a) {
-        b b = new b();
+        ProgressManager.ProgressBar f = ProgressManager.push("Dungeons Guide", 5);
+        b b = new b(f);
         String c = null;
         try {
             c = b.b(this.getClass().getResourceAsStream("/kr/syeyoung/dungeonsguide/e.class") == null);
@@ -54,8 +55,10 @@ public class a
                 d.addURL(new URL("z:///"));
 
                 try {
+                    f.step("Initializing");
                     this.d = new e(b);
                     this.d.pre(a);
+                    ProgressManager.pop(f);
                 } catch (Exception e) {
                     e.printStackTrace();
 
@@ -101,17 +104,6 @@ public class a
                 "If you haven't purchased the mod, please consider doing so"
         });
     }
-//    @EventHandler
-//    public void pre(FMLPreInitializationEvent event) {
-//                a = this;
-//                URL.setURLStreamHandlerFactory(new c(null));
-//                try {
-//                    d = new e(null);
-//                    d.pre(event);
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//    }
 
     public void a(final String[] a) {
         final GuiScreen b = new GuiErrorScreen(null, null) {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/b.java b/src/main/java/kr/syeyoung/dungeonsguide/b.java
index 2e706b39..e4ac7ea0 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/b.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/b.java
@@ -9,6 +9,7 @@ import com.mojang.authlib.minecraft.MinecraftSessionService;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.Session;
+import net.minecraftforge.fml.common.ProgressManager;
 import org.apache.commons.codec.binary.Base64;
 
 import javax.crypto.*;
@@ -30,6 +31,7 @@ import java.util.zip.ZipInputStream;
 public class b {
     private KeyPair a;
     private String b;
+    private ProgressManager.ProgressBar p;
 
     public String c() {
         return b;
@@ -45,7 +47,9 @@ public class b {
         return this.a;
     }
 
-    public b() {
+    public b(ProgressManager.ProgressBar p) {
+        this.p = p;
+        p.step("Generating KeyPair...");
         a();
     }
 
@@ -94,13 +98,16 @@ public class b {
         Session a = Minecraft.getMinecraft().getSession();
         String b = a.getToken();
 
+        p.step("Authenticating Dungeons Guide (1/2)");
         String c = a(a.getProfile());
         MinecraftSessionService yggdrasilMinecraftSessionService = Minecraft.getMinecraft().getSessionService();
         JsonObject d = a(c);
         String hash = a(Base64.decodeBase64(d.get("sharedSecret").getAsString()),
                 Base64.decodeBase64(d.get("publicKey").getAsString()));
         yggdrasilMinecraftSessionService.joinServer(a.getProfile(), b, hash);
+        p.step("Authenticating Dungeons Guide (2/2)");
         this.b = a(c, this.a.getPublic());
+        p.step("Downloading Required Resources");
         if (jars)
             b(this.b, "https://dungeonsguide.kro.kr/resource/latest");
         b(this.b, "https://dungeonsguide.kro.kr/resource/roomdata");