Use recipe-based tooltips for food

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/flatbread.json

@@ -14,6 +14,6 @@
   ],
   "intermediate": "minecraft:air",
   "loot-table": "minecolonies:recipes/large_bottle",
-  "min-building-level": 1,
-  "result": "minecolonies:flatbread"
+  "result": "minecolonies:flatbread",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/lembas_scone.json

@@ -14,6 +14,6 @@
   ],
   "intermediate": "minecraft:air",
   "loot-table": "minecolonies:recipes/glass_bottle",
-  "min-building-level": 1,
-  "result": "minecolonies:lembas_scone"
+  "result": "minecolonies:lembas_scone",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/manchet.json

@@ -7,6 +7,6 @@
     }
   ],
   "intermediate": "minecraft:furnace",
-  "min-building-level": 1,
-  "result": "minecolonies:manchet_bread"
+  "result": "minecolonies:manchet_bread",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/manchet_dough.json

@@ -14,6 +14,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:manchet_dough"
+  "result": "minecolonies:manchet_dough",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/muffin.json

@@ -7,6 +7,6 @@
     }
   ],
   "intermediate": "minecraft:furnace",
-  "min-building-level": 1,
-  "result": "minecolonies:muffin"
+  "result": "minecolonies:muffin",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/muffin_dough.json

@@ -20,6 +20,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:muffin_dough"
+  "result": "minecolonies:muffin_dough",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/butter.json

@@ -12,6 +12,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:butter"
+  "result": "minecolonies:butter",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/cabochis.json

@@ -16,6 +16,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:cabochis"
+  "result": "minecolonies:cabochis",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/cheddar_cheese.json

@@ -12,6 +12,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:cheddar_cheese"
+  "result": "minecolonies:cheddar_cheese",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/congee.json

@@ -16,6 +16,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:congee"
+  "result": "minecolonies:congee",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/cooked_rice.json

@@ -10,6 +10,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:cooked_rice"
+  "result": "minecolonies:cooked_rice",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/eggplant_dolma.json

@@ -22,6 +22,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:eggplant_dolma"
+  "result": "minecolonies:eggplant_dolma",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/feta_cheese.json

@@ -12,6 +12,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:feta_cheese"
+  "result": "minecolonies:feta_cheese",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/hand_pie.json

@@ -19,6 +19,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:hand_pie"
+  "result": "minecolonies:hand_pie",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/lamb_stew.json

@@ -31,6 +31,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:lamb_stew"
+  "result": "minecolonies:lamb_stew",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pasta_plain.json

@@ -16,6 +16,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:pasta_plain"
+  "result": "minecolonies:pasta_plain",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pasta_tomato.json

@@ -22,6 +22,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:pasta_tomato"
+  "result": "minecolonies:pasta_tomato",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pepper_hummus.json

@@ -20,6 +20,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:pepper_hummus"
+  "result": "minecolonies:pepper_hummus",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pita_hummus.json

@@ -22,6 +22,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:pita_hummus"
+  "result": "minecolonies:pita_hummus",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pottage.json

@@ -22,6 +22,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:pottage"
+  "result": "minecolonies:pottage",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/raw_noodle.json

@@ -7,6 +7,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:raw_noodle"
+  "result": "minecolonies:raw_noodle",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/rice_ball.json

@@ -14,6 +14,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:rice_ball"
+  "result": "minecolonies:rice_ball",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/soy_milk.json

@@ -16,6 +16,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:large_soy_milk_bottle"
+  "result": "minecolonies:large_soy_milk_bottle",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/stew_trencher.json

@@ -16,6 +16,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:stew_trencher"
+  "result": "minecolonies:stew_trencher",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/stuffed_pepper.json

@@ -22,6 +22,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:stuffed_pepper"
+  "result": "minecolonies:stuffed_pepper",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/stuffed_pita.json

@@ -19,6 +19,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:stuffed_pita"
+  "result": "minecolonies:stuffed_pita",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/sushi_roll.json

@@ -20,6 +20,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:sushi_roll"
+  "result": "minecolonies:sushi_roll",
+  "show-tooltip": true
 }

src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/tofu.json

@@ -10,6 +10,6 @@
     }
   ],
   "intermediate": "minecraft:air",
-  "min-building-level": 1,
-  "result": "minecolonies:tofu"
+  "result": "minecolonies:tofu",
+  "show-tooltip": true
 }

src/main/java/com/minecolonies/api/util/constant/TranslationConstants.java

