Merge branch 'version/1.21' into fix/food_tags

# Conflicts: # src/main/java/com/minecolonies/api/items/ModItems.java # src/main/java/com/minecolonies/apiimp/initializer/ModItemsInitializer.java # src/main/java/com/minecolonies/core/generation/defaults/DefaultItemTagsProvider.java # src/main/java/com/minecolonies/core/items/ItemFood.java
ldtteam · Nov 17, 2024 · 24241c5 · 24241c5
2 parents e718edf + fac7b50
commit 24241c5
Show file tree

Hide file tree

Showing 823 changed files with 9,968 additions and 3,168 deletions.
diff --git a/documentation/formatter/intellij/Minecolonies.xml b/documentation/formatter/intellij/Minecolonies.xml
@@ -15,6 +15,8 @@
     <option name="WRAP_COMMENTS" value="true" />
     <JavaCodeStyleSettings>
         <option name="BLANK_LINES_AROUND_INITIALIZER" value="0" />
+        <option name="RECORD_COMPONENTS_WRAP" value="2"/>
+        <option name="NEW_LINE_AFTER_LPAREN_IN_RECORD_HEADER" value="true"/>
     </JavaCodeStyleSettings>
     <MarkdownNavigatorCodeStyleSettings>
         <option name="RIGHT_MARGIN" value="72" />
@@ -66,8 +68,8 @@
         <option name="FOR_BRACE_FORCE" value="3" />
         <option name="ENUM_CONSTANTS_WRAP" value="2" />
         <indentOptions>
-            <option name="CONTINUATION_INDENT_SIZE" value="2" />
-            <option name="USE_RELATIVE_INDENTS" value="true" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4"/>
+            <option name="USE_RELATIVE_INDENTS" value="false"/>
         </indentOptions>
         <arrangement>
             <groups>

diff --git a/gradle.properties b/gradle.properties
@@ -79,7 +79,6 @@ usesSonarQube=true
 
 usesCrowdInTranslationManagement=true
 crowdInDownloadDirectory=src/main/resources/assets/minecolonies/lang
-usesCrowdInBuildingWithFilteredBranches=true
-usesCrowdInUploadWithFilteredBranches=true
+usesCrowdInUploadWithFilteredBranchesSpec=(version|release)\/.+
 
 additionalModsInDataGen=structurize;domum_ornamentum
