Merge pull request #23 from Polyfrost/refactor/clean-up

Clean up entire project

Author: SubAt0m1c

build.gradle.kts

@@ -23,11 +23,11 @@ repositories {
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.151"
+        version = "1.0.0-alpha.176"
         loaderVersion = "1.1.0-alpha.53"
 
         usePolyMixin = true
-        polyMixinVersion = "0.8.4+build.2"
+        polyMixinVersion = "0.8.4+build.7"
 
         applyLoaderTweaker = true
 
@@ -37,7 +37,7 @@ toolkitLoomHelper {
     }
 
     useDevAuth("1.2.1")
-    useMixinExtras("0.4.1")
+    useMixinExtras("0.5.0")
 
     // Turns off the server-side run configs, as we're building a client-sided mod.
     disableRunConfigs(GameSide.SERVER)
@@ -54,6 +54,16 @@ toolkitLoomHelper {
 }
 
 dependencies {
+    implementation(libs.discord.game.sdk4j)
+    includeOrShade(libs.discord.game.sdk4j)
+
+    implementation(libs.bundles.ktor.client)
+    includeOrShade(libs.bundles.ktor.client)
+    implementation(libs.bundles.ktor.server)
+    includeOrShade(libs.bundles.ktor.server)
+    implementation(libs.bundles.ktor.serialization)
+    includeOrShade(libs.bundles.ktor.serialization)
+
     // Add (Legacy) Fabric API as dependencies (these are both optional but are particularly useful).
     if (mcData.isFabric) {
         if (mcData.isLegacyFabric) {
@@ -64,22 +74,4 @@ dependencies {
             modImplementation("net.fabricmc.fabric-api:fabric-api:${mcData.dependencies.fabric.fabricApiVersion}")
         }
     }
-    modImplementation("com.github.JnCrMx:discord-game-sdk4j:v0.5.5")
-
-    implementation("io.ktor:ktor-client-core:3.3.1")
-    shade("io.ktor:ktor-client-core:3.3.1")
-    implementation("io.ktor:ktor-client-cio:3.3.1")
-    shade("io.ktor:ktor-client-cio:3.3.1")
-    implementation("io.ktor:ktor-client-content-negotiation:3.3.1")
-    shade("io.ktor:ktor-client-content-negotiation:3.3.1")
-    implementation("io.ktor:ktor-serialization-kotlinx-json:3.3.1")
-    shade("io.ktor:ktor-serialization-kotlinx-json:3.3.1")
-    implementation("io.ktor:ktor-server-websockets:3.3.1")
-    shade("io.ktor:ktor-server-websockets:3.3.1")
-}
-
-tasks {
-    named("build") {
-        dependsOn("fatJar")
-    }
 }

gradle/libs.versions.toml

@@ -0,0 +1,16 @@
+[versions]
+discord-game-sdk4j = "v0.5.5"
+ktor = "3.3.1"
+
+[libraries]
+discord-game-sdk4j = { group = "com.github.JnCrMx", name = "discord-game-sdk4j", version.ref = "discord-game-sdk4j" }
+ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
+ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
+ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
+ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" }
+ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
+
+[bundles]
+ktor-client = ["ktor-client-core", "ktor-client-cio", "ktor-client-content-negotiation"]
+ktor-server = ["ktor-server-websockets"]
+ktor-serialization = ["ktor-serialization-kotlinx-json"]

settings.gradle.kts

@@ -25,7 +25,7 @@ pluginManagement {
     plugins {
         kotlin("jvm") version("2.2.10")
         kotlin("plugin.serialization") version("2.2.10")
-        id("dev.deftu.gradle.multiversion-root") version("2.51.0")
+        id("dev.deftu.gradle.multiversion-root") version("2.62.0")
     }
 }
 

src/main/java/org/polyfrost/polyplus/client/mixin/Mixin_ReplaceCapeTexture.java

@@ -3,31 +3,23 @@
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.util.ResourceLocation;
-import org.polyfrost.polyplus.PolyPlus;
+import org.polyfrost.polyplus.client.cosmetics.CosmeticManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import static org.polyfrost.polyplus.network.plus.cache.CosmeticCache.getCosmetic;
-
 @Mixin(NetworkPlayerInfo.class)
 public class Mixin_ReplaceCapeTexture {
-    @Shadow
-    private ResourceLocation locationCape;
-
-    @Shadow @Final
-    private GameProfile gameProfile;
+    @Shadow @Final private GameProfile gameProfile;
 
-    @Inject(method = "getLocationCape", at = @org.spongepowered.asm.mixin.injection.At("HEAD"))
-    private void polyplus$onGetCape(CallbackInfoReturnable<ResourceLocation> cir) {
-        ResourceLocation cape = getCosmetic(gameProfile.getId(), "cape");
-        if (cape != null) {
-            System.out.println("Replacing cape for " + gameProfile.getName() + " with " + cape);
-            this.locationCape = cape;
-        } else {
-            System.out.println("No cape found for " + gameProfile.getName());
+    @Inject(method = "getLocationCape", at = @At("HEAD"))
+    private void polyplus$useCustomCape(CallbackInfoReturnable<ResourceLocation> cir) {
+        ResourceLocation capeLocation = CosmeticManager.get(this.gameProfile.getId(), "cape");
+        if (capeLocation != null) {
+            cir.setReturnValue(capeLocation);
         }
     }
 }

src/main/kotlin/org/polyfrost/polyplus/BackendUrl.kt

@@ -0,0 +1,15 @@
+package org.polyfrost.polyplus
+
+enum class BackendUrl(val url: String) {
+    PRODUCTION("https://plus.polyfrost.org"),
+    STAGING("https://plus-staging.polyfrost.org"),
+    LOCAL("http://localhost:8080");
+
+    operator fun plus(other: String): String {
+        return this + other
+    }
+
+    override fun toString(): String {
+        return url
+    }
+}

src/main/kotlin/org/polyfrost/polyplus/Example.kt

@@ -0,0 +1,8 @@
+package org.polyfrost.polyplus
+
+object PolyPlusConstants {
+    // Sets the variables from `gradle.properties`. Depends on the `bloom` DGT plugin.
+    const val ID = "@MOD_ID@"
+    const val NAME = "@MOD_NAME@"
+    const val VERSION = "@MOD_VERSION@"
+}