From 52505caf9a147d6a89e38b7fad14cf02885e74ca Mon Sep 17 00:00:00 2001
From: DatArnoGuy <DatArnoGuy@users.noreply.github.com>
Date: Thu, 9 Jul 2026 01:08:36 +0300
Subject: [PATCH 1/6] Fix food saturation for 1.21.4 - 1.21.11

---
 .../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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 8f36b26..ad3dbd3 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         foodDesc.addProperty("foodPoints", foodPoints);
         foodDesc.addProperty("saturation", saturation);

From 7a829644230f0f5d4f0d2586160f4d48f3af66f8 Mon Sep 17 00:00:00 2001
From: DatArnoGuy <DatArnoGuy@users.noreply.github.com>
Date: Thu, 9 Jul 2026 11:47:34 +0300
Subject: [PATCH 2/6] Revert "Merge branch 'PrismarineJS:main' into main"

This reverts commit ce5b588c750b250777805ca2953cf2aa08a52556, reversing
changes made to 52505caf9a147d6a89e38b7fad14cf02885e74ca.
---
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 .../generators/BlocksDataGenerator.java                     | 6 +-----
 10 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 1de1bd5..324b4d9 100644
--- a/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 7023cb4..787fe43 100644
--- a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 80236a5..cc8b947 100644
--- a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index dfb6a56..5e260d0 100644
--- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 7023cb4..787fe43 100644
--- a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 7023cb4..787fe43 100644
--- a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 7023cb4..787fe43 100644
--- a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 7023cb4..787fe43 100644
--- a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 7023cb4..787fe43 100644
--- a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 1de1bd5..324b4d9 100644
--- a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,11 +115,7 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.stream()
-            .filter(m -> m.getMaterialName().startsWith("mineable/"))
-            .findFirst()
-            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
-            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
+        return matchingMaterials.getFirst().getMaterialName();
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {

From 01a2e1ce83522eccfcf0cde418fe24dfe3e6dc0f Mon Sep 17 00:00:00 2001
From: DatArnoGuy <DatArnoGuy@users.noreply.github.com>
Date: Thu, 9 Jul 2026 11:48:19 +0300
Subject: [PATCH 3/6] Revert "Fix food saturation for 1.21.4 - 1.21.11 (#73)"

This reverts commit 80ce09d3a97f24b40b3dc78ef49e6558f55c7890.
---
 .../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..de640ee 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodComponent.saturation();
+        float saturation = foodPoints * saturationRatio;
 
         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..8f36b26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodComponent.saturation();
+        float saturation = foodPoints * saturationRatio;
 
         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..de640ee 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodComponent.saturation();
+        float saturation = foodPoints * saturationRatio;
 
         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..de640ee 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodComponent.saturation();
+        float saturation = foodPoints * saturationRatio;
 
         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..de640ee 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodComponent.saturation();
+        float saturation = foodPoints * saturationRatio;
 
         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..de640ee 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodComponent.saturation();
+        float saturation = foodPoints * saturationRatio;
 
         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..de640ee 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodComponent.saturation();
+        float saturation = foodPoints * saturationRatio;
 
         foodDesc.addProperty("foodPoints", foodPoints);
         foodDesc.addProperty("saturation", saturation);

From 665fc638c3f373a5d1f947b120dbb244b5055166 Mon Sep 17 00:00:00 2001
From: DatArnoGuy <DatArnoGuy@users.noreply.github.com>
Date: Thu, 9 Jul 2026 11:52:05 +0300
Subject: [PATCH 4/6] Reapply "Fix food saturation for 1.21.4 - 1.21.11 (#73)"

This reverts commit 01a2e1ce83522eccfcf0cde418fe24dfe3e6dc0f.
---
 .../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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 8f36b26..ad3dbd3 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         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 de640ee..d32ef26 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
@@ -26,7 +26,7 @@ public static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
         FoodProperties foodComponent = Objects.requireNonNull(foodItem.components().get(DataComponents.FOOD));
         float foodPoints = foodComponent.nutrition();
         float saturationRatio = foodComponent.saturation() * 2.0F;
-        float saturation = foodPoints * saturationRatio;
+        float saturation = foodComponent.saturation();
 
         foodDesc.addProperty("foodPoints", foodPoints);
         foodDesc.addProperty("saturation", saturation);

From 289a64767ed40879c7ea34cd2ff8e5a916788fc2 Mon Sep 17 00:00:00 2001
From: DatArnoGuy <DatArnoGuy@users.noreply.github.com>
Date: Thu, 9 Jul 2026 11:52:37 +0300
Subject: [PATCH 5/6] Reapply "Merge branch 'PrismarineJS:main' into main"

This reverts commit 7a829644230f0f5d4f0d2586160f4d48f3af66f8.
---
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 .../generators/BlocksDataGenerator.java                     | 6 +++++-
 10 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 324b4d9..1de1bd5 100644
--- a/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 787fe43..7023cb4 100644
--- a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index cc8b947..80236a5 100644
--- a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 5e260d0..dfb6a56 100644
--- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 787fe43..7023cb4 100644
--- a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 787fe43..7023cb4 100644
--- a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 787fe43..7023cb4 100644
--- a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 787fe43..7023cb4 100644
--- a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 787fe43..7023cb4 100644
--- a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {
diff --git a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
index 324b4d9..1de1bd5 100644
--- a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+++ b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
@@ -115,7 +115,11 @@ private static String findMatchingBlockMaterial(BlockState blockState, List<Mate
         if (matchingMaterials.isEmpty()) {
             return "default";
         }
-        return matchingMaterials.getFirst().getMaterialName();
+        return matchingMaterials.stream()
+            .filter(m -> m.getMaterialName().startsWith("mineable/"))
+            .findFirst()
+            .map(MaterialsDataGenerator.MaterialInfo::getMaterialName)
+            .orElseGet(() -> matchingMaterials.getFirst().getMaterialName());
     }
 
     public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo> materials, Block block) {

From b973bdf2ca147d3694a4fe70c4dabec9428207bb Mon Sep 17 00:00:00 2001
From: DatArnoGuy <DatArnoGuy@users.noreply.github.com>
Date: Thu, 9 Jul 2026 11:57:28 +0300
Subject: [PATCH 6/6] 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 static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
 
         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 static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
 
         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 static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
 
         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 static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
 
         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 static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
 
         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 static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
 
         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 static JsonObject generateFoodDescriptor(Registry<Item> registry, Item fo
 
         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);