Be more friendly to other mods

Author: magicus

README.md

@@ -23,7 +23,7 @@ This is what it looks like when you are using the mod.
 
 ## Download
 
-The latest version is 1.1.1. 
+The latest version is 1.2.0.
 
 Direct download links for Minecraft 1.19:
 

build.gradle

@@ -15,6 +15,7 @@ dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
 }
 
 processResources {

gradle.properties

@@ -5,13 +5,14 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://fabricmc.net/develop
 minecraft_version=1.19
 yarn_mappings=1.19+build.2
-loader_version=0.14.7
+loader_version=0.14.11
 
 # Mod Properties
-mod_version = 1.1.1+1.19
+mod_version = 1.2.0+1.19
 maven_group = se.icus.mag
 archives_base_name = statuseffecttimer
 
 # Dependencies
 # Fabric api
 fabric_version=0.56.0+1.19
+mixinextras_version=0.2.2

src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java

@@ -1,14 +1,13 @@
 package se.icus.mag.statuseffecttimer.mixin;
 
-import com.google.common.collect.Ordering;
+import com.llamalad7.mixinextras.sugar.Local;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.NotNull;
@@ -19,7 +18,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.Collection;
+import java.util.List;
 
 // Set priority to 500, to load before default at 1000. This is to better cooperate with HUDTweaks.
 @Environment(EnvType.CLIENT)
@@ -28,38 +27,14 @@ public abstract class StatusEffectTimerMixin extends DrawableHelper {
 	@Shadow @Final
 	private MinecraftClient client;
 
-	@Inject(method = "renderStatusEffectOverlay", at = @At("TAIL"))
-	private void renderDurationOverlay(MatrixStack matrices, CallbackInfo c) {
-		Collection<StatusEffectInstance> collection = this.client.player.getStatusEffects();
-		if (!collection.isEmpty()) {
-			// Replicate vanilla placement algorithm to get the duration
-			// labels to line up exactly right.
-
-			int beneficialCount = 0;
-			int nonBeneficialCount = 0;
-			for (StatusEffectInstance statusEffectInstance : Ordering.natural().reverse().sortedCopy(collection)) {
-				StatusEffect statusEffect = statusEffectInstance.getEffectType();
-				if (statusEffectInstance.shouldShowIcon()) {
-					int x = this.client.getWindow().getScaledWidth();
-					int y = 1;
-
-					if (this.client.isDemo()) {
-						y += 15;
-					}
-
-					if (statusEffect.isBeneficial()) {
-						beneficialCount++;
-						x -= 25 * beneficialCount;
-					} else {
-						nonBeneficialCount++;
-						x -= 25 * nonBeneficialCount;
-						y += 26;
-					}
-
-					drawStatusEffectOverlay(matrices, statusEffectInstance, x, y);
-				}
-			}
-		}
+	@Inject(method = "renderStatusEffectOverlay",
+			at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", shift = At.Shift.AFTER))
+	private void appendOverlayDrawing(MatrixStack matrices, CallbackInfo c,
+									  @Local List<Runnable> list, @Local StatusEffectInstance statusEffectInstance,
+									  @Local(ordinal = 4) int x, @Local(ordinal = 3) int y) {
+		list.add(() -> {
+			drawStatusEffectOverlay(matrices, statusEffectInstance, x, y);
+		});
 	}
 
 	private void drawStatusEffectOverlay(MatrixStack matrices, StatusEffectInstance statusEffectInstance, int x, int y) {