Merge branch '1.9.4-dev' into 1.10.2-dev

Merge branch '1.10.2-reprod' into 1.10.2-dev
2018-01-19 13:06:15 +01:00 · 2018-01-16 22:31:31 +01:00 · 2018-01-16 22:28:17 +01:00 · 2017-10-28 17:42:58 +02:00 · 2017-10-28 17:26:43 +02:00 · 2017-10-28 11:35:58 +02:00
6 changed files with 29 additions and 28 deletions
--- 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:14daa88'
+    shade 'com.github.replaymod:ReplayStudio:7d8c2f7'
    testCompile 'junit:junit:4.11'
 }
--- a/gradle/reprod/checksums.txt
+++ b/gradle/reprod/checksums.txt
@@ -14,8 +14,8 @@ f98b3e07c6b6a32dd6f9f70f5cef4ac9be42a9a6c850ceb8f33767da94706635 /com/github/joh
 03e3dff7f9b3ac6cd3b87684fd36a2f6996a4b164a2f8fab9c22c01cb7bfb84b /com/github/johni0702/gradle-reproducible-builds-plugin/a524ada/gradle-reproducible-builds-plugin-a524ada.pom
 75ccc0e24d37ed5b8916e1bcffad1e067c2b1cfa21b635287f968db5c3c1963a /com/github/jponge/lzma-java/1.3/lzma-java-1.3.jar
 fbcba81b21a8bc3c0761e4798fa05285444b43d681c03c9af49f9b2e1ecb0184 /com/github/jponge/lzma-java/1.3/lzma-java-1.3.pom
-9de10955f2f5e43c982fab9c88b9fb5a7984e4be08f8665294920fa866dc38e2 /com/github/replaymod/ReplayStudio/14daa88/ReplayStudio-14daa88.jar
+259c0b9e7679cefc5fbf9e7fdada3dec5aaeefb28f6f41b09ea22b22809d9765 /com/github/replaymod/ReplayStudio/7d8c2f7/ReplayStudio-7d8c2f7.jar
-2a48580e2a41a35303b5d661a8870f4adaefbd5216af1cbfcf3dd3ca1b906c61 /com/github/replaymod/ReplayStudio/14daa88/ReplayStudio-14daa88.pom
+c1f4e76c40b3cd3b7653b52a5aacbd2ef9561633879c127a5cb86bbe5ac49e7b /com/github/replaymod/ReplayStudio/7d8c2f7/ReplayStudio-7d8c2f7.pom
 c6ebd74cd6108b8c372c95b842725ee5bd6d3303ba26cb00f18bc92f80b47956 /com/github/tony19/named-regexp/0.2.3/named-regexp-0.2.3.jar
 7cdd89a892927998beab59398ef073232588f6e83e411cf4f0905833bf300487 /com/github/tony19/named-regexp/0.2.3/named-regexp-0.2.3.pom
 47c625c83a8cf97b8bbdff2acde923ff8fd3174e62aabcfc5d1b86692594ffba /com/google/api-client/google-api-client/1.22.0/google-api-client-1.22.0.jar
@@ -82,8 +82,8 @@ dc07988e5bb1609e8e027cc89c2993a19586e219c02ff74ea4298e73e97b0efb /com/mojang/aut
 3e70bac893bb04ac2992baa6fc438f6fc33c0d0213c4edcc40d295e7938091ca /com/mojang/authlib/1.5.22/authlib-1.5.22.pom
 3120fd24c09ab9bc088cb9c1eb2065be86718608450fdbc27b5d371729a619cb /com/mojang/netty/1.6/netty-1.6.jar
 568cc3fad81e5e389bad0012a07eca5db073e287200c6c9cb02caf3dc489e9f6 /com/mojang/netty/1.6/netty-1.6.pom
