selimaj-devandclaude
c5665548a0
1.21.5 is the first version before the 1.21.6 GUI rewrite, which moved GUI drawing from vertex consumers and a MatrixStack to render states and a 2D Matrix3x2fStack. - RenderScopeImpl and EntityDrawerImpl have two whole implementations, one per side of 1.21.6 (a single >=1.21.6 / else split), instead of conditionals scattered through them. Callers use RenderScopeImpl(context) in every version; 1.21.5's did the same thing through its (matrices, vertexConsumers) constructor. - MatrixStackMixin (MatrixStack as a MatrixStackRef) is real before 1.21.6 and empty from 1.21.6, registered everywhere like NametagsMixin. - DrawContextAccessor exposes the vertex consumers before 1.21.6 and the GUI render state from it. - Smaller changes: fog (BackgroundRenderer vs FogRenderer), the end portal texture arguments (ShaderUtils, now a flat three-way chain), the status effect sprite manager, and getIconId only from 1.21.6. Features 1.21.6+ lacks stay on 1.21.5, with a TODO: the title panorama behind Saturn screens and the background blur (screen.backgroundBlur, see #23). The 1.21.5 jar differs from the old one only in the helpers from earlier steps, the RenderScopeImpl(context) calls, the empty SaturnRenderState and unused Matrix3x2fStackRef, and 1.21.5's dead NameTagMixin (never registered) being gone. 1.21.6-1.21.11 only gain the empty MatrixStackMixin and its impl.mixins.json entry. Co-Authored-By: Claude Opus 5.5 <[email protected]>
62 lines
1.9 KiB
Java
62 lines
1.9 KiB
Java
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;
|
|
//? if <1.21.9
|
|
//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.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 {
|
|
|
|
@Shadow
|
|
public abstract boolean shouldShowIcon();
|
|
|
|
@Shadow
|
|
public abstract boolean isInfinite();
|
|
|
|
@Shadow
|
|
public abstract int getDuration();
|
|
|
|
@Shadow
|
|
public abstract RegistryEntry<StatusEffect> getEffectType();
|
|
|
|
@Override
|
|
public SpriteRef getIcon() {
|
|
// 1.21.9 changed the GUI atlas, so newer versions draw the effect's texture (getIconId) instead.
|
|
//? if >=1.21.9 {
|
|
return null;
|
|
//?} else if >=1.21.6 {
|
|
//return (SpriteRef) SaturnClient.client.getGuiAtlasManager().getSprite((InGameHud.getEffectTexture(getEffectType())));
|
|
//?} else
|
|
//return (SpriteRef) SaturnClient.client.getStatusEffectSpriteManager().getSprite(getEffectType());
|
|
}
|
|
|
|
// Before 1.21.6 there's no InGameHud.getEffectTexture; getIcon's sprite is used there instead.
|
|
//? if >=1.21.6 {
|
|
@Override
|
|
public IdentifierRef getIconId() {
|
|
Identifier id = InGameHud.getEffectTexture(getEffectType());
|
|
|
|
return IdentifierRef.of(id.getNamespace(), "textures/" + id.getPath() + ".png");
|
|
}
|
|
//?}
|
|
|
|
@Override
|
|
public String getInfiniteText() {
|
|
return "∞";
|
|
}
|
|
|
|
@Override
|
|
public int getDurationSeconds() {
|
|
return getDuration() / 20; // ticks → seconds
|
|
}
|
|
} |