From 99ca7892133cc754dc450c957f33f012785f8b0e Mon Sep 17 00:00:00 2001 From: DatArnoGuy Date: Thu, 9 Jul 2026 16:29:12 +0300 Subject: [PATCH] Fix 1.21.5 - 1.21.11 saturationRatio (#75) * Fix food saturation for 1.21.4 - 1.21.11 * Revert "Merge branch 'PrismarineJS:main' into main" This reverts commit ce5b588c750b250777805ca2953cf2aa08a52556, reversing changes made to 52505caf9a147d6a89e38b7fad14cf02885e74ca. * Revert "Fix food saturation for 1.21.4 - 1.21.11 (#73)" This reverts commit 80ce09d3a97f24b40b3dc78ef49e6558f55c7890. * Reapply "Fix food saturation for 1.21.4 - 1.21.11 (#73)" This reverts commit 01a2e1ce83522eccfcf0cde418fe24dfe3e6dc0f. * Reapply "Merge branch 'PrismarineJS:main' into main" This reverts commit 7a829644230f0f5d4f0d2586160f4d48f3af66f8. * Fix 1.21.5 - 1.21.11 saturationRatio --- .../minecraftdatagenerator/generators/FoodsDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/FoodsDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/FoodsDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/FoodsDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/FoodsDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/FoodsDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/FoodsDataGenerator.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index d32ef26..5074558 100644 --- a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -25,8 +25,8 @@ public class FoodsDataGenerator implements IDataGenerator { FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD)); float foodPoints = foodComponent.nutrition(); - float saturationRatio = foodComponent.saturation() * 2.0F; float saturation = foodComponent.saturation(); + float saturationRatio = saturation / foodPoints; foodDesc.addProperty("foodPoints", foodPoints); foodDesc.addProperty("saturation", saturation); diff --git a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index ad3dbd3..645b471 100644 --- a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -25,8 +25,8 @@ public class FoodsDataGenerator implements IDataGenerator { FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD)); float foodPoints = foodComponent.nutrition(); - float saturationRatio = foodComponent.saturation() * 2.0F; float saturation = foodComponent.saturation(); + float saturationRatio = saturation / foodPoints; foodDesc.addProperty("foodPoints", foodPoints); foodDesc.addProperty("saturation", saturation); diff --git a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index d32ef26..5074558 100644 --- a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -25,8 +25,8 @@ public class FoodsDataGenerator implements IDataGenerator { FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD)); float foodPoints = foodComponent.nutrition(); - float saturationRatio = foodComponent.saturation() * 2.0F; float saturation = foodComponent.saturation(); + float saturationRatio = saturation / foodPoints; foodDesc.addProperty("foodPoints", foodPoints); foodDesc.addProperty("saturation", saturation); diff --git a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index d32ef26..5074558 100644 --- a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -25,8 +25,8 @@ public class FoodsDataGenerator implements IDataGenerator { FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD)); float foodPoints = foodComponent.nutrition(); - float saturationRatio = foodComponent.saturation() * 2.0F; float saturation = foodComponent.saturation(); + float saturationRatio = saturation / foodPoints; foodDesc.addProperty("foodPoints", foodPoints); foodDesc.addProperty("saturation", saturation); diff --git a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index d32ef26..5074558 100644 --- a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -25,8 +25,8 @@ public class FoodsDataGenerator implements IDataGenerator { FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD)); float foodPoints = foodComponent.nutrition(); - float saturationRatio = foodComponent.saturation() * 2.0F; float saturation = foodComponent.saturation(); + float saturationRatio = saturation / foodPoints; foodDesc.addProperty("foodPoints", foodPoints); foodDesc.addProperty("saturation", saturation); diff --git a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index d32ef26..5074558 100644 --- a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -25,8 +25,8 @@ public class FoodsDataGenerator implements IDataGenerator { FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD)); float foodPoints = foodComponent.nutrition(); - float saturationRatio = foodComponent.saturation() * 2.0F; float saturation = foodComponent.saturation(); + float saturationRatio = saturation / foodPoints; foodDesc.addProperty("foodPoints", foodPoints); foodDesc.addProperty("saturation", saturation); diff --git a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index d32ef26..5074558 100644 --- a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -25,8 +25,8 @@ public class FoodsDataGenerator implements IDataGenerator { FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD)); float foodPoints = foodComponent.nutrition(); - float saturationRatio = foodComponent.saturation() * 2.0F; float saturation = foodComponent.saturation(); + float saturationRatio = saturation / foodPoints; foodDesc.addProperty("foodPoints", foodPoints); foodDesc.addProperty("saturation", saturation);