diff --git a/gradle.properties b/gradle.properties index 02633c5f..3874fbbd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ authors=HavenKing, ModFest contributors=Sisby folk, Sammy.K, Chai, dooiji, Superkat32, Hyperpigeon, ShiroJR, maximumpower55, CallMeEcho, quaternary, afamiliarquiet, Emi, comp500, LemmaEOF, acikek, hammy275, TheEpicBlock, Tomate0613, SkyNotTheLimit, Patbox, AmyMialee, Ampflower, Awakened Redstone license=CC0-1.0 # Mod Version -baseVersion=2.5.4 +baseVersion=2.5.5 # Branch Metadata branch=26.1 tagBranch=26.1 diff --git a/src/main/java/dev/hephaestus/glowcase/mixin/client/CompactVectorArrayMixin.java b/src/main/java/dev/hephaestus/glowcase/mixin/client/CompactVectorArrayMixin.java index af04f306..3b2774a1 100644 --- a/src/main/java/dev/hephaestus/glowcase/mixin/client/CompactVectorArrayMixin.java +++ b/src/main/java/dev/hephaestus/glowcase/mixin/client/CompactVectorArrayMixin.java @@ -1,21 +1,21 @@ package dev.hephaestus.glowcase.mixin.client; +import com.llamalad7.mixinextras.expression.Definition;import com.llamalad7.mixinextras.expression.Expression; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.mojang.blaze3d.vertex.CompactVectorArray; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; @Mixin(CompactVectorArray.class) public class CompactVectorArrayMixin { - @Shadow @Final private float[] contents; - /** * @author Awakened Redstone (Luna) * @reason Fix bug on vanilla method */ - @Overwrite - public float getZ(final int index) { - return this.contents[3 * index + 2]; + @Definition(id = "contents", field = "Lcom/mojang/blaze3d/vertex/CompactVectorArray;contents:[F") + @Expression("this.contents[? + @(1)]") + @ModifyExpressionValue(method = "getZ", at = @At("MIXINEXTRAS:EXPRESSION")) + public int getZ(int original) { + return 2; } }