new visitor/name + fix #10450 (#10451)

port

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

@@ -3,7 +3,10 @@
   "crafter": "chef_crafting",
   "inputs": [
     {
-      "item": "minecolonies:garlic"
+      "id": "minecraft:kelp"
+    },
+    {
+      "id": "minecolonies:garlic"
     },
     {
       "item": "minecolonies:onion"

src/datagen/generated/minecolonies/data/minecolonies/tags/items/cook_product.json

@@ -43,8 +43,6 @@
     "minecolonies:mutton_dinner",
     "minecolonies:tortillas",
     "minecolonies:apple_pie",
-    "minecolonies:cheese_pizza",
-    "minecolonies:plain_cheesecake",
     "minecolonies:spicy_eggplant"
   ]
 }

src/main/java/com/minecolonies/api/creativetab/ModCreativeTabs.java

@@ -4,8 +4,10 @@
 import com.minecolonies.api.blocks.ModBlocks;
 import com.minecolonies.api.items.ModItems;
 import com.minecolonies.api.util.constant.Constants;
+import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -103,6 +105,11 @@ public final class ModCreativeTabs
           output.accept(ModItems.sifterMeshIron);
           output.accept(ModItems.sifterMeshDiamond);
 
+          output.accept(ModItems.breadDough);
+          output.accept(ModItems.cookieDough);
+          output.accept(ModItems.cakeBatter);
+          output.accept(ModItems.rawPumpkinPie);
+
           output.accept(ModItems.milkyBread);
           output.accept(ModItems.sugaryBread);
           output.accept(ModItems.goldenBread);

src/main/java/com/minecolonies/api/items/ModBannerPatterns.java

@@ -41,5 +41,7 @@ private ModBannerPatterns()
         BANNER_PATTERNS.register("threetriangles", () -> new BannerPattern("ttan"));
         BANNER_PATTERNS.register("theart", () -> new BannerPattern("thrt"));
         BANNER_PATTERNS.register("dragonhead", () -> new BannerPattern("drhd"));
+        BANNER_PATTERNS.register("tinyflowers", () -> new BannerPattern("tflw"));
+        BANNER_PATTERNS.register("stripe_middle_up", () -> new BannerPattern("stmiu"));
     }
 }

src/main/java/com/minecolonies/core/client/gui/townhall/WindowMainPage.java