diff --git a/...minecolonies/models/item/raw_noodles.json → ...s/minecolonies/models/item/apple_pie.json b/...minecolonies/models/item/raw_noodles.json → ...s/minecolonies/models/item/apple_pie.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecolonies:item/food/raw_noodles"
+    "layer0": "minecolonies:item/food/apple_pie"
   }
 }
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/baked_salmon.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/baked_salmon.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/baked_salmon"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/borscht.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/borscht.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/borscht"
+  }
+}
diff --git a/...sets/minecolonies/models/item/butter.json → ...sets/minecolonies/models/item/butter.json b/...sets/minecolonies/models/item/butter.json → ...sets/minecolonies/models/item/butter.json
diff --git a/...ts/minecolonies/models/item/cabochis.json → ...ts/minecolonies/models/item/cabochis.json b/...ts/minecolonies/models/item/cabochis.json → ...ts/minecolonies/models/item/cabochis.json
diff --git a/...ecolonies/models/item/cheddar_cheese.json → ...ecolonies/models/item/cheddar_cheese.json b/...ecolonies/models/item/cheddar_cheese.json → ...ecolonies/models/item/cheddar_cheese.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/cheese_pizza.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/cheese_pizza.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/cheese_pizza"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/cheese_ravioli.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/cheese_ravioli.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/cheese_ravioli"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/chicken_broth.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/chicken_broth.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/chicken_broth"
+  }
+}
diff --git a/...sets/minecolonies/models/item/congee.json → ...sets/minecolonies/models/item/congee.json b/...sets/minecolonies/models/item/congee.json → ...sets/minecolonies/models/item/congee.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/cooked_rice.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/cooked_rice.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/cooked_rice"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/corn_chowder.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/corn_chowder.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/corn_chowder"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/cornmeal.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/cornmeal.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/cornmeal"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/creamcheese.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/creamcheese.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/creamcheese"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/eggdrop_soup.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/eggdrop_soup.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/eggdrop_soup"
+  }
+}
diff --git a/...ecolonies/models/item/eggplant_dolma.json → ...ecolonies/models/item/eggplant_dolma.json b/...ecolonies/models/item/eggplant_dolma.json → ...ecolonies/models/item/eggplant_dolma.json
diff --git a/...minecolonies/models/item/feta_cheese.json → ...minecolonies/models/item/feta_cheese.json b/...minecolonies/models/item/feta_cheese.json → ...minecolonies/models/item/feta_cheese.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/fish_dinner.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/fish_dinner.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/fish_dinner"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/fish_n_chips.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/fish_n_chips.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/fish_n_chips"
+  }
+}
diff --git a/...s/minecolonies/models/item/flatbread.json → ...s/minecolonies/models/item/flatbread.json b/...s/minecolonies/models/item/flatbread.json → ...s/minecolonies/models/item/flatbread.json
diff --git a/...ts/minecolonies/models/item/hand_pie.json → ...ts/minecolonies/models/item/hand_pie.json b/...ts/minecolonies/models/item/hand_pie.json → ...ts/minecolonies/models/item/hand_pie.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/kebab.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/kebab.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/kebab"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/kimchi.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/kimchi.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/kimchi"
+  }
+}
diff --git a/...s/minecolonies/models/item/lamb_stew.json → ...s/minecolonies/models/item/lamb_stew.json b/...s/minecolonies/models/item/lamb_stew.json → ...s/minecolonies/models/item/lamb_stew.json
diff --git a/...inecolonies/models/item/lembas_scone.json → ...inecolonies/models/item/lembas_scone.json b/...inecolonies/models/item/lembas_scone.json → ...inecolonies/models/item/lembas_scone.json
diff --git a/...necolonies/models/item/manchet_bread.json → ...necolonies/models/item/manchet_bread.json b/...necolonies/models/item/manchet_bread.json → ...necolonies/models/item/manchet_bread.json
diff --git a/...necolonies/models/item/manchet_dough.json → ...necolonies/models/item/manchet_dough.json b/...necolonies/models/item/manchet_dough.json → ...necolonies/models/item/manchet_dough.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/meat_ravioli.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/meat_ravioli.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/meat_ravioli"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mint_jelly.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mint_jelly.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/mint_jelly"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mint_tea.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mint_tea.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/mint_tea"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mintchoco_cheesecake.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mintchoco_cheesecake.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/mintchoco_cheesecake"
+  }
+}
diff --git a/...sets/minecolonies/models/item/muffin.json → ...sets/minecolonies/models/item/muffin.json b/...sets/minecolonies/models/item/muffin.json → ...sets/minecolonies/models/item/muffin.json
diff --git a/...inecolonies/models/item/muffin_dough.json → ...inecolonies/models/item/muffin_dough.json b/...inecolonies/models/item/muffin_dough.json → ...inecolonies/models/item/muffin_dough.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mushroom_pizza.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mushroom_pizza.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/mushroom_pizza"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mutton_dinner.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/mutton_dinner.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/mutton_dinner"
+  }
+}
diff --git a/...minecolonies/models/item/pasta_plain.json → ...minecolonies/models/item/pasta_plain.json b/...minecolonies/models/item/pasta_plain.json → ...minecolonies/models/item/pasta_plain.json
diff --git a/...inecolonies/models/item/pasta_tomato.json → ...inecolonies/models/item/pasta_tomato.json b/...inecolonies/models/item/pasta_tomato.json → ...inecolonies/models/item/pasta_tomato.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/pea_soup.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/pea_soup.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/pea_soup"
+  }
+}
diff --git a/...necolonies/models/item/pepper_hummus.json → ...necolonies/models/item/pepper_hummus.json b/...necolonies/models/item/pepper_hummus.json → ...necolonies/models/item/pepper_hummus.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/pierogi.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/pierogi.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/pierogi"
+  }
+}
diff --git a/...minecolonies/models/item/pita_hummus.json → ...minecolonies/models/item/pita_hummus.json b/...minecolonies/models/item/pita_hummus.json → ...minecolonies/models/item/pita_hummus.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/plain_cheesecake.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/plain_cheesecake.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/plain_cheesecake"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/polenta.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/polenta.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/polenta"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/potato_soup.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/potato_soup.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/potato_soup"
+  }
+}
diff --git a/...ets/minecolonies/models/item/pottage.json → ...ets/minecolonies/models/item/pottage.json b/...ets/minecolonies/models/item/pottage.json → ...ets/minecolonies/models/item/pottage.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/ramen.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/ramen.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/ramen"
+  }
+}
diff --git a/.../minecolonies/models/item/raw_noodle.json → .../minecolonies/models/item/raw_noodle.json b/.../minecolonies/models/item/raw_noodle.json → .../minecolonies/models/item/raw_noodle.json
diff --git a/...s/minecolonies/models/item/rice_ball.json → ...s/minecolonies/models/item/rice_ball.json b/...s/minecolonies/models/item/rice_ball.json → ...s/minecolonies/models/item/rice_ball.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/schnitzel.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/schnitzel.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/schnitzel"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/soysauce.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/soysauce.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/soysauce"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/spicy_eggplant.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/spicy_eggplant.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/spicy_eggplant"
+  }
+}
diff --git a/...datagen/generated/minecolonies/assets/minecolonies/models/item/spicy_grilled_chicken.json b/...datagen/generated/minecolonies/assets/minecolonies/models/item/spicy_grilled_chicken.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/spicy_grilled_chicken"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/squash_soup.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/squash_soup.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/squash_soup"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/steak_dinner.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/steak_dinner.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/steak_dinner"
+  }
+}
diff --git a/...necolonies/models/item/stew_trencher.json → ...necolonies/models/item/stew_trencher.json b/...necolonies/models/item/stew_trencher.json → ...necolonies/models/item/stew_trencher.json
diff --git a/...ecolonies/models/item/stuffed_pepper.json → ...ecolonies/models/item/stuffed_pepper.json b/...ecolonies/models/item/stuffed_pepper.json → ...ecolonies/models/item/stuffed_pepper.json
diff --git a/...inecolonies/models/item/stuffed_pita.json → ...inecolonies/models/item/stuffed_pita.json b/...inecolonies/models/item/stuffed_pita.json → ...inecolonies/models/item/stuffed_pita.json
diff --git a/.../minecolonies/models/item/sushi_roll.json → .../minecolonies/models/item/sushi_roll.json b/.../minecolonies/models/item/sushi_roll.json → .../minecolonies/models/item/sushi_roll.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/tacos.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/tacos.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/tacos"
+  }
+}
diff --git a/...assets/minecolonies/models/item/tofu.json → ...assets/minecolonies/models/item/tofu.json b/...assets/minecolonies/models/item/tofu.json → ...assets/minecolonies/models/item/tofu.json
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/tortillas.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/tortillas.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/tortillas"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_quiche.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_quiche.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/veggie_quiche"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_ravioli.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_ravioli.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/veggie_ravioli"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_soup.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/veggie_soup.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/veggie_soup"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/yogurt.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/yogurt.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/yogurt"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/assets/minecolonies/models/item/yogurt_with_berries.json b/src/datagen/generated/minecolonies/assets/minecolonies/models/item/yogurt_with_berries.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/food/yogurt_with_berries"
+  }
+}
diff --git a/src/datagen/generated/minecolonies/data/c/tags/item/foods.json b/src/datagen/generated/minecolonies/data/c/tags/item/foods.json
@@ -3,29 +3,6 @@
     "minecolonies:milky_bread",
     "minecolonies:sugary_bread",
     "minecolonies:golden_bread",
