Added TNT Timer

FabiPunktExe · FabiPunktExe · commit 93e156e1c307 · 2023-07-22T14:03:53.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -1,2 +1,2 @@
 ## SimpleClient %version%
-- Zoom fix for 1.8.9
+- Added TNT Timer
diff --git a/gradle.properties b/gradle.properties
@@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # SimpleClient
-simpleclient_version=0.3.1
+simpleclient_version=0.3.2
 discord_game_sdk_version=v0.5.5
diff --git a/simpleclient-1.19.4/src/main/java/simpleclient/feature/FeatureManagerImpl.java b/simpleclient-1.19.4/src/main/java/simpleclient/feature/FeatureManagerImpl.java
@@ -29,6 +29,7 @@ public void init() {
         addFeature(new Perspective());
         addFeature(new Ping());
         addFeature(new PvPImprovements());
+        addFeature(new TNTTimer());
         addFeature(new Zoom());
         super.init();
     }
diff --git a/simpleclient-1.19.4/src/main/java/simpleclient/feature/TNTTimer.java b/simpleclient-1.19.4/src/main/java/simpleclient/feature/TNTTimer.java
@@ -0,0 +1,42 @@
+package simpleclient.feature;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import simpleclient.text.Style;
+
+public class TNTTimer extends EnableableFeature implements TextFeature {
+    public static TNTTimer INSTANCE = null;
+    public static boolean ENABLED = false;
+    public static int FUSE = -1;
+
+    public TNTTimer() {
+        super(FeatureType.TNT_TIMER);
+        INSTANCE = this;
+        refresh();
+    }
+
+    public void refresh() {
+        ENABLED = isEnabled();
+    }
+
+    @Override
+    public void setData(JsonObject data) {
+        super.setData(data);
+        refresh();
+    }
+
+    @Override
+    public String valueForParameter(String parameter) {
+        if (parameter.equals("ticks")) return String.valueOf(FUSE);
+        if (parameter.equals("seconds")) return String.valueOf((float) (FUSE / 2) / 10);
+        return "";
+    }
+
+    @Override
+    public JsonArray getDefaultFormat() {
+        JsonArray format = new JsonArray();
+        format.add(parameter("seconds", new Style()));
+        format.add(text("s", new Style()));
+        return format;
+    }
+}
diff --git a/simpleclient-1.19.4/src/main/java/simpleclient/mixin/feature/tnt_timer/TntRendererMixin.java b/simpleclient-1.19.4/src/main/java/simpleclient/mixin/feature/tnt_timer/TntRendererMixin.java
@@ -0,0 +1,29 @@
+package simpleclient.mixin.feature.tnt_timer;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.TntRenderer;
+import net.minecraft.world.entity.item.PrimedTnt;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import simpleclient.adapter.TextAdapter;
+import simpleclient.feature.TNTTimer;
+
+@Mixin(TntRenderer.class)
+public abstract class TntRendererMixin extends EntityRenderer<PrimedTnt> {
+    protected TntRendererMixin(EntityRendererProvider.Context context) {
+        super(context);
+    }
+
+    @Inject(at = @At("TAIL"), method = "render(Lnet/minecraft/world/entity/item/PrimedTnt;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V")
+    public void render(PrimedTnt entity, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+        if (TNTTimer.ENABLED) {
+            TNTTimer.FUSE = entity.getFuse();
+            renderNameTag(entity, TextAdapter.adapt(TNTTimer.INSTANCE.toText()), poseStack, multiBufferSource, i);
+        }
+    }
+}
diff --git a/simpleclient-1.19.4/src/main/resources/simpleclient.mixins.json b/simpleclient-1.19.4/src/main/resources/simpleclient.mixins.json
@@ -14,6 +14,7 @@
     "feature.perspective.CameraMixin",
     "feature.perspective.MouseMixin",
     "feature.pvp_improvements.MinecraftMixin",
+    "feature.tnt_timer.TntRendererMixin",
     "feature.zoom.GameRendererMixin",
     "performance.LevelRendererMixin",
     "performance.OptionsMixin",
