diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d60ed9..f441c65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,8 @@ -### Fixed: -- [Let's Do] Bakery `1.1.8` compat -- [Let's Do] Candlelight `1.2.10` compat -- [Let's Do] Vinery `1.4.14` compat -- [Let's Do] HerbalBrews `1.0.6` compat +### Changed: +- Vitamins Buff `regeneration 2` -> `regeneration 1` +- Minerals Buff `absorption` -> `haste` +- Minerals Debuff `weakness` -> `mining_fatigue` ### Added: -- [Let's Do] Beachparty `1.1.4` compat -- [Let's Do] Brewery `1.1.5` compat -- Expanded Delight compat (thx illustietor) -- Farmer's Delight compat (thx illustietor) \ No newline at end of file +- Hybrid Aquatic `1.2.2` compat +- Regions Unexplored `0.5.5` compat +- German lang file \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 210b171..662b76d 100644 --- 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.2 + mod_version=1.0.3 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 index a900f35..9bf2306 100644 --- a/src/main/java/net/nutritionz/init/EventInit.java +++ b/src/main/java/net/nutritionz/init/EventInit.java @@ -90,6 +90,10 @@ public static void init() { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "herbalbrews_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("meadow")) { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "meadow_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); @@ -106,6 +110,10 @@ public static void init() { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "nethervinery_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("supplementaries")) { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("nutritionz", "supplementaries_nutrition_compat"), FabricLoader.getInstance().getModContainer("nutritionz").orElseThrow(), ResourcePackActivationType.DEFAULT_ENABLED); diff --git a/src/main/resources/assets/nutritionz/lang/de_de.json b/src/main/resources/assets/nutritionz/lang/de_de.json new file mode 100644 index 0000000..eecdd30 --- /dev/null +++ b/src/main/resources/assets/nutritionz/lang/de_de.json @@ -0,0 +1,29 @@ +{ + "screen.nutritionz": "Nährstoffe", + + "text.autoconfig.nutritionz.title": "NutritionZ Config", + "text.autoconfig.nutritionz.option.maxNutrition": "Max Nährstoffe", + "text.autoconfig.nutritionz.option.negativeNutrition": "Negative Nährstoffe", + "text.autoconfig.nutritionz.option.positiveNutrition": "Positive Nährstoffe", + "text.autoconfig.nutritionz.option.posX": "Pos X", + "text.autoconfig.nutritionz.option.posY": "Pos Y", + "text.autoconfig.nutritionz.option.carbohydrateItemId": "Kohlenhydrat Item Id", + "text.autoconfig.nutritionz.option.proteinItemId": "Protein Item Id", + "text.autoconfig.nutritionz.option.fatItemId": "Fett Item Id", + "text.autoconfig.nutritionz.option.vitaminItemId": "Vitamin Item Id", + "text.autoconfig.nutritionz.option.mineralItemId": "Mineral Item Id", + + "screen.nutritionz.carbohydrates": "Kohlenhydrate", + "screen.nutritionz.protein": "Proteine", + "screen.nutritionz.fat": "Fett", + "screen.nutritionz.vitamins": "Vitamine", + "screen.nutritionz.minerals": "Mineralien", + "screen.nutritionz.nutritionValue": "%s/%s", + + "item.nutritionz.nutrients": "§7Nährstoffe:", + "item.nutritionz.carbohydrates": " %s Kohlenhydrate", + "item.nutritionz.protein": " %s Proteine", + "item.nutritionz.fat": " %s Fett", + "item.nutritionz.vitamins": " %s Vitamine", + "item.nutritionz.minerals": " %s Mineralien" +} \ No newline at end of file diff --git a/src/main/resources/data/nutritionz/nutrition_manager/default.json b/src/main/resources/data/nutritionz/nutrition_manager/default.json index 09a74f4..820e13c 100644 --- a/src/main/resources/data/nutritionz/nutrition_manager/default.json +++ b/src/main/resources/data/nutritionz/nutrition_manager/default.json @@ -79,7 +79,7 @@ }, "minecraft:regeneration": { "duration": 319, - "amplifier": 1 + "amplifier": 0 } }, "negative": { @@ -100,7 +100,7 @@ "operation": "ADDITION", "value": 1.0 }, - "minecraft:absorption": { + "minecraft:haste": { "duration": 319, "amplifier": 0 } @@ -110,7 +110,7 @@ "operation": "ADDITION", "value": 1.0 }, - "minecraft:weakness": { + "minecraft:mining_fatigue": { "duration": 319, "amplifier": 0 } diff --git a/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/data/hybrid-aquatic/nutrition/hybrid-aquatic_items.json b/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/data/hybrid-aquatic/nutrition/hybrid-aquatic_items.json new file mode 100644 index 0000000..65d2519 --- /dev/null +++ b/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/data/hybrid-aquatic/nutrition/hybrid-aquatic_items.json @@ -0,0 +1,212 @@ +{ + "hybrid-aquatic:raw_fish_meat": { + "carbohydrates": 0, + "protein": 5, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:cooked_fish_meat": { + "carbohydrates": 0, + "protein": 10, + "fat": 10, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:raw_fish_steak": { + "carbohydrates": 0, + "protein": 12, + "fat": 8, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:cooked_fish_steak": { + "carbohydrates": 0, + "protein": 25, + "fat": 15, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:raw_tentacle": { + "carbohydrates": 0, + "protein": 4, + "fat": 6, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:cooked_tentacle": { + "carbohydrates": 0, + "protein": 8, + "fat": 12, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:raw_crab": { + "carbohydrates": 0, + "protein": 7, + "fat": 3, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:cooked_crab": { + "carbohydrates": 0, + "protein": 21, + "fat": 9, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:raw_lobster": { + "carbohydrates": 0, + "protein": 8, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:cooked_lobster": { + "carbohydrates": 0, + "protein": 32, + "fat": 8, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:cooked_shrimp": { + "carbohydrates": 0, + "protein": 20, + "fat": 10, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:cooked_crayfish": { + "carbohydrates": 0, + "protein": 24, + "fat": 6, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:tiger_barb": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:oscar": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:cowfish": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:unicorn_fish": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:lionfish": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:blue_spotted_stingray": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:piranha": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:anglerfish": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:barreleye": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:blue_tang": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:clownfish": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:needlefish": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:moray_eel": { + "carbohydrates": 0, + "protein": 10, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:triggerfish": { + "carbohydrates": 0, + "protein": 10, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:opah": { + "carbohydrates": 0, + "protein": 10, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:rockfish": { + "carbohydrates": 0, + "protein": 3, + "fat": 2, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:mahi_mahi": { + "carbohydrates": 0, + "protein": 10, + "fat": 5, + "vitamins": 0, + "minerals": 0 + }, + "hybrid-aquatic:yellowfin_tuna": { + "carbohydrates": 0, + "protein": 10, + "fat": 5, + "vitamins": 0, + "minerals": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.mcmeta new file mode 100644 index 0000000..7b09728 --- /dev/null +++ b/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "pack_format": 15, + "description": { + "text": "hybrid-aquatic nutritionz compat" + } + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.png b/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.png new file mode 100644 index 0000000..25b6b06 Binary files /dev/null and b/src/main/resources/resourcepacks/hybrid-aquatic_nutrition_compat/pack.png differ diff --git a/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/data/regions_unexplored/nutrition/regions_unexplored_items.json b/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/data/regions_unexplored/nutrition/regions_unexplored_items.json new file mode 100644 index 0000000..7d0d963 --- /dev/null +++ b/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/data/regions_unexplored/nutrition/regions_unexplored_items.json @@ -0,0 +1,30 @@ +{ + "regions_unexplored:haning_earlight_fruit": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 15, + "minerals": 15 + }, + "regions_unexplored:salmonberry": { + "carbohydrates": 0, + "protein": 5, + "fat": 5, + "vitamins": 5, + "minerals": 0 + }, + "regions_unexplored:meadow_sage": { + "carbohydrates": 0, + "protein": 0, + "fat": 0, + "vitamins": 8, + "minerals": 2 + }, + "regions_unexplored:duskmelon_slice": { + "carbohydrates": 0, + "protein": 5, + "fat": 0, + "vitamins": 10, + "minerals": 10 + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.mcmeta b/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.mcmeta new file mode 100644 index 0000000..5d81c2c --- /dev/null +++ b/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "pack_format": 15, + "description": { + "text": "regions_unexplored nutritionz compat" + } + } +} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.png b/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.png new file mode 100644 index 0000000..25b6b06 Binary files /dev/null and b/src/main/resources/resourcepacks/regions_unexplored_nutrition_compat/pack.png differ