From 4dd5580f8681f0b90f3b3bbb79eab1bd14f0c63a Mon Sep 17 00:00:00 2001 From: WakelessSloth56 Date: Sun, 24 Apr 2022 08:09:51 +0800 Subject: [PATCH] build: update to forge 40.1.0 --- README.md | 2 +- gradle.properties | 2 +- .../auioc/mcmod/arnicalib/mixin/server/MixinLivingEntity.java | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 51f83406..59b5e856 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Shared library for AH's Minecraft mods. [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/auioc/arnicalib-mcmod/dev-build?label=dev%20build&style=flat-square)](https://github.com/auioc/arnicalib-mcmod/actions/workflows/dev-build.yml)
![Minecraft](https://img.shields.io/static/v1?label=Minecraft&message=1.18.2&color=00aa00&style=flat-square) -[![Forge](https://img.shields.io/static/v1?label=Forge&message=40.0.44&color=e04e14&logo=Conda-Forge&style=flat-square)](http://files.minecraftforge.net/net/minecraftforge/forge/index_1.18.2.html) +[![Forge](https://img.shields.io/static/v1?label=Forge&message=40.1.0&color=e04e14&logo=Conda-Forge&style=flat-square)](http://files.minecraftforge.net/net/minecraftforge/forge/index_1.18.2.html) [![AdoptiumOpenJDK](https://img.shields.io/static/v1?label=AdoptiumOpenJDK&message=17.0.2%2B8&color=brightgreen&logo=java&style=flat-square)](https://adoptium.net) [![Gradle](https://img.shields.io/static/v1?label=Gradle&message=7.3&color=brightgreen&logo=gradle&style=flat-square)](https://docs.gradle.org/7.3/release-notes.html) diff --git a/gradle.properties b/gradle.properties index bce6851f..c4c73fb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx4G -Dhttps://maven.minecraftforge.net/=false org.gradle.daemon=false minecraft_version=1.18.2 -forge_version=40.0.44 +forge_version=40.1.0 mappings_channel=official mappings_version=1.18.2 diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLivingEntity.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLivingEntity.java index 4484010c..57b8128b 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLivingEntity.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLivingEntity.java @@ -27,7 +27,7 @@ private void addEatEffect(ItemStack stack, Level level, LivingEntity entity) { if (!level.isClientSide() && stack.isEdible()) { List effects = new ArrayList<>(); - for (Pair pair : stack.getItem().getFoodProperties().getEffects()) { + for (Pair pair : stack.getItem().getFoodProperties(stack, entity).getEffects()) { if (pair.getFirst() != null && level.random.nextFloat() < pair.getSecond()) { effects.add(new MobEffectInstance(pair.getFirst())); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 87b6b376..a22311e3 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -18,7 +18,7 @@ Shared library for AH's Minecraft mods. [[dependencies.arnicalib]] modId="forge" mandatory=true - versionRange="[40.0.35,)" + versionRange="[40.1.0,)" ordering="NONE" side="BOTH" [[dependencies.arnicalib]]