feat: move tnttime to common

Author: Floweynt

1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -40,7 +40,6 @@
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import io.github.axolotlclient.modules.sky.SkyResourceManager;
 import io.github.axolotlclient.modules.tablist.Tablist;
-import io.github.axolotlclient.modules.tnttime.TntTime;
 import io.github.axolotlclient.modules.zoom.Zoom;
 import io.github.axolotlclient.util.FeatureDisabler;
 import io.github.axolotlclient.util.FeatureDisablerCommon;
@@ -66,7 +65,7 @@ private void addBuiltinModules() {
 		registerModule(MenuBlur.getInstance());
 		registerModule(ScrollableTooltips.getInstance());
 		registerModule(DiscordRPC.getInstance());
-		registerModule(TntTime.getInstance());
+
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
 		registerModule(Tablist.getInstance());

1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/TntEntityRendererMixin.java

@@ -29,6 +29,7 @@
 import net.minecraft.client.render.entity.TntEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.TntEntity;
+import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -45,7 +46,7 @@ protected TntEntityRendererMixin(EntityRenderDispatcher dispatcher) {
 	public void axolotlclient$render(TntEntity entity, float yaw, float delta, MatrixStack matrixStack,
 									 VertexConsumerProvider vertexConsumerProvider, int light, CallbackInfo ci) {
 		if (TntTime.getInstance().enabled.get()) {
-			super.renderLabelIfPresent(entity, TntTime.getInstance().getFuseTime(entity.getFuse()), matrixStack,
+			super.renderLabelIfPresent(entity, (Text) TntTime.getInstance().getFuseTime(entity.getFuse()), matrixStack,
 				vertexConsumerProvider, light);
 		}
 	}

1.20/src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -40,7 +40,6 @@
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import io.github.axolotlclient.modules.sky.SkyResourceManager;
 import io.github.axolotlclient.modules.tablist.Tablist;
-import io.github.axolotlclient.modules.tnttime.TntTime;
 import io.github.axolotlclient.modules.zoom.Zoom;
 import io.github.axolotlclient.util.FeatureDisabler;
 import io.github.axolotlclient.util.FeatureDisablerCommon;
@@ -66,7 +65,7 @@ private void addBuiltinModules() {
 		registerModule(MenuBlur.getInstance());
 		registerModule(ScrollableTooltips.getInstance());
 		registerModule(DiscordRPC.getInstance());
-		registerModule(TntTime.getInstance());
+
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
 		registerModule(Tablist.getInstance());

1.20/src/main/java/io/github/axolotlclient/mixin/TntEntityRendererMixin.java

@@ -29,6 +29,7 @@
 import net.minecraft.client.render.entity.TntEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.TntEntity;
+import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -45,7 +46,7 @@ private TntEntityRendererMixin(EntityRendererFactory.Context context) {
 	private void axolotlclient$render(TntEntity entity, float yaw, float delta, MatrixStack matrixStack,
 									  VertexConsumerProvider vertexConsumerProvider, int light, CallbackInfo ci) {
 		if (TntTime.getInstance().enabled.get()) {
-			super.renderLabelIfPresent(entity, TntTime.getInstance().getFuseTime(entity.getFuse()), matrixStack,
+			super.renderLabelIfPresent(entity, (Text) TntTime.getInstance().getFuseTime(entity.getFuse()), matrixStack,
 				vertexConsumerProvider, light);
 		}
 	}

1.20/src/main/java/io/github/axolotlclient/modules/tnttime/TntTime.java

@@ -38,7 +38,6 @@
 import io.github.axolotlclient.modules.screenshotUtils.ScreenshotUtils;
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import io.github.axolotlclient.modules.tablist.Tablist;
-import io.github.axolotlclient.modules.tnttime.TntTime;
 import io.github.axolotlclient.modules.zoom.Zoom;
 import io.github.axolotlclient.util.FeatureDisabler;
 import io.github.axolotlclient.util.FeatureDisablerCommon;
@@ -62,7 +61,7 @@ private void addBuiltinModules() {
 		registerModule(MotionBlur.getInstance());
 		registerModule(ScrollableTooltips.getInstance());
 		registerModule(DiscordRPC.getInstance());
-		registerModule(TntTime.getInstance());
+
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
 		registerModule(Tablist.getInstance());

1.21/src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -29,6 +29,7 @@
 import net.minecraft.client.render.entity.TntEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.TntEntity;
+import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -45,7 +46,7 @@ private TntEntityRendererMixin(EntityRendererFactory.Context context) {
 	private void axolotlclient$render(TntEntity entity, float yaw, float delta, MatrixStack matrixStack,
 									  VertexConsumerProvider vertexConsumerProvider, int light, CallbackInfo ci) {
 		if (TntTime.getInstance().enabled.get()) {
-			super.renderLabelIfPresent(entity, TntTime.getInstance().getFuseTime(entity.getFuse()), matrixStack,
+			super.renderLabelIfPresent(entity, (Text) TntTime.getInstance().getFuseTime(entity.getFuse()), matrixStack,
 				vertexConsumerProvider, light, 0);
 		}
 	}

1.21/src/main/java/io/github/axolotlclient/mixin/TntEntityRendererMixin.java

@@ -41,7 +41,6 @@
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
 import io.github.axolotlclient.modules.sky.SkyResourceManager;
 import io.github.axolotlclient.modules.tablist.Tablist;
-import io.github.axolotlclient.modules.tnttime.TntTime;
 import io.github.axolotlclient.modules.unfocusedFpsLimiter.UnfocusedFpsLimiter;
 import io.github.axolotlclient.modules.zoom.Zoom;
 import io.github.axolotlclient.util.FeatureDisabler;
@@ -68,7 +67,7 @@ private void addBuiltinModules() {
 		registerModule(MenuBlur.getInstance());
 		registerModule(ScrollableTooltips.getInstance());
 		registerModule(DiscordRPC.getInstance());
-		registerModule(TntTime.getInstance());
+
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
 		registerModule(UnfocusedFpsLimiter.getInstance());

1.21/src/main/java/io/github/axolotlclient/modules/tnttime/TntTime.java

@@ -27,6 +27,7 @@
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.TntRenderer;
 import net.minecraft.entity.PrimedTntEntity;
+import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -42,8 +43,11 @@ protected TntEntityRendererMixin(EntityRenderDispatcher dispatcher) {
 	@Inject(method = "render(Lnet/minecraft/entity/PrimedTntEntity;DDDFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/EntityRenderer;render(Lnet/minecraft/entity/Entity;DDDFF)V"), cancellable = true)
 	public void axolotlclient$render(PrimedTntEntity entity, double x, double y, double z, float g, float h, CallbackInfo ci) {
 		if (TntTime.getInstance().enabled.get()) {
-			super.renderNameTag(entity, TntTime.getInstance().getFuseTime(entity.fuseTimer).getFormattedString(),
-				x, y, z, 64);
+			super.renderNameTag(
+				entity,
+				((Text) TntTime.getInstance().getFuseTime(entity.fuseTimer)).getFormattedString(),
+				x, y, z, 64
+			);
 			ci.cancel();
 		}
 	}