Start of the details for expeditions

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

@@ -1,14 +1,13 @@
 package com.minecolonies.core.client.gui.townhall;
 
 import com.ldtteam.blockui.Pane;
-import com.ldtteam.blockui.controls.Button;
-import com.ldtteam.blockui.controls.ButtonHandler;
-import com.ldtteam.blockui.controls.ButtonImage;
-import com.ldtteam.blockui.controls.Text;
+import com.ldtteam.blockui.controls.*;
 import com.ldtteam.blockui.views.Box;
 import com.ldtteam.blockui.views.ScrollingList;
 import com.ldtteam.blockui.views.ScrollingList.DataProvider;
+import com.ldtteam.blockui.views.View;
 import com.minecolonies.api.colony.IColonyView;
+import com.minecolonies.api.colony.colonyEvents.EventStatus;
 import com.minecolonies.api.util.constant.Constants;
 import com.minecolonies.core.client.gui.AbstractWindowSkeleton;
 import com.minecolonies.core.colony.ColonyView;
@@ -17,6 +16,7 @@
 import com.minecolonies.core.colony.expeditions.colony.ColonyExpeditionTypeManager;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -42,6 +42,14 @@ public class WindowTownHallExpeditions extends AbstractWindowSkeleton implements
     private static final String LABEL_EXPEDITION_NAME     = "expedition_name";
     private static final String LABEL_EXPEDITION_STATUS   = "expedition_status";
     private static final String BUTTON_EXPEDITION_OPEN    = "expedition_open";
+    private static final String LABEL_EMPTY               = "empty_text";
+    private static final String VIEW_EXPEDITION_DETAILS   = "expedition_details";
+    private static final String LIST_EXPEDITION_ITEMS     = "expedition_items";
+
+    /**
+     * The amount of item icons showing on a single list row.
+     */
+    private static final int ITEMS_PER_ROW = 9;
 
     /**
      * The client side colony data
@@ -58,6 +66,9 @@ public class WindowTownHallExpeditions extends AbstractWindowSkeleton implements
      */
     private final ScrollingList finishedExpeditionsList;
 
+    /**
+     * The current opened expedition data.
+     */
     @Nullable
     private OpenedExpeditionInfo openedExpedition;
 
@@ -77,6 +88,7 @@ public WindowTownHallExpeditions(final IColonyView colony)
         setupExpeditionList(finishedExpeditionsList, colony.getExpeditionManager()::getFinishedExpeditions, false);
 
         registerButton(BUTTON_EXPEDITION_OPEN, this::openExpedition);
+        updateOpenedExpedition();
     }
 
     /**
@@ -139,6 +151,66 @@ private void openExpedition(final Button button)
         {
             openedExpedition = new OpenedExpeditionInfo(colony.getExpeditionManager().getFinishedExpeditions().get(finishedListIndex), finishedListIndex, false);
         }
+
+        updateOpenedExpedition();
+    }
+
+    /**
+     * Updates the pane on the right to view the opened expedition.
+     */
+    private void updateOpenedExpedition()
+    {
+        findPaneOfTypeByID(LABEL_EMPTY, Text.class).setEnabled(openedExpedition == null);
+        findPaneOfTypeByID(LABEL_EMPTY, Text.class).setVisible(openedExpedition == null);
+
+        final View detailsContainer = findPaneOfTypeByID(VIEW_EXPEDITION_DETAILS, View.class);
+        detailsContainer.setEnabled(openedExpedition != null);
+        detailsContainer.setVisible(openedExpedition != null);
+
+        if (openedExpedition != null)
+        {
+            final ColonyExpeditionType expeditionType = ColonyExpeditionTypeManager.getInstance().getExpeditionType(openedExpedition.instance.getExpeditionTypeId());
+            if (expeditionType == null)
+            {
+                return;
+            }
+
+            detailsContainer.findPaneOfTypeByID(LABEL_EXPEDITION_NAME, Text.class).setText(expeditionType.getName());
+
+            final MutableComponent statusComponent =
+              Component.translatable(EXPEDITION_TOWNHALL_LIST_STATUS + openedExpedition.instance.getStatus().name())
+                .withStyle(openedExpedition.instance.getStatus().getStatusType().getDisplayColor());
+            detailsContainer.findPaneOfTypeByID(LABEL_EXPEDITION_STATUS, Text.class).setText(statusComponent);
+
+            if (openedExpedition.instance.getStatus().getEventStatus().equals(EventStatus.DONE))
+            {
+                final ScrollingList itemsList = detailsContainer.findPaneOfTypeByID(LIST_EXPEDITION_ITEMS, ScrollingList.class);
+                itemsList.setDataProvider(new DataProvider()
+                {
+                    @Override
+                    public int getElementCount()
+                    {
+                        return (int) Math.ceil(openedExpedition.instance.getEquipment().size() / (double) ITEMS_PER_ROW);
+                    }
+
+                    @Override
+                    public void updateElement(final int i, final Pane pane)
+                    {
+                        for (int colIndex = 0; colIndex < ITEMS_PER_ROW; colIndex++)
+                        {
+                            final int itemIndex = colIndex * (i + 1);
+                            if (openedExpedition.instance.getEquipment().size() <= itemIndex)
+                            {
+                                break;
+                            }
+
+                            final ItemStack item = openedExpedition.instance.getEquipment().get(itemIndex);
+                            pane.findPaneOfTypeByID("item_" + colIndex, ItemIcon.class).setItem(item);
+                        }
+                    }
+                });
+            }
+        }
     }
 
     /**

src/main/java/com/minecolonies/core/colony/expeditions/Expedition.java

@@ -31,7 +31,7 @@ public class Expedition implements IExpedition
      * The equipment given to the expedition prior to starting.
      */
     @NotNull
