Merge pull request #99 from TheMrEngMan/fabric_1_20

Update to Minecraft 1.20.2

build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
 }
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.3-SNAPSHOT'
 	id "com.modrinth.minotaur" version "2.+"
 	id "com.matthewprenger.cursegradle" version "1.4.0"
 }
@@ -34,7 +34,7 @@ repositories {
         }
 	maven {
 		name = "Ladysnake Libs"
-		url = "https://ladysnake.jfrog.io/artifactory/mods"
+		url = "https://maven.ladysnake.org/releases"
 	}
         maven { url "https://maven.shedaniel.me/" }
 }
@@ -43,10 +43,10 @@ sourceCompatibility = 17
 targetCompatibility = 17
 
 ext.Versions = new Properties()
-Versions.load(file("Versionfiles/mcversion-1.20.properties").newReader())
+Versions.load(file("Versionfiles/mcversion-1.20.2.properties").newReader())
 
 archivesBaseName = "durabilityviewer"
-ext.projectVersion = "1.10.4"
+ext.projectVersion = "1.10.5"
 
 version = "${Versions['minecraft_version']}-fabric${Versions['fabric_versiononly']}-${project.projectVersion}"
 

src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java

@@ -7,6 +7,9 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ServerInfo;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import static org.lwjgl.glfw.GLFW.GLFW_KEY_H;
@@ -29,6 +32,7 @@ public void onInitializeClient() {
         ConfigurationProvider.register(MODNAME, confHandler);
         confHandler.load(ConfigurationProvider.getSuggestedFile(MODID));
         changedWindowTitle=null;
+        registerEvents();
     }
 
     public static void setWindowTitle(String s) {
@@ -49,5 +53,31 @@ public void setKeyBindings() {
         final String category="key.categories.durabilityviewer";
         KeyBindingHelper.registerKeyBinding(showHide = new KeyBinding("key.durabilityviewer.showhide", InputUtil.Type.KEYSYM, GLFW_KEY_H, category));
         ClientTickEvents.END_CLIENT_TICK.register(e->processKeyBinds());
-    }    
+    }
+
+    private void registerEvents() {
+
+        ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
+            if (!ConfigurationHandler.showPlayerServerName())
+                return;
+            MinecraftClient mc=MinecraftClient.getInstance();
+            ServerInfo serverData = mc.getCurrentServerEntry();
+            String serverName;
+            if (serverData==null)
+                serverName="local game";
+            else
+                serverName = serverData.name;
+            if (serverName==null)
+                serverName="unknown server";
+            DurabilityViewer.setWindowTitle(mc.getSession().getUsername() + " on "+serverName);
+        });
+
+        ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> {
+            if (!ConfigurationHandler.showPlayerServerName())
+                return;
+            MinecraftClient mc=MinecraftClient.getInstance();
+            DurabilityViewer.setWindowTitle(mc.getSession().getUsername() + " not connected");
+        });
+
+    }
 }

src/main/java/de/guntram/mcmod/durabilityviewer/client/gui/GuiItemDurability.java

@@ -213,7 +213,7 @@ public void onRenderGameOverlayPost(DrawContext context, float partialTicks) {
         // warning sound / do the visible 
         if (!visible
         // ||  minecraft.player.abilities.creativeMode
-        ||  minecraft.options.debugEnabled) {
+        ||  minecraft.getDebugHud().shouldShowDebugHud()) {
             return;
         }
 

src/main/java/de/guntram/mcmod/durabilityviewer/mixin/PotionEffectsMixin.java

@@ -23,8 +23,8 @@ private void afterRenderStatusEffects(DrawContext context, CallbackInfo ci) {
     }
 
     @Inject(method="render", at=@At(
-            value="FIELD", 
-            target="Lnet/minecraft/client/option/GameOptions;debugEnabled:Z", 
+            value="INVOKE",
+            target="Lnet/minecraft/client/gui/hud/DebugHud;shouldShowDebugHud()Z",
             opcode = Opcodes.GETFIELD, args = {"log=false"}))
 
     private void beforeRenderDebugScreen(DrawContext context, float f, CallbackInfo ci) {

src/main/resources/assets/durabilityviewer/lang/en_us.json

@@ -24,6 +24,7 @@
     "durabilityviewer.config.tt.mindurability": "Play sound when durability below X",
     "durabilityviewer.config.tt.setwindowtitle": "Set window title to player and server name",
     "durabilityviewer.config.tt.showdamagepercent": "Show damage instead of durability while the item is still better than this %",
+    "durabilityviewer.config.tt.hidedamagepercent": "Don't show item icon while the item is still better than this %",
     "durabilityviewer.config.tt.showfreeslots": "Show chest icon with number of free inventory slots",
     "durabilityviewer.config.tt.showalltrinkets": "If you have the trinkets mod, show all trinkets even when they don't have durability/damage",
     "durabilityviewer.config.tt.percentvalues": "Show percentages instead of absolute values",

src/main/resources/mixins.durabilityviewer.json

@@ -5,7 +5,6 @@
     "minVersion": "0.6",
     "client": [
         "TooltipMixin",
-        "ConnectMixin",
         "PotionEffectsMixin",
         "WindowTitleMixin"
     ],