Merge branch '1.12-dev' into 1.12.1-dev

2018-01-19 19:48:36 +01:00 · 2018-01-19 13:16:56 +01:00 · 2018-01-17 20:02:27 +01:00 · 2018-01-17 19:49:37 +01:00 · 2017-10-28 19:51:02 +02:00 · 2017-10-28 19:34:38 +02:00
3 changed files with 12 additions and 11 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ archivesBaseName = "replaymod"

 minecraft {
    coreMod = 'com.replaymod.core.LoadingPlugin'
-    version = '1.12-14.21.1.2387'
+    version = '1.12.1-14.22.0.2444'
    runDir = "eclipse"
    mappings = "snapshot_20170615"
    replace '@MOD_VERSION@', project.version
@@ -69,7 +69,7 @@ dependencies {

    shade 'org.aspectj:aspectjrt:1.8.2'

-    shade 'com.github.replaymod:ReplayStudio:9ee698e'
+    shade 'com.github.replaymod:ReplayStudio:d4b2037'

    testCompile 'junit:junit:4.11'
 }
--- a/gradle/reprod/checksums.txt
+++ b/gradle/reprod/checksums.txt
@@ -16,8 +16,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
-bdf1952a9d02fc8f0909436a097eeda55c31b8db555f2d83b6b975e8f5a9c247 /com/github/replaymod/ReplayStudio/9ee698e/ReplayStudio-9ee698e.jar
-63ffed395d243e5b490042d9c1df9e1c35be0d2e511e2f4e298c3ea41686d0ef /com/github/replaymod/ReplayStudio/9ee698e/ReplayStudio-9ee698e.pom
+be650f4c822de0128866975e6af3ef7b4574328ecf99afd92ef92af30dddea34 /com/github/replaymod/ReplayStudio/d4b2037/ReplayStudio-d4b2037.jar
+b2a36467f1d2ea19d340912ddad589d306baa06b10411458a26bbb3886902400 /com/github/replaymod/ReplayStudio/d4b2037/ReplayStudio-d4b2037.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
@@ -139,7 +139,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
-82cdc6283bc0842bdfa243c1eb807338d1f106db8aef73d26bc908649c586d36 /de/oceanlabs/mcp/mcp/1.12/mcp-1.12-srg.zip
+a95c958f0c052e0a94d20de1d30a9151f68e66b19bdbea60a58cd41539558874 /de/oceanlabs/mcp/mcp/1.12.1/mcp-1.12.1-srg.zip
 5bbf57acadec0f5ea930b793772bbbf2885098aed8d2ecf6290c170a7cd9f33e /de/oceanlabs/mcp/mcp_snapshot/20170615-1.12/mcp_snapshot-20170615-1.12.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
@@ -162,9 +162,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
-59e84cf6acc3912e1705ab05c722485afb3ec33343eef4756d8c16edfe6411ca /mc/game/1.12/client/909823f9c467f9934687f136bc95a667a0d19d7f/client.jar
-feebff3834e41cc096522525707d2dd27adc2431b1f3145b9d0ccfc4c8a3dc09 /mc/game/1.12/server/8494e844e911ea0d63878f64da9dcc21f53a3463/server.jar
-* /mc/game/71579a8bd04a542218613d8015aaf386b84c6ba1/1.12.json
+19331fb29bf8b8d5ed764677c94cca9d66481e10104f660eb555894a4300cf22 /mc/game/1.12.1/client/83385d346cf7f97d1e447b888750fb88e9928b93/client.jar
+848912640bccfa7ea34a2cc1c76cb2b35f8467c4216d9603917c991660f91a8b /mc/game/1.12.1/server/561c7b2d54bae80cc06b05d950633a9ac95da816/server.jar
+* /mc/game/2ce9731e5bafdf69014e4e6db1cc56149958c5a8/1.12.1.json
 c4dadeeecaa90c8847902082aee5eb107fcf59c5d0e63a17fcaf273c0e2d2bd1 /net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar
 800bb2831dda341336ea69b7beb675f159973f64dad6aaa1ad8c4fa78e5cb19b /net/java/dev/jna/jna/4.4.0/jna-4.4.0.pom
 ea89d5090c8303ba4e9a0056e6d8a20429f3e021411e950bfd9eba3b6e6cf15c /net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar
@@ -180,8 +180,8 @@ af09ead4eb241473e7ec4d152a91a722ea09a717a202e20e4b385eac3217b7d6 /net/java/jutil
 * /net/minecraftforge/forge/json
 e6305077f41e2bfe957b486bed110e8af9ce54a651d36722d8d23e8e260d5b83 /net/md-5/SpecialSource/1.8.1/SpecialSource-1.8.1.jar
 dc5a991a91d6abc0059a7d0842a9e9899cf5e80354a727a22ffe35f508692d76 /net/md-5/SpecialSource/1.8.1/SpecialSource-1.8.1.pom
-51de37266b446ce00dca7073825a8ea2e16641866222bcb7c079bb537a3badad /net/minecraftforge/forge/1.12-14.21.1.2387/forge-1.12-14.21.1.2387.pom
-ce0229a5c0873e5085bfb67eaea93aeed2e9f95e0534d87eadba5f1864a90778 /net/minecraftforge/forge/1.12-14.21.1.2387/forge-1.12-14.21.1.2387-userdev.jar
+606b825e3920a1b7e8e2652a37e432f2b3066539e803a46212c5505a709cbff2 /net/minecraftforge/forge/1.12.1-14.22.0.2444/forge-1.12.1-14.22.0.2444.pom
+c8396b067c800425d4f4e97ec6879262f2133b5c53575c6b82c4eb6feb22f2a1 /net/minecraftforge/forge/1.12.1-14.22.0.2444/forge-1.12.1-14.22.0.2444-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
@@ -7,7 +7,8 @@ public enum MinecraftVersion {
    MC_1_10_2("Minecraft 1.10.2", "1.10.2"),
    MC_1_11("Minecraft 1.11", "1.11"),
    MC_1_11_2("Minecraft 1.11.2", "1.11.2"),
-    MC_1_12("Minecraft 1.12", "1.12");
+    MC_1_12("Minecraft 1.12", "1.12"),
+    MC_1_12_1("Minecraft 1.12.1", "1.12.1");

    private String niceName, apiName;
Author	SHA1	Message	Date
Jonas Herzig	d7e3c4d242	Merge branch '1.12-dev' into 1.12.1-dev	2018-01-19 19:48:36 +01:00
Jonas Herzig	ddeaf37e8e	Merge branch '1.12-dev' into 1.12.1-dev	2018-01-19 13:16:56 +01:00
Jonas Herzig	638cc59097	Merge branch '1.12-dev' into 1.12.1-dev	2018-01-17 20:02:27 +01:00
Jonas Herzig	3a2abf05cb	Merge branch '1.12.1-reprod' into 1.12.1-dev	2018-01-17 19:49:37 +01:00
Jonas Herzig	117dc6191f	Update reprod to 1.12.1	2017-10-28 19:51:02 +02:00
Jonas Herzig	903762f042	Merge branch '1.12.1-dev' into 1.12.1-reprod	2017-10-28 19:34:38 +02:00
Jonas Herzig	f9b6fd1ced	Update reprod to 1.12	2017-10-28 19:32:26 +02:00
Jonas Herzig	9592c6b8ea	Merge branch '1.12-dev' into 1.12-reprod	2017-10-28 18:28:19 +02:00
Jonas Herzig	db1717ffdd	Merge branch 1.12-dev into 1.12.1-dev `d7dc2ba` Merge branch 1.11.2-dev into 1.12-dev `b1c6098` Merge branch 1.11-dev into 1.11.2-dev `caf6051` Merge branch 1.9.4-dev into 1.11-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 12:47:13 +02:00
Jonas Herzig	b1a2826cb4	Merge branch 1.12 into 1.12.1 `0d6c1ca` Merge branch 1.11.2 into 1.12 `13bb0bd` Merge branch 1.11-staging into 1.11.2-staging `5257a41` Merge branch 1.10.2 into 1.11 `689f897` 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) `922c039` Fix server with RM installed refusing clients without RM (fixes #76) `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) `d56fa9b` Update ReplayStudio/MCProtocolLib (Fixes missing ARMOR_STAND MobType) `7c719e0` Update ReplayStudio/MCProtocolLib (Fixes missing ARMOR_STAND MobType) `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:53:36 +02:00
Jonas Herzig	0b462280fc	Update to 1.12.1	2017-08-04 09:10:48 +02:00