Update to 1.17.1 and bump version (#46)

Minenash · Jul 22, 2021 · fed0222 · fed0222
1 parent de80370
commit fed0222
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 29 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17-pre1
-	yarn_mappings=1.17-pre1+build.1
-	loader_version=0.11.3
+	minecraft_version=1.17.1
+	yarn_mappings=1.17.1+build.14
+	loader_version=0.11.6
 
 	modmenu_version = 2.0.0-beta.7
-	fabric_version=0.34.8+1.17
+	fabric_version=0.37.0+1.17
 
 # Mod Properties
-	mod_version = 1.3.5+1.17
+	mod_version = 1.3.6+1.17.1
 	maven_group = com.minenash
 	archives_base_name = seamless-loading-screen
diff --git a/src/main/java/com/minenash/seamless_loading_screen/FinishQuit.java b/src/main/java/com/minenash/seamless_loading_screen/FinishQuit.java
@@ -10,7 +10,7 @@
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.realms.gui.screen.RealmsMainScreen;
 import net.minecraft.client.texture.NativeImage;
-import net.minecraft.client.util.Screenshooter;
+import net.minecraft.client.util.ScreenshotRecorder;
 import net.minecraft.client.util.Window;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
@@ -64,7 +64,7 @@ else if (serverOrderedDisconnectHandler != null)
             prevHeight = client.getWindow().getFramebufferHeight();
             resizeScreen(client, Config.resolution.width, Config.resolution.height);
         }
-        client.openScreen(new FinishQuit());
+        client.setScreen(new FinishQuit());
     }
 
     @Override
@@ -73,7 +73,7 @@ public void render(MatrixStack matrices, int _mouseX, int _mouseY, float _delta)
 
         String name = ScreenshotLoader.getFileName();
 
-        NativeImage nativeImage = Screenshooter.takeScreenshot(0, 0, client.getFramebuffer()); //width and height args do nothing
+        NativeImage nativeImage = ScreenshotRecorder.takeScreenshot(client.getFramebuffer()); //width and height args do nothing
 
         try {
             nativeImage.writeFile(new File(name));
@@ -84,7 +84,7 @@ public void render(MatrixStack matrices, int _mouseX, int _mouseY, float _delta)
         }
 
         if (Config.updateWorldIcon && client.isInSingleplayer())
-            updateIcon(client.getServer().getIconFile(), nativeImage);
+            updateIcon(client.getServer().getIconFile().get().toFile(), nativeImage);
 
 
         client.options.hudHidden = hudHidden;
@@ -122,11 +122,11 @@ private static void quit(MinecraftClient client) {
             client.disconnect();
 
         if (isRealms)
-            client.openScreen(new RealmsMainScreen(new TitleScreen()));
+            client.setScreen(new RealmsMainScreen(new TitleScreen()));
         else if (isSinglePlayer)
-            client.openScreen(new TitleScreen());
+            client.setScreen(new TitleScreen());
         else
-            client.openScreen(new MultiplayerScreen(new TitleScreen()));
+            client.setScreen(new MultiplayerScreen(new TitleScreen()));
     }
 
     private static void updateIcon(File iconFile, NativeImage nativeImage) {

diff --git a/src/main/java/com/minenash/seamless_loading_screen/SeamlessLoadingScreen.java b/src/main/java/com/minenash/seamless_loading_screen/SeamlessLoadingScreen.java
@@ -39,7 +39,7 @@ public void onInitializeClient() {
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             while (OPEN_SETTINGS.wasPressed())
-                client.openScreen(Config.getScreen(client.currentScreen));
+                client.setScreen(Config.getScreen(client.currentScreen));
         });
     }
 }
diff --git a/src/main/java/com/minenash/seamless_loading_screen/config/TinyConfig.java b/src/main/java/com/minenash/seamless_loading_screen/config/TinyConfig.java
@@ -190,7 +190,7 @@ protected void init() {
                     try { info.field.set(null, info.value); }
                     catch (IllegalAccessException ignore) {}
                 write();
-                client.openScreen(parent);
+                client.setScreen(parent);
             }));
 
             int y = 45;

diff --git a/src/main/java/com/minenash/seamless_loading_screen/mixin/GameRendererMixin.java b/src/main/java/com/minenash/seamless_loading_screen/mixin/GameRendererMixin.java
@@ -1,21 +1,22 @@
 package com.minenash.seamless_loading_screen.mixin;
 
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
 import com.minenash.seamless_loading_screen.ScreenshotLoader;
 import com.minenash.seamless_loading_screen.config.Config;
 import com.mojang.blaze3d.systems.RenderSystem;
+
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.text.TranslatableText;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GameRenderer.class)
 public class GameRendererMixin {
@@ -57,9 +58,4 @@ else if (ScreenshotLoader.loaded && ScreenshotLoader.time == 0) {
         }
     }
 
-    @Redirect(method = "updateWorldIcon", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/integrated/IntegratedServer;hasIconFile()Z"))
-    private boolean allowsUpdatingIcon(IntegratedServer _server) {
-        return false;
-    }
-
 }
diff --git a/src/main/java/com/minenash/seamless_loading_screen/mixin/MinecraftClientMixin.java b/src/main/java/com/minenash/seamless_loading_screen/mixin/MinecraftClientMixin.java
@@ -37,9 +37,9 @@ private void changeScreen(MinecraftClient client) {
 		client.disconnect(new ScreenshotWithTextScreen());
 	}
 
-	@Redirect(method = "method_29970", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;openScreen(Lnet/minecraft/client/gui/screen/Screen;)V"))
+	@Redirect(method = "method_29970", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;setScreen(Lnet/minecraft/client/gui/screen/Screen;)V"))
 	private void changeScreen2(MinecraftClient client, Screen screen) {
-		client.openScreen(new ScreenshotWithTextScreen(screen.getTitle()));
+		client.setScreen(new ScreenshotWithTextScreen(screen.getTitle()));
 	}
 
 	boolean first = true;