fix polymer RPs on windows (#9)

Patbox · Nov 28, 2021 · 29c5bea · 29c5bea
1 parent 3f5bc76
commit 29c5bea
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/main/java/eu/pb4/polymer/impl/resourcepack/DefaultRPBuilder.java b/src/main/java/eu/pb4/polymer/impl/resourcepack/DefaultRPBuilder.java
@@ -49,7 +49,7 @@ public class DefaultRPBuilder implements InternalRPBuilder {
     private final Path outputPath;
     private ZipFile clientJar = null;
     private final List<ModContainer> modsList = new ArrayList<>();
-    private Map<Identifier, List<PolymerModelData>> customModelData = new HashMap<>();
+    private final Map<Identifier, List<PolymerModelData>> customModelData = new HashMap<>();
 
 
     public DefaultRPBuilder(Path outputPath) {
@@ -98,7 +98,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 
                     var bytes = Files.readAllBytes(file);
 
-                    fileMap.put(relative.toString(), bytes);
+                    fileMap.put(relative.toString().replace("\\", "/"), bytes);
 
                     return FileVisitResult.CONTINUE;
                 }
@@ -141,7 +141,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 
                         var bytes = Files.readAllBytes(file);
 
-                        fileMap.put("assets/" + relative, bytes);
+                        fileMap.put("assets/" + relative.toString().replace("\\", "/"), bytes);
 
                         return FileVisitResult.CONTINUE;
                     }
@@ -194,7 +194,7 @@ public boolean addCustomModelData(PolymerModelData cmdInfo) {
             JsonObject modelObject = null;
             var modelPath = "assets/" + cmdInfo.modelPath().getNamespace() + "/models/" + cmdInfo.modelPath().getPath() + ".json";
 
-            if (modelObject == null && this.fileMap.containsKey(modelPath)) {
+            if (this.fileMap.containsKey(modelPath)) {
                 modelObject = JsonParser.parseString(new String(this.fileMap.get(modelPath), StandardCharsets.UTF_8)).getAsJsonObject();
             }
 
@@ -285,7 +285,6 @@ public CompletableFuture<Boolean> buildResourcePack() {
                 for (Map.Entry<Item, JsonArray> entry : this.models.entrySet()) {
                     Identifier id = Registry.ITEM.getId(entry.getKey());
                     try {
-                        String basePath = "assets/" + id.getNamespace() + "/models/item/";
                         JsonObject modelObject;
 
                         String baseModelPath;
@@ -476,7 +475,6 @@ public CompletableFuture<Boolean> buildResourcePack() {
 
                 this.fileMap.put("polymer-about.txt", String.join("\n", credits).getBytes(StandardCharsets.UTF_8));
 
-
                 {
                     var outputStream = new ZipOutputStream(new FileOutputStream(this.outputPath.toFile()));