2.8.3

Fixed the default piece pack not being loaded if ti was just generated
Shnupbups · Sep 21, 2019 · 314223c · 314223c
1 parent 6dbe9ac
commit 314223c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.6.1+build.165
 
 # Mod Properties
-	mod_version = 2.8.2
+	mod_version = 2.8.3
 	maven_group = com.shnupbups
 	archives_base_name = extrapieces
 

diff --git a/src/main/java/com/shnupbups/extrapieces/register/ModConfigs.java b/src/main/java/com/shnupbups/extrapieces/register/ModConfigs.java
@@ -19,8 +19,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 public class ModConfigs {
 
@@ -140,12 +139,18 @@ public static void initPiecePacks() {
 		if (packs.length == 0) {
 			if (generateDefaultPack) {
 				ExtraPieces.log("No piece packs found, generating default!");
-				generateDefaultPack(new File(ppDir, "default.json"));
+				generateDefaultPack(defaultPack);
+				ArrayList<File> packslist = new ArrayList<>(Arrays.asList(packs));
+				packslist.add(defaultPack);
+				packs = packslist.toArray(packs);
 			} else ExtraPieces.log("No piece packs found! Why bother having Extra Pieces installed then?");
 		} else {
 			if (generateDefaultPack && (!defaultPack.exists() || forceUpdateDefaultPack || isDefaultPackOutdated(defaultPack))) {
 				ExtraPieces.log("Generating default piece pack as it either did not exist or needed updating...");
 				generateDefaultPack(defaultPack);
+				ArrayList<File> packslist = new ArrayList<>(Arrays.asList(packs));
+				packslist.add(defaultPack);
+				packs = packslist.toArray(packs);
 			}
 		}
 		for (File f : packs) {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "extrapieces",
-  "version": "2.8.2",
+  "version": "2.8.3",
 
   "name": "Extra Pieces",
   "description": "Adds more block shapes to Minecraft!",