From ca5796e399f2a56f4101d09216f15b722868bdb0 Mon Sep 17 00:00:00 2001 From: minenash Date: Tue, 1 Jun 2021 14:10:00 -0400 Subject: [PATCH] Updated to 1.17 --- build.gradle | 37 ++++++++-------- gradle.properties | 13 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../seamless_loading_screen/FinishQuit.java | 5 +-- .../ScreenshotLoader.java | 5 ++- .../SeamlessLoadingScreen.java | 2 +- .../config/ModMenuEntryPoint.java | 11 ++--- .../config/TinyConfig.java | 8 ++-- .../mixin/ClientPlayNetworkHandlerMixin.java | 2 - .../mixin/ConnectScreenMixin.java | 8 ++-- .../mixin/GameRendererMixin.java | 5 ++- .../mixin/WorldListWidgetMixin.java | 7 ++-- .../AddServerScreenMixin.java | 2 +- .../custom_screenshots/ServerInfoMixin.java | 12 +++--- .../bedrockify/LoadingScreenWidgetMixin.java | 42 +++++++++---------- src/main/resources/fabric.mod.json | 4 +- .../seamless_loading_screen.mixins.json | 15 +++---- 17 files changed, 87 insertions(+), 93 deletions(-) diff --git a/build.gradle b/build.gradle index d798250..d199c72 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' + id 'fabric-loom' version '0.8-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 archivesBaseName = project.archives_base_name version = project.mod_version @@ -12,7 +12,7 @@ group = project.maven_group repositories { maven { - url "https://www.cursemaven.com" + url "https://maven.terraformersmc.com/releases/" } } @@ -21,14 +21,14 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "curse.maven:bedrockify-403858:3152545" - modImplementation ("io.github.prospector:modmenu:${project.modmenu_version}") { + +// modImplementation "curse.maven:bedrockify-403858:3152545" + modImplementation ("com.terraformersmc:modmenu:${project.modmenu_version}") { exclude module: "fabric-api" } - - // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. - // You may need to force-disable transitiveness on them. } processResources { @@ -46,13 +46,8 @@ tasks.withType(JavaCompile).configureEach { // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" - // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too - // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. - // We'll use that if it's available, but otherwise we'll use the older option. - def targetVersion = 8 - if (JavaVersion.current().isJava9Compatible()) { - it.options.release = targetVersion - } + // Minecraft 1.17 (21w19a) upwards uses Java 16. + it.options.release = 16 } java { @@ -82,9 +77,11 @@ publishing { } } - // Select the repositories you want to publish to - // To publish to maven local, no extra repositories are necessary. Just use the task `publishToMavenLocal`. + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. repositories { - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 64625c8..6272500 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,13 +3,14 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.4 - yarn_mappings=1.16.4+build.6 - loader_version=0.10.6+build.214 - modmenu_version = 1.14.6+build.31 - fabric_version=0.30.0+1.16 + minecraft_version=1.17-pre1 + yarn_mappings=1.17-pre1+build.1 + loader_version=0.11.3 + + modmenu_version = 2.0.0-beta.7 + fabric_version=0.34.8+1.17 # Mod Properties - mod_version = 1.3.4 + mod_version = 1.3.4+1.17 maven_group = com.minenash archives_base_name = seamless-loading-screen diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be52383..e5338d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/minenash/seamless_loading_screen/FinishQuit.java b/src/main/java/com/minenash/seamless_loading_screen/FinishQuit.java index ae03e56..8775d4e 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/FinishQuit.java +++ b/src/main/java/com/minenash/seamless_loading_screen/FinishQuit.java @@ -8,10 +8,9 @@ import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.network.ClientPlayNetworkHandler; -import net.minecraft.client.realms.gui.screen.RealmsBridgeScreen; import net.minecraft.client.realms.gui.screen.RealmsMainScreen; import net.minecraft.client.texture.NativeImage; -import net.minecraft.client.util.ScreenshotUtils; +import net.minecraft.client.util.Screenshooter; import net.minecraft.client.util.Window; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; @@ -74,7 +73,7 @@ public void render(MatrixStack matrices, int _mouseX, int _mouseY, float _delta) String name = ScreenshotLoader.getFileName(); - NativeImage nativeImage = ScreenshotUtils.takeScreenshot(0, 0, client.getFramebuffer()); //width and height args do nothing + NativeImage nativeImage = Screenshooter.takeScreenshot(0, 0, client.getFramebuffer()); //width and height args do nothing try { nativeImage.writeFile(new File(name)); diff --git a/src/main/java/com/minenash/seamless_loading_screen/ScreenshotLoader.java b/src/main/java/com/minenash/seamless_loading_screen/ScreenshotLoader.java index 359728a..e2b9028 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/ScreenshotLoader.java +++ b/src/main/java/com/minenash/seamless_loading_screen/ScreenshotLoader.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormats; import net.minecraft.client.texture.NativeImage; @@ -55,6 +56,7 @@ public static void setRealmScreenshot(String realmName) { private static void setScreenshot() { loaded = false; try (InputStream in = new FileInputStream(ScreenshotLoader.fileName)) { + System.out.println("Name: " + ScreenshotLoader.fileName); NativeImageBackedTexture image = new NativeImageBackedTexture(NativeImage.read(in)); MinecraftClient.getInstance().getTextureManager().registerTexture(SCREENSHOT, image); imageRatio = image.getImage().getWidth() / (double) image.getImage().getHeight(); @@ -80,7 +82,8 @@ private static String cleanFileName(String fileName) { public static void render(Screen screen, MatrixStack stack) { if (loaded) { - MinecraftClient.getInstance().getTextureManager().bindTexture(ScreenshotLoader.SCREENSHOT); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, SCREENSHOT); int w = (int) (imageRatio * screen.height); DrawableHelper.drawTexture(stack, screen.width / 2 - w / 2, 0, 0.0F, 0.0F, w, screen.height, w, screen.height); diff --git a/src/main/java/com/minenash/seamless_loading_screen/SeamlessLoadingScreen.java b/src/main/java/com/minenash/seamless_loading_screen/SeamlessLoadingScreen.java index b93642e..826491e 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/SeamlessLoadingScreen.java +++ b/src/main/java/com/minenash/seamless_loading_screen/SeamlessLoadingScreen.java @@ -5,7 +5,7 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/com/minenash/seamless_loading_screen/config/ModMenuEntryPoint.java b/src/main/java/com/minenash/seamless_loading_screen/config/ModMenuEntryPoint.java index 94f6313..b0af7cd 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/config/ModMenuEntryPoint.java +++ b/src/main/java/com/minenash/seamless_loading_screen/config/ModMenuEntryPoint.java @@ -1,18 +1,13 @@ package com.minenash.seamless_loading_screen.config; -import io.github.prospector.modmenu.api.ConfigScreenFactory; -import io.github.prospector.modmenu.api.ModMenuApi; -import net.minecraft.client.MinecraftClient; +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; public class ModMenuEntryPoint implements ModMenuApi { - @Override - public String getModId() { - return "seamless_loading_screen"; - } - @Override public ConfigScreenFactory getModConfigScreenFactory() { return Config::getScreen; } + } \ No newline at end of file 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 index 0238a5a..928bab1 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/config/TinyConfig.java +++ b/src/main/java/com/minenash/seamless_loading_screen/config/TinyConfig.java @@ -184,7 +184,7 @@ protected TinyConfigScreen(Screen parent) { protected void init() { super.init(); - ButtonWidget done = this.addButton(new ButtonWidget(this.width/2 - 100,this.height - 28,200,20, + ButtonWidget done = addDrawableChild(new ButtonWidget(this.width/2 - 100,this.height - 28,200,20, new TranslatableText("gui.done"), (button) -> { for (EntryInfo info : entries) try { info.field.set(null, info.value); } @@ -197,17 +197,17 @@ protected void init() { for (EntryInfo info : entries) { if (info.widget instanceof Map.Entry) { Map.Entry> widget = (Map.Entry>) info.widget; - addButton(new ButtonWidget(width-85,y,info.width,20, widget.getValue().apply(info.value), widget.getKey())); + addDrawableChild(new ButtonWidget(width-85,y,info.width,20, widget.getValue().apply(info.value), widget.getKey())); } else { - TextFieldWidget widget = addButton(new TextFieldWidget(textRenderer, width-85, y, info.width, 20, null)); + TextFieldWidget widget = addDrawableChild(new TextFieldWidget(textRenderer, width-85, y, info.width, 20, null)); widget.setText(info.tempValue); Predicate processor = ((BiFunction>) info.widget).apply(widget,done); widget.setTextPredicate(processor); processor.test(info.tempValue); - children.add(widget); + addSelectableChild(widget); } y += 30; } diff --git a/src/main/java/com/minenash/seamless_loading_screen/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/com/minenash/seamless_loading_screen/mixin/ClientPlayNetworkHandlerMixin.java index 4be5f10..cda7262 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/com/minenash/seamless_loading_screen/mixin/ClientPlayNetworkHandlerMixin.java @@ -26,8 +26,6 @@ public class ClientPlayNetworkHandlerMixin { @Shadow @Final private Screen loginScreen; - @Shadow @Final private static Text field_26620; - @Redirect(method = "onGameJoin", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;joinWorld(Lnet/minecraft/client/world/ClientWorld;)V")) private void setChangeWorldJoinScreen(MinecraftClient client, ClientWorld world) { if (ScreenshotLoader.loaded) { diff --git a/src/main/java/com/minenash/seamless_loading_screen/mixin/ConnectScreenMixin.java b/src/main/java/com/minenash/seamless_loading_screen/mixin/ConnectScreenMixin.java index 983e0e8..5ac3324 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/mixin/ConnectScreenMixin.java +++ b/src/main/java/com/minenash/seamless_loading_screen/mixin/ConnectScreenMixin.java @@ -1,7 +1,9 @@ package com.minenash.seamless_loading_screen.mixin; import com.minenash.seamless_loading_screen.ScreenshotLoader; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ConnectScreen; +import net.minecraft.client.network.ServerAddress; import net.minecraft.client.util.math.MatrixStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -18,8 +20,8 @@ public void render(ConnectScreen screen, MatrixStack stack) { ScreenshotLoader.render(screen,stack); } - @Inject(method = "connect", at = @At("HEAD"), cancellable = true) - public void getImage(String address, int port, CallbackInfo info) { - ScreenshotLoader.setScreenshot(address, port); + @Inject(method = "connect(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ServerAddress;)V", at = @At("HEAD"), cancellable = true) + public void getImage(MinecraftClient client, ServerAddress address, CallbackInfo _info) { + ScreenshotLoader.setScreenshot(address.getAddress(), address.getPort()); } } 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 index bd1cf39..30b85ea 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/mixin/GameRendererMixin.java +++ b/src/main/java/com/minenash/seamless_loading_screen/mixin/GameRendererMixin.java @@ -32,7 +32,8 @@ private MatrixStack getStack() { @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V"), cancellable = true) private void fade(float tickDelta, long startTime, boolean tick, CallbackInfo info) { if (ScreenshotLoader.loaded && ScreenshotLoader.time > 0) { - client.getTextureManager().bindTexture(ScreenshotLoader.SCREENSHOT); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, ScreenshotLoader.SCREENSHOT); int height = client.getWindow().getScaledHeight(); int width = client.getWindow().getScaledWidth(); @@ -40,7 +41,7 @@ private void fade(float tickDelta, long startTime, boolean tick, CallbackInfo in boolean doFade = ScreenshotLoader.time <= Config.fade; if (doFade) - RenderSystem.color4f(1.0F, 1.0F, 1.0F, ScreenshotLoader.timeDelta * ScreenshotLoader.time); + RenderSystem.clearColor(1.0F, 1.0F, 1.0F, ScreenshotLoader.timeDelta * ScreenshotLoader.time); DrawableHelper.drawTexture(stack, width/2 - w/2, 0, 0.0F, 0.0F, w, height, w, height); //ScreenshotLoader.renderVignette(); diff --git a/src/main/java/com/minenash/seamless_loading_screen/mixin/WorldListWidgetMixin.java b/src/main/java/com/minenash/seamless_loading_screen/mixin/WorldListWidgetMixin.java index 78be1a1..97b376f 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/mixin/WorldListWidgetMixin.java +++ b/src/main/java/com/minenash/seamless_loading_screen/mixin/WorldListWidgetMixin.java @@ -3,6 +3,7 @@ import com.minenash.seamless_loading_screen.ScreenshotLoader; import com.minenash.seamless_loading_screen.ScreenshotWithTextScreen; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.world.WorldListWidget; import net.minecraft.text.TranslatableText; import net.minecraft.world.level.storage.LevelSummary; @@ -24,8 +25,8 @@ public void setFilename(CallbackInfo info) { ScreenshotLoader.setScreenshot(level.getName()); } - @Redirect(method = "start", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/world/WorldListWidget$Entry;method_29990()V")) - private void changeScreen(WorldListWidget.Entry entry) { - MinecraftClient.getInstance().method_29970(new ScreenshotWithTextScreen(new TranslatableText("selectWorld.data_read"))); + @Redirect(method = "openReadingWorldScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;method_29970(Lnet/minecraft/client/gui/screen/Screen;)V")) + private void changeScreen(MinecraftClient client, Screen screen) { + client.method_29970(new ScreenshotWithTextScreen(new TranslatableText("selectWorld.data_read"))); } } diff --git a/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/AddServerScreenMixin.java b/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/AddServerScreenMixin.java index e2eda11..562ccf4 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/AddServerScreenMixin.java +++ b/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/AddServerScreenMixin.java @@ -36,7 +36,7 @@ private ButtonWidget buttonCancel(int x, int y, int width, int height, Text mess @Inject(method = "init", at = @At("HEAD")) private void buttonAllowCustomScreenshot(CallbackInfo info) { - buttonAllowCustomScreenshot = addButton(new ButtonWidget(width / 2 - 100, height / 4 + 72 + 24, 200, 20, + buttonAllowCustomScreenshot = addDrawableChild(new ButtonWidget(width / 2 - 100, height / 4 + 72 + 24, 200, 20, getText(), buttonWidget -> { ((ServerInfoExtras)server).setAllowCustomScreenshots(!((ServerInfoExtras)server).getAllowCustomScreenshot()); buttonAllowCustomScreenshot.setMessage(getText()); diff --git a/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/ServerInfoMixin.java b/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/ServerInfoMixin.java index d211733..8ea4ae0 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/ServerInfoMixin.java +++ b/src/main/java/com/minenash/seamless_loading_screen/mixin/custom_screenshots/ServerInfoMixin.java @@ -2,7 +2,7 @@ import com.minenash.seamless_loading_screen.ServerInfoExtras; import net.minecraft.client.network.ServerInfo; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtCompound; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -16,15 +16,15 @@ public class ServerInfoMixin implements ServerInfoExtras { @Unique private boolean allowCustomScreenshots = false; - @Inject(method = "serialize", at = @At("RETURN"), cancellable = true) - private void serialize(CallbackInfoReturnable callback) { - CompoundTag tag = callback.getReturnValue(); + @Inject(method = "toNbt", at = @At("RETURN"), cancellable = true) + private void serialize(CallbackInfoReturnable callback) { + NbtCompound tag = callback.getReturnValue(); tag.putBoolean("allowCustomScreenshots", allowCustomScreenshots); callback.setReturnValue(tag); } - @Inject(method = "deserialize", at = @At("RETURN"), cancellable = true) - private static void deserialize(CompoundTag tag, CallbackInfoReturnable callback) { + @Inject(method = "fromNbt", at = @At("RETURN"), cancellable = true) + private static void deserialize(NbtCompound tag, CallbackInfoReturnable callback) { if (!tag.contains("allowCustomScreenshots", 1)) return; ServerInfo info = callback.getReturnValue(); diff --git a/src/main/java/com/minenash/seamless_loading_screen/mixin/mod_compat/bedrockify/LoadingScreenWidgetMixin.java b/src/main/java/com/minenash/seamless_loading_screen/mixin/mod_compat/bedrockify/LoadingScreenWidgetMixin.java index f8e2c49..7a97922 100644 --- a/src/main/java/com/minenash/seamless_loading_screen/mixin/mod_compat/bedrockify/LoadingScreenWidgetMixin.java +++ b/src/main/java/com/minenash/seamless_loading_screen/mixin/mod_compat/bedrockify/LoadingScreenWidgetMixin.java @@ -1,21 +1,21 @@ -package com.minenash.seamless_loading_screen.mixin.mod_compat.bedrockify; - -import com.minenash.seamless_loading_screen.ScreenshotLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.Text; -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(targets = "me.juancarloscp52.bedrockify.client.features.loadingScreens.LoadingScreenWidget", remap = false) -public class LoadingScreenWidgetMixin { - - @Inject(method = "render", at = @At("HEAD")) - private void renderBackground(MatrixStack matrices, int _width, int _height, Text _title, Text _message, int _progress, CallbackInfo _info) { - if (ScreenshotLoader.loaded) - ScreenshotLoader.render(MinecraftClient.getInstance().currentScreen, matrices); - } - -} +//package com.minenash.seamless_loading_screen.mixin.mod_compat.bedrockify; +// +//import com.minenash.seamless_loading_screen.ScreenshotLoader; +//import net.minecraft.client.MinecraftClient; +//import net.minecraft.client.util.math.MatrixStack; +//import net.minecraft.text.Text; +//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(targets = "me.juancarloscp52.bedrockify.client.features.loadingScreens.LoadingScreenWidget", remap = false) +//public class LoadingScreenWidgetMixin { +// +// @Inject(method = "render", at = @At("HEAD")) +// private void renderBackground(MatrixStack matrices, int _width, int _height, Text _title, Text _message, int _progress, CallbackInfo _info) { +// if (ScreenshotLoader.loaded) +// ScreenshotLoader.render(MinecraftClient.getInstance().currentScreen, matrices); +// } +// +//} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8a01e00..5b1005b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,8 +32,8 @@ }, "depends": { - "fabricloader": ">=0.7.4", + "fabricloader": ">=0.11.3", "fabric": "*", - "minecraft": "1.16.x" + "minecraft": "1.17.x" } } diff --git a/src/main/resources/seamless_loading_screen.mixins.json b/src/main/resources/seamless_loading_screen.mixins.json index eb434ee..79ddbfe 100644 --- a/src/main/resources/seamless_loading_screen.mixins.json +++ b/src/main/resources/seamless_loading_screen.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.minenash.seamless_loading_screen.mixin", - "compatibilityLevel": "JAVA_8", + "compatibilityLevel": "JAVA_16", "client": [ "ClientPlayNetworkHandlerMixin", "ConnectScreenMixin", @@ -17,16 +17,13 @@ "custom_screenshots.AddServerScreenMixin", "custom_screenshots.MultiplayerScreenMixin", "custom_screenshots.ServerInfoMixin", - "mod_compat.bedrockify.LoadingScreenWidgetMixin", - "mod_compat.fapi_0_30_0.ScreenEventsMixin" + "mod_compat.fapi_0_30_0.ScreenEventsMixin", + "realm.RealmsLongConfirmationScreenMixin", + "realm.RealmsLongRunningMcoTaskScreenMixin", + "realm.RealmsMainScreenMixin" ], "injectors": { "defaultRequire": 1 }, - "plugin": "com.minenash.seamless_loading_screen.mixin.mod_compat.ModCompatMixinPlugin", - "mixins": [ - "realm.RealmsLongConfirmationScreenMixin", - "realm.RealmsLongRunningMcoTaskScreenMixin", - "realm.RealmsMainScreenMixin" - ] + "plugin": "com.minenash.seamless_loading_screen.mixin.mod_compat.ModCompatMixinPlugin" }