Added special nameKey to default config to catch all food. Version up…

…date.
Stormwind99 · Apr 19, 2020 · 4754a56 · 4754a56
1 parent afa6bf6
commit 4754a56
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/build.properties b/build.properties
@@ -13,11 +13,11 @@ mc_mappings_version="20200119-1.14.4"
 forge_version="28.2.4"
 forge_loader_version="28"
 mc_version="1.14.4"
-version="2.2.0"
+version="2.3.0"
 
 /// For @Mod, etc.
 //dependencies="required-after:wumpleutil@[2.12,);after:waila;after:hwyla;after:theoneprobe;after:foodfunk"
-dependencies="required-after:wumpleutil@[3.5,)"
+dependencies="required-after:wumpleutil@[3.6,)"
 basegroup="com.wumple"
 group="${basegroup}.${mod_internalid}"
 group_path="${new String(group).replaceAll(/\./,'/')}"

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -26,7 +26,7 @@ dependencies {
     // Real examples
     // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
     // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-    compile fg.deobf('com.wumple.util:wumpleutil:3.5.0') {
+    compile fg.deobf('com.wumple.util:wumpleutil:3.6.0') {
         transitive = false;
     }
     //compile fg.deobf('com.wumple.megamap:megamap:2.0.0')

diff --git a/src/main/java/com/wumple/cannycomposter/CompostablesConfig.java b/src/main/java/com/wumple/cannycomposter/CompostablesConfig.java
@@ -190,6 +190,7 @@ protected void registerCompostables(Config c)
 		registerCompostable(c, f0, "foodfunk:rotten_food");
 		registerCompostable(c, f0, "rotted_item");
 		registerCompostable(c, f0, "biodegradable_item");
+		registerCompostable(c, f0, "$food");
 		// TODO "spoiled_milk" but give back bucket
 	}
 

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -53,6 +53,6 @@ description="${mod_description}"
 [[dependencies.${mod_id}]]
     modId="wumpleutil"
     mandatory=true
-    versionRange="[3.4,)"
+    versionRange="[3.6,)"
     ordering="NONE"
     side="BOTH"
diff --git a/update.json b/update.json
@@ -1,12 +1,13 @@
 {
   "homepage": "https://github.com/Stormwind99/CannyComposter",
   "promos": {
-    "1.14.4-latest": "2.2.0",
-    "1.14.4-recommended": "2.2.0",
+    "1.14.4-latest": "2.3.0",
+    "1.14.4-recommended": "2.3.0",
     "1.12.2-latest": "1.9.2",
     "1.12.2-recommended": "1.9.2"
   },
   "1.14.4": {
+    "2.3.0": "Added special $food nameKey to catch all food items if not specifically listed",
     "2.2.0": "Re-added Food Funk items. Added both old and new composter recipes.",
     "2.1.0": "Library update",
     "2.0.0": "Ported to 1.14.4"

diff --git a/version.properties b/version.properties
@@ -1,3 +1,3 @@
 #Automated build number increase
-#Fri Apr 17 14:50:18 CDT 2020
-BUILD_NUMBER=257
+#Sat Apr 18 10:59:26 CDT 2020
+BUILD_NUMBER=258