refactor and fixes

Author: nextdayy

build.gradle.kts

@@ -17,8 +17,8 @@ plugins {
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.69+dgt"
-        loaderVersion = "1.1.0-alpha.35"
+        version = "1.0.0-alpha.70"
+        loaderVersion = "1.1.0-alpha.44"
 
         usePolyMixin = true
         polyMixinVersion = "0.8.4+build.2"

settings.gradle.kts

@@ -24,7 +24,7 @@ pluginManagement {
 
     plugins {
         kotlin("jvm") version("2.0.0")
-        id("dev.deftu.gradle.multiversion-root") version("2.18.1")
+        id("dev.deftu.gradle.multiversion-root") version("2.22.0")
     }
 }
 

src/main/java/org/polyfrost/glintcolorizer/mixin/GlintCustomizer_RenderItem_Mixin.java

@@ -3,12 +3,9 @@
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.resources.model.IBakedModel;
-import net.minecraft.potion.PotionHelper;
-import org.polyfrost.glintcolorizer.config.GlintConfig;
-import org.polyfrost.glintcolorizer.config.GlintOptions;
 import org.polyfrost.glintcolorizer.GlintMetadata;
+import org.polyfrost.glintcolorizer.config.GlintConfig;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
@@ -64,30 +61,12 @@ private float modifySecondStrokeRotation(float angle) {
 
     @ModifyArg(method = "renderEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderModel(Lnet/minecraft/client/resources/model/IBakedModel;I)V", ordinal = 0), index = 1)
     private int modifyFirstStrokeColor(int color) {
-        return glc$getColor(color, true);
+        return GlintMetadata.getColor(color, true);
     }
 
     @ModifyArg(method = "renderEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderModel(Lnet/minecraft/client/resources/model/IBakedModel;I)V", ordinal = 1), index = 1)
     private int modifySecondStrokeColor(int color) {
-        return glc$getColor(color, false);
-    }
-
-    @Unique
-    private int glc$getColor(int color, boolean firstStroke) {
-        if (!GlintConfig.INSTANCE.enabled) {
-            return color;
-        }
-        GlintOptions options = GlintMetadata.getRenderingOptions();
-        if (options instanceof GlintOptions.ShinyPots) {
-            GlintOptions.ShinyPots potsOptions = (GlintOptions.ShinyPots) options;
-            if (potsOptions.usePotionBasedColor()) {
-                int potionId = GlintMetadata.getRenderingItemMetadata();
-                return PotionHelper.getLiquidColor(potionId, false) | 0xFF000000;
-            }
-        }
-        if (options.useIndividualStrokes()) {
-            return firstStroke ? options.getStrokeOneColor().getRgba() : options.getStrokeTwoColor().getRgba();
-        } else return options.getGlintColor().getRgba();
+        return GlintMetadata.getColor(color, false);
     }
 
 }

src/main/java/org/polyfrost/glintcolorizer/mixin/ShinyEffect_RenderItem_Mixin.java

@@ -7,8 +7,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import org.polyfrost.glintcolorizer.GlintMetadata;
+import org.polyfrost.glintcolorizer.SecondGlintHandler;
 import org.polyfrost.glintcolorizer.config.GlintOptions;
-import org.polyfrost.glintcolorizer.handler.SecondGlintHandler;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/kotlin/org/polyfrost/glintcolorizer/GlintColorizer.kt

@@ -10,7 +10,7 @@ import org.polyfrost.oneconfig.utils.v1.dsl.openUI
     modid = GlintColorizer.ID,
     name = GlintColorizer.NAME,
     version = GlintColorizer.VER,
-    modLanguageAdapter = "org.polyfrost.oneconfig.utils.KotlinLanguageAdapter"
+    modLanguageAdapter = "org.polyfrost.oneconfig.utils.v1.forge.KotlinLanguageAdapter"
 )
 object GlintColorizer {
     const val NAME: String = "@MOD_NAME@"

src/main/kotlin/org/polyfrost/glintcolorizer/GlintMetadata.kt

@@ -2,8 +2,10 @@ package org.polyfrost.glintcolorizer
 
 import net.minecraft.item.ItemPotion
 import net.minecraft.item.ItemStack
+import net.minecraft.potion.PotionHelper
 import org.polyfrost.glintcolorizer.config.GlintConfig
 import org.polyfrost.glintcolorizer.config.GlintOptions
+import org.polyfrost.glintcolorizer.config.GlintOptions.ShinyPots
 
 object GlintMetadata {
     @JvmStatic
@@ -19,7 +21,19 @@ object GlintMetadata {
     }
 
     @JvmStatic
-    var renderingItemMetadata = 0
+    fun getColor(color: Int, firstStroke: Boolean): Int {
+        if (!GlintConfig.enabled) return color
+        val options = renderingOptions
+        if (options is ShinyPots && options.usePotionBasedColor) {
+            val potionId = renderingItemMetadata
+            return PotionHelper.getLiquidColor(potionId, false) or -0x1000000
+        }
+        return if (options.individualStrokes) {
+            if (firstStroke) options.strokeOneColor.rgba else options.strokeTwoColor.rgba
+        } else options.glintColor.rgba
+    }
+
+    private var renderingItemMetadata = 0
 
     @JvmStatic
     var renderMode = RenderMode.HELD

…t/glintcolorizer/handler/GlintHandler.kt …olyfrost/glintcolorizer/GlintRenderer.ktsrc/main/kotlin/org/polyfrost/glintcolorizer/handler/GlintHandler.kt renamed to src/main/kotlin/org/polyfrost/glintcolorizer/GlintRenderer.kt src/main/kotlin/org/polyfrost/glintcolorizer/handler/GlintHandler.kt renamed to src/main/kotlin/org/polyfrost/glintcolorizer/GlintRenderer.kt

@@ -1,6 +1,6 @@
 @file:JvmName("SecondGlintHandler")
 
-package org.polyfrost.glintcolorizer.handler
+package org.polyfrost.glintcolorizer
 
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager