Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
#	src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
#	src/main/java/cc/polyfrost/oneconfig/lwjgl/image/ImageLoader.java
#	src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java
#	src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java
#	src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java

1 files changed, 8 insertions, 28 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index 294f7db..6ffa65d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,5 @@
-import gg.essential.gradle.util.noServerRunConfigs
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import gg.essential.gradle.util.RelocationTransform.Companion.registerRelocationAttribute
-import gg.essential.gradle.util.prebundle
+import gg.essential.gradle.util.noServerRunConfigs
 
 plugins {
     kotlin("jvm")
@@ -58,17 +56,7 @@ loom {
 }
 
 repositories {
-    maven("https://repo.woverflow.cc/")
-}
-
-val relocated = registerRelocationAttribute("relocate") {
-    relocate("gg.essential", "cc.polyfrost.oneconfig.libs")
-    relocate("me.kbrewster", "cc.polyfrost.oneconfig.libs")
-    relocate("com.llamalad7", "cc.polyfrost.oneconfig.libs")
-}
-
-val shadeRelocated: Configuration by configurations.creating {
-    attributes { attribute(relocated, true) }
+    maven("https://repo.polyfrost.cc/releases")
 }
 
 val shade: Configuration by configurations.creating {
@@ -81,16 +69,8 @@ val lwjglNative: Configuration by configurations.creating {
     isTransitive = false
 }
 
-val dummyImpl: Configuration by configurations.creating {
-    configurations.implementation.get().extendsFrom(this)
-}
-
 sourceSets {
-    val dummy by creating {
-        compileClasspath += dummyImpl
-    }
     main {
-        compileClasspath += dummy.output
         runtimeClasspath += lwjglNative
         output.setResourcesDir(java.classesDirectory)
     }
@@ -110,20 +90,18 @@ val lwjglJar by tasks.registering(ShadowJar::class) {
 }
 
 dependencies {
-    dummyImpl("gg.essential:vigilance-$platform:222") {
+    compileOnly("gg.essential:vigilance-$platform:222") {
         isTransitive = false
     }
 
-    shadeRelocated("gg.essential:universalcraft-$platform:211") {
+    shade("gg.essential:universalcraft-$platform:211") {
         isTransitive = false
     }
 
-    shadeRelocated("com.github.KevinPriv:keventbus:c52e0a2ea0") {
+    shade("com.github.KevinPriv:keventbus:c52e0a2ea0") {
         isTransitive = false
     }
 
-    annotationProcessor(shadeRelocated("com.github.LlamaLad7:MixinExtras:0.0.10")!!)
-
     // for other mods and universalcraft
     shade("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
     shade("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21")
@@ -157,7 +135,6 @@ dependencies {
     lwjglNative("org.lwjgl:lwjgl-tinyfd:3.3.1:natives-macos")
     lwjglNative("org.lwjgl:lwjgl-nanovg:3.3.1:natives-macos")
     shade(lwjglJar.get().outputs.files)
-    shade(prebundle(shadeRelocated))
 
     dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.21")
 }
@@ -222,6 +199,9 @@ tasks {
         archiveClassifier.set("dev")
         configurations = listOf(shade, lwjglNative)
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+        relocate("gg.essential", "cc.polyfrost.oneconfig.libs")
+        relocate("me.kbrewster", "cc.polyfrost.oneconfig.libs")
     }
     remapJar {
         input.set(shadowJar.get().archiveFile)