update PGT and relocate to org.polyfrost

45 files changed, 383 insertions, 269 deletions

diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 5a18999..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,111 +0,0 @@
-//file:noinspection UnnecessaryQualifiedReference
-//file:noinspection GroovyAssignabilityCheck
-
-plugins {
-    id "dev.architectury.architectury-pack200" version "0.1.3"
-    id 'org.jetbrains.kotlin.jvm' version '1.6.10'
-    id "cc.polyfrost.loom" version "0.10.0.5"
-    id "net.kyori.blossom" version "1.3.0"
-    id "java"
-}
-
-version = mod_version
-group = "cc.woverflow"
-archivesBaseName = mod_name
-
-blossom {
-    String className = "src/main/kotlin/cc/woverflow/chatting/Chatting.kt"
-    replaceToken("@VER@", project.version, className)
-    replaceToken("@NAME@", mod_name, className)
-    replaceToken("@ID@", mod_id, className)
-}
-kotlin.jvmToolchain {
-    languageVersion = JavaLanguageVersion.of(8)
-}
-compileJava.options.encoding = 'UTF-8'
-
-loom {
-    launchConfigs {
-        client {
-            arg("--tweakClass", "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker")
-            property("mixin.debug.export", "true")
-        }
-    }
-    runConfigs {
-        client {
-            vmArgs.remove("-XstartOnFirstThread")
-        }
-    }
-    forge {
-        pack200Provider = new dev.architectury.pack200.java.Pack200Adapter()
-        mixinConfig("mixins.${mod_id}.json")
-        mixin.defaultRefmapName.set("mixins.${mod_id}.refmap.json")
-    }
-}
-
-configurations {
-    include
-    implementation.extendsFrom(include)
-}
-
-repositories {
-    maven { url 'https://repo.polyfrost.cc/releases'}
-}
-
-dependencies {
-    minecraft("com.mojang:minecraft:1.8.9")
-    mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
-    forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
-    compileOnly ('org.spongepowered:mixin:0.7.11-SNAPSHOT')
-    compileOnly('cc.polyfrost:oneconfig-1.8.9-forge:0.2.0-alpha+')
-    include('cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta+')
-    modRuntimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.0")
-}
-
-processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", version
-    inputs.property "name", mod_name
-    inputs.property "id", mod_id
-
-    filesMatching("mcmod.info") {
-        expand(
-                "id": mod_id,
-                "name": mod_name,
-                "version": version
-        )
-    }
-
-    filesMatching("mixins.${mod_id}.json") {
-        expand("id": mod_id)
-    }
-
-    rename '(.+_at.cfg)', 'META-INF/$1'
-}
-
-sourceSets {
-    dummy
-    main {
-        compileClasspath += dummy.output
-        output.resourcesDir = java.classesDirectory
-    }
-}
-
-jar {
-    dependsOn configurations.include
-    from(configurations.include.collect { it.isDirectory() ? it : zipTree(it) }) {
-        def i = 0
-        filesMatching("META-INF/NOTICE*") { name = "$name.${i++}" }
-        filesMatching("META-INF/LICENSE*") { name = "$name.${i++}" }
-        filesMatching("META-INF/mods.toml") { name = "$name.${i++}" }
-        filesMatching("LICENSE*") { name = "$name.${i++}" }
-    }
-
-    manifest.attributes(
-            'ModSide': 'CLIENT',
-            'ForceLoadAsMod': true,
-            'MixinConfigs': "mixins.${mod_id}.json",
-            "TweakOrder": "0",
-            "TweakClass": "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker"
-    )
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..2c4e811
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,196 @@
+@file:Suppress("UnstableApiUsage", "PropertyName")
+
+import org.polyfrost.gradle.util.noServerRunConfigs
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+// Adds support for kotlin, and adds the Polyfrost Gradle Toolkit
+// which we use to prepare the environment.
+plugins {
+    kotlin("jvm")
+    id("org.polyfrost.multi-version")
+    id("org.polyfrost.defaults.repo")
+    id("org.polyfrost.defaults.java")
+    id("org.polyfrost.defaults.loom")
+    id("com.github.johnrengelman.shadow")
+    id("net.kyori.blossom") version "1.3.1"
+    id("signing")
+    java
+}
+
+// Gets the mod name, version and id from the `gradle.properties` file.
+val mod_name: String by project
+val mod_version: String by project
+val mod_id: String by project
+val mod_archives_name: String by project
+
+// Sets up the variables for when we preprocess to other Minecraft versions.
+preprocess {
+    vars.put("MODERN", if (project.platform.mcMinor >= 16) 1 else 0)
+}
+
+// Replaces the variables in `ExampleMod.java` to the ones specified in `gradle.properties`.
+blossom {
+    replaceToken("@VER@", mod_version)
+    replaceToken("@NAME@", mod_name)
+    replaceToken("@ID@", mod_id)
+}
+
+// Sets the mod version to the one specified in `gradle.properties`. Make sure to change this following semver!
+version = mod_version
+// Sets the group, make sure to change this to your own. It can be a website you own backwards or your GitHub username.
+// e.g. com.github.<your username> or com.<your domain>
+group = "org.polyfrost"
+
+// Sets the name of the output jar (the one you put in your mods folder and send to other people)
+// It outputs all versions of the mod into the `build` directory.
+base {
+    archivesName.set("$mod_archives_name-$platform")
+}
+
+// Configures the Polyfrost Loom, our plugin fork to easily set up the programming environment.
+loom {
+    // Removes the server configs from IntelliJ IDEA, leaving only client runs.
+    // If you're developing a server-side mod, you can remove this line.
+    noServerRunConfigs()
+
+    // Adds the tweak class if we are building legacy version of forge as per the documentation (https://docs.polyfrost.org)
+    if (project.platform.isLegacyForge) {
+        runConfigs {
+            "client" {
+                programArgs("--tweakClass", "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker")
+                property("mixin.debug.export", "true")
+            }
+        }
+    }
+    // Configures the mixins if we are building for forge, useful for when we are dealing with cross-platform projects.
+    if (project.platform.isForge) {
+        forge {
+            mixinConfig("mixins.${mod_id}.json")
+        }
+    }
+    // Configures the name of the mixin "refmap" using an experimental loom api.
+    mixin.defaultRefmapName.set("mixins.${mod_id}.refmap.json")
+}
+
+// Creates the shade/shadow configuration, so we can include libraries inside our mod, rather than having to add them separately.
+val shade: Configuration by configurations.creating {
+    configurations.implementation.get().extendsFrom(this)
+}
+
+// Configures the output directory for when building from the `src/resources` directory.
+sourceSets {
+    val dummy by creating
+    main {
+        compileClasspath += dummy.output
+        output.setResourcesDir(java.classesDirectory)
+    }
+}
+
+// Adds the Polyfrost maven repository so that we can get the libraries necessary to develop the mod.
+repositories {
+    maven("https://repo.polyfrost.org/releases")
+}
+
+// Configures the libraries/dependencies for your mod.
+dependencies {
+    // Adds the OneConfig library, so we can develop with it.
+    modCompileOnly("cc.polyfrost:oneconfig-$platform:0.2.1-alpha+")
+
+    modRuntimeOnly("me.djtheredstoner:DevAuth-${if (platform.isFabric) "fabric" else if (platform.isLegacyForge) "forge-legacy" else "forge-latest"}:1.1.2")
+
+    // If we are building for legacy forge, includes the launch wrapper with `shade` as we configured earlier.
+    if (platform.isLegacyForge) {
+        compileOnly("org.spongepowered:mixin:0.7.11-SNAPSHOT")
+        shade("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta+")
+    }
+}
+
+tasks {
+    // Processes the `src/resources/mcmod.info or fabric.mod.json` and replaces
+    // the mod id, name and version with the ones in `gradle.properties`
+    processResources {
+        inputs.property("id", mod_id)
+        inputs.property("name", mod_name)
+        val java = if (project.platform.mcMinor >= 18) {
+            17 // If we are playing on version 1.18, set the java version to 17
+        } else {
+            // Else if we are playing on version 1.17, use java 16.
+            if (project.platform.mcMinor == 17)
+                16
+            else
+                8 // For all previous versions, we **need** java 8 (for Forge support).
+        }
+        val compatLevel = "JAVA_${java}"
+        inputs.property("java", java)
+        inputs.property("java_level", compatLevel)
+        inputs.property("version", mod_version)
+        inputs.property("mcVersionStr", project.platform.mcVersionStr)
+        filesMatching(listOf("mcmod.info", "mixins.${mod_id}.json", "mods.toml")) {
+            expand(
+                    mapOf(
+                            "id" to mod_id,
+                            "name" to mod_name,
+                            "java" to java,
+                            "java_level" to compatLevel,
+                            "version" to mod_version,
+                            "mcVersionStr" to project.platform.mcVersionStr
+                    )
+            )
+        }
+        filesMatching("fabric.mod.json") {
+            expand(
+                    mapOf(
+                            "id" to mod_id,
+                            "name" to mod_name,
+                            "java" to java,
+                            "java_level" to compatLevel,
+                            "version" to mod_version,
+                            "mcVersionStr" to project.platform.mcVersionStr.substringBeforeLast(".") + ".x"
+                    )
+            )
+        }
+    }
+
+    // Configures the resources to include if we are building for forge or fabric.
+    withType(Jar::class.java) {
+        if (project.platform.isFabric) {
+            exclude("mcmod.info", "mods.toml")
+        } else {
+            exclude("fabric.mod.json")
+            if (project.platform.isLegacyForge) {
+                exclude("mods.toml")
+            } else {
+                exclude("mcmod.info")
+            }
+        }
+    }
+
+    // Configures our shadow/shade configuration, so we can
+    // include some dependencies within our mod jar file.
+    named<ShadowJar>("shadowJar") {
+        archiveClassifier.set("dev") // TODO: machete gets confused by the `dev` prefix.
+        configurations = listOf(shade)
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+
+    remapJar {
+        inputFile.set(shadowJar.get().archiveFile)
+        archiveClassifier.set("")
+    }
+
+    jar {
+        // Sets the jar manifest attributes.
+        if (platform.isLegacyForge) {
+            manifest.attributes += mapOf(
+                    "ModSide" to "CLIENT", // We aren't developing a server-side mod, so this is fine.
+                    "ForceLoadAsMod" to true, // We want to load this jar as a mod, so we force Forge to do so.
+                    "TweakOrder" to "0", // Makes sure that the OneConfig launch wrapper is loaded as soon as possible.
+                    "MixinConfigs" to "mixins.${mod_id}.json", // We want to use our mixin configuration, so we specify it here.
+                    "TweakClass" to "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker" // Loads the OneConfig launch wrapper.
+            )
+        }
+        dependsOn(shadowJar)
+        archiveClassifier.set("")
+        enabled = false
+    }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index d0f26a8..7e417f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,12 @@
-org.gradle.jvmargs=-Xmx2G
 mod_name = Chatting
 mod_id = chatting
-mod_version = 1.4.2-beta5
+mod_version = 1.5.0
+mod_archives_name = Chatting
 
-loom.platform = forge
-minecraft.version = "1.8.9-forge"
+# Gradle Configuration -- DO NOT TOUCH THESE VALUES.
+polyfrost.defaults.loom=1
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.configureoncommand=true
+org.gradle.parallel.threads=4
+org.gradle.jvmargs=-Xmx2G
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 070cb70..e411586 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/root.gradle.kts b/root.gradle.kts
new file mode 100644
index 0000000..2b3f7b0
--- /dev/null
+++ b/root.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    kotlin("jvm") version "1.8.22" apply false
+    id("org.polyfrost.multi-version.root")
+    id("com.github.johnrengelman.shadow") version "7.1.2" apply false
+}
+
+preprocess {
+    "1.8.9-forge"(10809, "srg") {}
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 8fa80f6..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven { url = "https://repo.polyfrost.cc/releases" }
-        maven { url = "https://maven.architectury.dev"}
-    }
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "io.github.juuxel.loom-quiltflower-mini") {
-                useModule("com.github.wyvest:loom-quiltflower-mini:${requested.version}")
-            }
-        }
-    }
-}
-
-rootProject.name = mod_name
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..9692a27
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,30 @@
+@file:Suppress("PropertyName")
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+        maven("https://repo.polyfrost.org/releases") // Adds the Polyfrost maven repository to get Polyfrost Gradle Toolkit
+    }
+    plugins {
+        val pgtVersion = "0.2.9" // Sets the default versions for Polyfrost Gradle Toolkit
+        id("org.polyfrost.multi-version.root") version pgtVersion
+    }
+}
+
+val mod_name: String by settings
+
+// Configures the root project Gradle name based on the value in `gradle.properties`
+rootProject.name = mod_name
+rootProject.buildFileName = "root.gradle.kts"
+
+// Adds all of our build target versions to the classpath if we need to add version-specific code.
+listOf(
+    "1.8.9-forge"
+).forEach { version ->
+    include(":$version")
+    project(":$version").apply {
+        projectDir = file("versions/$version")
+        buildFileName = "../../build.gradle.kts"
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/cc/woverflow/chatting/hook/ChatLineHook.java b/src/main/java/org/polyfrost/chatting/hook/ChatLineHook.java
index 9460e0c..50b9ce3 100644
--- a/src/main/java/cc/woverflow/chatting/hook/ChatLineHook.java
+++ b/src/main/java/org/polyfrost/chatting/hook/ChatLineHook.java
@@ -1,4 +1,4 @@
-package cc.woverflow.chatting.hook;
+package org.polyfrost.chatting.hook;
 
 import net.minecraft.client.gui.ChatLine;
 import net.minecraft.client.network.NetworkPlayerInfo;
diff --git a/src/main/java/cc/woverflow/chatting/hook/GuiNewChatHook.java b/src/main/java/org/polyfrost/chatting/hook/GuiNewChatHook.java
index 19da778..84097bd 100644
--- a/src/main/java/cc/woverflow/chatting/hook/GuiNewChatHook.java
+++ b/src/main/java/org/polyfrost/chatting/hook/GuiNewChatHook.java
@@ -1,4 +1,4 @@
-package cc.woverflow.chatting.hook;
+package org.polyfrost.chatting.hook;
 
 import net.minecraft.client.gui.ChatLine;
 
diff --git a/src/main/java/cc/woverflow/chatting/mixin/ChatLineMixin.java b/src/main/java/org/polyfrost/chatting/mixin/ChatLineMixin.java
index beef37b..2e5f21c 100644
--- a/src/main/java/cc/woverflow/chatting/mixin/ChatLineMixin.java
+++ b/src/main/java/org/polyfrost/chatting/mixin/ChatLineMixin.java
@@ -3,10 +3,10 @@
  * See: https://github.com/dzwdz/chat_heads/blob/fabric-1.16.x/LICENSE
  */
 
-package cc.woverflow.chatting.mixin;
+package org.polyfrost.chatting.mixin;
 
-import cc.woverflow.chatting.config.ChattingConfig;
-import cc.woverflow.chatting.hook.ChatLineHook;
+import org.polyfrost.chatting.config.ChattingConfig;
+import org.polyfrost.chatting.hook.ChatLineHook;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ChatLine;
 import net.minecraft.client.network.NetHandlerPlayClient;
diff --git a/src/main/java/cc/woverflow/chatting/mixin/ClientCommandHandlerMixin.java b/src/main/java/org/polyfrost/chatting/mixin/ClientCommandHandlerMixin.java
index f771c87..ee63ed3 100644
--- a/src/main/java/cc/woverflow/chatting/mixin/ClientCommandHandlerMixin.java
+++ b/src/main/java/org/polyfrost/chatting/mixin/ClientCommandHandlerMixin.java
@@ -1,7 +1,5 @@
-package cc.woverflow.chatting.mixin;
+package org.polyfrost.chatting.mixin;
 
-import cc.woverflow.chatting.chat.ChatShortcuts;
-import cc.woverflow.chatting.config.ChattingConfig;
 import kotlin.Pair;
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandHandler;
@@ -9,6 +7,8 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.util.BlockPos;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.fml.client.FMLClientHandler;
+import org.polyfrost.chatting.chat.ChatShortcuts;
+import org.polyfrost.chatting.config.ChattingConfig;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
diff --git a/src/main/java/cc/woverflow/chatting/mixin/EntityPlayerSPMixin.java b/src/main/java/org/polyfrost/chatting/mixin/EntityPlayerSPMixin.java
index fa125cb..d59d7f2 100644
--- a/src/main/java/cc/woverflow/chatting/mixin/EntityPlayerSPMixin.java
+++ b/src/main/java/org/polyfrost/chatting/mixin/EntityPlayerSPMixin.java
@@ -1,12 +1,12 @@
-package cc.woverflow.chatting.mixin;
+package org.polyfrost.chatting.mixin;
 
-import cc.woverflow.chatting.chat.ChatTab;
-import cc.woverflow.chatting.chat.ChatTabs;
-import cc.woverflow.chatting.config.ChattingConfig;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.client.C01PacketChatMessage;
+import org.polyfrost.chatting.chat.ChatTab;
+import org.polyfrost.chatting.chat.ChatTabs;
+import org.polyfrost.chatting.config.ChattingConfig;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/cc/woverflow/chatting/mixin/GuiChatMixin.java b/src/main/java/org/polyfrost/chatting/mixin/GuiChatMixin.java
index a12aea1..303326f 100644
--- a/src/main/java/cc/woverflow/chatting/mixin/GuiChatMixin.java
+++ b/src/main/java/org/polyfrost/chatting/mixin/GuiChatMixin.java
@@ -1,13 +1,12 @@
-package cc.woverflow.chatting.mixin;
+package org.polyfrost.chatting.mixin;
 
-import cc.woverflow.chatting.chat.*;
-import cc.woverflow.chatting.config.ChattingConfig;
-import cc.woverflow.chatting.gui.components.ClearButton;
-import cc.woverflow.chatting.gui.components.ScreenshotButton;
-import cc.woverflow.chatting.gui.components.SearchButton;
-import cc.woverflow.chatting.hook.ChatLineHook;
-import cc.woverflow.chatting.hook.GuiNewChatHook;
-import cc.woverflow.chatting.utils.ModCompatHooks;
+import org.polyfrost.chatting.chat.*;
+import org.polyfrost.chatting.config.ChattingConfig;
+import org.polyfrost.chatting.gui.components.ClearButton;
+import org.polyfrost.chatting.gui.components.ScreenshotButton;
+import org.polyfrost.chatting.gui.components.SearchButton;
+import org.polyfrost.chatting.hook.ChatLineHook;
+import org.polyfrost.chatting.hook.GuiNewChatHook;
 import com.google.common.collect.Lists;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ChatLine;
@@ -18,6 +17,9 @@ import net.minecraft.util.MathHelper;
 import net.minecraftforge.fml.client.config.GuiUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.lwjgl.input.Mouse;
+import org.polyfrost.chatting.chat.ChatSearchingManager;
+import org.polyfrost.chatting.chat.ChatShortcuts;
+import org.polyfrost.chatting.utils.ModCompatHooks;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/cc/woverflow/chatting/mixin/GuiNewChatAccessor.java b/src/main/java/org/polyfrost/chatting/mixin/GuiNewChatAccessor.java
index d4fd524..d0630ca 100644
--- a/src/main/java/cc/woverflow/chatting/mixin/GuiNewChatAccessor