diff --git a/simpleclient-1.20.1/src/main/java/simpleclient/feature/FeatureManagerImpl.java b/simpleclient-1.20.1/src/main/java/simpleclient/feature/FeatureManagerImpl.java
@@ -29,6 +29,7 @@ public void init() {
         addFeature(new Perspective());
         addFeature(new Ping());
         addFeature(new PvPImprovements());
+        addFeature(new TNTTimer());
         addFeature(new Zoom());
         super.init();
     }
diff --git a/simpleclient-1.20.1/src/main/java/simpleclient/feature/TNTTimer.java b/simpleclient-1.20.1/src/main/java/simpleclient/feature/TNTTimer.java
@@ -0,0 +1,42 @@
+package simpleclient.feature;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import simpleclient.text.Style;
+
+public class TNTTimer extends EnableableFeature implements TextFeature {
+    public static TNTTimer INSTANCE = null;
+    public static boolean ENABLED = false;
+    public static int FUSE = -1;
+
+    public TNTTimer() {
+        super(FeatureType.TNT_TIMER);
+        INSTANCE = this;
+        refresh();
+    }
+
+    public void refresh() {
+        ENABLED = isEnabled();
+    }
+
+    @Override
+    public void setData(JsonObject data) {
+        super.setData(data);
+        refresh();
+    }
+
+    @Override
+    public String valueForParameter(String parameter) {
+        if (parameter.equals("ticks")) return String.valueOf(FUSE);
+        if (parameter.equals("seconds")) return String.valueOf((float) (FUSE / 2) / 10);
+        return "";
+    }
+
+    @Override
+    public JsonArray getDefaultFormat() {
+        JsonArray format = new JsonArray();
+        format.add(parameter("seconds", new Style()));
+        format.add(text("s", new Style()));
+        return format;
+    }
+}
diff --git a/simpleclient-1.20.1/src/main/java/simpleclient/mixin/tnt_timer/TntRendererMixin.java b/simpleclient-1.20.1/src/main/java/simpleclient/mixin/tnt_timer/TntRendererMixin.java
@@ -0,0 +1,29 @@
+package simpleclient.mixin.tnt_timer;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.TntRenderer;
+import net.minecraft.world.entity.item.PrimedTnt;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import simpleclient.adapter.TextAdapter;
+import simpleclient.feature.TNTTimer;
+
+@Mixin(TntRenderer.class)
+public abstract class TntRendererMixin extends EntityRenderer<PrimedTnt> {
+    protected TntRendererMixin(EntityRendererProvider.Context context) {
+        super(context);
+    }
+
+    @Inject(at = @At("TAIL"), method = "render(Lnet/minecraft/world/entity/item/PrimedTnt;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V")
+    public void render(PrimedTnt entity, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+        if (TNTTimer.ENABLED) {
+            TNTTimer.FUSE = entity.getFuse();
+            renderNameTag(entity, TextAdapter.adapt(TNTTimer.INSTANCE.toText()), poseStack, multiBufferSource, i);
+        }
+    }
+}
diff --git a/simpleclient-1.20.1/src/main/resources/simpleclient.mixins.json b/simpleclient-1.20.1/src/main/resources/simpleclient.mixins.json
@@ -18,7 +18,8 @@
     "feature.zoom.GameRendererMixin",
     "performance.LevelRendererMixin",
     "performance.OptionsMixin",
-    "performance.SharedConstantsMixin"
+    "performance.SharedConstantsMixin",
+    "tnt_timer.TntRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/simpleclient-1.20/src/main/java/simpleclient/feature/FeatureManagerImpl.java b/simpleclient-1.20/src/main/java/simpleclient/feature/FeatureManagerImpl.java
@@ -29,6 +29,7 @@ public void init() {
         addFeature(new Perspective());
         addFeature(new Ping());
         addFeature(new PvPImprovements());
+        addFeature(new TNTTimer());
         addFeature(new Zoom());
         super.init();
     }
