Merge branch 'mc-1.16.2' into release-2.4.3
This commit is contained in:
Jonas Herzig
@@ -178,20 +178,22 @@ val doRelease by tasks.registering {
|
||||
defaultTasks("shadowJar")
|
||||
|
||||
preprocess {
|
||||
"1.16.1"(11601, "yarn") {
|
||||
"1.15.2"(11502, "yarn") {
|
||||
"1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.2-1.14.4.txt")) {
|
||||
"1.14.4-forge"(11404, "srg", file("versions/mapping-1.14.4-fabric-forge.txt")) {
|
||||
"1.12.2"(11202, "srg", file("versions/1.14.4-forge/mapping.txt")) {
|
||||
"1.12.1"(11201, "srg") {
|
||||
"1.12"(11200, "srg") {
|
||||
"1.11.2"(11102, "srg", file("versions/1.12/mapping.txt")) {
|
||||
"1.11"(11100, "srg", file("versions/1.11.2/mapping.txt")) {
|
||||
"1.10.2"(11002, "srg", file("versions/1.11/mapping.txt")) {
|
||||
"1.9.4"(10904, "srg") {
|
||||
"1.8.9"(10809, "srg", file("versions/1.9.4/mapping.txt")) {
|
||||
"1.8"(10800, "srg", file("versions/1.8.9/mapping.txt")) {
|
||||
"1.7.10"(10710, "srg", file("versions/1.8/mapping.txt"))
|
||||
"1.16.2"(11602, "yarn") {
|
||||
"1.16.1"(11601, "yarn") {
|
||||
"1.15.2"(11502, "yarn") {
|
||||
"1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.2-1.14.4.txt")) {
|
||||
"1.14.4-forge"(11404, "srg", file("versions/mapping-1.14.4-fabric-forge.txt")) {
|
||||
"1.12.2"(11202, "srg", file("versions/1.14.4-forge/mapping.txt")) {
|
||||
"1.12.1"(11201, "srg") {
|
||||
"1.12"(11200, "srg") {
|
||||
"1.11.2"(11102, "srg", file("versions/1.12/mapping.txt")) {
|
||||
"1.11"(11100, "srg", file("versions/1.11.2/mapping.txt")) {
|
||||
"1.10.2"(11002, "srg", file("versions/1.11/mapping.txt")) {
|
||||
"1.9.4"(10904, "srg") {
|
||||
"1.8.9"(10809, "srg", file("versions/1.9.4/mapping.txt")) {
|
||||
"1.8"(10800, "srg", file("versions/1.8.9/mapping.txt")) {
|
||||
"1.7.10"(10710, "srg", file("versions/1.8/mapping.txt"))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
2
jGui
2
jGui
Submodule jGui updated: 037d54f83a...bf00dcf2ce
@@ -28,7 +28,8 @@ val jGuiVersions = listOf(
|
||||
"1.14.4-forge",
|
||||
"1.14.4",
|
||||
"1.15.2",
|
||||
"1.16.1"
|
||||
"1.16.1",
|
||||
"1.16.2"
|
||||
)
|
||||
val replayModVersions = listOf(
|
||||
"1.7.10",
|
||||
@@ -44,7 +45,8 @@ val replayModVersions = listOf(
|
||||
"1.14.4-forge",
|
||||
"1.14.4",
|
||||
"1.15.2",
|
||||
"1.16.1"
|
||||
"1.16.1",
|
||||
"1.16.2"
|
||||
)
|
||||
|
||||
include(":jGui")
|
||||
|
||||
@@ -48,8 +48,16 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa
|
||||
private MinecraftClient client;
|
||||
|
||||
//#if MC>=11600
|
||||
//$$ protected MixinWorldClient(MutableWorldProperties mutableWorldProperties, RegistryKey<World> registryKey, RegistryKey<DimensionType> registryKey2, DimensionType dimensionType, Supplier<Profiler> profiler, boolean bl, boolean bl2, long l) {
|
||||
//$$ super(mutableWorldProperties, registryKey, registryKey2, dimensionType, profiler, bl, bl2, l);
|
||||
//$$ protected MixinWorldClient(MutableWorldProperties mutableWorldProperties, RegistryKey<World> registryKey,
|
||||
//#if MC<11602
|
||||
//$$ RegistryKey<DimensionType> registryKey2,
|
||||
//#endif
|
||||
//$$ DimensionType dimensionType, Supplier<Profiler> profiler, boolean bl, boolean bl2, long l) {
|
||||
//$$ super(mutableWorldProperties, registryKey,
|
||||
//#if MC<11602
|
||||
//$$ registryKey2,
|
||||
//#endif
|
||||
//$$ dimensionType, profiler, bl, bl2, l);
|
||||
//$$ }
|
||||
//#else
|
||||
//#if MC>=11400
|
||||
|
||||
@@ -625,7 +625,11 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
|
||||
false,
|
||||
//#if MC>=11600
|
||||
//$$ packet.method_29443(),
|
||||
//#if MC>=11602
|
||||
//$$ (net.minecraft.util.registry.DynamicRegistryManager.Impl) packet.getRegistryManager(),
|
||||
//#else
|
||||
//$$ (net.minecraft.util.registry.RegistryTracker.Modifiable) packet.getDimension(),
|
||||
//#endif
|
||||
//$$ packet.method_29444(),
|
||||
//$$ packet.getDimensionId(),
|
||||
//#else
|
||||
|
||||
@@ -39,6 +39,11 @@ import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
//#if MC>=11602
|
||||
//$$ import net.minecraft.util.registry.DynamicRegistryManager;
|
||||
//$$ import net.minecraft.util.registry.Registry;
|
||||
//#endif
|
||||
|
||||
//#if MC>=11600
|
||||
//$$ import net.minecraft.world.World;
|
||||
//#else
|
||||
@@ -195,7 +200,11 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
|
||||
replay.reset();
|
||||
ctx.fireChannelRead(new PlayerRespawnS2CPacket(
|
||||
//#if MC>=11600
|
||||
//#if MC>=11602
|
||||
//$$ DimensionType.addRegistryDefaults(new DynamicRegistryManager.Impl()).get(Registry.DIMENSION_TYPE_KEY).get(DimensionType.OVERWORLD_REGISTRY_KEY),
|
||||
//#else
|
||||
//$$ DimensionType.OVERWORLD_REGISTRY_KEY,
|
||||
//#endif
|
||||
//$$ World.OVERWORLD,
|
||||
//$$ 0,
|
||||
//$$ GameMode.SPECTATOR,
|
||||
|
||||
@@ -51,7 +51,11 @@ public abstract class MixinPlayerControllerMP {
|
||||
//#endif
|
||||
|
||||
//#if MC>=11400
|
||||
//#if MC>=11602
|
||||
//$$ @Inject(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)Lnet/minecraft/client/network/ClientPlayerEntity;", at=@At("HEAD"), cancellable = true)
|
||||
//#else
|
||||
@Inject(method = "createPlayer", at=@At("HEAD"), cancellable = true)
|
||||
//#endif
|
||||
private void replayModReplay_createReplayCamera(
|
||||
//#if MC>=11400
|
||||
ClientWorld worldIn,
|
||||
|
||||
@@ -226,21 +226,25 @@ dependencies {
|
||||
11404: '1.14.4',
|
||||
11502: '1.15.2',
|
||||
11601: '1.16.1',
|
||||
11602: '1.16.2',
|
||||
][mcVersion]
|
||||
mappings 'net.fabricmc:yarn:' + [
|
||||
11404: '1.14.4+build.16',
|
||||
11502: '1.15.2+build.14',
|
||||
11601: '1.16.1+build.17:v2',
|
||||
11602: '1.16.2+build.1:v2',
|
||||
][mcVersion]
|
||||
modCompile 'net.fabricmc:fabric-loader:' + [
|
||||
11404: '0.7.8+build.189',
|
||||
11502: '0.7.8+build.189',
|
||||
11601: '0.8.8+build.202',
|
||||
11602: '0.9.1+build.205',
|
||||
][mcVersion]
|
||||
def fabricApiVersion = [
|
||||
11404: '0.4.3+build.247-1.14',
|
||||
11502: '0.5.1+build.294-1.15',
|
||||
11601: '0.14.0+build.371-1.16',
|
||||
11602: '0.17.1+build.394-1.16',
|
||||
][mcVersion]
|
||||
def fabricApiModules = [
|
||||
"api-base",
|
||||
@@ -292,7 +296,7 @@ dependencies {
|
||||
|
||||
shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
|
||||
|
||||
shadow "com.github.ReplayMod:ReplayStudio:20b5183", shadeExclusions
|
||||
shadow "com.github.ReplayMod:ReplayStudio:bc8baba", shadeExclusions
|
||||
|
||||
implementation(jGui){
|
||||
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those
|
||||
@@ -301,7 +305,10 @@ dependencies {
|
||||
shadow 'com.github.ReplayMod:lwjgl-utils:27dcd66'
|
||||
|
||||
if (FABRIC) {
|
||||
if (mcVersion >= 11600) {
|
||||
if (mcVersion >= 11602) {
|
||||
// TODO re-add to runtime once available
|
||||
modCompileOnly 'io.github.prospector:modmenu:1.14.0+build.24'
|
||||
} else if (mcVersion >= 11600) {
|
||||
modCompile 'io.github.prospector:modmenu:1.14.0+build.24'
|
||||
} else {
|
||||
modCompile 'io.github.prospector.modmenu:ModMenu:1.6.2-92'
|
||||
|
||||
Reference in New Issue
Block a user