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

Fix Vanilla resources loading from classpath, instead of the extra jar. Causing issues in dev time, and Forge replacements. Closes #5824

Browse source
This commit is contained in:
LexManos 2019-06-17 14:08:16 -07:00
parent 0a8a601877
commit 40bdde2043
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
patches/minecraft/net/minecraft/resources/VanillaPack.java.patch Normal file
View file

@ -0,0 +1,39 @@
--- a/net/minecraft/resources/VanillaPack.java
+++ b/net/minecraft/resources/VanillaPack.java
@@ -184,7 +184,7 @@
try {
URL url = VanillaPack.class.getResource(s);
- return url != null && FolderPack.func_195777_a(new File(url.getFile()), s) ? VanillaPack.class.getResourceAsStream(s) : null;
+ return url != null && FolderPack.func_195777_a(new File(url.getFile()), s) ? getExtraInputStream(p_195782_1_, s) : null;
} catch (IOException var6) {
return VanillaPack.class.getResourceAsStream(s);
}
@@ -192,7 +192,7 @@
@Nullable
protected InputStream func_200010_a(String p_200010_1_) {
- return VanillaPack.class.getResourceAsStream("/" + p_200010_1_);
+ return getExtraInputStream(ResourcePackType.SERVER_DATA, "/" + p_200010_1_);
}
public boolean func_195764_b(ResourcePackType p_195764_1_, ResourceLocation p_195764_2_) {
@@ -222,4 +222,18 @@
public void close() {
}
+
+ //Vanilla used to just grab from the classpath, this breaks dev environments, and Forge runtime
+ //as forge ships vanilla assets in an 'extra' jar with no classes.
+ //So find that extra jar using the .mcassetsroot marker.
+ private InputStream getExtraInputStream(ResourcePackType type, String resource) {
+ try {
+ FileSystem fs = field_217810_e.get(type);
+ if (fs != null)
+ return Files.newInputStream(fs.getPath(resource));
+ return VanillaPack.class.getResourceAsStream(resource);
+ } catch (IOException e) {
+ return VanillaPack.class.getResourceAsStream(resource);
+ }
+ }
}