From 09f167f10e6fc5616debfd9149bca62e7ddb8446 Mon Sep 17 00:00:00 2001 From: johni0702 Date: Mon, 17 Oct 2016 22:23:44 +0200 Subject: [PATCH 1/3] Update to 1.10.2 --- ReplayStudio | 2 +- build.gradle | 2 +- .../packet/ResourcePackRecorder.java | 22 +++++++++---------- .../com/replaymod/replay/ReplaySender.java | 2 +- src/main/resources/META-INF/replaymod_at.cfg | 6 ++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ReplayStudio b/ReplayStudio index 99955dd5..aa48888e 160000 --- a/ReplayStudio +++ b/ReplayStudio @@ -1 +1 @@ -Subproject commit 99955dd5646cb26bf754bee94b5efc5d80919935 +Subproject commit aa48888e154ac3d7399a944f64eb5f228aff66bf diff --git a/build.gradle b/build.gradle index 57a18e28..010ac6d4 100755 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ archivesBaseName = "replaymod" minecraft { coreMod = 'com.replaymod.core.LoadingPlugin' - version = '1.9.4-12.17.0.1976' + version = '1.10.2-12.18.2.2099' runDir = "eclipse" mappings = "snapshot_20160518" } diff --git a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java index 4bc59356..5cb9c0f0 100644 --- a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java +++ b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java @@ -83,39 +83,39 @@ public class ResourcePackRecorder { final File levelDir = new File(savesDir, levelName); if (levelDir.isFile()) { - netManager.sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.ACCEPTED)); + netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.ACCEPTED)); Futures.addCallback(mc.getResourcePackRepository().setResourcePackInstance(levelDir), new FutureCallback() { @Override public void onSuccess(Object result) { recordResourcePack(levelDir, requestId); - netManager.sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.SUCCESSFULLY_LOADED)); + netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.SUCCESSFULLY_LOADED)); } @Override public void onFailure(@Nonnull Throwable throwable) { - netManager.sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.FAILED_DOWNLOAD)); + netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.FAILED_DOWNLOAD)); } }); } else { - netManager.sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.FAILED_DOWNLOAD)); + netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.FAILED_DOWNLOAD)); } } else { final ServerData serverData = mc.getCurrentServerData(); if (serverData != null && serverData.getResourceMode() == ServerData.ServerResourceMode.ENABLED) { - netManager.sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.ACCEPTED)); + netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.ACCEPTED)); downloadResourcePackFuture(requestId, url, hash); } else if (serverData != null && serverData.getResourceMode() != ServerData.ServerResourceMode.PROMPT) { - netManager.sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.DECLINED)); + netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.DECLINED)); } else { mc.addScheduledTask(() -> mc.displayGuiScreen(new GuiYesNo((result, id) -> { if (serverData != null) { serverData.setResourceMode(result ? ServerData.ServerResourceMode.ENABLED : ServerData.ServerResourceMode.DISABLED); } if (result) { - netManager.sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.ACCEPTED)); + netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.ACCEPTED)); downloadResourcePackFuture(requestId, url, hash); } else { - netManager.sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.DECLINED)); + netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.DECLINED)); } ServerList.saveSingleServer(serverData); @@ -131,12 +131,12 @@ public class ResourcePackRecorder { Futures.addCallback(downloadResourcePack(requestId, url, hash), new FutureCallback() { @Override public void onSuccess(Object result) { - mc.getConnection().sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.SUCCESSFULLY_LOADED)); + mc.getConnection().sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.SUCCESSFULLY_LOADED)); } @Override public void onFailure(@Nonnull Throwable throwable) { - mc.getConnection().sendPacket(new CPacketResourcePackStatus(hash, CPacketResourcePackStatus.Action.FAILED_DOWNLOAD)); + mc.getConnection().sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.FAILED_DOWNLOAD)); } }); } @@ -186,7 +186,7 @@ public class ResourcePackRecorder { Futures.getUnchecked(mc.addScheduledTask(() -> mc.displayGuiScreen(guiScreen))); - Map sessionInfo = Minecraft.getSessionInfo(); + Map sessionInfo = ResourcePackRepository.func_190115_a(); repo.downloadingPacks = HttpUtil.downloadResourcePack(file, url, sessionInfo, 50 * 1024 * 1024, guiScreen, mc.getProxy()); Futures.addCallback(repo.downloadingPacks, new FutureCallback() { @Override diff --git a/src/main/java/com/replaymod/replay/ReplaySender.java b/src/main/java/com/replaymod/replay/ReplaySender.java index cccc2877..3502ff4d 100755 --- a/src/main/java/com/replaymod/replay/ReplaySender.java +++ b/src/main/java/com/replaymod/replay/ReplaySender.java @@ -22,8 +22,8 @@ import net.minecraft.network.*; import net.minecraft.network.play.server.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.GameType; import net.minecraft.world.World; -import net.minecraft.world.WorldSettings.GameType; import net.minecraft.world.WorldType; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/resources/META-INF/replaymod_at.cfg b/src/main/resources/META-INF/replaymod_at.cfg index 51605cc5..d35f4c3c 100644 --- a/src/main/resources/META-INF/replaymod_at.cfg +++ b/src/main/resources/META-INF/replaymod_at.cfg @@ -1,7 +1,7 @@ # To apply changes in this file run: ./gradlew clean setupDecompWorkspace idea # Minecraft -public net.minecraft.client.Minecraft field_71428_T # timer +public-f net.minecraft.client.Minecraft field_71428_T # timer public net.minecraft.client.Minecraft field_83002_am # debugCrashKeyPressTime public net.minecraft.client.Minecraft field_71467_ac # rightClickDelayTimer public net.minecraft.client.Minecraft field_71423_H # systemTime @@ -95,10 +95,10 @@ public net.minecraft.client.entity.EntityOtherPlayerMP * public net.minecraft.server.integrated.IntegratedServer field_71348_o # isGamePaused # GameSettings -public net.minecraft.client.settings.GameSettings field_186714_aM # soundLevels +public-f net.minecraft.client.settings.GameSettings field_186714_aM # soundLevels # Frustum -public net.minecraft.client.renderer.culling.Frustum field_78552_a # clippingHelper +public-f net.minecraft.client.renderer.culling.Frustum field_78552_a # clippingHelper # CrashReportCategory public net.minecraft.crash.CrashReportCategory field_85077_c # children From ce313596dbebb7507e76731526ba81d3a068090b Mon Sep 17 00:00:00 2001 From: johni0702 Date: Sat, 12 Nov 2016 19:30:26 +0100 Subject: [PATCH 2/3] Add 1.10.2 version to ReplayCenter search (fixes #38) --- .../replaymod/online/api/replay/holders/MinecraftVersion.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java b/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java index de5d2285..9333b2b1 100644 --- a/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java +++ b/src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java @@ -3,7 +3,8 @@ package com.replaymod.online.api.replay.holders; public enum MinecraftVersion { MC_1_8("Minecraft 1.8", "1.8"), - MC_1_9_4("Minecraft 1.9.4", "1.9.4"); + MC_1_9_4("Minecraft 1.9.4", "1.9.4"), + MC_1_10_2("Minecraft 1.10.2", "1.10.2"); private String niceName, apiName; From 7c719e03ccc7a7c7edc31d08faa632f186a41601 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Thu, 27 Jul 2017 15:20:34 +0200 Subject: [PATCH 3/3] Update ReplayStudio/MCProtocolLib (Fixes missing ARMOR_STAND MobType) --- ReplayStudio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReplayStudio b/ReplayStudio index 98bbf92b..feed546a 160000 --- a/ReplayStudio +++ b/ReplayStudio @@ -1 +1 @@ -Subproject commit 98bbf92b9d37fc01c9dd6620c00768c2350eb31d +Subproject commit feed546a9e1f467d286c700f78c4e05b5fb297ac