mirror of
https://github.com/FabricMC/fabric.git
synced 2025-04-05 11:39:57 -04:00
Update to 19w14a, only mapping changes. Also fix version not being updated in the mod.json
This commit is contained in:
parent
eabeb85473
commit
ca298f60ed
5 changed files with 22 additions and 9 deletions
17
build.gradle
17
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
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Add table
Reference in a new issue