From ca298f60eda3fd14bdb4731662a302a529fd12f4 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 3 Apr 2019 20:34:09 +0100
Subject: [PATCH] Update to 19w14a, only mapping changes. Also fix version not
 being updated in the mod.json

---
 build.gradle                                    | 17 +++++++++++++++--
 .../fabric/api/network/PacketContext.java       |  4 ++--
 .../MixinClientPlayNetworkHandler.java          |  4 ++--
 .../MixinServerPlayNetworkHandler.java          |  4 ++--
 src/main/resources/fabric.mod.json              |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index d8cd1774f..82a8d82bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ targetCompatibility = 1.8
 archivesBaseName = "fabric"
 
 def baseVersion = "0.2.6"
-def mcVersion = "19w13a"
+def mcVersion = "19w14a"
 
 def ENV = System.getenv()
 version = baseVersion + "." + (ENV.BUILD_NUMBER ?: "local")
@@ -38,10 +38,23 @@ minecraft {
 
 dependencies {
 	minecraft "com.mojang:minecraft:$mcVersion"
-	mappings "net.fabricmc:yarn:$mcVersion.2"
+	mappings "net.fabricmc:yarn:$mcVersion.1"
 	modCompile "net.fabricmc:fabric-loader:0.3.7.109"
 }
 
+processResources {
+	inputs.property "version", project.version
+
+	from(sourceSets.main.resources.srcDirs) {
+		include "fabric.mod.json"
+		expand "version": project.version
+	}
+
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
+	}
+}
+
 task sourcesJar(type: Jar, dependsOn: classes) {
 	classifier = 'sources'
 	from sourceSets.main.allSource
diff --git a/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java b/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java
index 51258e457..98dffecf3 100644
--- a/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java
+++ b/src/main/java/net/fabricmc/fabric/api/network/PacketContext.java
@@ -18,7 +18,7 @@ package net.fabricmc.fabric.api.network;
 
 import net.fabricmc.api.EnvType;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.ThreadTaskQueue;
+import net.minecraft.util.ThreadExecutor;
 
 /**
  * Interface defining a context used during packet processing. Allows access
@@ -59,5 +59,5 @@ public interface PacketContext {
 	 *
 	 * @return The thread task queue.
 	 */
-	ThreadTaskQueue getTaskQueue();
+	ThreadExecutor getTaskQueue();
 }
diff --git a/src/main/java/net/fabricmc/fabric/mixin/networking/MixinClientPlayNetworkHandler.java b/src/main/java/net/fabricmc/fabric/mixin/networking/MixinClientPlayNetworkHandler.java
index 8f6ddd601..26a697978 100644
--- a/src/main/java/net/fabricmc/fabric/mixin/networking/MixinClientPlayNetworkHandler.java
+++ b/src/main/java/net/fabricmc/fabric/mixin/networking/MixinClientPlayNetworkHandler.java
@@ -33,7 +33,7 @@ import net.minecraft.network.ClientConnection;
 import net.minecraft.network.Packet;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.ThreadTaskQueue;
+import net.minecraft.util.ThreadExecutor;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -79,7 +79,7 @@ public abstract class MixinClientPlayNetworkHandler implements PacketContext {
 	}
 
 	@Override
-	public ThreadTaskQueue getTaskQueue() {
+	public ThreadExecutor getTaskQueue() {
 		return client;
 	}
 }
diff --git a/src/main/java/net/fabricmc/fabric/mixin/networking/MixinServerPlayNetworkHandler.java b/src/main/java/net/fabricmc/fabric/mixin/networking/MixinServerPlayNetworkHandler.java
index 60025f72e..aca88890a 100644
--- a/src/main/java/net/fabricmc/fabric/mixin/networking/MixinServerPlayNetworkHandler.java
+++ b/src/main/java/net/fabricmc/fabric/mixin/networking/MixinServerPlayNetworkHandler.java
@@ -25,7 +25,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.network.packet.CustomPayloadC2SPacket;
-import net.minecraft.util.ThreadTaskQueue;
+import net.minecraft.util.ThreadExecutor;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -57,7 +57,7 @@ public class MixinServerPlayNetworkHandler implements PacketContext {
 	}
 
 	@Override
-	public ThreadTaskQueue getTaskQueue() {
+	public ThreadExecutor getTaskQueue() {
 		return server;
 	}
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2e3a1fd77..ea01a6162 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "id": "fabric",
   "name": "Fabric API",
-  "version": "0.2.3",
+  "version": "${version}",
   "side": "universal",
   "description": "Core API module providing key hooks and intercompatibility features.",
   "license": "Apache-2.0",