diff --git a/simpleclient-1.20/src/main/java/simpleclient/feature/TNTTimer.java b/simpleclient-1.20/src/main/java/simpleclient/feature/TNTTimer.java
@@ -0,0 +1,42 @@
+package simpleclient.feature;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import simpleclient.text.Style;
+
+public class TNTTimer extends EnableableFeature implements TextFeature {
+    public static TNTTimer INSTANCE = null;
+    public static boolean ENABLED = false;
+    public static int FUSE = -1;
+
+    public TNTTimer() {
+        super(FeatureType.TNT_TIMER);
+        INSTANCE = this;
+        refresh();
+    }
+
+    public void refresh() {
+        ENABLED = isEnabled();
+    }
+
+    @Override
+    public void setData(JsonObject data) {
+        super.setData(data);
+        refresh();
+    }
+
+    @Override
+    public String valueForParameter(String parameter) {
+        if (parameter.equals("ticks")) return String.valueOf(FUSE);
+        if (parameter.equals("seconds")) return String.valueOf((float) (FUSE / 2) / 10);
+        return "";
+    }
+
+    @Override
+    public JsonArray getDefaultFormat() {
+        JsonArray format = new JsonArray();
+        format.add(parameter("seconds", new Style()));
+        format.add(text("s", new Style()));
+        return format;
+    }
+}
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/tnt_timer/TntRendererMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/tnt_timer/TntRendererMixin.java
@@ -0,0 +1,29 @@
+package simpleclient.mixin.tnt_timer;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.EntityRenderer;
+import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.TntRenderer;
+import net.minecraft.world.entity.item.PrimedTnt;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import simpleclient.adapter.TextAdapter;
+import simpleclient.feature.TNTTimer;
+
+@Mixin(TntRenderer.class)
+public abstract class TntRendererMixin extends EntityRenderer<PrimedTnt> {
+    protected TntRendererMixin(EntityRendererProvider.Context context) {
+        super(context);
+    }
+
+    @Inject(at = @At("TAIL"), method = "render(Lnet/minecraft/world/entity/item/PrimedTnt;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V")
+    public void render(PrimedTnt entity, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, CallbackInfo ci) {
+        if (TNTTimer.ENABLED) {
+            TNTTimer.FUSE = entity.getFuse();
+            renderNameTag(entity, TextAdapter.adapt(TNTTimer.INSTANCE.toText()), poseStack, multiBufferSource, i);
+        }
+    }
+}
diff --git a/simpleclient-1.20/src/main/resources/simpleclient.mixins.json b/simpleclient-1.20/src/main/resources/simpleclient.mixins.json
@@ -18,7 +18,8 @@
     "feature.zoom.GameRendererMixin",
     "performance.LevelRendererMixin",
     "performance.OptionsMixin",
-    "performance.SharedConstantsMixin"
+    "performance.SharedConstantsMixin",
+    "tnt_timer.TntRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/simpleclient-1.8.9/src/main/java/simpleclient/feature/FeatureManagerImpl.java b/simpleclient-1.8.9/src/main/java/simpleclient/feature/FeatureManagerImpl.java
@@ -28,6 +28,7 @@ public void init() {
         addFeature(new Perspective());
         addFeature(new Ping());
         addFeature(new PvPImprovements());
+        addFeature(new TNTTimer());
         addFeature(new Zoom());
         super.init();
     }
