From 27bb50be9d989eb2ea0d3300479f896068df7afd Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Thu, 18 Apr 2019 08:18:01 -0300
Subject: [PATCH] 1.14 Pre-Release 4, workaround for loader 0.4.1

---
 build.gradle.kts                                       | 10 +++++-----
 .../viafabric/mixin/MixinServerNetworkIoChInit.java    |  5 ++++-
 .../mixin/client/MixinClientConnectionChInit.java      |  5 ++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f97c12f..a4a1c5c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -40,8 +40,8 @@ tasks.named<ProcessResources>("processResources") {
 
 dependencies {
     // transitive = false, viabackwards-core because Guava is conflicting on runClient
-    compile("us.myles:viaversion:2.0.0-1.14-pre3") { isTransitive = false }
-    include("us.myles:viaversion:2.0.0-1.14-pre3")
+    compile("us.myles:viaversion:2.0.0-1.14-pre4") { isTransitive = false }
+    include("us.myles:viaversion:2.0.0-1.14-pre4")
     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,9 +49,9 @@ dependencies {
 
     compileOnly("com.google.code.findbugs:jsr305:3.0.2")
 
-    minecraft("com.mojang:minecraft:1.14 Pre-Release 3")
-    mappings("net.fabricmc:yarn:1.14 Pre-Release 3+build.1")
-    modCompile("net.fabricmc:fabric-loader:0.4.1+build.125")
+    minecraft("com.mojang:minecraft:1.14 Pre-Release 4")
+    mappings("net.fabricmc:yarn:1.14 Pre-Release 4+build.2")
+    modCompile("net.fabricmc:fabric-loader:0.4.1+build.126")
 
     modCompile("net.fabricmc:fabric:0.2.7+build.123")
     include("net.fabricmc:fabric:0.2.7+build.123")
diff --git a/src/main/java/com/github/creeper123123321/viafabric/mixin/MixinServerNetworkIoChInit.java b/src/main/java/com/github/creeper123123321/viafabric/mixin/MixinServerNetworkIoChInit.java
index 736b166..3be1695 100644
--- a/src/main/java/com/github/creeper123123321/viafabric/mixin/MixinServerNetworkIoChInit.java
+++ b/src/main/java/com/github/creeper123123321/viafabric/mixin/MixinServerNetworkIoChInit.java
@@ -37,7 +37,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
 
-@Mixin(targets = "net.minecraft.server.ServerNetworkIo$1")
+@Mixin(targets = {
+        "net.minecraft.server.ServerNetworkIo$1",
+        "net/minecraft/class_3242$1" // Workaround
+})
 public class MixinServerNetworkIoChInit {
     @Inject(method = "initChannel(Lio/netty/channel/Channel;)V", at = @At(value = "TAIL"), remap = false)
     private void onInitChannel(Channel channel, CallbackInfo ci) {
diff --git a/src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinClientConnectionChInit.java b/src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinClientConnectionChInit.java
index 74e38e3..eead9d9 100644
--- a/src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinClientConnectionChInit.java
+++ b/src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinClientConnectionChInit.java
@@ -39,7 +39,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
 
-@Mixin(targets = "net.minecraft.network.ClientConnection$1")
+@Mixin(targets = {
+        "net.minecraft.network.ClientConnection$1",
+        "net/minecraft/class_2535$1" // Workaround
+})
 public class MixinClientConnectionChInit {
     @Inject(method = "initChannel(Lio/netty/channel/Channel;)V", at = @At(value = "TAIL"), remap = false)
     private void onInitChannel(Channel channel, CallbackInfo ci) {