-    "minecolonies:chorus_bread",
-    "minecolonies:cabochis",
-    "minecolonies:cheddar_cheese",
-    "minecolonies:congee",
-    "minecolonies:cooked_rice",
-    "minecolonies:eggplant_dolma",
-    "minecolonies:feta_cheese",
-    "minecolonies:flatbread",
-    "minecolonies:hand_pie",
-    "minecolonies:lamb_stew",
-    "minecolonies:lembas_scone",
-    "minecolonies:manchet_bread",
-    "minecolonies:muffin",
-    "minecolonies:pasta_plain",
-    "minecolonies:pasta_tomato",
-    "minecolonies:pepper_hummus",
-    "minecolonies:pita_hummus",
-    "minecolonies:pottage",
-    "minecolonies:rice_ball",
-    "minecolonies:stew_trencher",
-    "minecolonies:stuffed_pepper",
-    "minecolonies:stuffed_pita",
-    "minecolonies:sushi_roll",
-    "minecolonies:tofu"
+    "minecolonies:chorus_bread"
   ]
 }
diff --git a/src/datagen/generated/minecolonies/data/c/tags/item/foods/bread.json b/src/datagen/generated/minecolonies/data/c/tags/item/foods/bread.json
@@ -3,13 +3,6 @@
     "minecolonies:milky_bread",
     "minecolonies:sugary_bread",
     "minecolonies:golden_bread",
-    "minecolonies:chorus_bread",
-    "minecolonies:flatbread",
-    "minecolonies:hand_pie",
-    "minecolonies:lembas_scone",
-    "minecolonies:manchet_bread",
-    "minecolonies:muffin",
-    "minecolonies:stew_trencher",
-    "minecolonies:stuffed_pita"
+    "minecolonies:chorus_bread"
   ]
 }