@@ -408,8 +408,6 @@ public final class TranslationConstants
     @NonNls
     public static final String CROP_TOOLTIP                                                         = "com.minecolonies.core.item.crop.tooltip";
     @NonNls
-    public static final String FOOD_TOOLTIP                                                         = "com.minecolonies.core.item.food.tooltip.";
-    @NonNls
     public static final String TIER_TOOLTIP                                                         = "com.minecolonies.core.item.food.tooltip.tier.";
     @NonNls
     public static final String BIOME_TOOLTIP                                                        = "com.minecolonies.core.item.crop.tooltip.biome";

src/main/java/com/minecolonies/apiimp/initializer/ModItemsInitializer.java

@@ -1,7 +1,6 @@
 package com.minecolonies.apiimp.initializer;
 
 import com.minecolonies.api.blocks.ModBlocks;
-import com.minecolonies.api.colony.jobs.ModJobs;
 import com.minecolonies.api.entity.ModEntities;
 import com.minecolonies.api.items.ModItems;
 import com.minecolonies.api.util.constant.Constants;
@@ -135,53 +134,53 @@ public static void init(final IForgeRegistry<Item> registry)
         ModItems.scanAnalyzer = new ItemScanAnalyzer("scan_analyzer", new Item.Properties());
 
         // Tier 1 Food Items
-        ModItems.cheddar_cheese = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1);
-        ModItems.feta_cheese = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1);
-        ModItems.cooked_rice = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1);
-        ModItems.tofu = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1);
-        ModItems.flatbread = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), ModJobs.BAKER_ID.getPath(), 1);
+        ModItems.cheddar_cheese = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), 1);
+        ModItems.feta_cheese = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), 1);
+        ModItems.cooked_rice = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), 1);
+        ModItems.tofu = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), 1);
+        ModItems.flatbread = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.6F).build()), 1);
 
         // Tier 2 Food Items
-        ModItems.manchet_bread = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.BAKER_ID.getPath(), 2);
-        ModItems.lembas_scone = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.BAKER_ID.getPath(), 2);
-        ModItems.muffin = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.BAKER_ID.getPath(), 2);
-        ModItems.pottage = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.CHEF_ID.getPath(), 2);
-        ModItems.pasta_plain = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.CHEF_ID.getPath(), 2);
+        ModItems.manchet_bread = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
+        ModItems.lembas_scone = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
+        ModItems.muffin = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
+        ModItems.pottage = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
+        ModItems.pasta_plain = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
 
         // Tier 3 Food items
-        ModItems.hand_pie = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3);
+        ModItems.hand_pie = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), 3);
 
         // Cold Biomes
         // Tier 2
-        ModItems.cabochis = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.CHEF_ID.getPath(), 2);
+        ModItems.cabochis = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
         // Tier 3
-        ModItems.lamb_stew = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3);
+        ModItems.lamb_stew = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), 3);
 
         // Hot Humid Biomes
         // Tier 2
-        ModItems.rice_ball = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.CHEF_ID.getPath(), 2);
+        ModItems.rice_ball = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
         // Tier 3
-        ModItems.sushi_roll = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3);
+        ModItems.sushi_roll = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), 3);
 
         // Temperate Biomes
         // Tier 2
-        ModItems.pasta_tomato = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.CHEF_ID.getPath(), 2);
+        ModItems.pasta_tomato = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
         // Tier 3
-        ModItems.eggplant_dolma = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3);
-        ModItems.stuffed_pita = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3);
+        ModItems.eggplant_dolma = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), 3);
+        ModItems.stuffed_pita = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), 3);
 
         // Hot Dry Biomes
         // Tier 2
-        ModItems.pepper_hummus = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.CHEF_ID.getPath(), 2);
+        ModItems.pepper_hummus = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
         // Tier 3
-        ModItems.pita_hummus = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3);
+        ModItems.pita_hummus = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), 3);
 
         // Require trading
         // Tier 2
-        ModItems.congee = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), ModJobs.CHEF_ID.getPath(), 2);
+        ModItems.congee = new ItemBowlFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(6).saturationMod(1.0F).build()), 2);
         // Tier 3
-        ModItems.stew_trencher = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3);
-        ModItems.stuffed_pepper = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3);
+        ModItems.stew_trencher = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), 3);
+        ModItems.stuffed_pepper = new ItemFood((new Item.Properties()).food(new FoodProperties.Builder().nutrition(8).saturationMod(1.2F).build()), 3);
 
         // Just dough
         ModItems.muffin_dough = new Item((new Item.Properties()));