Revert "Relocate libraries in shadow jar"

Tho this would be the proper way to do things, and should prevent issues when launchers force the installer to be run every launch. This breaks the wrapper because they do things in a lazy way. As such reverting.

Author: LexManos

build.gradle

@@ -46,21 +46,15 @@ dependencies {
     testRuntimeOnly(libs.bundles.junit.runtime)
 }
 
-// This isn't great, but it alows us to drop a existing jar file into the root folder and do some debugging
-def testJars = fileTree(dir: projectDir).matching{ include '*-installer.jar' }    
-if (testJars.files.size() == 1) {
-    logger.lifecycle("Detected test installer: ${testJars.singleFile.name}")
-    def testData = tasks.register('testData', Jar) {
-        from(zipTree(testJars.singleFile)) {
-            exclude('**/*.class')
-            exclude('META-INF/**')
-            exclude('joptsimple/**')
-        }
-        includeEmptyDirs = false
-        archiveClassifier = 'test-data'
-    }
-    dependencies.implementation(files(testData))
-}
+Files.list(Paths.get(projectDir.absolutePath))
+        .filter(Files::isRegularFile)
+        .filter(path -> path.getFileName().toString().endsWith('-installer.jar'))
+        .findFirst()
+        .ifPresent(path -> {
+            var firstFile = path.toFile()
+            logger.lifecycle("Detected test installer: ${firstFile.name}")
+            dependencies.implementation(files(firstFile))
+        })
 
 tasks.named('jar', Jar) {
     manifest {
@@ -99,21 +93,6 @@ tasks.named('shadowJar', ShadowJar) {
 
     archiveClassifier = 'fatjar'
     minimize()
-    
-    // Meta stuff we don't need
-    exclude('com/google/errorprone/**')
-    exclude('META-INF/maven/**')
-    exclude('META-INF/proguard/**')
-    
-    // We shouldn't ever need to care about conflicts as this is an executable jar, but just be safe
-    relocate('joptsimple', 'net.minecraftforge.installer.shadow.joptsimple')
-    relocate('com.google.gson', 'net.minecraftforge.installer.shadow.gson')
-    
-    // Rewrite JOpt's message files, so that help text is displayed nicely.
-    transform(com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer) {
-        paths = [ 'Messages.properties$' ]
-        keyTransformer = { key -> 'net.minecraftforge.installer.shadow.' + key }
-    }
 }
 
 tasks.withType(JavaCompile).configureEach {

proguard.pro

@@ -0,0 +1,31 @@
+-dontoptimize
+-dontobfuscate
+#-dontpreverify
+-dontwarn javax.annotation.**
+-dontwarn javax.inject.**
+-dontwarn com.google.gson.**
+
+
+# Keep - Applications. Keep all application classes, along with their 'main'
+# methods.
+-keepclasseswithmembers public class * {
+    public static void main(java.lang.String[]);
+}
+
+# Also keep - Enumerations. Keep the special static methods that are required in
+# enumeration classes.
+-keepclassmembers enum  * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+# Also keep - Swing UI L&F. Keep all extensions of javax.swing.plaf.ComponentUI,
+# along with the special 'createUI' method.
+-keep class * extends javax.swing.plaf.ComponentUI {
+    public static javax.swing.plaf.ComponentUI createUI(javax.swing.JComponent);
+}
+
+# Keep names - Native method names. Keep all native class/method names.
+-keepclasseswithmembers,allowshrinking class * {
+    native <methods>;
+}