diff --git a/build.gradle.kts b/build.gradle.kts index 83d8b15..d4ddc8c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,8 +46,8 @@ tasks.named("processResources") { dependencies { // transitive = false because Guava is conflicting on runClient - compile("us.myles:viaversion:2.1.0") { isTransitive = false } - include("us.myles:viaversion:2.1.0") + compile("us.myles:viaversion:2.1.1-1.14.2-pre1") { isTransitive = false } + include("us.myles:viaversion:2.1.1-1.14.2-pre1") compile("de.gerrygames:viarewind-all:1.4.0") { isTransitive = false } include("de.gerrygames:viarewind-all:1.4.0") compile("nl.matsv:viabackwards-all:3.0.0-SNAPSHOT") { isTransitive = false } @@ -55,8 +55,8 @@ dependencies { compileOnly("com.google.code.findbugs:jsr305:3.0.2") - minecraft("com.mojang:minecraft:1.14.1") - mappings("net.fabricmc:yarn:1.14.1+build.1") + minecraft("com.mojang:minecraft:1.14.2 Pre-Release 1") + mappings("net.fabricmc:yarn:1.14.2 Pre-Release 1+build.1") modCompile("net.fabricmc:fabric-loader:0.4.7+build.147") modCompile("net.fabricmc:fabric:0.2.7+build.127") diff --git a/src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinMultiplayerScreen.java b/src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinMultiplayerScreen.java index 19527f4..5fed0bc 100644 --- a/src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinMultiplayerScreen.java +++ b/src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinMultiplayerScreen.java @@ -28,9 +28,9 @@ import com.github.creeper123123321.viafabric.providers.VRVersionProvider; import com.github.creeper123123321.viafabric.util.VersionFormatFilter; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.Screen; -import net.minecraft.client.gui.menu.MultiplayerScreen; -import net.minecraft.client.gui.menu.YesNoScreen; +import net.minecraft.client.gui.screen.ConfirmScreen; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.RecipeBookButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -116,7 +116,7 @@ public abstract class MixinMultiplayerScreen extends Screen { 20, // v Hover offset new Identifier("viafabric:textures/gui/via_button.png"), 64, 64, // Texture size - button -> MinecraftClient.getInstance().openScreen(new YesNoScreen( + button -> MinecraftClient.getInstance().openScreen(new ConfirmScreen( answer -> { MinecraftClient.getInstance().openScreen(this); if (answer) {