PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 11:36:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed asset walker not respecting the chosen namespace

Browse source
This commit is contained in:
Sollace 2019-02-20 15:01:40 +02:00
parent f5e6cf49f1
commit 76a725c981
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/minelittlepony/util/AssetWalker.java
View file

@ -38,12 +38,15 @@ public class AssetWalker {
private final String loadLocation; private final String loadLocation;
private final String namespace;
private final JsonConsumer consumer; private final JsonConsumer consumer;
public AssetWalker(ResourceLocation assetLocation, JsonConsumer consumer) { public AssetWalker(ResourceLocation assetLocation, JsonConsumer consumer) {
this.consumer = consumer; this.consumer = consumer;
this.namespace = assetLocation.getNamespace();
loadLocation = "/assets/" + assetLocation.getNamespace() + "/" + assetLocation.getPath(); loadLocation = "/assets/" + namespace + "/" + assetLocation.getPath();
} }
public void walk() { public void walk() {
@ -86,7 +89,7 @@ public class AssetWalker {
Path i = iterator.next(); Path i = iterator.next();
if ("json".equals(FilenameUtils.getExtension(i.toString()))) { if ("json".equals(FilenameUtils.getExtension(i.toString()))) {
ResourceLocation id = new ResourceLocation(FilenameUtils.removeExtension(path.relativize(i).toString()).replaceAll("\\\\", "/")); ResourceLocation id = new ResourceLocation(namespace, FilenameUtils.removeExtension(path.relativize(i).toString()).replaceAll("\\\\", "/"));
try(BufferedReader bufferedreader = Files.newBufferedReader(i)) { try(BufferedReader bufferedreader = Files.newBufferedReader(i)) {
consumer.accept(id, JsonUtils.fromJson(GSON, bufferedreader, JsonObject.class)); consumer.accept(id, JsonUtils.fromJson(GSON, bufferedreader, JsonObject.class));