diff --git a/common b/common index 5dd4b17..5e44a71 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 5dd4b17db53305b2ab5a3eca708d5b0f8ff3a7cc +Subproject commit 5e44a71054a052c964fbcfcc3bd822f62b2b1b11 diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/StatusEffectMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/StatusEffectMixin.java index 6ec311b..122ba6c 100644 --- a/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/StatusEffectMixin.java +++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/StatusEffectMixin.java @@ -1,17 +1,16 @@ package org.saturnclient.impl.mixins; +import org.saturnclient.common.ref.asset.IdentifierRef; import org.saturnclient.common.ref.asset.SpriteRef; import org.saturnclient.common.ref.game.EffectRef; -import org.saturnclient.saturnclient.SaturnClient; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.texture.SpriteAtlasTexture; -import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.util.Identifier; @Mixin(StatusEffectInstance.class) public abstract class StatusEffectMixin implements EffectRef { @@ -30,10 +29,14 @@ public abstract class StatusEffectMixin implements EffectRef { @Override public SpriteRef getIcon() { - SpriteIdentifier identifier = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, - InGameHud.getEffectTexture(getEffectType())); + return null; + } - return (SpriteRef) SaturnClient.client.getAtlasManager().getSprite(identifier); + @Override + public IdentifierRef getIconId() { + Identifier id = InGameHud.getEffectTexture(getEffectType()); + + return IdentifierRef.of(id.getNamespace(), "textures/" + id.getPath() + ".png"); } @Override