-c5bbcbcfba1c7444af30b94f7c3eb2ff215ec3cc17c57a9be6b2c815f9a93a0f /com/mojang/realms/1.8.19/realms-1.8.19.jar
+fe558457679bc0734c83a80f579bbe73415d02a83709d19c6d78c011843ca17c /com/mojang/realms/1.9.8/realms-1.9.8.jar
-c9a429757023ac6daa636205efebd16ef8c21e2ec4e45621fc134a5692c14380 /com/mojang/realms/1.8.19/realms-1.8.19.pom
+28bcfc79565f33a1b6382f6ae2ed7841f456f088488083e199764de46c99efd6 /com/mojang/realms/1.9.8/realms-1.9.8.pom
 e7cd8951956d349b568b7ccfd4f5b2529a8c113e67c32b028f52ffda371259d9 /commons-cli/commons-cli/1.2/commons-cli-1.2.jar
 18f3e92076e08c2fde48317025098e9f6baaa85f6912eb43f2d7e68d570e4561 /commons-cli/commons-cli/1.2/commons-cli-1.2.pom
 1bafd2ece2e88db4cdf835a7f8f0de65fab5b1147977a5dcc59b7c1b8c6f5080 /commons-codec/commons-codec/1.3/commons-codec-1.3.jar
@@ -123,7 +123,7 @@ c1a2438a4d35f8586c71d96c44a7e2f133ec924597147a246f8c501acca6acb5 /com/paulscode/
 9f9920b48ae5f1045fe966f08164d6b4e0a727cf17f8e4813ae5c0f2daecffbc /com/typesafe/akka/akka-actor_2.11/2.3.3/akka-actor_2.11-2.3.3.pom
 c160fbd78f51a0c2375a794e435ce2112524a6871f64d0331895e9e26ee8b9ee /com/typesafe/config/1.2.1/config-1.2.1.jar
 62361ef10448869fff8c05150bd0449b423e3ff4498f2a4bab825b3c7685aa3c /com/typesafe/config/1.2.1/config-1.2.1.pom
-83b111d3d1a8e8cf06cacf2c877f40bc4fce23c3b04941fe9a1a582374e6d924 /de/oceanlabs/mcp/mcp/1.9.4/mcp-1.9.4-srg.zip
+f2ce9e7cdc3e3598390a495a07cc18aa930a8b9e1480d97bfae31f29e1e75a19 /de/oceanlabs/mcp/mcp/1.10.2/mcp-1.10.2-srg.zip
 16f933fe337c265ed20fd616a2acadbd119a0b1d1fb186ca26fc8964aeebe0c2 /de/oceanlabs/mcp/mcp_snapshot/20160518-1.9.4/mcp_snapshot-20160518-1.9.4.zip
 22c45060f350fcaa94e503f4a420cf8237c26c0fcdb4ada4aa98389b75c7b231 /de/oceanlabs/mcp/RetroGuard/3.6.6/RetroGuard-3.6.6.jar
 d6f165bb39aaa20ee14fdcbbdb0b8fffae38067087f333ec6e0acd3f6666b2ad /de/oceanlabs/mcp/RetroGuard/3.6.6/RetroGuard-3.6.6.pom
@@ -144,9 +144,9 @@ cb54dedc5d8c4510148dfa792701cbac1a84c383a84f48f5a32e6d7e460bbb72 /log4j/log4j/1.
 0c3085cb93c3ef95d731c274b6f2dd195aa0405fe9328d69cab7f5e899d5e124 /lzma/lzma/0.0.1/lzma-0.0.1.jar
 a096bc9f7579cec07483874151578720eeb3189c546c19cff56a6203df17b50e /lzma/lzma/0.0.1/lzma-0.0.1.pom
 * /mc/game/version_manifest.json
-23e90103a1ca2ac71100004c6d5846de09f85695f579843ef8da41571e60c908 /mc/game/1.9.4/client/4a61c873be90bb1196d68dac7b29870408c56969/client.jar
+7cdf7fcdc1c92584a233bf3c42bd7f0df1bdad3007d306831fe50410692be1e9 /mc/game/1.10.2/client/dc8e75ac7274ff6af462b0dcec43c307de668e40/client.jar
-13fea7aa10d804dd14ed7ebde2493dc64c7d3c8173369309bd7f6ea4c0ea40ad /mc/game/1.9.4/server/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar
+195f468227c5f9218f3919538b9b16ba34adced67fc7d7b652c508a5e8d07a21 /mc/game/1.10.2/server/3d501b23df53c548254f5e3f66492d178a48db63/server.jar
-045c639666c64d61efcdd7be61dbd6a3b1ce5108a11d7d4fc9ad5584937bce19 /mc/game/cdcd308b7cbd15bc595850ce6557d4ade48cee7a/1.9.4.json
+48841dde28888f147bef0f2656b589427cd1ec6ad355b9434f3bc3038bdb698f /mc/game/1920a2b4e996bae0af1a67d38d63706bac10ac47/1.10.2.json
 3bff6a1489b8e54cf130344bc5e8744db331045ad2fc736612576e1d80eb1f48 /net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar
 cf4605822bd56d135dd7031603f122a11a0ec772373f466a4f2aac72dd9a1761 /net/java/dev/jna/jna/3.4.0/jna-3.4.0.pom
 ea89d5090c8303ba4e9a0056e6d8a20429f3e021411e950bfd9eba3b6e6cf15c /net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar
