Skip to content

Commit

Permalink
Fix pepper hummus (#10178)
Browse files Browse the repository at this point in the history 
Fix "pepper hummus" food item missing from game.
Re-order Food creative tab into more logical groups.
Reuse existing recipe-based tooltip system instead of hard-coding custom tooltips.
Remove redundant minimum level 1 building restrictions (since level 0 can't craft anyway).
  • Loading branch information
@uecasm
uecasm authored Sep 5, 2024
1 parent 843d442 commit bce345d
Show file tree
Hide file tree
Showing 36 changed files with 130 additions and 142 deletions.
3 changes: 3 additions & 0 deletions src/datagen/generated/minecolonies/data/minecolonies/compatibility/itemnbtmatching.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,9 @@
{
"item": "minecolonies:pasta_tomato"
},
{
"item": "minecolonies:pepper_hummus"
},
{
"checkednbtkeys": [
{
Expand Down
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/flatbread.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/lembas_scone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/manchet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
}
],
"intermediate": "minecraft:furnace",
"min-building-level": 1,
"result": "minecolonies:manchet_bread"
"result": "minecolonies:manchet_bread",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/manchet_dough.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:manchet_dough"
"result": "minecolonies:manchet_dough",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/muffin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
}
],
"intermediate": "minecraft:furnace",
"min-building-level": 1,
"result": "minecolonies:muffin"
"result": "minecolonies:muffin",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/baker/muffin_dough.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:muffin_dough"
"result": "minecolonies:muffin_dough",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/butter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:butter"
"result": "minecolonies:butter",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/cabochis.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:cabochis"
"result": "minecolonies:cabochis",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/cheddar_cheese.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:cheddar_cheese"
"result": "minecolonies:cheddar_cheese",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/congee.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:congee"
"result": "minecolonies:congee",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/cooked_rice.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:cooked_rice"
"result": "minecolonies:cooked_rice",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/eggplant_dolma.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:eggplant_dolma"
"result": "minecolonies:eggplant_dolma",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/feta_cheese.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:feta_cheese"
"result": "minecolonies:feta_cheese",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/hand_pie.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:hand_pie"
"result": "minecolonies:hand_pie",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/lamb_stew.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:lamb_stew"
"result": "minecolonies:lamb_stew",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pasta_plain.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:pasta_plain"
"result": "minecolonies:pasta_plain",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pasta_tomato.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:pasta_tomato"
"result": "minecolonies:pasta_tomato",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pepper_hummus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:pepper_hummus"
"result": "minecolonies:pepper_hummus",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pita_hummus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:pita_hummus"
"result": "minecolonies:pita_hummus",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/pottage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:pottage"
"result": "minecolonies:pottage",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/raw_noodle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:raw_noodle"
"result": "minecolonies:raw_noodle",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/rice_ball.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:rice_ball"
"result": "minecolonies:rice_ball",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/soy_milk.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/stew_trencher.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:stew_trencher"
"result": "minecolonies:stew_trencher",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/stuffed_pepper.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:stuffed_pepper"
"result": "minecolonies:stuffed_pepper",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/stuffed_pita.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:stuffed_pita"
"result": "minecolonies:stuffed_pita",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/sushi_roll.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:sushi_roll"
"result": "minecolonies:sushi_roll",
"show-tooltip": true
}
4 changes: 2 additions & 2 deletions src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/tofu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
}
],
"intermediate": "minecraft:air",
"min-building-level": 1,
"result": "minecolonies:tofu"
"result": "minecolonies:tofu",
"show-tooltip": true
}
32 changes: 18 additions & 14 deletions src/main/java/com/minecolonies/api/creativetab/ModCreativeTabs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,30 +114,44 @@ public final class ModCreativeTabs
output.accept(crop);
}

// bottles
output.accept(ModItems.large_empty_bottle);
output.accept(ModItems.large_water_bottle);
output.accept(ModItems.large_milk_bottle);
output.accept(ModItems.large_soy_milk_bottle);

// ingredients
output.accept(ModItems.breadDough);
output.accept(ModItems.cookieDough);
output.accept(ModItems.cakeBatter);
output.accept(ModItems.rawPumpkinPie);
output.accept(ModItems.muffin_dough);
output.accept(ModItems.manchet_dough);
output.accept(ModItems.raw_noodle);
output.accept(ModItems.butter);

// baker products
output.accept(ModItems.milkyBread);
output.accept(ModItems.sugaryBread);
output.accept(ModItems.goldenBread);
output.accept(ModItems.chorusBread);
output.accept(ModItems.flatbread);
output.accept(ModItems.lembas_scone);
output.accept(ModItems.manchet_bread);
output.accept(ModItems.muffin);

output.accept(ModItems.butter);
// chef products
output.accept(ModItems.cabochis);
output.accept(ModItems.cheddar_cheese);
output.accept(ModItems.congee);
output.accept(ModItems.cooked_rice);
output.accept(ModItems.eggplant_dolma);
output.accept(ModItems.feta_cheese);
output.accept(ModItems.flatbread);
output.accept(ModItems.hand_pie);
output.accept(ModItems.lamb_stew);
output.accept(ModItems.lembas_scone);
output.accept(ModItems.manchet_bread);
output.accept(ModItems.pasta_plain);
output.accept(ModItems.pasta_tomato);
output.accept(ModItems.pepper_hummus);
output.accept(ModItems.pita_hummus);
output.accept(ModItems.pottage);
output.accept(ModItems.rice_ball);
Expand All @@ -146,16 +160,6 @@ public final class ModCreativeTabs
output.accept(ModItems.stuffed_pita);
output.accept(ModItems.sushi_roll);
output.accept(ModItems.tofu);

output.accept(ModItems.large_water_bottle);
output.accept(ModItems.large_milk_bottle);
output.accept(ModItems.large_soy_milk_bottle);
output.accept(ModItems.large_empty_bottle);

output.accept(ModItems.muffin);
output.accept(ModItems.muffin_dough);
output.accept(ModItems.manchet_dough);
output.accept(ModItems.raw_noodle);
}).build());

/**
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/minecolonies/api/util/constant/TranslationConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading

0 comments on commit bce345d

Please sign in to comment.