1.12.2 - Fix License issues

PoE-Addon-Launcher-Core.iml

@@ -41,7 +41,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.atlassian.commonmark:commonmark:0.12.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9" level="project" />

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>RizlimDev</groupId>
     <artifactId>PoE-Addon-Launcher-Core</artifactId>
-    <version>1.11.4</version>
+    <version>1.12</version>
 
     <properties>
         <kotlin.version>1.3.0</kotlin.version>
@@ -25,6 +25,9 @@
                             <addClasspath>true</addClasspath>
                             <mainClass>Launcher2</mainClass>
                         </manifest>
+                        <manifestEntries>
+                            <Class-Path>.</Class-Path>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
@@ -33,8 +36,12 @@
                 <configuration>
                     <archive>
                         <manifest>
+                            <addClasspath>true</addClasspath>
                             <mainClass>Launcher2</mainClass>
                         </manifest>
+                        <manifestEntries>
+                            <Class-Path>.</Class-Path>
+                        </manifestEntries>
                     </archive>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>

src/main/kotlin/PAL2/Github/UpdateGrabber.kt

@@ -4,49 +4,60 @@ import Github.connect
 import SystemHandling.deleteFile
 import SystemHandling.unzip
 import SystemHandling.verifyFolder
+import mu.KotlinLogging
 import org.apache.commons.io.FileUtils
 import java.io.File
 import java.net.URL
 
+private val logger = KotlinLogging.logger {}
+
 /**
  *
  */
-fun getUpdate(install: String)
+fun checkUpdate()
+{
+    if (!GlobalData.debugging)
+    {
+        val gh = connect()
+        if (gh.rateLimit.remaining > 3)
+        {
+            val repo = gh.getRepository("")
+        }
+    }
+}
+
+fun getUpdate()
 {
     // Get Token from DB if DB exists and if token is != ""
     if (!GlobalData.debugging)
     {
         val gh = connect()
-        if (gh.rateLimit.remaining > 5)
+        if (gh.rateLimit.remaining > 3)
         {
-            val repo = gh.getRepository("POE-Addon-Launcher/PAL2")
+            val repo = gh.getRepository("POE-Addon-Launcher/PALRelease")
             val latest = repo.latestRelease
             val latest_tag = latest.tagName
             if(latest_tag != GlobalData.version)
             {
                 val down_folder = File("${GlobalData.pal_folder}")
-
-                val temp_update = File("$install${File.separator}latest")
-
                 verifyFolder(down_folder)
-                verifyFolder(temp_update)
 
-                val dest = File("${down_folder.path}${File.separator}pal.zip")
+                val dest = File("${GlobalData.install_dir}${File.separator}new${File.separator}PAL2.jar")
+                val destFolder = File("${GlobalData.install_dir}${File.separator}new")
                 if (dest.exists())
-                {
                     deleteFile(dest)
-                }
+
+                if (!destFolder.exists())
+                    destFolder.mkdir()
 
                 val download_url = latest.assets[0].browserDownloadUrl
                 FileUtils.copyURLToFile(URL(download_url), dest)
 
-                println("Unzipping: ${dest.path} in ${temp_update.path}")
-                unzip(dest, temp_update)
+                logger.debug { "Downloaded update [$latest_tag] to: $dest" }
 
-                val stateONE = File("${GlobalData.pal_folder.path}${File.separator}1.state")
-                stateONE.createNewFile()
-                // Launch the newest version instead.
-                Runtime.getRuntime().exec("\"$temp_update${File.separator}PAL2.exe\"")
+                //rundll32 url.dll,FileProtocolHandler
+                println(">>> \"${GlobalData.install_dir}${File.separator}PAL2.exe\" <<")
+                Runtime.getRuntime().exec("\"${GlobalData.install_dir}${File.separator}PAL2.exe\"")
 
                 System.exit(99)
             }

src/main/kotlin/PAL2/GlobalData.kt

@@ -10,7 +10,7 @@ class GlobalData
 {
     companion object
     {
-        var version = "1.11.4"
+        var version = "1.12.2"
         var debugging = false
         var install_dir = ""
         var github_token = ""

src/main/kotlin/PAL2/Launcher.kt

@@ -22,6 +22,21 @@ class Launcher2
             // Set Locale to US to avoid any locale issues.
             Locale.setDefault(Locale.US)
 
+            if (!GlobalData.debugging)
+            {
+                var fInstall = File(Launcher2::class.java.protectionDomain.codeSource.location.toURI())
+
+                if (fInstall.isFile)
+                {
+                    fInstall = fInstall.parentFile
+                }
+                GlobalData.install_dir = fInstall.path
+
+
+            }
+
+
+            /*
             if (!GlobalData.debugging)
             {
                 var fInstall = File(Launcher2::class.java.protectionDomain.codeSource.location.toURI())
@@ -52,7 +67,7 @@ class Launcher2
                     deleteFile(newest_update)
                     deleteFile(stateTWO)
                 }
-            }
+            }*/
 
             try
             {

src/main/kotlin/PAL2/SystemHandling/Init.kt

@@ -6,6 +6,7 @@ import PAL2.Database.*
 import PAL2.GUI.Configurator.ConfiguratorApplication
 import PAL2.GUI.CoreApplication
 import PAL2.GUI.Loader.Loader
+import PAL2.Github.checkUpdate
 import PAL2.Github.getUpdate
 import PAL_DataClasses.PAL_AddonFullData
 import PAL_DataClasses.initObjectMapper
@@ -106,7 +107,10 @@ fun moreInit()
     }
 
     loader("Checking for Updates to PAL", 0.5)
-    getUpdate(GlobalData.install_dir)
+    //getUpdate(GlobalData.install_dir)
+
+    getUpdate()
+
     loader("No updates to PAL!", 0.6)
 
 

src/main/resources/update_notes.html

@@ -60,6 +60,13 @@
 
 </style>
 <body>
+<div class="block_1 hline-bottom"><h1>Version 1.12</h1></div>
+<ul>
+    <li>No longer uses Excelsior JET!</li>
+    <li>License issue won't happen anymore.</li>
+    <li>Readme's now use Markdown.md from their github repos.</li>
+</ul>
+
 <div class="block_1 hline-bottom"><h1>Version 1.11</h1></div>
 <ul>
     <li>Fix some bugs with Externals</li>