@@ -162,8 +162,8 @@ af09ead4eb241473e7ec4d152a91a722ea09a717a202e20e4b385eac3217b7d6 /net/java/jutil
 b47c5d5810643426a3147ddb2195ef2ab67c80b167e7c2ac64a5d0dee8c030dd /net/md-5/SpecialSource/1.7.4/SpecialSource-1.7.4.jar
 5f374f8ae7afff8dbc23aff14e59c5bd585c230afe9a8dcaa7b928e8cb16a27e /net/md-5/SpecialSource/1.7.4/SpecialSource-1.7.4.pom
 * /net/minecraftforge/forge/json
-95f1435c1638b942f4a63d5c5b3cbc85653183caa5357e4586fb792e2d7a819b /net/minecraftforge/forge/1.9.4-12.17.0.1976/forge-1.9.4-12.17.0.1976.pom
+df07ca74ae02f9879c6e5dd49eac661ddb907e65ba1536694aa0f27932ac9b99 /net/minecraftforge/forge/1.10.2-12.18.2.2099/forge-1.10.2-12.18.2.2099.pom
-f317d5572442e9c072046247a5f1c9e5643c5cf5af8900a2c2f878a44d07bbf1 /net/minecraftforge/forge/1.9.4-12.17.0.1976/forge-1.9.4-12.17.0.1976-userdev.jar
+305dbc9c547d87f650de3b1ded42d48a28533f45c857c9e05f217b61238fc1cb /net/minecraftforge/forge/1.10.2-12.18.2.2099/forge-1.10.2-12.18.2.2099-userdev.jar
 e74b65b8948446982a506a96176dd8baf4688237ba4903f56ca6f667b6c7ee42 /net/minecraft/launchwrapper/1.11/launchwrapper-1.11.jar
 616c4971035d1e6ab4809e16daabb02aa308c1dc001c06dd547c7d3b2e916999 /net/minecraft/launchwrapper/1.11/launchwrapper-1.11.pom
 57f402b626d16cc2705bf2a37add7adbb074f0ca3b3102fa6e23aa303dae682f /net/minecraft/launchwrapper/1.12/launchwrapper-1.12.jar
