diff --git a/build.gradle.kts b/build.gradle.kts index 555748b..4258835 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,8 +40,8 @@ tasks.named("processResources") { dependencies { // transitive = false, viabackwards-core because Guava is conflicting on runClient - compile("us.myles:viaversion:2.0.0-19w14b") { isTransitive = false } - include("us.myles:viaversion:2.0.0-19w14b") + compile("us.myles:viaversion:2.0.0-1.14-pre1") { isTransitive = false } + include("us.myles:viaversion:2.0.0-1.14-pre1") compile("de.gerrygames:viarewind-core:1.4.0") { isTransitive = false } include("de.gerrygames:viarewind-core:1.4.0") compile("nl.matsv:viabackwards-core:3.0.0-19w11b") { isTransitive = false } // todo update @@ -49,12 +49,12 @@ dependencies { compileOnly("com.google.code.findbugs:jsr305:3.0.2") - minecraft("com.mojang:minecraft:19w14b") - mappings("net.fabricmc:yarn:19w14b.4") - modCompile("net.fabricmc:fabric-loader:0.4.0+build.115") + minecraft("com.mojang:minecraft:1.14 Pre-Release 1") + mappings("net.fabricmc:yarn:1.14 Pre-Release 1+build.3") + modCompile("net.fabricmc:fabric-loader:0.4.0+build.116") - modCompile("net.fabricmc:fabric:0.2.6.121") - include("net.fabricmc:fabric:0.2.6.121") + modCompile("net.fabricmc:fabric:0.2.7+build.122") + include("net.fabricmc:fabric:0.2.7+build.122") } minecraft { 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 2bea602..26c1619 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 @@ -106,7 +106,7 @@ public abstract class MixinMultiplayerScreen extends Screen { enableClientSideViaVersion = new ButtonWidget(this.width / 2 + 48, 13, 105, 15, I18n.translate("gui.enable_client_side_button"), button -> MinecraftClient.getInstance().openScreen(new YesNoScreen( - (answer, id) -> { + answer -> { MinecraftClient.getInstance().openScreen(this); if (answer) { try { @@ -121,8 +121,7 @@ public abstract class MixinMultiplayerScreen extends Screen { new TranslatableTextComponent("gui.enable_client_side.question"), new TranslatableTextComponent("gui.enable_client_side.warning"), I18n.translate("gui.enable_client_side.enable"), - I18n.translate("gui.cancel"), - 0 + I18n.translate("gui.cancel") ))); protocolVersion.setVisible(FabricLoader.getInstance().getConfigDirectory().toPath().resolve("ViaFabric").resolve("enable_client_side").toFile().exists()); enableClientSideViaVersion.visible = !protocolVersion.isVisible();