diff --git a/build.gradle b/build.gradle index cff5e8b1..cd25e69e 100755 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,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" replace '@MOD_VERSION@', project.version @@ -69,7 +69,7 @@ dependencies { shade 'org.aspectj:aspectjrt:1.8.2' - shade 'com.github.replaymod:ReplayStudio:c7ed696' + shade 'com.github.replaymod:ReplayStudio:cc35b80' testCompile 'junit:junit:4.11' } 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; diff --git a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java index 2e383fcb..ad3f0910 100644 --- a/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java +++ b/src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java @@ -87,39 +87,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); @@ -135,12 +135,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)); } }); } @@ -190,7 +190,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 bed3de85..6904d62f 100755 --- a/src/main/java/com/replaymod/replay/ReplaySender.java +++ b/src/main/java/com/replaymod/replay/ReplaySender.java @@ -25,8 +25,8 @@ import net.minecraft.util.ClassInheritanceMultiMap; import net.minecraft.util.math.MathHelper; 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.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; 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