keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix scala mods crashing with the json annotation cache.

Browse source
This commit is contained in:
LexManos 2018-06-01 00:07:17 -07:00
parent d9a042c775
commit 9cda586ebd
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
jsons/1.12.2.json
View file

@ -266,13 +266,13 @@
} }
}, },
{ {
"name": "com.mojang:realms:1.10.19", "name": "com.mojang:realms:1.10.21",
"downloads": { "downloads": {
"artifact": { "artifact": {
"size": 7134997, "size": 7134971,
"sha1": "c0e1cddb173faa8bf69a4236211cfd0af6c6150d", "sha1": "cfc457545a482027c066f13c262b9a4df64bc3f3",
"path": "com/mojang/realms/1.10.19/realms-1.10.19.jar", "path": "com/mojang/realms/1.10.21/realms-1.10.21.jar",
"url": "https://libraries.minecraft.net/com/mojang/realms/1.10.19/realms-1.10.19.jar" "url": "https://libraries.minecraft.net/com/mojang/realms/1.10.21/realms-1.10.21.jar"
} }
} }
}, },
@ -719,6 +719,6 @@
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}", "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
"minimumLauncherVersion": 18, "minimumLauncherVersion": 18,
"releaseTime": "2017-09-18T08:39:46+00:00", "releaseTime": "2017-09-18T08:39:46+00:00",
"time": "2018-04-02T07:39:26+00:00", "time": "2018-05-25T15:20:02+00:00",
"type": "release" "type": "release"
} }

3
src/main/java/net/minecraftforge/fml/common/discovery/json/JsonAnnotationLoader.java
View file

@ -54,6 +54,9 @@ public class JsonAnnotationLoader
//TODO: Java9 Multi-Release Jars, picking the correct class for the current platform. For now we just ignore them. //TODO: Java9 Multi-Release Jars, picking the correct class for the current platform. For now we just ignore them.
if (entry.getKey().startsWith("META-INF/")) if (entry.getKey().startsWith("META-INF/"))
continue; continue;
//TODO: Remove in 1.13, some older mods have these in the entries due to FG issue. Basically filter out scala synthetic class.
if (entry.getKey().endsWith("$"))
continue;
ASMInfo asm_info = entry.getValue(); ASMInfo asm_info = entry.getValue();
if (asm_info.interfaces != null) if (asm_info.interfaces != null)