ArmorHUD protection display

Author: moehreag

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

@@ -23,6 +23,7 @@
 import net.minecraft.resource.pack.ResourcePack;
 import net.minecraft.util.Identifier;
 import org.quiltmc.loader.api.ModContainer;
+import org.quiltmc.loader.api.QuiltLoader;
 import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer;
 import org.quiltmc.qsl.lifecycle.api.client.event.ClientTickEvents;
 import org.quiltmc.qsl.resource.loader.api.ResourceLoader;
@@ -57,9 +58,29 @@ public class AxolotlClient implements ClientModInitializer {
 
 	public static Integer tickTime = 0;
 
+	public static String badmod="";
+	public static boolean titleDisclaimer = false;
+	public static boolean showWarning = true;
+
 	@Override
 	public void onInitializeClient(ModContainer container) {
 
+		if (QuiltLoader.isModLoaded("ares")){
+			badmod = "Ares Client";
+		} else if (QuiltLoader.isModLoaded("inertia")) {
+			badmod = "Inertia Client";
+		} else if (QuiltLoader.isModLoaded("meteor-client")) {
+			badmod = "Meteor Client";
+		} else if (QuiltLoader.isModLoaded("wurst")) {
+			badmod = "Wurst Client";
+		} else if (QuiltLoader.isModLoaded("baritone")) {
+			badmod = "Baritone";
+		} else if (QuiltLoader.isModLoaded("xaerominimap")) {
+			badmod = "Xaero's Minimap";
+		} else {
+			showWarning = false;
+		}
+
 		CONFIG = new AxolotlClientConfig();
 		config.add(someNiceBackground);
 

src/main/java/io/github/moehreag/axolotlclient/config/AxolotlclientConfig.java-

@@ -7,5 +7,7 @@
 @Mixin(MinecraftClient.class)
 public interface AccessorMinecraftClient {
 	@Accessor
-	int getCurrentFps();
+	static int getCurrentFps() {
+		return 0;
+	}
 }

src/main/java/io/github/moehreag/axolotlclient/mixin/AccessorMinecraftClient.java

@@ -1,30 +1,26 @@
 package io.github.moehreag.axolotlclient.mixin;
 
+import io.github.moehreag.axolotlclient.AxolotlClient;
 import net.minecraft.util.crash.CrashReport;
 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 java.util.Objects;
+
 @Mixin(CrashReport.class)
 public class MixinCrashReport {
 
 	@Inject(method = "addStackTrace", at = @At(value = "TAIL"))
 	public void addAxolotlclientInfo(StringBuilder builder, CallbackInfo ci){
-			builder.append("\n\n");
-			builder.append("---- Axolotlclient Information ----\n");
-			/*if (Axolotlclient.TitleDisclaimer){
-				builder.append("Unsupported Mods were found!\n");
-				builder.append("Suspected mod: ").append(Axolotlclient.badmod);
-			} else if (!Axolotlclient.features) {
-				builder.append("The mod is being used outside of Axolotlclient!\n");
-				builder.append("No support whatsoever will be given!");
-
-			} else {
-				builder.append("No unsupported Mods found…\n");
-				builder.append("No clear sign why his crashed…");
-			}*/
-
+			builder.append("\n\n")
+				.append("---- Axolotlclient Information ----\n");
+			if (!Objects.equals(AxolotlClient.badmod, "")){
+				builder.append("Unsupported Mods were found!\n")
+					.append("Suspected mod: ")
+					.append(AxolotlClient.badmod);
+			}
 			builder.append("\n\n");
 	}
 }

src/main/java/io/github/moehreag/axolotlclient/mixin/MixinCrashReport.java

@@ -1,15 +1,18 @@
 package io.github.moehreag.axolotlclient.mixin;
 
 
+import io.github.moehreag.axolotlclient.AxolotlClient;
 import io.github.moehreag.axolotlclient.modules.hud.HudEditScreen;
 import io.github.moehreag.axolotlclient.util.DiscordRPC;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ConfirmScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import org.quiltmc.loader.api.QuiltLoader;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,6 +22,8 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
+import java.util.Objects;
+
 @Mixin(TitleScreen.class)
 public abstract class MixinTitleScreen extends Screen{
 
@@ -49,32 +54,32 @@ public String setVersionText(String s){
 	@Inject(method = "init", at = @At("HEAD"))
 	public void showBadModsScreen(CallbackInfo ci){
 
-		/*if (Axolotlclient.showWarning) {
+		if (AxolotlClient.showWarning) {
 			MinecraftClient.getInstance().setScreen(new ConfirmScreen(
 				(boolean confirmed) -> {
 					if (confirmed) {
-						Axolotlclient.showWarning = false;
-						Axolotlclient.TitleDisclaimer = true;
+						AxolotlClient.showWarning = false;
+						AxolotlClient.titleDisclaimer = true;
 						System.out.println("Proceed with Caution!");
 						MinecraftClient.getInstance().setScreen(new TitleScreen());
 					} else {
 						MinecraftClient.getInstance().stop();
 					}
 				},
-				new LiteralText("Axolotlclient warning").formatted(Formatting.RED),
-				new LiteralText("The mod ").append(
-					new LiteralText(Axolotlclient.badmod).formatted(Formatting.BOLD, Formatting.DARK_RED)).append(" is most likely prohibited to be used on many Servers!\n" +
-					"I will not be responsible for any punishment you will get for using it. Proceed with Caution!"),
-				new LiteralText("Proceed"), new TranslatableText("menu.quit")));
-		}*/
+				Text.literal("Axolotlclient warning").formatted(Formatting.RED),
+				Text.literal("The mod ").append(
+					Text.literal(AxolotlClient.badmod).formatted(Formatting.BOLD, Formatting.DARK_RED)).append(" is most likely prohibited to be used on many Servers!\n" +
+					"AxolotlClient will not be responsible for any punishment you will get for using it. Proceed with Caution!"),
+				Text.literal("Proceed"), Text.translatable("menu.quit")));
+		}
 	}
 
 	@Inject(method = "render", at = @At("TAIL"))
 	public void addDisclaimer(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci){
-		/*if(Axolotlclient.TitleDisclaimer){
+		if(AxolotlClient.titleDisclaimer){
 			TitleScreen.drawCenteredText(matrices, this.textRenderer, "You are playing at your own risk with unsupported Mods",
 				this.width/2, 5, 0xFFCC8888);
 			TitleScreen.drawCenteredText(matrices, this.textRenderer, "Things could break!", this.width/2, 15, 0xFFCC8888);
-		}*/
+		}
 	}
 }

