Skip to content

Commit

Permalink
updated to 1.0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
xR4YM0ND committed Jun 8, 2024
1 parent 4ac982c commit 4532605
Show file tree
Hide file tree
Showing 24 changed files with 635 additions and 33 deletions.
32 changes: 12 additions & 20 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
## Fixed:
- Wrong expanded delight values
- Wrong farmers delight refabricated values
## Changed:
- Apples are now vitamin based

## Added:
- Brewin' and Chewin' `3.0.3` compat
- Cultural Delights `1.0.0` compat
- End's Delight `alpha 1.0` compat
- Festive Delight `1.1.0` compat
- More Delight `1.2.2` compat
- Nethers Delight Refabricated `4.1.1` compat
- Ocean's Delight `1.0.2` compat
- Spelunkery `0.3.5` compat
- Ube's Delight `0.1.5.4` compat
- Wilder Wild `2.4.2` compat

## Updated:
- [Let's Do] Bakery `1.1.11` compat
- [Let's Do] Meadow `1.3.16` compat
- Expanded Delight `0.3.1` compat
- Farmers Delight Refabricated `2.1.1` compat
- Natures Spirit `1.5.3` compat
- Ad Astra `1.15.18` compat
- Aquamirae `6` compat
- Biome Makeover `1.11.4` compat
- Create `0.5.1 f build 1417` compat
- Create Crafts & Additions `1.2.3` compat
- Fish of Thieves `3.0.5` compat
- Immersive Weathering `2.0.1` compat
- Promenade `4.1.1` compat
- Spawn `1.0.3` compat
- The Bumblezone `7.4.2` compat
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ org.gradle.parallel=true
loader_version=0.14.24

# Mod Properties
mod_version=1.0.7
mod_version=1.0.8
maven_group=net.nutritionz
archives_base_name=nutritionz

Expand Down
41 changes: 41 additions & 0 deletions src/main/java/net/nutritionz/init/EventInit.java
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,28 @@ public static void init() {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "ubesdelight_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
// Create Series
if (FabricLoader.getInstance().isModLoaded("create")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "create_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("createaddition")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "createaddition_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
// Others
if (FabricLoader.getInstance().isModLoaded("ad_astra")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "adastra_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("adventurez")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "adventurez_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("aquamirae")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "aquamirae_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("betterend")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "betterend_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
Expand All @@ -134,14 +151,26 @@ public static void init() {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "betternether_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("biomemakeover")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "biomemakeover_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("dehydration")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "dehydration_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("fishofthieves")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "fishofthieves_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("hybrid-aquatic")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "hybrid-aquatic_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("immersive_weathering")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "immersiveweathering_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("mobcatalog")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "mobcatalog_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
Expand All @@ -154,10 +183,18 @@ public static void init() {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "natures_spirit_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("promenade")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "promenade_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("regions_unexplored")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "regions_unexplored_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("spawn")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "spawn_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("spelunkery")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "spelunkery_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
Expand All @@ -166,6 +203,10 @@ public static void init() {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "supplementaries_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("the_bumblezone")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "thebumblezone_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
}
if (FabricLoader.getInstance().isModLoaded("wilderwild")) {
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "wilderwild_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(),
ResourcePackActivationType.DEFAULT_ENABLED);
Expand Down
24 changes: 12 additions & 12 deletions src/main/resources/data/nutritionz/nutrition/vanilla_items.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"minecraft:apple": {
"carbohydrates": 12,
"protein": 1,
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 6,
"minerals": 1
"vitamins": 15,
"minerals": 5
},
"minecraft:golden_apple": {
"carbohydrates": 12,
"protein": 1,
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 6,
"minerals": 1
"vitamins": 15,
"minerals": 5
},
"minecraft:enchanted_golden_apple": {
"carbohydrates": 12,
"protein": 1,
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 6,
"minerals": 1
"vitamins": 15,
"minerals": 5
},
"minecraft:melon_slice": {
"carbohydrates": 4,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"ad_astra:cheese": {
"carbohydrates": 0,
"protein": 5,
"fat": 10,
"vitamins": 0,
"minerals": 5
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"pack": {
"pack_format": 15,
"description": {
"text": "Ad Astra nutritionz compat"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"aquamirae:fin": {
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 0,
"minerals": 5
},
"aquamirae:esca": {
"carbohydrates": 0,
"protein": 10,
"fat": 5,
"vitamins": 0,
"minerals": 15
},
"aquamirae:sharp_bones": {
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 0,
"minerals": 5
},
"aquamirae:sea_casserole": {
"carbohydrates": 0,
"protein": 10,
"fat": 5,
"vitamins": 5,
"minerals": 10
},
"aquamirae:spinefish": {
"carbohydrates": 0,
"protein": 3,
"fat": 0,
"vitamins": 0,
"minerals": 2
},
"aquamirae:cooked_spinefish": {
"carbohydrates": 0,
"protein": 15,
"fat": 0,
"vitamins": 0,
"minerals": 15
},
"aquamirae:sea_stew": {
"carbohydrates": 10,
"protein": 5,
"fat": 0,
"vitamins": 10,
"minerals": 35
},
"aquamirae:poseidons_breakfast": {
"carbohydrates": 20,
"protein": 20,
"fat": 20,
"vitamins": 20,
"minerals": 20
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"pack": {
"pack_format": 15,
"description": {
"text": "Aquamirae nutritionz compat"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"biomemakeover:glowshroom_stew": {
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 5,
"minerals": 20
},
"biomemakeover:glowfish": {
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 0,
"minerals": 5
},
"biomemakeover:cooked_glowfish": {
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 0,
"minerals": 25
},
"biomemakeover:bulbus_root": {
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 5,
"minerals": 5
},
"biomemakeover:roasted_bulbus_root": {
"carbohydrates": 0,
"protein": 0,
"fat": 0,
"vitamins": 10,
"minerals": 15
},
"biomemakeover:raw_crab": {
"carbohydrates": 0,
"protein": 10,
"fat": 0,
"vitamins": 0,
"minerals": 0
},
"biomemakeover:cooked_crab": {
"carbohydrates": 0,
"protein": 20,
"fat": 5,
"vitamins": 0,
"minerals": 0
},
"biomemakeover:crab_chowder": {
"carbohydrates": 10,
"protein": 15,
"fat": 10,
"vitamins": 15,
"minerals": 5
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"pack": {
"pack_format": 15,
"description": {
"text": "Biome Makeover nutritionz compat"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"create:bar_of_chocolate": {
"carbohydrates": 20,
"protein": 5,
"fat": 5,
"vitamins": 0,
"minerals": 0
},
"create:sweet_roll": {
"carbohydrates": 15,
"protein": 5,
"fat": 10,
"vitamins": 0,
"minerals": 0
},
"create:chocolate_glazed_berries": {
"carbohydrates": 15,
"protein": 5,
"fat": 5,
"vitamins": 10,
"minerals": 0
},
"create:honeyed_apple": {
"carbohydrates": 20,
"protein": 0,
"fat": 0,
"vitamins": 20,
"minerals": 0
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"pack": {
"pack_format": 15,
"description": {
"text": "Create nutritionz compat"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"createaddition:chocolate_cake": {
"carbohydrates": 5,
"protein": 5,
"fat": 5,
"vitamins": 0,
"minerals": 0
},
"createaddition:honey_cake": {
"carbohydrates": 5,
"protein": 5,
"fat": 5,
"vitamins": 0,
"minerals": 0
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"pack": {
"pack_format": 15,
"description": {
"text": "Create Crafts & Additions compat for Nutritionz"
}
}
}
Loading

0 comments on commit 4532605

Please sign in to comment.