Merge pull request #3 from Lori3f6/1.20.1

upgrade to mc 1.20.4

gradle.properties

@@ -2,13 +2,15 @@
 org.gradle.jvmargs=-Xmx8G
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.15.6
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.7
+
+#Fabric api
+fabric_version=0.96.3+1.20.4
+
 # Mod Properties
 mod_version=1.1.1
 maven_group=com.takaranoao
 archives_base_name=autoreconnector-fabric
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.91.0+1.20.1
+

in_case_i_will_forget.md

@@ -0,0 +1,3 @@
+## how to upgrade?
+1. change the property in the gradle.properties file as https://fabricmc.net/develop/ stated
+2. refer to https://github.com/FabricMC/yarn to find out mappings & changes if needed

src/client/java/com/takaranoao/mods/autoreconnector/AutoConnectorMod.java

@@ -5,9 +5,9 @@
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.ConnectScreen;
 import net.minecraft.client.gui.screen.DisconnectedScreen;
 import net.minecraft.client.gui.screen.TitleScreen;
+import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
 import net.minecraft.client.network.ServerAddress;
 import net.minecraft.client.network.ServerInfo;
 import org.apache.logging.log4j.LogManager;

src/client/java/com/takaranoao/mods/autoreconnector/mixins/MixinDisconnectedScreen.java

@@ -7,18 +7,20 @@
 import net.minecraft.client.gui.screen.DisconnectedScreen;
 import net.minecraft.client.resource.language.I18n;
 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;
 
+// mixin inheritance due to render method is no longer in DisconnectedScreen class
+// refers to: https://www.fabricmc.net/wiki/tutorial:mixinheritance
 @Mixin(DisconnectedScreen.class)
-public class MixinDisconnectedScreen {
+public class MixinDisconnectedScreen extends MixinScreen {
     private static final int FONT_HEIGHT = 9;
 
     //ref: https://fabricmc.net/wiki/tutorial:mixin_injects
-    @Inject(method = "render", at = @At("RETURN"))
-    private void onRender(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+    @Override
+    public void onRender(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (AutoConnectorMod.lastestServerEntry == null) return;
+        if (AutoConnectorMod.disconnectTick == 0) return;
+
         MinecraftClient mc = MinecraftClient.getInstance();
         TextRenderer textRenderer = mc.textRenderer;
         if (mc.currentScreen == null) return;

src/client/java/com/takaranoao/mods/autoreconnector/mixins/MixinScreen.java

@@ -0,0 +1,16 @@
+package com.takaranoao.mods.autoreconnector.mixins;
+
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.Screen;
+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;
+
+@Mixin(Screen.class)
+public class MixinScreen {
+    @Inject(at = @At("RETURN"), method = "render")
+    public void onRender(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+
+    }
+}

src/client/resources/autoreconnector.mixins.json

@@ -6,6 +6,7 @@
   "mixins": [
   ],
   "client": [
+    "MixinScreen",
     "MixinDisconnectedScreen"
   ],
   "injectors": {