bump cotton to 12b, add mod icon, change config to .json5

CottonMC · Mar 25, 2019 · 7c90f4a · 7c90f4a
1 parent 9c2f0f5
commit 7c90f4a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/project.gradle b/project.gradle
@@ -1,13 +1,13 @@
 ext {
 	projectName = "cotton";
 	group = "io.github.cottonmc";
-	version = "0.0.6+19w11b";
+	version = "0.0.6+19w12b";
 	snapshot = true;
 
-	minecraft = "19w11b";
-	mappings = "19w11b.4";
+	minecraft = "19w12b";
+	mappings = "19w12b.4";
 	loader = "0.3.7.109";
-	fabricMod = "0.2.3.111";
+	fabricMod = "0.2.5.114";
 	silkMod = null;
 	jankson = "1.1.1"; //If needsShadow is false, jankson will not be included!
 

diff --git a/src/main/java/io/github/cottonmc/cotton/config/ConfigManager.java b/src/main/java/io/github/cottonmc/cotton/config/ConfigManager.java
@@ -14,7 +14,7 @@
 
 public class ConfigManager {
 
-    private static final String CONFIG_FILE_EXTENSION = ".conf";
+    private static final String CONFIG_FILE_EXTENSION = ".json5";
 
     /**Loads a .config file from the config folder and parses it to a POJO.
      *

diff --git a/src/main/java/io/github/cottonmc/cotton/mixins/MixinDataPackLoad.java b/src/main/java/io/github/cottonmc/cotton/mixins/MixinDataPackLoad.java
@@ -21,7 +21,7 @@ public class MixinDataPackLoad {
 
 	@Inject(method = "method_3800",
 			at = @At(value = "HEAD"))
-		public void method_3800(File file, LevelProperties properties, CallbackInfo info) {
+		public void addGlobalDataPacks(File file, LevelProperties properties, CallbackInfo info) {
 		resourcePackContainerManager.addCreator(new GlobalResourcePackCreator());
 	}
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -11,5 +11,6 @@
   },
   "requires": {
     "fabric": "*"
-  }
+  },
+  "description": "Common materials for inter-compatibility and ease of use."
 }
diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png