Merge pull request #365 from Polyfrost/revert-364-develop-v0

Author: Wyvest

README.md

@@ -18,7 +18,7 @@ OneConfig is a free, open sourced configuration library by [Polyfrost](https://p
 </details>
 
 ### How to get:
-For beginners, we recommend using [SkyClient](https://skyclient.co/), a free and open-sourced mod installer. For more technical users, all of our mods, including [Hytils](https://github.com/Polyfrost/Hytils-Reborn), [CrashPatch](https://github.com/Polyfrost/crashpatch), [EvergreenHUD](https://github.com/Polyfrost/EvergreenHUD), and [Chatting](https://github.com/Polyfrost/chatting) have full support, and come with OneConfig. Mods which use [Vigilance](https://github.com/EssentialGG/Vigilance) are also supported through our [compatibility layer](https://docs.polyfrost.cc/oneconfig/config/compatibility).
+For beginners, we recommend using [SkyClient](https://skyclient.co/), a free and open-sourced mod installer. For more technical users, all of our mods, including [Hytils](https://github.com/Polyfrost/Hytils-Reborn), [CrashPatch](https://github.com/Polyfrost/crashpatch), [EvergreenHUD](https://github.com/Polyfrost/EvergreenHUD), and [Chatting](https://github.com/Polyfrost/chatting) have full support, and come with OneConfig. Mods which use [Vigilance](https://github.com/EssentialGG/Vigilance) are also supported through our [compatability layer](https://docs.polyfrost.cc/oneconfig/config/compatibility).
 
 ### Is it a client?
 While it may look like OneConfig is a client, in reality it's actually a standalone mod. You can actually [see for yourself](https://github.com/Polyfrost/OneConfig-Bootstrap), it doesn't come with any mods of it's own. It's left up to the user to decide which mods they want to actually use.

build.gradle.kts

@@ -40,8 +40,7 @@ blossom {
 }
 
 repositories {
-    maven("https://repo.polyfrost.org/releases")
-    maven("https://repo.polyfrost.org/snapshots")
+    maven("https://repo.polyfrost.cc/releases")
 }
 
 val relocated = registerRelocationAttribute("relocate") {

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ deencapsulation = "42b829f373"
 caffeine = "2.9.3"
 mixin = "0.7.11-SNAPSHOT"
 
-lwjgl = "1.0.0-alpha29"
+lwjgl = "1.0.0-alpha26"
 fabric-asm = "v2.3"
 
 [libraries]

settings.gradle.kts

@@ -3,7 +3,7 @@ pluginManagement {
         gradlePluginPortal()
         maven("https://repo.polyfrost.org/releases")
     }
-    val pgtVersion = "0.6.6"
+    val pgtVersion = "0.6.2"
     plugins {
         id("org.polyfrost.multi-version.root") version pgtVersion
         id("org.polyfrost.defaults") version pgtVersion

versions/build.gradle.kts

@@ -75,8 +75,7 @@ loom {
 }
 
 repositories {
-    maven("https://repo.polyfrost.org/releases")
-    maven("https://repo.polyfrost.org/snapshots")
+    maven("https://repo.polyfrost.cc/releases")
 }
 
 val relocatedCommonProject = registerRelocationAttribute("common-lwjgl") {
@@ -166,11 +165,20 @@ dependencies {
         }
     }
 
-    val configuration = configurations.create("tempLwjglConfiguration0")
-    compileOnly(configuration("cc.polyfrost:lwjgl-legacy:${libs.versions.lwjgl.get()}") {
-        isTransitive = false
-    })
-    shadeNoPom(implementationNoPom(prebundle(configuration, "lwjgl-legacy.jar"))!!)
+    val repackedVersions = when (platform.mcVersion) {
+        in 10809..11202 -> listOf(RepackedVersion.LEGACY)
+        in 11203..11802 -> listOf(RepackedVersion.PRE119NOARM, RepackedVersion.PRE119ARM)
+        else -> listOf(RepackedVersion.POST119)
+    }
+
+    repackedVersions.forEachIndexed { index, version ->
+        val configuration = configurations.create("tempLwjglConfiguration$index")
+
+        compileOnly(configuration("cc.polyfrost:lwjgl-$version:${libs.versions.lwjgl.get()}"){
+            isTransitive = false
+        })
+        shadeNoPom(implementationNoPom(prebundle(configuration, "lwjgl-$version.jar"))!!)
+    }
 
     modRuntimeOnly("me.djtheredstoner:DevAuth-" +
             (if (platform.isForge) { if (platform.isLegacyForge) "forge-legacy" else "forge-latest" } else "fabric")

versions/src/main/java/cc/polyfrost/oneconfig/internal/hacks/SkyClientUpdaterHack.java

@@ -17,7 +17,6 @@
     "OptifineConfigMixin",
     "RedactionNameHighlightMixin",
     "ShaderGroupAccessor",
-    "SkyClientUpdaterMixin",
     "VigilantMixin",
     "WorldClientMixin"
   ]