fix back button position on DownloadImageScreen

moehreag · moehreag · commit d99d5b44338b · 2025-01-20T16:41:48.000+01:00
- fix TntTime for 1.21.4, rendering independent of other name tag attachments
- make PingHud always ping the server
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java
@@ -82,11 +82,7 @@ public void tick() {
 
 	private void updatePing() {
 		if (MinecraftClient.getInstance().getCurrentServerEntry() != null) {
-			if (MinecraftClient.getInstance().getCurrentServerEntry().ping <= 1) {
-				getRealTimeServerPing(MinecraftClient.getInstance().getCurrentServerEntry());
-			} else {
-				currentServerPing = (int) MinecraftClient.getInstance().getCurrentServerEntry().ping;
-			}
+			getRealTimeServerPing(MinecraftClient.getInstance().getCurrentServerEntry());
 		} else if (MinecraftClient.getInstance().isIntegratedServerRunning()) {
 			currentServerPing = 1;
 		}
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/screenshotUtils/DownloadImageScreen.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/screenshotUtils/DownloadImageScreen.java
@@ -81,7 +81,7 @@ public void renderButton(MatrixStack graphics, int mouseX, int mouseY, float del
 			}
 		});
 
-		addButton(new ButtonWidget(width / 2 - 75, height - 33 / 2, 150, 20, ScreenTexts.BACK, b -> onClose()));
+		addButton(new ButtonWidget(width / 2 - 75, height - 33 / 2 - 10, 150, 20, ScreenTexts.BACK, b -> onClose()));
 
 
 		setInitialFocus(urlBox);
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java
@@ -57,11 +57,17 @@ public class ImageScreen extends Screen {
 
 	static Screen create(Screen parent, CompletableFuture<ImageInstance> future, boolean freeOnClose) {
 		if (future.isDone()) {
-			return new ImageScreen(parent, future.join(), freeOnClose);
+			if (future.join() != null) {
+				return new ImageScreen(parent, future.join(), freeOnClose);
+			} else {
+				return parent;
+			}
 		}
 		return new LoadingImageScreen(parent, future.thenAccept(i -> {
 			if (i != null) {
 				MinecraftClient.getInstance().execute(() -> MinecraftClient.getInstance().openScreen(new ImageScreen(parent, i, freeOnClose)));
+			} else {
+				MinecraftClient.getInstance().execute(() -> MinecraftClient.getInstance().openScreen(parent));
 			}
 		}), freeOnClose);
 	}
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java b/1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java
@@ -83,11 +83,7 @@ public void tick() {
 
 	private void updatePing() {
 		if (MinecraftClient.getInstance().getCurrentServerEntry() != null) {
-			if (MinecraftClient.getInstance().getCurrentServerEntry().ping <= 1) {
-				getRealTimeServerPing(MinecraftClient.getInstance().getCurrentServerEntry());
-			} else {
-				currentServerPing = (int) MinecraftClient.getInstance().getCurrentServerEntry().ping;
-			}
+			getRealTimeServerPing(MinecraftClient.getInstance().getCurrentServerEntry());
 		} else if (MinecraftClient.getInstance().isIntegratedServerRunning()) {
 			currentServerPing = 1;
 		}
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/screenshotUtils/DownloadImageScreen.java b/1.20/src/main/java/io/github/axolotlclient/modules/screenshotUtils/DownloadImageScreen.java
@@ -82,7 +82,7 @@ public void drawScrollableText(GuiGraphics graphics, TextRenderer renderer, int
 			}
 		});
 
-		addDrawableChild(ButtonWidget.builder(CommonTexts.BACK, b -> closeScreen()).positionAndSize(width / 2 - 75, height - 33 / 2, 150, 20).build());
+		addDrawableChild(ButtonWidget.builder(CommonTexts.BACK, b -> closeScreen()).positionAndSize(width / 2 - 75, height - 33 / 2 - 10, 150, 20).build());
 
 
 		setInitialFocus(urlBox);
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java b/1.20/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java
@@ -55,13 +55,19 @@ public class ImageScreen extends Screen {
 	private final boolean isRemote;
 
     static Screen create(Screen parent, CompletableFuture<ImageInstance> future, boolean freeOnClose) {
-        if (future.isDone()) {
-            return new ImageScreen(parent, future.join(), freeOnClose);
-        }
+		if (future.isDone()) {
+			if (future.join() != null) {
+				return new ImageScreen(parent, future.join(), freeOnClose);
+			} else {
+				return parent;
+			}
+		}
         return new LoadingImageScreen(parent, future.thenAccept(i -> {
             if (i != null) {
                 MinecraftClient.getInstance().execute(() -> MinecraftClient.getInstance().setScreen(new ImageScreen(parent, i, freeOnClose)));
-            }
+            } else {
+				MinecraftClient.getInstance().execute(() -> MinecraftClient.getInstance().setScreen(parent));
+			}
         }), freeOnClose);
     }
 
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/mixin/TntEntityRendererMixin.java b/1.21.4/src/main/java/io/github/axolotlclient/mixin/TntEntityRendererMixin.java
@@ -30,6 +30,7 @@
 import net.minecraft.client.renderer.entity.TntRenderer;
 import net.minecraft.client.renderer.entity.state.TntRenderState;
 import net.minecraft.world.entity.item.PrimedTnt;
+import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -44,16 +45,20 @@ protected TntEntityRendererMixin(EntityRendererProvider.Context ctx) {
 
 	@Inject(
 		method = "render(Lnet/minecraft/client/renderer/entity/state/TntRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V",
-		at = @At(value = "INVOKE",
-			target = "Lnet/minecraft/client/renderer/entity/EntityRenderer;render(Lnet/minecraft/client/renderer/entity/state/EntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V"))
+		at = @At(value = "TAIL"))
 	private void axolotlclient$render(TntRenderState tntRenderState, PoseStack matrices, MultiBufferSource vertexConsumers, int i, CallbackInfo ci) {
 		if (TntTime.getInstance().enabled.get()) {
 			matrices.pushPose();
 			if (tntRenderState.nameTag != null) {
 				matrices.translate(0, 0.25, 0);
 			}
-			super.renderNameTag(tntRenderState, TntTime.getInstance().getFuseTime(tntRenderState.fuseRemainingInTicks),
+			Vec3 prevAttachment = tntRenderState.nameTagAttachment;
+			if (prevAttachment == null) {
+				tntRenderState.nameTagAttachment = new Vec3(0, 2, 0);
+			}
+			renderNameTag(tntRenderState, TntTime.getInstance().getFuseTime(tntRenderState.fuseRemainingInTicks),
 								matrices, vertexConsumers, i);
+			tntRenderState.nameTagAttachment = prevAttachment;
 			matrices.popPose();
 		}
 	}
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java b/1.21.4/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java
@@ -71,11 +71,7 @@ public void tick() {
 
 	private void updatePing() {
 		if (client.getCurrentServer() != null) {
-			if (client.getCurrentServer().ping <= 1) {
-				getRealTimeServerPing(client.getCurrentServer());
-			} else {
-				currentServerPing = (int) client.getCurrentServer().ping;
-			}
+			getRealTimeServerPing(client.getCurrentServer());
 		} else if (client.hasSingleplayerServer()) {
 			currentServerPing = 1;
 		}
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java b/1.21.4/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java
@@ -60,11 +60,17 @@ public class ImageScreen extends Screen {
 
 	static Screen create(Screen parent, CompletableFuture<ImageInstance> future, boolean freeOnClose) {
 		if (future.isDone()) {
-			return new ImageScreen(parent, future.join(), freeOnClose);
+			if (future.join() != null) {
+				return new ImageScreen(parent, future.join(), freeOnClose);
+			} else {
+				return parent;
+			}
 		}
 		return new LoadingImageScreen(parent, future.thenAccept(i -> {
 			if (i != null) {
 				Minecraft.getInstance().execute(() -> Minecraft.getInstance().setScreen(new ImageScreen(parent, i, freeOnClose)));
+			} else {
+				Minecraft.getInstance().execute(() -> Minecraft.getInstance().setScreen(parent));
 			}
 		}), freeOnClose);
 	}
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java b/1.21/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java
@@ -83,11 +83,7 @@ public void tick() {
 
 	private void updatePing() {
 		if (MinecraftClient.getInstance().getCurrentServerEntry() != null) {
-			if (MinecraftClient.getInstance().getCurrentServerEntry().ping <= 1) {
-				getRealTimeServerPing(MinecraftClient.getInstance().getCurrentServerEntry());
-			} else {
-				currentServerPing = (int) MinecraftClient.getInstance().getCurrentServerEntry().ping;
-			}
+			getRealTimeServerPing(MinecraftClient.getInstance().getCurrentServerEntry());
 		} else if (MinecraftClient.getInstance().isIntegratedServerRunning()) {
 			currentServerPing = 1;
 		}
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java b/1.21/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java
@@ -57,13 +57,19 @@ public class ImageScreen extends Screen {
     private final boolean freeOnClose;
 
     static Screen create(Screen parent, CompletableFuture<ImageInstance> future, boolean freeOnClose) {
-        if (future.isDone()) {
-            return new ImageScreen(parent, future.join(), freeOnClose);
-        }
+		if (future.isDone()) {
+			if (future.join() != null) {
+				return new ImageScreen(parent, future.join(), freeOnClose);
+			} else {
+				return parent;
+			}
+		}
         return new LoadingImageScreen(parent, future.thenAccept(i -> {
             if (i != null) {
                 MinecraftClient.getInstance().execute(() -> MinecraftClient.getInstance().setScreen(new ImageScreen(parent, i, freeOnClose)));
-            }
+            } else {
+				MinecraftClient.getInstance().execute(() -> MinecraftClient.getInstance().setScreen(parent));
+			}
         }), freeOnClose);
     }
 
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java
@@ -83,13 +83,9 @@ public void tick() {
 
 	private void updatePing() {
 		if (Minecraft.getInstance().getCurrentServerEntry() != null) {
-			if (Minecraft.getInstance().getCurrentServerEntry().ping <= 1) {
-				ServerAddress address = ServerAddress
-					.parse(Minecraft.getInstance().getCurrentServerEntry().address);
-				getRealTimeServerPing(address.getAddress(), address.getPort());
-			} else {
-				currentServerPing = (int) Minecraft.getInstance().getCurrentServerEntry().ping;
-			}
+			ServerAddress address = ServerAddress
+				.parse(Minecraft.getInstance().getCurrentServerEntry().address);
+			getRealTimeServerPing(address.getAddress(), address.getPort());
 		} else if (((MinecraftClientAccessor) Minecraft.getInstance()).getServerAddress() != null) {
 			getRealTimeServerPing(((MinecraftClientAccessor) Minecraft.getInstance()).getServerAddress(),
 				((MinecraftClientAccessor) Minecraft.getInstance()).getServerPort());
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/screenshotUtils/DownloadImageScreen.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/screenshotUtils/DownloadImageScreen.java
@@ -81,7 +81,7 @@ public void render(Minecraft client, int mouseX, int mouseY) {
 			}
 		});
 
-		buttons.add(new ButtonWidget(2, width / 2 - 75, height - 33 / 2, 150, 20, I18n.translate("gui.back")));
+		buttons.add(new ButtonWidget(2, width / 2 - 75, height - 33 / 2 - 10, 150, 20, I18n.translate("gui.back")));
 	}
 
 	@Override
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java
@@ -56,11 +56,17 @@ public class ImageScreen extends Screen {
 
 	static Screen create(Screen parent, CompletableFuture<ImageInstance> future, boolean freeOnClose) {
 		if (future.isDone()) {
-			return new ImageScreen(parent, future.join(), freeOnClose);
+			if (future.join() != null) {
+				return new ImageScreen(parent, future.join(), freeOnClose);
+			} else {
+				return parent;
+			}
 		}
 		return new LoadingImageScreen(parent, future.thenAccept(i -> {
 			if (i != null) {
 				Minecraft.getInstance().submit(() -> Minecraft.getInstance().openScreen(new ImageScreen(parent, i, freeOnClose)));
+			} else {
+				Minecraft.getInstance().submit(() -> Minecraft.getInstance().openScreen(parent));
 			}
 		}), freeOnClose);
 	}
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.1-rc.6
+version=3.1.1-rc.7
 
 maven_group=io.github.axolotlclient
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void renderButton(MatrixStack graphics, int mouseX, int mouseY, float del`
`81`	`81`	`}`
`82`	`82`	`});`
`83`	`83`
`84`		`- addButton(new ButtonWidget(width / 2 - 75, height - 33 / 2, 150, 20, ScreenTexts.BACK, b -> onClose()));`
	`84`	`+ addButton(new ButtonWidget(width / 2 - 75, height - 33 / 2 - 10, 150, 20, ScreenTexts.BACK, b -> onClose()));`
`85`	`85`
`86`	`86`
`87`	`87`	`setInitialFocus(urlBox);`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,17 @@ public class ImageScreen extends Screen {`
`57`	`57`
`58`	`58`	`static Screen create(Screen parent, CompletableFuture<ImageInstance> future, boolean freeOnClose) {`
`59`	`59`	`if (future.isDone()) {`
`60`		`- return new ImageScreen(parent, future.join(), freeOnClose);`
	`60`	`+ if (future.join() != null) {`
	`61`	`+ return new ImageScreen(parent, future.join(), freeOnClose);`
	`62`	`+ } else {`
	`63`	`+ return parent;`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`	`return new LoadingImageScreen(parent, future.thenAccept(i -> {`
`63`	`67`	`if (i != null) {`
`64`	`68`	`MinecraftClient.getInstance().execute(() -> MinecraftClient.getInstance().openScreen(new ImageScreen(parent, i, freeOnClose)));`
	`69`	`+ } else {`
	`70`	`+ MinecraftClient.getInstance().execute(() -> MinecraftClient.getInstance().openScreen(parent));`
`65`	`71`	`}`
`66`	`72`	`}), freeOnClose);`
`67`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public void drawScrollableText(GuiGraphics graphics, TextRenderer renderer, int`
`82`	`82`	`}`
`83`	`83`	`});`
`84`	`84`
`85`		`- addDrawableChild(ButtonWidget.builder(CommonTexts.BACK, b -> closeScreen()).positionAndSize(width / 2 - 75, height - 33 / 2, 150, 20).build());`
	`85`	`+ addDrawableChild(ButtonWidget.builder(CommonTexts.BACK, b -> closeScreen()).positionAndSize(width / 2 - 75, height - 33 / 2 - 10, 150, 20).build());`
`86`	`86`
`87`	`87`
`88`	`88`	`setInitialFocus(urlBox);`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,17 @@ public class ImageScreen extends Screen {`
`60`	`60`
`61`	`61`	`static Screen create(Screen parent, CompletableFuture<ImageInstance> future, boolean freeOnClose) {`
`62`	`62`	`if (future.isDone()) {`
`63`		`- return new ImageScreen(parent, future.join(), freeOnClose);`
	`63`	`+ if (future.join() != null) {`
	`64`	`+ return new ImageScreen(parent, future.join(), freeOnClose);`
	`65`	`+ } else {`
	`66`	`+ return parent;`
	`67`	`+ }`
`64`	`68`	`}`
`65`	`69`	`return new LoadingImageScreen(parent, future.thenAccept(i -> {`
`66`	`70`	`if (i != null) {`
`67`	`71`	`Minecraft.getInstance().execute(() -> Minecraft.getInstance().setScreen(new ImageScreen(parent, i, freeOnClose)));`
	`72`	`+ } else {`
	`73`	`+ Minecraft.getInstance().execute(() -> Minecraft.getInstance().setScreen(parent));`
`68`	`74`	`}`
`69`	`75`	`}), freeOnClose);`
`70`	`76`	`}`