--- 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;
--- 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<Object>() {
                    @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<String, String> sessionInfo = Minecraft.getSessionInfo();
+            Map<String, String> sessionInfo = ResourcePackRepository.func_190115_a();
            repo.downloadingPacks = HttpUtil.downloadResourcePack(file, url, sessionInfo, 50 * 1024 * 1024, guiScreen, mc.getProxy());
            Futures.addCallback(repo.downloadingPacks, new FutureCallback<Object>() {
                @Override
--- a/src/main/java/com/replaymod/replay/ReplaySender.java
+++ b/src/main/java/com/replaymod/replay/ReplaySender.java
@@ -29,8 +29,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;
--- 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
Author	SHA1	Message	Date
Jonas Herzig	ed6e11f106	Merge branch '1.9.4-dev' into 1.10.2-dev	2018-01-19 13:06:15 +01:00
Jonas Herzig	2dce4eb54a	Merge branch '1.9.4-dev' into 1.10.2-dev	2018-01-16 22:31:31 +01:00
Jonas Herzig	0ed9a5533e	Merge branch '1.10.2-reprod' into 1.10.2-dev	2018-01-16 22:28:17 +01:00
Jonas Herzig	fd7da227a0	Update reprod to 1.10.2	2017-10-28 17:42:58 +02:00
Jonas Herzig	701e8e8bba	Merge branch '1.10.2-dev' into 1.10.2-reprod	2017-10-28 17:26:43 +02:00
Jonas Herzig	b8b4f167ef	Merge branch 1.9.4-dev into 1.10.2-dev `263e080` Merge branch 1.8.9-dev into 1.9.4-dev `8fad02c` Merge branch 1.8-dev into 1.8.9-dev `1c888aa` Add minVersion to mixin configs and bump bundled mixin version `10ce71e` Fix mapwriter crash when opening replay for <MC1.12 (fixes #96) `5fb1cf3` Fix half-despawned player entities (see #93) when the entity is moved greater distances `adfe6a2` Fix NPE when spectated non-player entity despawns (fixes #94) `b27af27` Fix player entities being half-despawned after jumping in time (fixes #93)	2017-10-28 11:35:58 +02:00
Jonas Herzig	689f897930	Merge branch 1.9.4 into 1.10.2 `0aed9c3` Merge branch 1.8.9 into 1.9.4 `f36ebf1` Merge branch 1.8 into 1.8.9 `08170b3` Downgrade FG to 2.1 because FG 2.2 is 1.9+ only `41d2547` Update translations `00e999f` Fix replay not being closed when opened via URI scheme handler (fixes #92) `767ea29` Fix book gui not being suppressed during replay (fixes #90) `5b04edb` Hide ReplayMod app entry from menus on Linux `6aff99d` Fix livelock during netty write to embedded channel (fixes #85) `703805f` Fix infinite loop in mc.scheduledTasks (fixes #86) `7a4440c` Update ReplayStudio `0b9c56c` Fix resource packs not working after first time jumping back in time `933ee5f` [Compat] Fix camera entity with BetterSprinting prior to 2.0.0 (fixes #78) `83b1090` Fix hotbar being visible while spectating player (fixes #83) `5c73117` [Compat] Fix invisible entities with Orange's 1.7 Animations (fixes #78) `4704b29` Replace the RenderPlayer hook (used subclassing) with a mixin (fixes #79) `0c226b0` Fix path at end of replay resulting in constant reloading (fixes #56) `1b9b13e` Rename render success sound to all lowercase (required for 1.11) (fixes #66) `c2000b3` Fix only front-facing chunks visible for ODS rendering (fixes #67) `aafeecc` Fix initial login gui not closing on success (fixes #68) `9292add` Use percent-encoding for replay file names (fixes #71) `8499c0f` Fix name of invis armor stand with CustomNameVisible not rendering (fixes #72) `b9ea572` Try to handle invalid ffmpeg arguments more gracefully (fixes #77) `a2f8c88` Fix compression packets being recorded (fixes #80) `19629c3` Replace usages of System.out with logger `fe1d9b8` Stop Forge from allowing the mod to load on other MC versions (fixes #82) `1a1e96c` Fix server with RM installed refusing clients without RM (fixes #76) `35eb9ca` Replace usage of FMLLog with the mod logger	2017-08-26 14:17:14 +02:00
Jonas Herzig	7c719e03cc	Update ReplayStudio/MCProtocolLib (Fixes missing ARMOR_STAND MobType)	2017-07-27 15:20:34 +02:00
Jonas Herzig	96b2904e4b	Merge branch '1.9.4' into 1.10.2 `6c8c779` Merge branch '1.8.9' into 1.9.4 `aa16e42` Add workaround for setupCIWorkspace not being sufficient `ed56673` Merge branch '1.8' into 1.8.9 `91573d9` Update jGui, ReplayStudio and Translations `d71358b` Add confirmation dialog before overwriting path presets (fixes #65) `1a55983` Move addCallback method from integration test Utils to main Utils `18c5bcd` Be more cooperative with other mods on the ingame menu (fixes #42) `c054fe8` Register keys for simplepathing only once (fixes #63) `f13297c` Fix default interpolator handling in keyframe gui and after loading (fixes #64) `391f304` Show error popup if entity tracker fails to load `0e0eaaa` Fix entity tracker being set even if it failed loading (fixes #50) `a34bbbc` Fix NPE when spectating a player without a camera entity `60879fb` Change local class to be an inner class because Srg2Source breaks with it `dfafbec` Load translations from github repo, only reload language not all resource packs `8a6ec51` Add missing tooltips to player overview and various missing chat messages `5677fc5` Re-add warning to replay editor `748a91e` Fix missing tooltips on fav/like/dislike buttons in replay center `ee24866` Fix upload replay button not being updated when name/tags change `dba085c` Move translations into separate repo `3f0e3e7` Fix NPE when receiving Replay\|Restrict messages (fixes #16 GH) `40e1d85` Fix crash when saving the last keyframe in the edit gui (fixes #61) `03aada1` Update Mixin to 0.6.8 (fixes #9 GH) `0c1dc65` Fix interpolator being lost when moving keyframe to the end (fixes #62) `fcbbbc9` Add integration test. Run with ./gradlew runIntegrationTest `fe6ded0` Fix movement of keyframe via GuiEditKeyframe not updating selected keyframe `f58fa8f` Fix Login GUI not respecting other GUIs opened on startup `4fc3a31` Fix OpenEye being installed into working dir instead of mcDataDir	2017-05-31 21:10:35 +02:00
johni0702	325d041bd9	Merge branch '1.9.4' into 1.10.2 `d9d57e2` Merge branch '1.8.9' into 1.9.4 `24c58cb` Merge branch '1.8' into 1.8.9 `1ffeb01` Update jGui `c122d30` Merge branch '1.8-path-segments' into 1.8 `27fd25a` Fix crash when server responds with garbage to language query (fixes #51) `db6b0ff` Fix / by 0 when two spectator keyframes are closer than 50ms (fixes #60) `d61d0ac` Fix hand of invisible spectated player being visible (fixes #59) `f7460f9` Re-enable time path after path playback (fixes #55) `bdbffd5` Add Catmull-Rom spline interpolator to simplepathing `5cbfd28` Generate interpolator settings from InterpolatorType enum `6095aef` Fix loading and storing of default interpolator with settings `3f52336` Revert "Fix AbstractMethodError caused by FG2.0 not supporting lambdas (fixes #58)" `c6293bc` Update to FG2.2 `c8126ed` Merge '1.8' into 1.8.9 `64898ce` Fix NPE when saving recorded resource pack `70e3e54` Fix AbstractMethodError caused by FG2.0 not supporting lambdas (fixes #58) `3f2b3d6` Fix replacing source file in Replay Editor (fixes #57) `d2def94` Fix duration of replays corrupted because of JVM/OS crash `2c64030` Refactor simple pathing timeline logic into dedicated class with unit tests Fix logic for user-set interpolators `4deb374` Enable validation on focus change for all number input fields `5302bca` Fix id and text of Replay Editor button in docs `057edcc` Manually inject root cert for cross-signed LetsEncrypt cert in requests `cd16211` Register new Property to imply that the path segment following a keyframe has a user-set interpolator instead of the default Modified Keyframe GUI to allow for custom Path interpolator	2017-01-29 13:01:09 +01:00
johni0702	c6dec95a57	Merge branch '1.9.4' into 1.10.2 `4fdfa9e` Merge branch '1.8.9' into 1.9.4 `44d4a25` Merge branch '1.8' into 1.9.4 `01acbc6` Update to 1.8.9 `1c60687` Update ReplayStudio and jGui `d9b796d` Mixin'd the Shader's mods ShadersRender class to only render hands if the Forge event isn't cancelled `6bbff3b` Updated Mixin to 0.6.4-SNAPSHOT and set mixin target level `6f3ac71` Add CustomMainMenu compatibility info to docs `b0a1cdf` Search for ffmpeg executable in common locations to simplify setup `d465891` Fixed GuiEditPositionKeyframe's width to fit on all screen sizes Centered all rows of GuiEditPositionKeyframe's VerticalLayout `1b099f9` Add render queue `03534c6` Update docs `4388d69` Only try to create the downloads folder if it does not yet exist `7ad19aa` Add mod version and accepted MC version directly to the @Mod annotation `655bea0` Replace @Mod.Instance with direct static references `458dad6` Merge pull request #4 from ReplayMod/1.8-editor `eb5ccb2` Add Replay Editor (for now, trimming only) `6498d62` Fix server game data snapshot being restored in singleplayer (fixes #44) `2c898a8` Prevent rendering without sufficient keyframes (fixes #45) `5d520a5` Fix deserialization of chroma key color (fixes #43) `c681742` Use caching maven proxy for faster and more stable drone builds `fbf165e` Added Anti-Aliasing to the Render Settings	2017-01-14 23:56:14 +01:00
johni0702	905ae75330	Merge branch '1.9.4' into 1.10.2 `72e1fe0` Merge branch '1.8' into 1.9.4 `6163585` Update ReplayStudio to fix dependencies	2016-12-16 21:47:30 +01:00
johni0702	372206fdff	Merge branch '1.9.4' into 1.10.2 `4a1ccea` Merge branch '1.8' into 1.9.4 `fb39a06` Add drone ci config `030c71c` Automatically disable and re-enable Optifine's Fast Render setting before rendering a video `1fef12d` Include FML handshake in recording `e86c66d` Move README.md, LICENSE.md and user docs from master branch to 1.8	2016-12-10 19:54:55 +01:00
johni0702	9f7ccb9d07	Merge branch '1.9.4' into 1.10.2 `ca2bbca` Merge branch '1.8' into 1.9.4 `5b3284f` Update jGui and ReplayStudio (fixes #33) `61d6fd4` Close replay file zip after recording (fixes #32) `00bcc9e` Fix paths of files that are supposed to be in the mc data dir (fixes #40) `e6a789d` Fix camera rotation when jumping in time (fixes #39) `50b53fc` Add a way to register key bindings triggered every render tick (fixes #31) `a817c73` Prevent GUIs of other mods from opening during replay `d64ef8b` Hide NPCs in the Player Overview GUI (fixes #29) `1f2c05e` Fix spectating player entities past death and respawn (fixes #36) `ad2893b` Fix vanilla bug caused by unremovable entities in the entityList of ClientWorld (fixes #29) `75c0e7b` Fix particles being visible after world change when jumping in time (fixes #35) `c934cb9` Fix spawn player packet being sent twice `6efbf91` Handle F1 properly while mouse is visible in the replay overlay (fixes #30) `9add2af` Deselect keyframe when pressing "V" aka. sync timelines (fixes #27)	2016-11-29 22:49:35 +01:00
johni0702	ce313596db	Add 1.10.2 version to ReplayCenter search (fixes #38 )	2016-11-12 19:30:26 +01:00
johni0702	b1661e359a	Merge branch '1.9.4' into 1.10.2 `e20dfa6` Merge branch '1.8' into 1.9.4 `682fb4b` Download OpenEye via http because of outdated java versions `0c48d6a` Make ShaderReflection init fail fast, not printing out unneeded exceptions	2016-11-11 18:15:54 +01:00
johni0702	7cc0ee523a	Merge branch '1.9.4' into 1.10.2 `54790d3` Merge branch '1.8' into 1.9.4 `0ba5b0a` Merge branch '1.8-shaders' into 1.8 `1658617` Merge branch '1.8' into 1.9.4 `0db1b9e` Fix opening a replay multiple times by quickly double clicking (fixes #25) `5014eda` Remove javascript comments from mcmod.info `e5eb982` Add Optifine compatibility to rendering by disabling their separate chunk loading queue Add compatibility to shaders that utilize the Shadow Map by manually setting displayListEntitiesDirty to false Call Shaders.beginRender in an Event Handler to avoid calling all of EntityRenderer#renderWorld `3a28c5b` Draw the GuiVideoRenderer on a separate framebuffer that has the actual size of the window instead of MC's framebuffer which may have a different size `636ce7b` Add compatibility for GLSL Shaders `92eb11a` Change video preview to be compatible with Optifine `9ff767b` Fix spectated player having the arm model of the camera player `d82cef3` Make sure video folder exists before rendering (fixes #24) `cc65b26` Replace custom update system with forge update checker `c8b71dc` Add tooltips to ingame buttons `b240f8a` Fix camera path always playing from the beginning regardless of ctrl key `4805e5e` Fix crash when setting two keyframes to the same time via the edit keyframe gui `18f8303` Fix crash when moving the last keyframe `fcd4c07` Add error popup when trying to play path with reversed time keyframes Update jGui `9c605ba` Update jGui Fix handling of ESC key in popups (fixes #17) `721fdc4` Allow moving the keyframe timeline cursor by dragging (fixes #18) `1851e97` Allow deletion of selected keyframes by pressing the DELETE key (fixes #19) `d547098` Fix markers not being removed `b2c7faa` Fix marker not being deselected when clicking anywhere else `4e6b387` Update jGui Fix popups being drawn outside of the actually visible element (fixes #21) `21bbeb2` Fix bitrate field always being active regardless of selected preset (fixes #20) `b5a6d8b` Fix camera player head being visible while in third person `dd0537b` Center star between resolution fields in render settings gui `e35bfca` Increase spacing between rows in the render settings gui `6d0cdfb` Update jGui (fixes #15)	2016-11-10 22:00:36 +01:00
johni0702	09f167f10e	Update to 1.10.2	2016-10-17 22:23:44 +02:00