src/main/java/io/github/moehreag/axolotlclient/mixin/MixinTitleScreen.java

@@ -50,7 +50,7 @@ public void render(MatrixStack matrices) {
 		lastY = lastY - 20;
 		for (int i = 0; i <= 3; i++) {
 			ItemStack item = client.player.getInventory().armor.get(i);
-			renderItem(matrices, item, pos.x + 2, lastY + pos.y);
+			renderItem(matrices, item.copy(), pos.x + 2, lastY + pos.y);
 			lastY = lastY - 20;
 		}
 		matrices.pop();

src/main/java/io/github/moehreag/axolotlclient/modules/hud/gui/hud/ArmorHud.java

@@ -25,7 +25,7 @@ public Identifier getId() {
 
     @Override
     public String getValue() {
-        return ((AccessorMinecraftClient)MinecraftClient.getInstance()).getCurrentFps() + " FPS";
+        return AccessorMinecraftClient.getCurrentFps() + " FPS";
     }
 
     @Override

src/main/java/io/github/moehreag/axolotlclient/modules/hud/gui/hud/FPSHud.java

@@ -15,7 +15,6 @@
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.json.ModelTransformation;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.PlayerScreenHandler;

src/main/java/io/github/moehreag/axolotlclient/modules/hud/util/ItemUtil.java

@@ -90,6 +90,7 @@
 	"rightcps": "Show Rightclick Cps",
 	"fpshud": "FPS HUD",
 	"armorhud": "Armor HUD",
+	"showProtectionLevel": "Show Protection Level",
 	"potionshud": "Potion HUD",
 	"keystrokehud": "Keystrokes",
 	"speedhud": "Speed HUD",