Migrate 1.15.1 project to 1.15.2

This commit is contained in:
Jonas Herzig
2020-03-30 15:32:30 +02:00
parent 78ba9bd55e
commit b3b73609cb
7 changed files with 15 additions and 23 deletions

View File

@@ -174,8 +174,8 @@ val doRelease by tasks.registering {
defaultTasks("shadowJar") defaultTasks("shadowJar")
preprocess { preprocess {
"1.15.1"(11501, "yarn") { "1.15.2"(11502, "yarn") {
"1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.1-1.14.4.txt")) { "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.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.2"(11202, "srg", file("versions/1.14.4-forge/mapping.txt")) {
"1.12.1"(11201, "srg") { "1.12.1"(11201, "srg") {

2
jGui

Submodule jGui updated: a13e1e31c9...5b6a9334a6

View File

@@ -27,7 +27,7 @@ val jGuiVersions = listOf(
"1.12", "1.12",
"1.14.4-forge", "1.14.4-forge",
"1.14.4", "1.14.4",
"1.15.1" "1.15.2"
) )
val replayModVersions = listOf( val replayModVersions = listOf(
"1.7.10", "1.7.10",
@@ -42,7 +42,7 @@ val replayModVersions = listOf(
"1.12.2", "1.12.2",
"1.14.4-forge", "1.14.4-forge",
"1.14.4", "1.14.4",
"1.15.1" "1.15.2"
) )
include(":jGui") include(":jGui")

View File

@@ -6,6 +6,11 @@ import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(IntegratedServer.class) @Mixin(IntegratedServer.class)
public interface IntegratedServerAccessor { public interface IntegratedServerAccessor {
// TODO probably https://github.com/ReplayMod/remap/issues/10
//#if MC>=11500
//$$ @Accessor("paused")
//#else
@Accessor("field_5524") @Accessor("field_5524")
//#endif
boolean isGamePaused(); boolean isGamePaused();
} }

View File

@@ -637,7 +637,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
p = new PlayerRespawnS2CPacket( p = new PlayerRespawnS2CPacket(
respawn.getDimension(), respawn.getDimension(),
//#if MC>=11500 //#if MC>=11500
//$$ respawn.method_22425(), //$$ respawn.getSha256Seed(),
//#endif //#endif
respawn.getGeneratorType(), respawn.getGeneratorType(),
GameMode.SPECTATOR GameMode.SPECTATOR

View File

@@ -214,19 +214,19 @@ dependencies {
if (FABRIC) { if (FABRIC) {
minecraft 'com.mojang:minecraft:' + [ minecraft 'com.mojang:minecraft:' + [
11404: '1.14.4', 11404: '1.14.4',
11501: '1.15.1', 11502: '1.15.2',
][mcVersion] ][mcVersion]
mappings 'net.fabricmc:yarn:' + [ mappings 'net.fabricmc:yarn:' + [
11404: '1.14.4+build.1', 11404: '1.14.4+build.1',
11501: '1.15.1+build.37', 11502: '1.15.2+build.14',
][mcVersion] ][mcVersion]
modCompile 'net.fabricmc:fabric-loader:' + [ modCompile 'net.fabricmc:fabric-loader:' + [
11404: '0.4.8+build.155', 11404: '0.4.8+build.155',
11501: '0.7.4+build.177', 11502: '0.7.8+build.189',
][mcVersion] ][mcVersion]
modCompile 'net.fabricmc.fabric-api:fabric-api:' + [ modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
11404: '0.3.0+build.200', 11404: '0.3.0+build.200',
11501: '0.4.27+build.286-1.15', 11502: '0.5.1+build.294-1.15',
][mcVersion] ][mcVersion]
} }

View File

@@ -1,10 +1,5 @@
net.minecraft.client.model.ModelPart.Cuboid net.minecraft.client.model.Box 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 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.fabricmc.fabric.impl.resource.loader.ModResourcePackUtil net.fabricmc.fabric.impl.resources.ModResourcePackUtil
net.minecraft.client.render.entity.EntityRenderer shouldRender() isVisible() net.minecraft.client.render.entity.EntityRenderer shouldRender() isVisible()
net.minecraft.client.render.Frustum net.minecraft.client.render.VisibleRegion 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.WorldRenderer drawBlockOutline() drawHighlightedBlockOutline()
net.minecraft.client.render.GameRenderer method_22973() applyCameraTransformations() net.minecraft.client.render.GameRenderer method_22973() applyCameraTransformations()
net.minecraft.client.util.math.Matrix4f viewboxMatrix() method_4929() 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() net.minecraft.client.util.ScreenshotUtils takeScreenshot() method_1663()