From 3188a3bc0c6246da7549ec6d29380b6977a2e839 Mon Sep 17 00:00:00 2001 From: Bstn1802 <37768378+Bstn1802@users.noreply.github.com> Date: Mon, 7 Sep 2020 16:27:09 +0200 Subject: [PATCH] added 1.16.1 support by changing some code (still works for 1.16.2) fixed timer resetting so reconnecting can be canceled and works multiple times fixed typo in .gitignore added icon --- .gitignore | 2 +- build.gradle | 8 ++++---- gradle.properties | 8 ++++---- .../java/net/autoreconnect/AutoReconnect.java | 1 + .../mixin/MixinDisconnectedScreen.java | 12 ++++++------ .../mixin/MixinMinecraftClient.java | 4 +++- src/main/resources/assets/icon.png | Bin 0 -> 10158 bytes 7 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/icon.png diff --git a/.gitignore b/.gitignore index 66f16ea..a9ca9cd 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,4 @@ bin/ # fabric run/ -log/ +logs/ diff --git a/build.gradle b/build.gradle index 6a443f9..57d8e16 100644 --- a/build.gradle +++ b/build.gradle @@ -11,12 +11,12 @@ version = project.mod_version group = project.maven_group dependencies { - minecraft "com.mojang:minecraft:1.16.2" - mappings "net.fabricmc:yarn:1.16.2+build.43:v2" - modImplementation "net.fabricmc:fabric-loader:0.9.2+build.206" + minecraft "com.mojang:minecraft:1.16.1" + mappings "net.fabricmc:yarn:1.16.1+build.21:v2" + modImplementation "net.fabricmc:fabric-loader:0.9.3+build.207" //Fabric api - modImplementation "net.fabricmc.fabric-api:fabric-api:0.19.0+build.398-1.16" + modImplementation "net.fabricmc.fabric-api:fabric-api:0.18.0+build.387-1.16.1" } processResources { diff --git a/gradle.properties b/gradle.properties index 4aa1b07..b5f847c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.2 - yarn_mappings=1.16.2+build.43 - loader_version=0.9.2+build.206 + minecraft_version=1.16.1 + yarn_mappings=1.16.1+build.21 + loader_version=0.9.3+build.207 # Mod Properties mod_version = 1.0.0 @@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx1G # 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.19.0+build.398-1.16 + fabric_version=0.18.0+build.387-1.16.1 \ No newline at end of file diff --git a/src/main/java/net/autoreconnect/AutoReconnect.java b/src/main/java/net/autoreconnect/AutoReconnect.java index a64b75b..5f3f87c 100644 --- a/src/main/java/net/autoreconnect/AutoReconnect.java +++ b/src/main/java/net/autoreconnect/AutoReconnect.java @@ -47,6 +47,7 @@ public class AutoReconnect implements ModInitializer cancel(); attempt = 0; connect = false; + System.out.println("reset"); } public static int getCountdown() diff --git a/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java b/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java index 3d8517b..52e5ddb 100644 --- a/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java +++ b/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java @@ -1,7 +1,7 @@ package net.autoreconnect.mixin; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.DisconnectedScreen; import net.minecraft.client.util.Window; import net.minecraft.client.util.math.MatrixStack; @@ -27,11 +27,11 @@ public class MixinDisconnectedScreen private void render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo info) { Window window = MinecraftClient.getInstance().getWindow(); - DrawableHelper.drawCenteredString(matrices, - MinecraftClient.getInstance().textRenderer, - attempt == -1 ? "Can not reconnect!" : "Reconnecting in " + getCountdown() + "...", - window.getScaledWidth() / 2, - window.getScaledHeight() / 4, + TextRenderer renderer = MinecraftClient.getInstance().textRenderer; + String text = attempt == -1 ? "Can not reconnect!" : "Reconnecting in " + getCountdown() + "..."; + renderer.draw(matrices, text, + (window.getScaledWidth() - renderer.getWidth(text)) / 2F, + (window.getScaledHeight() - renderer.fontHeight) / 3F, 0xFF4422); } } \ No newline at end of file diff --git a/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java b/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java index 610aaef..aa65196 100644 --- a/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java +++ b/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java @@ -30,6 +30,7 @@ public class MixinMinecraftClient { System.out.println(screen == null ? null : screen.getClass().getSimpleName()); //TODO interpret disconnect reason + //TODO revalidate session if needed if (screen instanceof DisconnectedScreen) { if (attempt < 0) return; @@ -53,6 +54,7 @@ public class MixinMinecraftClient } else if (screen instanceof MultiplayerScreen || MinecraftClient.getInstance().player != null) { + System.out.println(screen == null ? null : screen.getClass().getSimpleName()); //TODO find better conditions to reset reset(); } @@ -72,7 +74,7 @@ public class MixinMinecraftClient return; } mc.disconnect(); - mc.openScreen(new ConnectScreen(new TitleScreen(), mc, lastServerEntry)); + mc.openScreen(new ConnectScreen(new MultiplayerScreen(new TitleScreen()), mc, lastServerEntry)); } } } \ No newline at end of file diff --git a/src/main/resources/assets/icon.png b/src/main/resources/assets/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5d030cfa5dff5d482eb81a7552cb9263d0cff6b4 GIT binary patch literal 10158 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