updated to 1.0.10 , switched to farm & charm + more

xR4YM0ND · Aug 20, 2024 · 2b43337 · 2b43337
1 parent 81b2185
commit 2b43337
Show file tree

Hide file tree

Showing 65 changed files with 1,051 additions and 268 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,21 @@
 ## Changed:
-- Default max nutrition from 100 -> 300
+- Minerals negative effect from `mining fatique` -> `nausea`
+- Now all datapacks are valid throughout minecraft versions
+- Dropped support for standalone legacy lets do mods
 
 ## Added:
-- Bountiful Fares `1.2.1` compat
-- Culinaire `3.0.0` compat
-- Exline's Fishing `1.0.4` compat
-- Living Things `2.0.2` compat
-- Natures Delight `1.2` compat
+- [Let's Do Addon] Corn Expansion `1.0.1` compat
+- [Let's Do] Bakery - Farm&Charm Compat `2.0.1` compat
+- [Let's Do] Brewery - Farm&Charm Compat `2.0.2` compat
+- [Let's Do] Candlelight - Farm&Charm Compat `2.0.1` compat
+- [Let's Do] Farm & Charm `1.0.2` compat
+- [Let's Do] WilderNature `1.0.2` compat
+
+## Removed:
+- Legacy: [Let's Do] Bakery compat
+- Legacy: [Let's Do] Brewery compat
+- Legacy: [Let's Do] Candlelight compat
+
+## Updated:
+- [Let's Do] Beachparty `1.1.5` compat
+- [Let's Do] Vinery `1.4.28` compat
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.parallel=true
     loader_version=0.14.24
 
 # Mod Properties
-    mod_version=1.0.9
+    mod_version=1.0.10
     maven_group=net.nutritionz
     archives_base_name=nutritionz
 

diff --git a/src/main/java/net/nutritionz/init/EventInit.java b/src/main/java/net/nutritionz/init/EventInit.java
@@ -52,6 +52,10 @@ public static void init() {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "candlelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
+        if (FabricLoader.getInstance().isModLoaded("cornexpansion")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "cornexpansion_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
         if (FabricLoader.getInstance().isModLoaded("dehydration") && FabricLoader.getInstance().isModLoaded("meadow")) {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "dehydration_x_meadow_nutrition_compat"),
                     FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED);
@@ -64,6 +68,10 @@ public static void init() {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "dehydration_x_vinery_nutrition_compat"),
                     FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED);
         }
+        if (FabricLoader.getInstance().isModLoaded("farm_and_charm")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "farm_and_charm_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
         if (FabricLoader.getInstance().isModLoaded("herbalbrews")) {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "herbalbrews_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
@@ -80,6 +88,10 @@ public static void init() {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "vinery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
                     ResourcePackActivationType.DEFAULT_ENABLED);
         }
+        if (FabricLoader.getInstance().isModLoaded("wildernature")) {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "wildernature_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
+                    ResourcePackActivationType.DEFAULT_ENABLED);
+        }
         // Farmers Delight Series
         if (FabricLoader.getInstance().isModLoaded("brewinandchewin")) {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "brewinandchewin_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),

diff --git a/src/main/resources/data/nutritionz/nutrition_manager/default.json b/src/main/resources/data/nutritionz/nutrition_manager/default.json
@@ -110,7 +110,7 @@
                 "operation": "ADDITION",
                 "value": 1.0
             },
-            "minecraft:mining_fatigue": {
+            "minecraft:nausea": {
                 "duration": 319,
                 "amplifier": 0
             }

diff --git a/src/main/resources/resourcepacks/adastra_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/adastra_nutrition_compat/pack.mcmeta
@@ -1,8 +1,12 @@
 {
   "pack": {
     "pack_format": 15,
+    "supported_formats": {
+      "min_inclusive": 1,
+      "max_inclusive": 999
+      },
     "description": {
-        "text": "Ad Astra nutritionz compat"
+        "text": "ad astra nutritionz compat"
     }
   }
 }
diff --git a/src/main/resources/resourcepacks/adventurez_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/adventurez_nutrition_compat/pack.mcmeta
@@ -1,6 +1,10 @@
 {
   "pack": {
     "pack_format": 15,
+    "supported_formats": {
+      "min_inclusive": 1,
+      "max_inclusive": 999
+      },
     "description": {
         "text": "adventurez nutritionz compat"
     }

diff --git a/src/main/resources/resourcepacks/aquamirae_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/aquamirae_nutrition_compat/pack.mcmeta
@@ -1,8 +1,12 @@
 {
   "pack": {
     "pack_format": 15,
+    "supported_formats": {
+      "min_inclusive": 1,
+      "max_inclusive": 999
+      },
     "description": {
-        "text": "Aquamirae nutritionz compat"
+        "text": "aquamirae nutritionz compat"
     }
   }
 }
diff --git a/.../resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_blocks.json b/.../resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_blocks.json
@@ -1,18 +1,4 @@
 {
-    "bakery:bread": {
-        "carbohydrates": 19,
-        "protein": 4,
-        "fat": 1,
-        "vitamins": 0,
-        "minerals": 1
-    },
-    "bakery:bread_crate": {
-        "carbohydrates": 19,
-        "protein": 4,
-        "fat": 1,
-        "vitamins": 0,
-        "minerals": 1
-    },
     "bakery:strawberry_cake": {
         "carbohydrates": 10,
         "protein": 0,
@@ -34,9 +20,9 @@
         "vitamins": 0,
         "minerals": 0
     },
-    "bakery:pudding": {
-        "carbohydrates": 5,
-        "protein": 10,
+    "bakery:chocolate_gateau": {
+        "carbohydrates": 10,
+        "protein": 5,
         "fat": 10,
         "vitamins": 0,
         "minerals": 0
@@ -56,18 +42,18 @@
         "minerals": 0
     },
     "bakery:apple_pie": {
-        "carbohydrates": 12,
+        "carbohydrates": 8,
         "protein": 3,
         "fat": 6,
-        "vitamins": 4,
+        "vitamins": 8,
         "minerals": 0
     },
-    "bakery:glowberry_tart": {
-        "carbohydrates": 12,
+    "bakery:glowberry_pie": {
+        "carbohydrates": 8,
         "protein": 2,
         "fat": 5,
-        "vitamins": 3,
-        "minerals": 3
+        "vitamins": 5,
+        "minerals": 5
     },
     "bakery:chocolate_tart": {
         "carbohydrates": 10,
@@ -76,9 +62,9 @@
         "vitamins": 0,
         "minerals": 0
     },
-    "bakery:chocolate_gateau": {
-        "carbohydrates": 10,
-        "protein": 5,
+    "bakery:pudding": {
+        "carbohydrates": 5,
+        "protein": 10,
         "fat": 10,
         "vitamins": 0,
         "minerals": 0

diff --git a/...n/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_items.json b/...n/resources/resourcepacks/bakery_nutrition_compat/data/bakery/nutrition/bakery_items.json
@@ -1,17 +1,17 @@
 {
-    "bakery:strawberry": {
-        "carbohydrates": 1,
-        "protein": 0,
-        "fat": 0,
-        "vitamins": 3,
-        "minerals": 1
-    },
-    "bakery:oat": {
+    "bakery:cake_dough": {
         "carbohydrates": 3,
+        "protein": 2,
+        "fat": 3,
+        "vitamins": 0,
+        "minerals": 2
+    },
+    "bakery:sweet_dough": {
+        "carbohydrates": 4,
         "protein": 1,
-        "fat": 0,
+        "fat": 3,
         "vitamins": 0,
-        "minerals": 1
+        "minerals": 2
     },
     "bakery:croissant": {
         "carbohydrates": 8,
@@ -62,20 +62,6 @@
         "vitamins": 0,
         "minerals": 1
     },
-    "bakery:vegetable_sandwich": {
-        "carbohydrates": 10,
-        "protein": 5,
-        "fat": 0,
-        "vitamins": 5,
-        "minerals": 5
-    },
-    "bakery:sandwich": {
-        "carbohydrates": 10,
-        "protein": 10,
-        "fat": 5,
-        "vitamins": 0,
-        "minerals": 0
-    },
     "bakery:strawberry_cake_slice": {
         "carbohydrates": 10,
         "protein": 0,
@@ -119,18 +105,18 @@
         "minerals": 0
     },
     "bakery:apple_pie_slice": {
-        "carbohydrates": 12,
+        "carbohydrates": 8,
         "protein": 3,
         "fat": 6,
-        "vitamins": 4,
+        "vitamins": 8,
         "minerals": 0
     },
     "bakery:glowberry_pie_slice": {
-        "carbohydrates": 12,
+        "carbohydrates": 8,
         "protein": 2,
         "fat": 5,
-        "vitamins": 3,
-        "minerals": 3
+        "vitamins": 5,
+        "minerals": 5
     },
     "bakery:chocolate_tart_slice": {
         "carbohydrates": 10,
@@ -222,5 +208,40 @@
         "fat": 5,
         "vitamins": 0,
         "minerals": 0
+    },
+    "bakery:sandwich": {
+        "carbohydrates": 10,
+        "protein": 10,
+        "fat": 5,
+        "vitamins": 5,
+        "minerals": 5
+    },
+    "bakery:vegetable_sandwich": {
+        "carbohydrates": 10,
+        "protein": 0,
+        "fat": 0,
+        "vitamins": 25,
+        "minerals": 5
+    },
+    "bakery:grilled_salmon_sandwich": {
+        "carbohydrates": 10,
+        "protein": 8,
+        "fat": 2,
+        "vitamins": 5,
+        "minerals": 5
+    },
+    "bakery:grilled_bacon_sandwich": {
+        "carbohydrates": 10,
+        "protein": 15,
+        "fat": 10,
+        "vitamins": 0,
+        "minerals": 0
+    },
+    "bakery:bread_with_jam": {
+        "carbohydrates": 15,
+        "protein": 0,
+        "fat": 0,
+        "vitamins": 0,
+        "minerals": 10
     }
 }
diff --git a/src/main/resources/resourcepacks/bakery_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/bakery_nutrition_compat/pack.mcmeta
@@ -1,8 +1,12 @@
 {
   "pack": {
     "pack_format": 15,
+    "supported_formats": {
+      "min_inclusive": 1,
+      "max_inclusive": 999
+      },
     "description": {
-        "text": "bakery nutritionz compat"
+        "text": "bakery farm & charm compat nutritionz compat"
     }
   }
 }