-    protected final Collection<ItemStack> equipment;
+    protected final List<ItemStack> equipment;
 
     /**
      * The members of the expedition.
@@ -47,7 +47,7 @@ public class Expedition implements IExpedition
     /**
      * The stage of the expedition.
      */
-    protected ExpeditionStatus status = ExpeditionStatus.CREATED;
+    protected ExpeditionStatus status;
 
     /**
      * Deserialization constructor.
@@ -56,7 +56,7 @@ public class Expedition implements IExpedition
      * @param members   the members for this expedition.
      * @param status    the status of the expedition.
      */
-    public Expedition(final @NotNull Collection<ItemStack> equipment, final @NotNull Collection<IExpeditionMember<?>> members, final ExpeditionStatus status)
+    public Expedition(final @NotNull List<ItemStack> equipment, final @NotNull List<IExpeditionMember<?>> members, final ExpeditionStatus status)
     {
         this.equipment = equipment;
         this.members = members.stream().collect(Collectors.toMap(IExpeditionMember::getId, v -> v));
@@ -113,30 +113,30 @@ public void setStatus(final ExpeditionStatus stage)
 
     @Override
     @NotNull
-    public Collection<IExpeditionMember<?>> getMembers()
+    public List<IExpeditionMember<?>> getMembers()
     {
-        return this.members.values();
+        return this.members.values().stream().toList();
     }
 
     @Override
     @NotNull
-    public Collection<ItemStack> getEquipment()
+    public List<ItemStack> getEquipment()
     {
         return equipment;
     }
 
     @Override
     @NotNull
-    public Collection<IExpeditionMember<?>> getActiveMembers()
+    public List<IExpeditionMember<?>> getActiveMembers()
     {
         return this.members.values().stream().filter(f -> !f.isDead()).toList();
     }
 
     @Override
     @NotNull
-    public Collection<IExpeditionStage> getResults()
+    public List<IExpeditionStage> getResults()
     {
-        return Collections.unmodifiableCollection(this.results);
+        return this.results.stream().toList();
     }
 
     @Override

src/main/java/com/minecolonies/core/colony/expeditions/colony/ColonyExpedition.java

@@ -14,7 +14,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 
@@ -59,8 +58,8 @@ public final class ColonyExpedition extends Expedition
      * @param expeditionTypeId the expedition type.
      */
     public ColonyExpedition(
-      final @NotNull Collection<ItemStack> equipment,
-      final @NotNull Collection<IExpeditionMember<?>> members,
+      final @NotNull List<ItemStack> equipment,
+      final @NotNull List<IExpeditionMember<?>> members,
       final @NotNull ExpeditionStatus status,
       final int id,
       final @NotNull ResourceKey<Level> dimensionId,

src/main/resources/assets/minecolonies/gui/townhall/windowtownhallexpeditions.xml

@@ -60,6 +60,32 @@
                   color="black"
                   textscale="0.8"
                   textalign="MIDDLE"/>
+
+            <view id="expedition_details" size="100% 100%">
+                <text id="expedition_name" size="100% 15" color="black"/>
+                <text id="expedition_status" pos="0 15" size="100% 15" color="black" textscale="0.8"/>
+
+                <text pos="0 40" size="100% 15" text="$(com.minecolonies.core.expedition.gui.townhall.header_items)" color="black"/>
+                <box pos="0 55" size="100% 20" linewidth="1">
+                    <list id="expedition_items"
+                          size="100% 100%"
+                          emptytext="$(com.minecolonies.core.expedition.gui.townhall.empty_list_finished)"
+                          emptyscale="0.8"
+                          emptycolor="black">
+                        <view size="100% 20">
+                            <itemicon id="item_0" pos="2 2" size="16 16"/>
+                            <itemicon id="item_1" pos="21 2" size="16 16"/>
+                            <itemicon id="item_2" pos="40 2" size="16 16"/>
+                            <itemicon id="item_3" pos="59 2" size="16 16"/>
+                            <itemicon id="item_4" pos="78 2" size="16 16"/>
+                            <itemicon id="item_5" pos="97 2" size="16 16"/>
+                            <itemicon id="item_6" pos="116 2" size="16 16"/>
+                            <itemicon id="item_7" pos="135 2" size="16 16"/>
+                            <itemicon id="item_8" pos="154 2" size="16 16"/>
+                        </view>
+                    </list>
+                </box>
+            </view>
         </view>
     </view>
 </window>

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

@@ -2600,6 +2600,8 @@
   "com.minecolonies.core.expedition.gui.townhall.header": "Expeditions Overview",
   "com.minecolonies.core.expedition.gui.townhall.header_active": "Active Expeditions",
   "com.minecolonies.core.expedition.gui.townhall.header_finished": "Previous Expeditions",
+  "com.minecolonies.core.expedition.gui.townhall.header_items": "Items",
+  "com.minecolonies.core.expedition.gui.townhall.header_results": "Results",
   "com.minecolonies.core.expedition.gui.townhall.empty_list_active": "No active expeditions.",
   "com.minecolonies.core.expedition.gui.townhall.empty_list_finished": "No previous expeditions.",
   "com.minecolonies.core.expedition.gui.townhall.expedition_list.to_text": "To %s",