From bb50bbf6c10531793b77a8e685fb2254ceb191ff Mon Sep 17 00:00:00 2001
From: Raycoms <ray.neiheiser@gmail.com>
Date: Sun, 17 Nov 2024 10:07:45 +0100
Subject: [PATCH] new visitor/name + fix #10450 (#10451)

port
---
 .../minecolonies/crafterrecipes/chef/ramen.json  |   5 ++++-
 .../minecolonies/tags/items/cook_product.json    |   2 --
 .../api/creativetab/ModCreativeTabs.java         |   7 +++++++
 .../api/items/ModBannerPatterns.java             |   2 ++
 .../core/client/gui/townhall/WindowMainPage.java |   2 ++
 .../core/colony/buildings/AbstractBuilding.java  |  11 +++++++++--
 .../defaults/DefaultItemTagsProvider.java        |   2 --
 .../workers/DefaultChefCraftingProvider.java     |   1 +
 .../assets/minecolonies/lang/manual_en_us.json   |   1 +
 .../minecolonies/models/item/cake_batter.json    |   6 ++++++
 .../textures/entity/banner/stripe_middle_up.png  | Bin 0 -> 4995 bytes
 .../textures/entity/banner/tinyflowers.png       | Bin 0 -> 4839 bytes
 .../textures/entity/shield/stripe_middle_up.png  | Bin 0 -> 4995 bytes
 .../textures/entity/shield/tinyflowers.png       | Bin 0 -> 5072 bytes
 .../data/minecolonies/citizennames/default.json  |   4 ++--
 .../data/minecolonies/visitors/legodoc.json      |  12 ++++++++++++
 16 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/assets/minecolonies/models/item/cake_batter.json
 create mode 100644 src/main/resources/assets/minecolonies/textures/entity/banner/stripe_middle_up.png
 create mode 100644 src/main/resources/assets/minecolonies/textures/entity/banner/tinyflowers.png
 create mode 100644 src/main/resources/assets/minecolonies/textures/entity/shield/stripe_middle_up.png
 create mode 100644 src/main/resources/assets/minecolonies/textures/entity/shield/tinyflowers.png
 create mode 100644 src/main/resources/data/minecolonies/visitors/legodoc.json

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/ramen.json b/src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/ramen.json
index f5d34780425..e64e3ce1815 100644
--- a/src/datagen/generated/minecolonies/data/minecolonies/crafterrecipes/chef/ramen.json
+++ b/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"
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/tags/items/cook_product.json b/src/datagen/generated/minecolonies/data/minecolonies/tags/items/cook_product.json
index 2e594f16846..cc9ed349941 100644
--- a/src/datagen/generated/minecolonies/data/minecolonies/tags/items/cook_product.json
+++ b/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"
   ]
 }
\ No newline at end of file
diff --git a/src/main/java/com/minecolonies/api/creativetab/ModCreativeTabs.java b/src/main/java/com/minecolonies/api/creativetab/ModCreativeTabs.java
index 266a67c57c0..a769c8b672f 100755
--- a/src/main/java/com/minecolonies/api/creativetab/ModCreativeTabs.java
+++ b/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);
diff --git a/src/main/java/com/minecolonies/api/items/ModBannerPatterns.java b/src/main/java/com/minecolonies/api/items/ModBannerPatterns.java
index 445c6436051..d063472cf7a 100755
--- a/src/main/java/com/minecolonies/api/items/ModBannerPatterns.java
+++ b/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"));
     }
 }
