Pain :(

Polyfrost · Jan 14, 2025 · ce0e206 · ce0e206
1 parent 7761d8b
commit ce0e206
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 106 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
     id("dev.deftu.gradle.tools.resources") // Applies resource processing so that we can replace tokens, such as our mod name/version, in our resources.
     id("dev.deftu.gradle.tools.bloom") // Applies the Bloom plugin, which allows us to replace tokens in our source files, such as being able to use `@MOD_VERSION` in our source files.
     id("dev.deftu.gradle.tools.shadow") // Applies the Shadow plugin, which allows us to shade our dependencies into our mod JAR. This is NOT recommended for Fabric mods, but we have an *additional* configuration for those!
+    id("dev.deftu.gradle.tools.ducks") // Creates a ducks source set, which allows us to use theoretical classes which may not exist at runtime (such as things which are in other mods).
     id("dev.deftu.gradle.tools.minecraft.loom") // Applies the Loom plugin, which automagically configures Essential's Architectury Loom plugin for you.
     id("dev.deftu.gradle.tools.minecraft.releases") // Applies the Minecraft auto-releasing plugin, which allows you to automatically release your mod to CurseForge and Modrinth.
 }

diff --git a/...g/internal/config/annotations/Option.java → ...g/internal/config/annotations/Option.java b/...g/internal/config/annotations/Option.java → ...g/internal/config/annotations/Option.java
diff --git a/src/main/java/org/polyfrost/glintcolorizer/mixin/oneconfig/ConfigMixin.java b/src/main/java/org/polyfrost/glintcolorizer/mixin/oneconfig/ConfigMixin.java
diff --git a/src/main/kotlin/org/polyfrost/glintcolorizer/command/GlintCommand.kt b/src/main/kotlin/org/polyfrost/glintcolorizer/command/GlintCommand.kt
@@ -3,6 +3,7 @@ package org.polyfrost.glintcolorizer.command
 import org.polyfrost.glintcolorizer.GlintColorizer
 import org.polyfrost.glintcolorizer.config.GlintConfig
 import org.polyfrost.oneconfig.api.commands.v1.factories.annotated.Command
+import org.polyfrost.oneconfig.utils.v1.dsl.openUI
 
 @Command(
     value = [GlintColorizer.ID],
@@ -12,7 +13,7 @@ class GlintCommand {
 
     @Command
     fun handle() {
-        GlintConfig.openGui()
+        GlintConfig.openUI()
     }
 
 }
diff --git a/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintEffectOptions.kt b/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintEffectOptions.kt
@@ -4,8 +4,8 @@ import org.polyfrost.oneconfig.api.config.v1.annotations.Button
 import org.polyfrost.oneconfig.api.config.v1.annotations.Color
 import org.polyfrost.oneconfig.api.config.v1.annotations.Slider
 import org.polyfrost.oneconfig.api.config.v1.annotations.Switch
+import org.polyfrost.oneconfig.utils.v1.dsl.openUI
 import org.polyfrost.polyui.color.argb
-import org.polyfrost.utils.v1.dsl.openUI
 
 class GlintEffectOptions {
 

diff --git a/src/main/kotlin/org/polyfrost/glintcolorizer/handler/SecondGlintHandler.kt b/src/main/kotlin/org/polyfrost/glintcolorizer/handler/SecondGlintHandler.kt
@@ -38,7 +38,7 @@ fun glintStroke1(renderItem : RenderItem, model : IBakedModel) {
     GlStateManager.translate(f, 0.0f, 0.0f)
     GlStateManager.rotate(-50.0f, 0.0f, 0.0f, 1.0f)
     (renderItem as RenderItemAccessor).invokeRenderModel(model,
-        if (GlintConfig.guiItem.individualStrokes) GlintConfig.guiItem.strokeOneColor.rgb else GlintConfig.guiItem.glintColor.rgb
+        if (GlintConfig.guiItem.individualStrokes) GlintConfig.guiItem.strokeOneColor.rgba else GlintConfig.guiItem.glintColor.rgba
     )
     GlStateManager.popMatrix()
 }
@@ -50,7 +50,7 @@ fun glintStroke2(renderItem : RenderItem, model : IBakedModel) {
     GlStateManager.translate(-f1, 0.0f, 0.0f)
     GlStateManager.rotate(10.0f, 0.0f, 0.0f, 1.0f)
     (renderItem as RenderItemAccessor).invokeRenderModel(model,
-        if (GlintConfig.guiItem.individualStrokes) GlintConfig.guiItem.strokeTwoColor.rgb else GlintConfig.guiItem.glintColor.rgb
+        if (GlintConfig.guiItem.individualStrokes) GlintConfig.guiItem.strokeTwoColor.rgba else GlintConfig.guiItem.glintColor.rgba
     )
     GlStateManager.popMatrix()
 }
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -1,10 +1,10 @@
 [
   {
-    "modid": "${id}",
-    "name": "${name}",
+    "modid": "${mod_id}",
+    "name": "${mod_name}",
     "description": "Change the color of the enchantment glint!",
-    "version": "${version}",
-    "mcversion": "${mcVersionStr}",
+    "version": "${mod_version}",
+    "mcversion": "${mc_version}",
     "url": "",
     "updateUrl": "",
     "authorList": [

diff --git a/src/main/resources/mixins.glintcolorizer.json b/src/main/resources/mixins.glintcolorizer.json
@@ -2,7 +2,7 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7",
   "package": "org.polyfrost.glintcolorizer.mixin",
-  "refmap": "mixins.${id}.refmap.json",
+  "refmap": "mixins.${mod_id}.refmap.json",
   "mixins": [
     "ForgeHooksClientMixin",
     "LayerArmorBaseMixin",