Merge branch '1.21.6'

Author: magicus

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.0.0+1.21.6 - 2025-07-29
+
+### Added
+
+- Internal refactoring to allow for interoperability with other mods
+
 ## 1.2.0+1.21.6 - 2025-07-24
 
 ### Added

gradle.properties

@@ -1,5 +1,5 @@
 # Mod version
-mod_version=1.2.0
+mod_version=2.0.0
 
 # Minecraft/Java version
 # Also hardcoded in fabric.mod.json and *.mixin.json

src/main/java/se/icus/mag/statuseffecttimer/StatusEffectTimerRenderer.java

@@ -0,0 +1,40 @@
+package se.icus.mag.statuseffecttimer;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.util.math.MathHelper;
+
+public class StatusEffectTimerRenderer {
+    public void drawStatusEffectOverlay(MinecraftClient client, DrawContext context, StatusEffectInstance statusEffectInstance, int x, int y) {
+        String duration = getDurationAsString(statusEffectInstance);
+        int durationLength = client.textRenderer.getWidth(duration);
+        context.drawTextWithShadow(client.textRenderer, duration, x + 13 - (durationLength / 2), y + 14, 0x99FFFFFF);
+
+        int amplifier = statusEffectInstance.getAmplifier();
+        if (amplifier > 0) {
+            // Convert to roman numerals if possible
+            String amplifierString = (amplifier < 10) ? I18n.translate("enchantment.level." + (amplifier + 1)) : "**";
+            int amplifierLength = client.textRenderer.getWidth(amplifierString);
+            context.drawTextWithShadow(client.textRenderer, amplifierString, x + 22 - amplifierLength, y + 3, 0x99FFFFFF);
+        }
+    }
+
+    private String getDurationAsString(StatusEffectInstance statusEffectInstance) {
+        if (statusEffectInstance.isInfinite()) {
+            return I18n.translate("effect.duration.infinite");
+        }
+
+        int ticks = MathHelper.floor((float) statusEffectInstance.getDuration());
+        int seconds = ticks / 20;
+
+        if (seconds >= 3600) {
+            return seconds / 3600 + "h";
+        } else if (seconds >= 60) {
+            return seconds / 60 + "m";
+        } else {
+            return String.valueOf(seconds);
+        }
+    }
+}

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

@@ -7,22 +7,23 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.render.RenderTickCounter;
-import net.minecraft.client.resource.language.I18n;
 import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.List;
+import se.icus.mag.statuseffecttimer.StatusEffectTimerRenderer;
 
 // Set priority to 500, to load before default at 1000. This is to better cooperate with HUDTweaks.
 @Environment(EnvType.CLIENT)
 @Mixin(value = InGameHud.class, priority = 500)
 public abstract class StatusEffectTimerMixin {
+	@Unique
+	private StatusEffectTimerRenderer renderer = new StatusEffectTimerRenderer();
+
 	@Shadow @Final
 	private MinecraftClient client;
 
@@ -33,37 +34,6 @@ public abstract class StatusEffectTimerMixin {
 	private void appendOverlayDrawing(DrawContext context, RenderTickCounter tickCounter, CallbackInfo c,
 									  @Local StatusEffectInstance statusEffectInstance,
 									  @Local(ordinal = 2) int x, @Local(ordinal = 3) int y) {
-		drawStatusEffectOverlay(context, statusEffectInstance, x, y);
-	}
-
-	private void drawStatusEffectOverlay(DrawContext context, StatusEffectInstance statusEffectInstance, int x, int y) {
-		String duration = getDurationAsString(statusEffectInstance);
-		int durationLength = client.textRenderer.getWidth(duration);
-		context.drawTextWithShadow(client.textRenderer, duration, x + 13 - (durationLength / 2), y + 14, 0x99FFFFFF);
-
-		int amplifier = statusEffectInstance.getAmplifier();
-		if (amplifier > 0) {
-			// Convert to roman numerals if possible
-			String amplifierString = (amplifier < 10) ? I18n.translate("enchantment.level." + (amplifier + 1)) : "**";
-			int amplifierLength = client.textRenderer.getWidth(amplifierString);
-			context.drawTextWithShadow(client.textRenderer, amplifierString, x + 22 - amplifierLength, y + 3, 0x99FFFFFF);
-		}
-	}
-
-	private String getDurationAsString(StatusEffectInstance statusEffectInstance) {
-		if (statusEffectInstance.isInfinite()) {
-			return I18n.translate("effect.duration.infinite");
-		}
-
-		int ticks = MathHelper.floor((float) statusEffectInstance.getDuration());
-		int seconds = ticks / 20;
-
-		if (seconds >= 3600) {
-			return seconds / 3600 + "h";
-		} else if (seconds >= 60) {
-			return seconds / 60 + "m";
-		} else {
-			return String.valueOf(seconds);
-		}
+		renderer.drawStatusEffectOverlay(client, context, statusEffectInstance, x, y);
 	}
 }