diff --git a/simpleclient-1.8.9/src/main/java/simpleclient/feature/TNTTimer.java b/simpleclient-1.8.9/src/main/java/simpleclient/feature/TNTTimer.java
@@ -0,0 +1,42 @@
+package simpleclient.feature;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import simpleclient.text.Style;
+
+public class TNTTimer extends EnableableFeature implements TextFeature {
+    public static TNTTimer INSTANCE = null;
+    public static boolean ENABLED = false;
+    public static int FUSE = -1;
+
+    public TNTTimer() {
+        super(FeatureType.TNT_TIMER);
+        INSTANCE = this;
+        refresh();
+    }
+
+    public void refresh() {
+        ENABLED = isEnabled();
+    }
+
+    @Override
+    public void setData(JsonObject data) {
+        super.setData(data);
+        refresh();
+    }
+
+    @Override
+    public String valueForParameter(String parameter) {
+        if (parameter.equals("ticks")) return String.valueOf(FUSE);
+        if (parameter.equals("seconds")) return String.valueOf((float) (FUSE / 2) / 10);
+        return "";
+    }
+
+    @Override
+    public JsonArray getDefaultFormat() {
+        JsonArray format = new JsonArray();
+        format.add(parameter("seconds", new Style()));
+        format.add(text("s", new Style()));
+        return format;
+    }
+}
diff --git a/simpleclient-1.8.9/src/main/java/simpleclient/mixin/feature/tnt_timer/TntEntityRendererMixin.java b/simpleclient-1.8.9/src/main/java/simpleclient/mixin/feature/tnt_timer/TntEntityRendererMixin.java
@@ -0,0 +1,27 @@
+package simpleclient.mixin.feature.tnt_timer;
+
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.EntityRenderer;
+import net.minecraft.client.render.entity.TntEntityRenderer;
+import net.minecraft.entity.TntEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import simpleclient.adapter.TextAdapter;
+import simpleclient.feature.TNTTimer;
+
+@Mixin(TntEntityRenderer.class)
+public abstract class TntEntityRendererMixin extends EntityRenderer<TntEntity> {
+    protected TntEntityRendererMixin(EntityRenderDispatcher entityRenderDispatcher) {
+        super(entityRenderDispatcher);
+    }
+
+    @Inject(at = @At("TAIL"), method = "render(Lnet/minecraft/entity/TntEntity;DDDFF)V")
+    public void render(TntEntity entity, double d, double e, double f, float g, float h, CallbackInfo ci) {
+        if (TNTTimer.ENABLED) {
+            TNTTimer.FUSE = entity.fuseTimer;
+            renderLabelIfPresent(entity, TextAdapter.adapt(TNTTimer.INSTANCE.toText()).asUnformattedString(), d, e, f, 64);
+        }
+    }
+}
diff --git a/simpleclient-1.8.9/src/main/resources/simpleclient.mixins.json b/simpleclient-1.8.9/src/main/resources/simpleclient.mixins.json
@@ -21,6 +21,7 @@
     "feature.perspective.GameRendererMixin",
     "feature.pvp_improvements.LivingEntityMixin",
     "feature.pvp_improvements.MinecraftClientMixin",
+    "feature.tnt_timer.TntEntityRendererMixin",
     "feature.zoom.GameRendererMixin"
   ],
   "injectors": {
diff --git a/simpleclient-core/src/main/java/simpleclient/feature/DraggableFeature.java b/simpleclient-core/src/main/java/simpleclient/feature/DraggableFeature.java
@@ -29,7 +29,7 @@ public void renderDummy(TextRendererAdapter textRenderer, ItemRendererAdapter it
 
     public double getX() {
         JsonObject data = getData();
-       if (!data.has("x")) data.addProperty("x", getDefaultX());
+        if (!data.has("x")) data.addProperty("x", getDefaultX());
         return data.get("x").getAsDouble();
     }
 
diff --git a/simpleclient-core/src/main/java/simpleclient/feature/DraggableTextFeature.java b/simpleclient-core/src/main/java/simpleclient/feature/DraggableTextFeature.java
diff --git a/simpleclient-core/src/main/java/simpleclient/feature/FeatureManager.java b/simpleclient-core/src/main/java/simpleclient/feature/FeatureManager.java
diff --git a/simpleclient-core/src/main/java/simpleclient/feature/FeatureType.java b/simpleclient-core/src/main/java/simpleclient/feature/FeatureType.java
diff --git a/simpleclient-core/src/main/java/simpleclient/feature/TextFeature.java b/simpleclient-core/src/main/java/simpleclient/feature/TextFeature.java

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`## SimpleClient %version%`
`2`		`-- Zoom fix for 1.8.9`
	`2`	`+- Added TNT Timer`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public void init() {`
`29`	`29`	`addFeature(new Perspective());`
`30`	`30`	`addFeature(new Ping());`
`31`	`31`	`addFeature(new PvPImprovements());`
	`32`	`+ addFeature(new TNTTimer());`
`32`	`33`	`addFeature(new Zoom());`
`33`	`34`	`super.init();`
`34`	`35`	`}`