adjust to review

ldtteam · Nov 17, 2024 · 0ebcb14 · 0ebcb14
1 parent b12d8ad
commit 0ebcb14
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/src/main/java/com/minecolonies/core/client/gui/modules/RestaurantMenuModuleWindow.java b/src/main/java/com/minecolonies/core/client/gui/modules/RestaurantMenuModuleWindow.java
@@ -174,6 +174,15 @@ private void updateStockList()
         menu = new ArrayList<>(moduleView.getMenu());
         applySorting(menu);
 
+        if (menu.isEmpty())
+        {
+            findPaneByID("warning").show();
+        }
+        else
+        {
+            findPaneByID("warning").hide();
+        }
+
         menuList.enable();
         menuList.show();
 

diff --git a/src/main/resources/assets/minecolonies/gui/layouthuts/layoutfoodstock.xml b/src/main/resources/assets/minecolonies/gui/layouthuts/layoutfoodstock.xml
@@ -1,17 +1,20 @@
 <window size="380 255" pause="false" lightbox="false">
-     <image source="minecolonies:textures/gui/builderhut/builder_paper.png" size="190 244"/>
-            <label id="title" size="130 11" pos="30 14" textalign="MIDDLE" color="black"
-                   label="$(com.minecolonies.core.menu.title)"/>
-            <list id="resourcesstock" size="164 180" pos="13 50">
-                <box size="100% 17" linewidth="1">
-                    <gradient id="gradient" size="162 15" pos="1 1"/>
-                    <itemicon id="resourceIcon" size="16 16" pos="0 0"/>
-                    <label id="resourceName" size="100 12" pos="20 1" color="black"/>
+    <image source="minecolonies:textures/gui/builderhut/builder_paper.png" size="190 244"/>
+    <label id="title" size="130 11" pos="30 14" textalign="MIDDLE" color="black"
+           label="$(com.minecolonies.core.menu.title)"/>
+    <text id="warning" size="150 22" pos="13 50" color="black" textalign="MIDDLE" label="$(com.minecolonies.core.menu.warning)"/>
 
-                    <buttonimage label="X" id="removeStock" pos="126 1" size="29 15"
-                                 source="minecolonies:textures/gui/builderhut/builder_button_very_small.png" textcolor="red"/>
-                </box>
-            </list>
+
+    <list id="resourcesstock" size="164 180" pos="13 50">
+        <box size="100% 17" linewidth="1">
+            <gradient id="gradient" size="162 15" pos="1 1"/>
+            <itemicon id="resourceIcon" size="16 16" pos="0 0"/>
+            <label id="resourceName" size="100 12" pos="20 1" color="black"/>
+
+            <buttonimage label="X" id="removeStock" pos="126 1" size="29 15"
+                         source="minecolonies:textures/gui/builderhut/builder_button_very_small.png" textcolor="red"/>
+        </box>
+    </list>
 
     <image source="minecolonies:textures/gui/builderhut/builder_paper.png" size="190 244" pos="190 0"/>
     <label id="desc" size="130 11" pos="220 14" color="black" textalign="MIDDLE" label="$(com.minecolonies.core.food_list.title)"/>
@@ -23,7 +26,7 @@
             <itemicon id="resourceIcon" size="16 16" pos="20 0"/>
             <label id="resourceName" size="100 12" pos="40 3" color="white"/>
             <buttonimage label="&lt;&lt;" id="switch" pos="3 1" size="14 15"
-                             source="minecolonies:textures/gui/builderhut/builder_button_mini.png" textcolor="black"/>
+                         source="minecolonies:textures/gui/builderhut/builder_button_mini.png" textcolor="black"/>
         </box>
     </list>
 </window>
diff --git a/src/main/resources/assets/minecolonies/lang/manual_en_us.json b/src/main/resources/assets/minecolonies/lang/manual_en_us.json
@@ -1380,7 +1380,7 @@
   "entity.fisherman.messagewatertoofar": "I can't find any suitable water for fishing! There should be an area of water at least 7 blocks long and wide, and 2 blocks deep nearby.",
   "com.minecolonies.coremod.furnaceuser.nofuel": "Please tell me what kind of fuel I should use in my furnace!",
   "com.minecolonies.coremod.furnaceuser.noore": "Please tell me what kind of ore I should smelt in my furnace!",
-  "com.minecolonies.coremod.furnaceuser.nofood": "Please configure the Menu you want me to hand out!",
+  "com.minecolonies.coremod.furnaceuser.nofood": "Please add some food options to the menu so I can start serving food to the citizens!",
   "com.minecolonies.coremod.netherminer.nofood": "Please configure the menu of food items I should bring along for my trips to the Nether",
   "com.minecolonies.coremod.sifter.nomesh": "Please make sure I have at least a string mesh to sift with! You can either manually stock different meshes in my hut or setup a minimum stock to automate it.",
   "com.minecolonies.coremod.florist.noplantground": "I don't have any composted dirt to plant on! Please repair my Flower Shop!",
@@ -2732,5 +2732,6 @@
   "item.minecolonies.large_soy_milk_bottle": "Large Soy Milk Bottle",
   "com.minecolonies.coremod.setting.minecolonies:milk_item": "Milk Item:",
   "com.minecolonies.core.menu.title": "Menu",
-  "com.minecolonies.core.food_list.title": "Food Options"
+  "com.minecolonies.core.food_list.title": "Food Options",
+  "com.minecolonies.core.menu.warning": "Select the Food Citizens will eat at this Restaurant"
 }