Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid usage of Local in AbstractInventoryScreenMixin #649

Merged
merged 1 commit into from
Dec 30, 2024
Merged

Avoid usage of Local in AbstractInventoryScreenMixin #649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/main/java/de/dafuqs/spectrum/mixin/client/AbstractInventoryScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package de.dafuqs.spectrum.mixin.client;

import com.llamalad7.mixinextras.sugar.*;
import de.dafuqs.spectrum.*;
import de.dafuqs.spectrum.api.status_effect.*;
import de.dafuqs.spectrum.registries.*;
Expand All @@ -9,6 +8,7 @@
import net.minecraft.util.*;
import org.spongepowered.asm.mixin.*;
import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.*;

@Mixin(AbstractInventoryScreen.class)
public class AbstractInventoryScreenMixin {
Expand All @@ -20,16 +20,31 @@ public class AbstractInventoryScreenMixin {
@Unique
private static final Identifier DIVINITY_EFFECT_BACKGROUNDS = SpectrumCommon.locate("textures/gui/divinity_effect_backgrounds.png");

@Unique
private StatusEffectInstance effect;

@ModifyVariable(method = "drawStatusEffectBackgrounds", at = @At("STORE"))
public StatusEffectInstance storeEffect(StatusEffectInstance value) {
this.effect = value;
return value;
}

@ModifyArg(method = "drawStatusEffectBackgrounds", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V", ordinal = 0))
public Identifier modifyWideBackground(Identifier texture, @Local StatusEffectInstance effect) {
return getTexture(texture, effect);
public Identifier modifyWideBackground(Identifier texture) {
return getTexture(texture, this.effect);
}

@ModifyArg(method = "drawStatusEffectBackgrounds", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V", ordinal = 1))
public Identifier modifyBackground(Identifier texture, @Local StatusEffectInstance effect) {
return getTexture(texture, effect);
public Identifier modifyBackground(Identifier texture) {
return getTexture(texture, this.effect);
}

@Inject(method = "drawStatusEffectBackgrounds", at = @At("TAIL"))
private void nullifyEffect(CallbackInfo ci) {
this.effect = null;
}

@Unique
private static Identifier getTexture(Identifier texture, StatusEffectInstance effect) {
var type = effect.getEffectType();

Expand Down