@@ -264,13 +264,15 @@ public void onUpdate()
 
         if (isFeatureUnlocked.get())
         {
+            findPaneByID(BUTTON_PATREON).hide();
             textPane.enable();
             namePane.enable();
             textPane.show();
             resetButton.hide();
         }
         else
         {
+            findPaneByID(BUTTON_PATREON).show();
             textPane.disable();
             namePane.disable();
 

src/main/java/com/minecolonies/core/colony/buildings/AbstractBuilding.java

@@ -1522,7 +1522,14 @@ public Collection<IRequest<?>> getOpenRequests(final int citizenId)
     @Override
     public boolean hasWorkerOpenRequestsFiltered(final int citizenId, @NotNull final Predicate<IRequest<?>> selectionPredicate)
     {
-        return getOpenRequests(citizenId).stream().anyMatch(selectionPredicate);
+        for (final IRequest<?> req : getOpenRequests(citizenId))
+        {
+            if (selectionPredicate.test(req))
+            {
+                return true;
+            }
+        }
+        return false;
     }
 
     @Override
@@ -1535,7 +1542,7 @@ public boolean hasOpenSyncRequest(@NotNull final ICitizenData citizen)
 
         for (final IToken<?> token : getOpenRequestsByCitizen().get(citizen.getId()))
         {
-            if (!citizen.isRequestAsync(token))
+            if (!citizen.isRequestAsync(token) && colony.getRequestManager().getRequestForToken(token) != null)
             {
                 return true;
             }

src/main/java/com/minecolonies/core/generation/defaults/DefaultItemTagsProvider.java

@@ -269,8 +269,6 @@ protected void addTags(final HolderLookup.Provider p_256380_)
           .add(ModItems.mutton_dinner)
           .add(ModItems.tortillas)
           .add(ModItems.apple_pie)
-          .add(ModItems.cheese_pizza)
-          .add(ModItems.plain_cheesecake)
           .add(ModItems.spicy_eggplant);
 
         tag(ModTags.crafterProductExclusions.get(TagConstants.CRAFTING_COOK))

src/main/java/com/minecolonies/core/generation/defaults/workers/DefaultChefCraftingProvider.java

@@ -169,6 +169,7 @@ protected void registerRecipes(@NotNull final Consumer<FinishedRecipe> consumer)
 
         CustomRecipeBuilder.create(CHEF, MODULE_CRAFTING, "ramen")
           .inputs(List.of(
+            new ItemStorage(new ItemStack(Items.KELP)),
             new ItemStorage(new ItemStack(ModBlocks.blockGarlic)),
             new ItemStorage(new ItemStack(ModBlocks.blockOnion)),
             new ItemStorage(new ItemStack(ModItems.raw_noodle)),

src/main/resources/assets/minecolonies/lang/manual_en_us.json

@@ -2277,6 +2277,7 @@
   "com.minecolonies.building.postbox": "Postbox",
 
   "com.minecolonies.coremod.gui.chat.potatogod": "I used to be just Jack then I made a bet with the Devil.. What was his name?.. 'Ray', I think. Anyways, being a cactus has.. interrupted my relationships. I've been wandering these lands for as long as I can remember. Then finally, I saw your pathetic village and thought 'hmm.. someone that lame could definitely use my help!'",
+  "com.minecolonies.coremod.gui.chat.legodoc": "While experimenting with ender pearls, I somehow turned into a blue fox. Now, I’m trying to settle down and figure out how to undo this—or at least, get rid of the relentless urge to chase every chicken I come across.",
   "com.minecolonies.coremod.recruit.message.custom": "%s has decided to stay in your colony as a citizen! They quickly switched out of their travellers gear into some new clothes to fit in!",
   "com.minecolonies.coremod.gui.workerhuts.warehouse.couriers": "Couriers",
 

src/main/resources/assets/minecolonies/models/item/cake_batter.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/cake_batter"
+  }
+}

src/main/resources/data/minecolonies/citizennames/default.json

@@ -108,7 +108,7 @@
       "Mabel", "Maci", "Macie", "Mackenzie", "Macy", "Madalyn", "Madalynn", "Maddison", "Madeleine", "Madeline", "Madelyn", "Madelynn", "Madilyn", "Madilynn", "Madison",
       "Madisyn", "Mae", "Maeve", "Magdalena", "Maggie", "Magnolia", "Maia", "Maisie", "Maisy", "Makayla", "Makenna", "Makenzie", "Malani", "Malaya", "Malayah", "Malaysia",
       "Maleah", "Malia", "Maliah", "Maliyah", "Mallory", "Mara", "Maren", "Margaret", "Margery", "Margo", "Margot", "Maria", "Mariah", "Mariam", "Mariana", "Marianna", "Marie",
-      "Marilyn", "Marina", "Marine", "Marion", "Marissa", "Marlee", "Marley", "Martha", "Mary", "Maryam", "Matilda", "Maud", "Mavis", "Maxine", "Maya", "Mckenna", "Mckenzie",
+      "Marilyn", "Marina", "Marine", "Marion", "Marissa", "Marlee", "Marley", "Martha", "Mary", "Maryam", "Maryana", "Matilda", "Maud", "Mavis", "Maxine", "Maya", "Mckenna", "Mckenzie",
       "Mckinley", "Meadow", "Megan", "Meghan", "Meilani", "Mildred", "Milena", "Miley", "Millicent", "Millie", "Mina", "Mira", "Miracle", "Miranda", "Miriam", "Molly", "Monica",
       "Monroe", "Morgan", "Mya", "Myah", "Myla", "Mylah", "Myra", "Nadia", "Nala", "Nalani", "Nancy", "Naomi", "Natalia", "Natalie", "Nataly", "Natasha", "Nathalie", "Navy",
       "Nayeli", "Nellie", "Nevaeh", "Nia", "Mélanie", "Melanie", "Melany", "Melina", "Melissa", "Melody", "Mercy", "Meredith", "Mia", "Miah", "Micah", "Michaela", "Michelle",
@@ -145,6 +145,6 @@
       "Hadresham", "Hakebourne", "Hale", "Hall", "Halley", "Hambard", "Hammer", "Hammond", "Hampden", "Harris", "Ito", "Jalin", "Janeli", "Johnson", "Johnston", "Jones",
       "Karpinksi", "Kemp", "Kennedy", "Kolanowski", "Kravitz", "Kumar", "LaClair", "Magic", "Madden", "Mardle", "McCarthy", "McDonald", "McGee", "McKenzie", "Mekkelsen", "Mello",
       "Miller", "Moontail", "Nair", "Pericherla","Purves", "Rao", "Reddy", "Reeves","Revaluri", "Rhino", "Robinson", "Skellett", "Smith", "Souri", "Sparrow", "Taylor", "Tenford", "Thorpe", "Wallgreen", "Walsh", "White",
-      "Williams", "Wilson"
+      "Williams", "Wilson", "van Ast"
     ]
 }

src/main/resources/data/minecolonies/visitors/legodoc.json

@@ -0,0 +1,12 @@
+{
+  "texture": "1e79f62a-d205-4f56-bc15-1dcd6d50a52c",
+  "citizensuffix": "_w",
+  "name": "Lupin Vulpes",
+  "chance": 0.001,
+  "storylangkey": "com.minecolonies.coremod.gui.chat.legodoc",
+  "recruitcost": "minecraft:piston",
+  "recruitcostcount": 5,
+  "gender": "male",
+  "primaryskill": "Knowledge",
+  "secondaryskill": "Agility"
+}