Release v1.0.1

api/src/main/java/com/rappytv/glintcolorizer/api/ItemEffect.java

@@ -0,0 +1,7 @@
+package com.rappytv.glintcolorizer.api;
+
+public enum ItemEffect {
+  NONE,
+  DEFAULT,
+  GLOW
+}

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";")
 
 group = "org.example"
-version = providers.environmentVariable("VERSION").getOrElse("1.0.0")
+version = providers.environmentVariable("VERSION").getOrElse("1.0.1")
 
 labyMod {
     defaultPackageName = "com.rappytv.glintcolorizer"
@@ -16,12 +16,15 @@ labyMod {
         displayName = "GlintColorizer"
         author = "RappyTV"
         description = "Lets you adjust the color of enchanted items and armor."
-        minecraftVersion = "1.8.9,1.12.2"
+        minecraftVersion = "1.8.9<1.21.4"
         version = rootProject.version.toString()
     }
 
     minecraft {
         registerVersion(versions.toTypedArray()) {
+
+            accessWidener.set(file("./game-runner/src/${this.sourceSetName}/resources/glintcolorizer-${versionId}.accesswidener"))
+
             runs {
                 getByName("client") {
                     devLogin = true

core/src/main/java/com/rappytv/glintcolorizer/GlintColorizerAddon.java → core/src/main/java/com/rappytv/glintcolorizer/core/GlintColorizerAddon.java

@@ -1,6 +1,6 @@
-package com.rappytv.glintcolorizer;
+package com.rappytv.glintcolorizer.core;
 
-import com.rappytv.glintcolorizer.GlintColorizerConfig.ItemEffect;
+import com.rappytv.glintcolorizer.api.ItemEffect;
 import net.labymod.api.addon.LabyAddon;
 import net.labymod.api.models.addon.annotation.AddonMain;
 import net.labymod.api.util.Color;
@@ -9,11 +9,11 @@
 @AddonMain
 public class GlintColorizerAddon extends LabyAddon<GlintColorizerConfig> {
 
-  private static GlintColorizerAddon instance;
+  private static GlintColorizerAddon INSTANCE;
 
   @Override
   protected void enable() {
-    instance = this;
+    INSTANCE = this;
 
     this.registerSettingCategory();
   }
@@ -24,26 +24,26 @@ protected Class<? extends GlintColorizerConfig> configurationClass() {
   }
 
   public static ItemEffect getItemEffect() {
-    return instance.configuration().enabled().get()
-        ? instance.configuration().itemEffect().get()
+    return INSTANCE.configuration().enabled().get()
+        ? INSTANCE.configuration().itemEffect().get()
         : ItemEffect.DEFAULT;
   }
 
   @Nullable
   public static Color getItemGlintColor() {
-    if(!instance.configuration().enabled().get()
-        || !instance.configuration().enableCustomItemGlintColor().get()) {
+    if (!INSTANCE.configuration().enabled().get()
+        || !INSTANCE.configuration().enableCustomItemGlintColor().get()) {
       return null;
     }
-    return instance.configuration().customItemGlintColor().get();
+    return INSTANCE.configuration().customItemGlintColor().get();
   }
 
   @Nullable
   public static Color getArmorGlintColor() {
-    if(!instance.configuration().enabled().get()
-        || !instance.configuration().enableCustomArmorGlintColor().get()) {
+    if (!INSTANCE.configuration().enabled().get()
+        || !INSTANCE.configuration().enableCustomArmorGlintColor().get()) {
       return null;
     }
-    return instance.configuration().customArmorGlintColor().get();
+    return INSTANCE.configuration().customArmorGlintColor().get();
   }
 }

core/src/main/java/com/rappytv/glintcolorizer/GlintColorizerConfig.java → core/src/main/java/com/rappytv/glintcolorizer/core/GlintColorizerConfig.java

@@ -1,18 +1,20 @@
-package com.rappytv.glintcolorizer;
+package com.rappytv.glintcolorizer.core;
 
+import com.rappytv.glintcolorizer.api.ItemEffect;
 import net.labymod.api.addon.AddonConfig;
 import net.labymod.api.client.component.format.NamedTextColor;
 import net.labymod.api.client.gui.screen.widget.widgets.input.SwitchWidget.SwitchSetting;
 import net.labymod.api.client.gui.screen.widget.widgets.input.color.ColorPickerWidget.ColorPickerSetting;
 import net.labymod.api.client.gui.screen.widget.widgets.input.dropdown.DropdownWidget.DropdownSetting;
 import net.labymod.api.configuration.loader.annotation.SpriteSlot;
 import net.labymod.api.configuration.loader.annotation.SpriteTexture;
+import net.labymod.api.configuration.loader.annotation.VersionCompatibility;
 import net.labymod.api.configuration.loader.property.ConfigProperty;
 import net.labymod.api.configuration.settings.annotation.SettingRequires;
 import net.labymod.api.configuration.settings.annotation.SettingSection;
 import net.labymod.api.util.Color;
 
-@SpriteTexture("settings.png")
+@SpriteTexture("settings")
 public class GlintColorizerConfig extends AddonConfig {
 
   @SpriteSlot
@@ -23,19 +25,24 @@ public class GlintColorizerConfig extends AddonConfig {
   @SpriteSlot(x = 1)
   @DropdownSetting
   private final ConfigProperty<ItemEffect> itemEffect = new ConfigProperty<>(ItemEffect.DEFAULT);
+
   @SpriteSlot(size = 32, x = 2)
   @SwitchSetting
   private final ConfigProperty<Boolean> enableCustomItemGlintColor = new ConfigProperty<>(true);
+
   @SettingRequires("enableCustomItemGlintColor")
   @SpriteSlot(size = 32, x = 3)
   @ColorPickerSetting(chroma = true)
   private final ConfigProperty<Color> customItemGlintColor = new ConfigProperty<>(Color.WHITE);
 
   @SettingSection("armor")
+  @VersionCompatibility("1.8<1.20.6")
   @SpriteSlot(x = 2)
   @SwitchSetting
   private final ConfigProperty<Boolean> enableCustomArmorGlintColor = new ConfigProperty<>(true);
+
   @SettingRequires("enableCustomArmorGlintColor")
+  @VersionCompatibility("1.8<1.20.6")
   @SpriteSlot(size = 32, x = 3)
   @ColorPickerSetting(chroma = true)
   private final ConfigProperty<Color> customArmorGlintColor = new ConfigProperty<>(NamedTextColor.AQUA.color());
@@ -48,23 +55,20 @@ public ConfigProperty<Boolean> enabled() {
   public ConfigProperty<ItemEffect> itemEffect() {
     return this.itemEffect;
   }
+
   public ConfigProperty<Boolean> enableCustomItemGlintColor() {
     return this.enableCustomItemGlintColor;
   }
+
   public ConfigProperty<Color> customItemGlintColor() {
     return this.customItemGlintColor;
   }
 
   public ConfigProperty<Boolean> enableCustomArmorGlintColor() {
     return this.enableCustomArmorGlintColor;
   }
+
   public ConfigProperty<Color> customArmorGlintColor() {
     return this.customArmorGlintColor;
   }
-
-  public enum ItemEffect {
-    NONE,
-    DEFAULT,
-    GLOW
-  }
 }

game-runner/src/v1_12_2/java/com/rappytv/glintcolorizer/v1_12_2/mixins/MixinLayerArmorBase.java

@@ -1,6 +1,6 @@
 package com.rappytv.glintcolorizer.v1_12_2.mixins;
 
-import com.rappytv.glintcolorizer.GlintColorizerAddon;
+import com.rappytv.glintcolorizer.core.GlintColorizerAddon;
 import net.labymod.api.util.Color;
 import net.minecraft.client.renderer.entity.layers.LayerArmorBase;
 import org.spongepowered.asm.mixin.Mixin;

game-runner/src/v1_12_2/java/com/rappytv/glintcolorizer/v1_12_2/mixins/MixinRenderItem.java

@@ -1,7 +1,7 @@
 package com.rappytv.glintcolorizer.v1_12_2.mixins;
 
-import com.rappytv.glintcolorizer.GlintColorizerAddon;
-import com.rappytv.glintcolorizer.GlintColorizerConfig.ItemEffect;
+import com.rappytv.glintcolorizer.api.ItemEffect;
+import com.rappytv.glintcolorizer.core.GlintColorizerAddon;
 import net.labymod.api.util.Color;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderItem;
@@ -20,25 +20,25 @@
 public class MixinRenderItem {
 
   @Unique
-  private boolean sandbox$firstDepthCall = true;
+  private boolean glintcolorizer$firstDepthCall = true;
 
   @Inject(method = "renderEffect", at = @At("HEAD"), cancellable = true)
-  private void renderEffect(IBakedModel model, CallbackInfo ci) {
+  private void cancelGlintRendering(IBakedModel model, CallbackInfo ci) {
     if(GlintColorizerAddon.getItemEffect() == ItemEffect.NONE) {
       ci.cancel();
     }
   }
 
   @Redirect(method = "renderEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GlStateManager;depthFunc(I)V"))
   private void modifyDepthFunc(int i) {
-    if(this.sandbox$firstDepthCall) {
+    if(this.glintcolorizer$firstDepthCall) {
       if(GlintColorizerAddon.getItemEffect() != ItemEffect.GLOW) {
         GlStateManager.depthFunc(GL11.GL_EQUAL);
       }
     } else {
       GlStateManager.depthFunc(i);
     }
-    this.sandbox$firstDepthCall = !this.sandbox$firstDepthCall;
+    this.glintcolorizer$firstDepthCall = !this.glintcolorizer$firstDepthCall;
   }
 
   @ModifyConstant(method = "renderEffect", constant = @Constant(intValue = -8372020))

game-runner/src/v1_16_5/java/com/rappytv/glintcolorizer/v1_16_5/ColoredVertexConsumer.java

@@ -0,0 +1,59 @@
+package com.rappytv.glintcolorizer.v1_16_5;
+
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.labymod.api.util.Color;
+
+public class ColoredVertexConsumer implements VertexConsumer {
+
+  private final VertexConsumer delegate;
+  private final float red;
+  private final float green;
+  private final float blue;
+
+  public ColoredVertexConsumer(VertexConsumer delegate, Color color) {
+    this.delegate = delegate;
+    this.red = color.getRed() / 255f;
+    this.green = color.getGreen() / 255f;
+    this.blue = color.getBlue() / 255f;
+  }
+
+  @Override
+  public VertexConsumer vertex(double x, double y, double z) {
+    return this.delegate.vertex(x, y, z);
+  }
+
+  @Override
+  public VertexConsumer color(int red, int green, int blue, int alpha) {
+    return this.delegate.color(
+        (int) (red * this.red),
+        (int) (green * this.green),
+        (int) (blue * this.blue),
+        alpha
+    );
+  }
+
+  @Override
+  public VertexConsumer uv(float u, float v) {
+    return this.delegate.uv(u, v);
+  }
+
+  @Override
+  public VertexConsumer overlayCoords(int u, int v) {
+    return this.delegate.overlayCoords(u, v);
+  }
+
+  @Override
+  public VertexConsumer uv2(int u, int v) {
+    return this.delegate.uv2(u, v);
+  }
+
+  @Override
+  public VertexConsumer normal(float x, float y, float z) {
+    return this.delegate.normal(x, y, z);
+  }
+
+  @Override
+  public void endVertex() {
+    this.delegate.endVertex();
+  }
+}

game-runner/src/v1_16_5/java/com/rappytv/glintcolorizer/v1_16_5/CustomRenderTypes.java

@@ -0,0 +1,115 @@
+package com.rappytv.glintcolorizer.v1_16_5;
+
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import net.minecraft.client.renderer.RenderStateShard;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+
+public class CustomRenderTypes extends RenderType {
+
+  private static final RenderType GLOW_GLINT = create(
+      "glint_glow",
+      DefaultVertexFormat.POSITION_TEX,
+      7,
+      256,
+      RenderType.CompositeState.builder()
+          .setTextureState(new RenderStateShard.TextureStateShard(
+              ItemRenderer.ENCHANT_GLINT_LOCATION,
+              true,
+              false
+          ))
+          .setWriteMaskState(COLOR_WRITE)
+          .setCullState(NO_CULL)
+          .setDepthTestState(NO_DEPTH_TEST)
+          .setTransparencyState(GLINT_TRANSPARENCY)
+          .setTexturingState(GLINT_TEXTURING)
+          .createCompositeState(false)
+  );
+
+  private static final RenderType GLOW_ENTITY_GLINT = create(
+      "entity_glint_glow",
+      DefaultVertexFormat.POSITION_TEX,
+      7,
+      256,
+      RenderType.CompositeState.builder()
+          .setTextureState(new RenderStateShard.TextureStateShard(
+              ItemRenderer.ENCHANT_GLINT_LOCATION,
+              true,
+              false
+          ))
+          .setWriteMaskState(COLOR_WRITE)
+          .setCullState(NO_CULL)
+          .setDepthTestState(NO_DEPTH_TEST)
+          .setTransparencyState(GLINT_TRANSPARENCY)
+          .setTexturingState(ENTITY_GLINT_TEXTURING)
+          .createCompositeState(false)
+  );
+
+  private static final RenderType GLOW_GLINT_DIRECT = create(
+      "glint_direct_glow",
+      DefaultVertexFormat.POSITION_TEX,
+      7,
+      256,
+      RenderType.CompositeState.builder()
+          .setTextureState(new RenderStateShard.TextureStateShard(
+              ItemRenderer.ENCHANT_GLINT_LOCATION,
+              true,
+              false
+          ))
+          .setWriteMaskState(COLOR_WRITE)
+          .setCullState(NO_CULL)
+          .setDepthTestState(NO_DEPTH_TEST)
+          .setTransparencyState(GLINT_TRANSPARENCY)
+          .setTexturingState(GLINT_TEXTURING)
+          .createCompositeState(false)
+  );
+
+  private static final RenderType GLOW_ENTITY_GLINT_DIRECT = create(
+      "entity_glint_direct_glow",
+      DefaultVertexFormat.POSITION_TEX,
+      7,
+      256,
+      RenderType.CompositeState.builder()
+          .setTextureState(new RenderStateShard.TextureStateShard(
+              ItemRenderer.ENCHANT_GLINT_LOCATION,
+              true,
+              false
+          ))
+          .setWriteMaskState(COLOR_WRITE)
+          .setCullState(NO_CULL)
+          .setDepthTestState(NO_DEPTH_TEST)
+          .setTransparencyState(GLINT_TRANSPARENCY)
+          .setTexturingState(ENTITY_GLINT_TEXTURING)
+          .createCompositeState(false)
+  );
+
+  private CustomRenderTypes(
+      String name,
+      VertexFormat format,
+      int mode,
+      int bufferSize,
+      boolean affectsCrumbling,
+      boolean sortOnUpload,
+      Runnable setupState,
+      Runnable clearState
+  ) {
+    super(name, format, mode, bufferSize, affectsCrumbling, sortOnUpload, setupState, clearState);
+  }
+
+  public static RenderType getGlowGlint() {
+    return GLOW_GLINT;
+  }
+
+  public static RenderType getGlowEntityGlint() {
+    return GLOW_ENTITY_GLINT;
+  }
+
+  public static RenderType getGlowGlintDirect() {
+    return GLOW_GLINT_DIRECT;
+  }
+
+  public static RenderType getGlowEntityGlintDirect() {
+    return GLOW_ENTITY_GLINT_DIRECT;
+  }
+}