tiny resource loader fix

This commit is contained in:
CreepyCre 2021-02-19 22:25:08 +01:00
parent 5633ac5e70
commit 55d5a68b1c

View file

@ -66,9 +66,9 @@ public class SchematicV2Handler implements SimpleSynchronousResourceReloadListen
JsonObject[] objects = GSON.fromJson(new InputStreamReader(group.getInputStream()), JsonObject[].class); JsonObject[] objects = GSON.fromJson(new InputStreamReader(group.getInputStream()), JsonObject[].class);
groupData = ArrayUtils.addAll(groupData, objects); groupData = ArrayUtils.addAll(groupData, objects);
} }
String[] path = groupId.getPath().split("/"); String[] path = groupId.toString().split("/");
String id = path[path.length - 1]; // Last one is the file name String id = String.join("/", ArrayUtils.subarray(path, 2, path.length));
id = id.substring(0, id.indexOf('.')); // Remove extension id = id.substring(0, id.lastIndexOf("."));
JsonArray arr = new JsonArray(); JsonArray arr = new JsonArray();
for (JsonObject groupDatum : groupData) { for (JsonObject groupDatum : groupData) {
arr.add(groupDatum); arr.add(groupDatum);
@ -86,7 +86,7 @@ public class SchematicV2Handler implements SimpleSynchronousResourceReloadListen
} }
JsonObject json = GSON.fromJson(new InputStreamReader(generator.getInputStream()), JsonObject.class); JsonObject json = GSON.fromJson(new InputStreamReader(generator.getInputStream()), JsonObject.class);
String[] path = generatorId.toString().split("/"); String[] path = generatorId.toString().split("/");
String id = String.join("/", ArrayUtils.subarray(path, 1, path.length)); String id = String.join("/", ArrayUtils.subarray(path, 2, path.length));
id = id.substring(0, id.lastIndexOf(".")); id = id.substring(0, id.lastIndexOf("."));
this.loadPocketGenerator(id, JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, json)); this.loadPocketGenerator(id, JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, json));
} }