diff --git a/src/main/java/com/minecolonies/core/client/gui/townhall/WindowMainPage.java b/src/main/java/com/minecolonies/core/client/gui/townhall/WindowMainPage.java
index deb65ccd624..64b8455c478 100644
--- a/src/main/java/com/minecolonies/core/client/gui/townhall/WindowMainPage.java
+++ b/src/main/java/com/minecolonies/core/client/gui/townhall/WindowMainPage.java
@@ -264,6 +264,7 @@ public void onUpdate()
 
         if (isFeatureUnlocked.get())
         {
+            findPaneByID(BUTTON_PATREON).hide();
             textPane.enable();
             namePane.enable();
             textPane.show();
@@ -271,6 +272,7 @@ public void onUpdate()
         }
         else
         {
+            findPaneByID(BUTTON_PATREON).show();
             textPane.disable();
             namePane.disable();
 
diff --git a/src/main/java/com/minecolonies/core/colony/buildings/AbstractBuilding.java b/src/main/java/com/minecolonies/core/colony/buildings/AbstractBuilding.java
index a790083d893..d0433533c16 100755
--- a/src/main/java/com/minecolonies/core/colony/buildings/AbstractBuilding.java
+++ b/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;
             }
diff --git a/src/main/java/com/minecolonies/core/generation/defaults/DefaultItemTagsProvider.java b/src/main/java/com/minecolonies/core/generation/defaults/DefaultItemTagsProvider.java
index 66d5dacece9..deffb6ebc8e 100644
--- a/src/main/java/com/minecolonies/core/generation/defaults/DefaultItemTagsProvider.java
+++ b/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))
diff --git a/src/main/java/com/minecolonies/core/generation/defaults/workers/DefaultChefCraftingProvider.java b/src/main/java/com/minecolonies/core/generation/defaults/workers/DefaultChefCraftingProvider.java
index 4e8359d016c..469826fe424 100644
--- a/src/main/java/com/minecolonies/core/generation/defaults/workers/DefaultChefCraftingProvider.java
+++ b/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)),
diff --git a/src/main/resources/assets/minecolonies/lang/manual_en_us.json b/src/main/resources/assets/minecolonies/lang/manual_en_us.json
index 8f0e3e4d02e..df83972e9c2 100644
--- a/src/main/resources/assets/minecolonies/lang/manual_en_us.json
+++ b/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",
 
diff --git a/src/main/resources/assets/minecolonies/models/item/cake_batter.json b/src/main/resources/assets/minecolonies/models/item/cake_batter.json
new file mode 100644
index 00000000000..73ba5d8be0d
--- /dev/null
+++ b/src/main/resources/assets/minecolonies/models/item/cake_batter.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecolonies:item/cake_batter"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minecolonies/textures/entity/banner/stripe_middle_up.png b/src/main/resources/assets/minecolonies/textures/entity/banner/stripe_middle_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd02b7c1d5d67e8054a24259e4681459ffceac50
GIT binary patch
literal 4995
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/minecolonies/textures/entity/banner/tinyflowers.png b/src/main/resources/assets/minecolonies/textures/entity/banner/tinyflowers.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc56c414ced4e3868c1673efc7a125b47410ae03
GIT binary patch
literal 4839
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/minecolonies/textures/entity/shield/stripe_middle_up.png b/src/main/resources/assets/minecolonies/textures/entity/shield/stripe_middle_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd02b7c1d5d67e8054a24259e4681459ffceac50
GIT binary patch
literal 4995
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/minecolonies/textures/entity/shield/tinyflowers.png b/src/main/resources/assets/minecolonies/textures/entity/shield/tinyflowers.png
new file mode 100644
index 0000000000000000000000000000000000000000..b144e9c9d8e4a39c299432bf5be4a9330b45b1fe
GIT binary patch
literal 5072
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
T(6)=#YZzb2YH#<qAKLt1=$5fB

literal 0
HcmV?d00001

diff --git a/src/main/resources/data/minecolonies/citizennames/default.json b/src/main/resources/data/minecolonies/citizennames/default.json
index 8a783e87856..b63970251da 100644
--- a/src/main/resources/data/minecolonies/citizennames/default.json
+++ b/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"
     ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecolonies/visitors/legodoc.json b/src/main/resources/data/minecolonies/visitors/legodoc.json
new file mode 100644
index 00000000000..36adc0ef647
--- /dev/null
+++ b/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"
+}