From b3b73609cbdaa75fdd84b6e7bf591f56782ebc24 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 30 Mar 2020 15:32:30 +0200 Subject: [PATCH] Migrate 1.15.1 project to 1.15.2 --- build.gradle.kts | 4 ++-- jGui | 2 +- settings.gradle.kts | 4 ++-- .../recording/mixin/IntegratedServerAccessor.java | 5 +++++ .../java/com/replaymod/replay/FullReplaySender.java | 2 +- versions/common.gradle | 8 ++++---- ...-1.14.4.txt => mapping-fabric-1.15.2-1.14.4.txt} | 13 ------------- 7 files changed, 15 insertions(+), 23 deletions(-) rename versions/{mapping-fabric-1.15.1-1.14.4.txt => mapping-fabric-1.15.2-1.14.4.txt} (55%) diff --git a/build.gradle.kts b/build.gradle.kts index 631ddbc3..7ce8df7e 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -174,8 +174,8 @@ val doRelease by tasks.registering { defaultTasks("shadowJar") preprocess { - "1.15.1"(11501, "yarn") { - "1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.1-1.14.4.txt")) { + "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") { diff --git a/jGui b/jGui index a13e1e31..5b6a9334 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit a13e1e31c946483a2dd5eca82181c487029daaf4 +Subproject commit 5b6a9334a66e72660b74fcac7c677392d02f5f37 diff --git a/settings.gradle.kts b/settings.gradle.kts index 767950ce..0520c702 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,7 @@ val jGuiVersions = listOf( "1.12", "1.14.4-forge", "1.14.4", - "1.15.1" + "1.15.2" ) val replayModVersions = listOf( "1.7.10", @@ -42,7 +42,7 @@ val replayModVersions = listOf( "1.12.2", "1.14.4-forge", "1.14.4", - "1.15.1" + "1.15.2" ) include(":jGui") diff --git a/src/main/java/com/replaymod/recording/mixin/IntegratedServerAccessor.java b/src/main/java/com/replaymod/recording/mixin/IntegratedServerAccessor.java index 97adbdb2..21d831d7 100644 --- a/src/main/java/com/replaymod/recording/mixin/IntegratedServerAccessor.java +++ b/src/main/java/com/replaymod/recording/mixin/IntegratedServerAccessor.java @@ -6,6 +6,11 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(IntegratedServer.class) public interface IntegratedServerAccessor { + // TODO probably https://github.com/ReplayMod/remap/issues/10 + //#if MC>=11500 + //$$ @Accessor("paused") + //#else @Accessor("field_5524") + //#endif boolean isGamePaused(); } diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java index f70a019f..21f92016 100755 --- a/src/main/java/com/replaymod/replay/FullReplaySender.java +++ b/src/main/java/com/replaymod/replay/FullReplaySender.java @@ -637,7 +637,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend p = new PlayerRespawnS2CPacket( respawn.getDimension(), //#if MC>=11500 - //$$ respawn.method_22425(), + //$$ respawn.getSha256Seed(), //#endif respawn.getGeneratorType(), GameMode.SPECTATOR diff --git a/versions/common.gradle b/versions/common.gradle index 629b5d27..80323690 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -214,19 +214,19 @@ dependencies { if (FABRIC) { minecraft 'com.mojang:minecraft:' + [ 11404: '1.14.4', - 11501: '1.15.1', + 11502: '1.15.2', ][mcVersion] mappings 'net.fabricmc:yarn:' + [ 11404: '1.14.4+build.1', - 11501: '1.15.1+build.37', + 11502: '1.15.2+build.14', ][mcVersion] modCompile 'net.fabricmc:fabric-loader:' + [ 11404: '0.4.8+build.155', - 11501: '0.7.4+build.177', + 11502: '0.7.8+build.189', ][mcVersion] modCompile 'net.fabricmc.fabric-api:fabric-api:' + [ 11404: '0.3.0+build.200', - 11501: '0.4.27+build.286-1.15', + 11502: '0.5.1+build.294-1.15', ][mcVersion] } diff --git a/versions/mapping-fabric-1.15.1-1.14.4.txt b/versions/mapping-fabric-1.15.2-1.14.4.txt similarity index 55% rename from versions/mapping-fabric-1.15.1-1.14.4.txt rename to versions/mapping-fabric-1.15.2-1.14.4.txt index 5c8c91de..5cd270f0 100644 --- a/versions/mapping-fabric-1.15.1-1.14.4.txt +++ b/versions/mapping-fabric-1.15.2-1.14.4.txt @@ -1,10 +1,5 @@ net.minecraft.client.model.ModelPart.Cuboid net.minecraft.client.model.Box -net.minecraft.client.render.chunk.ChunkBuilder net.minecraft.client.render.chunk.ChunkRenderWorker net.minecraft.client.render.chunk.ChunkBuilder.BuiltChunk net.minecraft.client.render.chunk.ChunkRenderer -net.minecraft.client.render.chunk.ChunkBuilder.BuiltChunk.Task net.minecraft.client.render.chunk.ChunkRenderTask -net.minecraft.client.network.packet.PlayerActionResponseS2CPacket net.minecraft.class_4463 -net.minecraft.network.NetworkState LOGIN field_11688 -net.minecraft.network.NetworkState PLAY field_11690 net.fabricmc.fabric.impl.resource.loader.ModResourcePackUtil net.fabricmc.fabric.impl.resources.ModResourcePackUtil net.minecraft.client.render.entity.EntityRenderer shouldRender() isVisible() net.minecraft.client.render.Frustum net.minecraft.client.render.VisibleRegion @@ -17,12 +12,4 @@ net.minecraft.entity.LivingEntity serverPitch field_6221 net.minecraft.client.render.WorldRenderer drawBlockOutline() drawHighlightedBlockOutline() net.minecraft.client.render.GameRenderer method_22973() applyCameraTransformations() net.minecraft.client.util.math.Matrix4f viewboxMatrix() method_4929() -net.minecraft.util.ThreadExecutor send() method_18858() -net.minecraft.util.ThreadExecutor createTask() prepareRunnable() -net.minecraft.util.ThreadExecutor canExecute() canRun() -net.minecraft.util.ThreadExecutor runTasks() executeTaskQueue() -net.minecraft.util.ThreadExecutor submit() executeFuture() -net.minecraft.client.util.Window method_4493() -net.minecraft.util.SystemUtil.OperatingSystem WINDOWS field_1133 -net.minecraft.util.SystemUtil.OperatingSystem OSX field_1137 net.minecraft.client.util.ScreenshotUtils takeScreenshot() method_1663()