Skip to content

Commit ce0e206

Browse files
committed
Pain :(
1 parent 7761d8b commit ce0e206

File tree

8 files changed

+11
-106
lines changed

8 files changed

+11
-106
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ plugins {
1111
id("dev.deftu.gradle.tools.resources") // Applies resource processing so that we can replace tokens, such as our mod name/version, in our resources.
1212
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.
1313
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!
14+
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).
1415
id("dev.deftu.gradle.tools.minecraft.loom") // Applies the Loom plugin, which automagically configures Essential's Architectury Loom plugin for you.
1516
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.
1617
}

src/dummy/java/cc/polyfrost/oneconfig/internal/config/annotations/Option.java renamed to src/ducks/java/cc/polyfrost/oneconfig/internal/config/annotations/Option.java

File renamed without changes.

src/main/java/org/polyfrost/glintcolorizer/mixin/oneconfig/ConfigMixin.java

Lines changed: 0 additions & 97 deletions
This file was deleted.

src/main/kotlin/org/polyfrost/glintcolorizer/command/GlintCommand.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.polyfrost.glintcolorizer.command
33
import org.polyfrost.glintcolorizer.GlintColorizer
44
import org.polyfrost.glintcolorizer.config.GlintConfig
55
import org.polyfrost.oneconfig.api.commands.v1.factories.annotated.Command
6+
import org.polyfrost.oneconfig.utils.v1.dsl.openUI
67

78
@Command(
89
value = [GlintColorizer.ID],
@@ -12,7 +13,7 @@ class GlintCommand {
1213

1314
@Command
1415
fun handle() {
15-
GlintConfig.openGui()
16+
GlintConfig.openUI()
1617
}
1718

1819
}

src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintEffectOptions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import org.polyfrost.oneconfig.api.config.v1.annotations.Button
44
import org.polyfrost.oneconfig.api.config.v1.annotations.Color
55
import org.polyfrost.oneconfig.api.config.v1.annotations.Slider
66
import org.polyfrost.oneconfig.api.config.v1.annotations.Switch
7+
import org.polyfrost.oneconfig.utils.v1.dsl.openUI
78
import org.polyfrost.polyui.color.argb
8-
import org.polyfrost.utils.v1.dsl.openUI
99

1010
class GlintEffectOptions {
1111

src/main/kotlin/org/polyfrost/glintcolorizer/handler/SecondGlintHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fun glintStroke1(renderItem : RenderItem, model : IBakedModel) {
3838
GlStateManager.translate(f, 0.0f, 0.0f)
3939
GlStateManager.rotate(-50.0f, 0.0f, 0.0f, 1.0f)
4040
(renderItem as RenderItemAccessor).invokeRenderModel(model,
41-
if (GlintConfig.guiItem.individualStrokes) GlintConfig.guiItem.strokeOneColor.rgb else GlintConfig.guiItem.glintColor.rgb
41+
if (GlintConfig.guiItem.individualStrokes) GlintConfig.guiItem.strokeOneColor.rgba else GlintConfig.guiItem.glintColor.rgba
4242
)
4343
GlStateManager.popMatrix()
4444
}
@@ -50,7 +50,7 @@ fun glintStroke2(renderItem : RenderItem, model : IBakedModel) {
5050
GlStateManager.translate(-f1, 0.0f, 0.0f)
5151
GlStateManager.rotate(10.0f, 0.0f, 0.0f, 1.0f)
5252
(renderItem as RenderItemAccessor).invokeRenderModel(model,
53-
if (GlintConfig.guiItem.individualStrokes) GlintConfig.guiItem.strokeTwoColor.rgb else GlintConfig.guiItem.glintColor.rgb
53+
if (GlintConfig.guiItem.individualStrokes) GlintConfig.guiItem.strokeTwoColor.rgba else GlintConfig.guiItem.glintColor.rgba
5454
)
5555
GlStateManager.popMatrix()
5656
}

src/main/resources/mcmod.info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[
22
{
3-
"modid": "${id}",
4-
"name": "${name}",
3+
"modid": "${mod_id}",
4+
"name": "${mod_name}",
55
"description": "Change the color of the enchantment glint!",
6-
"version": "${version}",
7-
"mcversion": "${mcVersionStr}",
6+
"version": "${mod_version}",
7+
"mcversion": "${mc_version}",
88
"url": "",
99
"updateUrl": "",
1010
"authorList": [

src/main/resources/mixins.glintcolorizer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compatibilityLevel": "JAVA_8",
33
"minVersion": "0.7",
44
"package": "org.polyfrost.glintcolorizer.mixin",
5-
"refmap": "mixins.${id}.refmap.json",
5+
"refmap": "mixins.${mod_id}.refmap.json",
66
"mixins": [
77
"ForgeHooksClientMixin",
88
"LayerArmorBaseMixin",

0 commit comments

Comments
 (0)