Fixes for the slot rework coming in BlockUI

gradle.properties

@@ -27,7 +27,7 @@ additionalMinecraftVersions=1.21
 minecraft_range=[1.21, 1.22)
 
 dataGeneratorsVersion=1.20.4-0.1.57-ALPHA
-blockUI_version=1.0.199-1.21.1-snapshot
+blockUI_version=1.0.200-1.21.1
 structurize_version=1.0.810-1.21.1-snapshot
 domumOrnamentumVersion=1.0.223-snapshot
 multiPistonVersion=1.2.51-1.21.1-snapshot

src/main/java/com/minecolonies/core/client/gui/AbstractWindowSkeleton.java

@@ -1,7 +1,5 @@
 package com.minecolonies.core.client.gui;
 
-import com.ldtteam.blockui.Loader;
-import com.ldtteam.blockui.Pane;
 import com.ldtteam.blockui.PaneBuilders;
 import com.ldtteam.blockui.controls.Button;
 import com.ldtteam.blockui.controls.ButtonHandler;
@@ -10,7 +8,6 @@
 import com.ldtteam.blockui.views.SwitchView;
 import com.minecolonies.api.colony.modules.IModuleContainer;
 import com.minecolonies.core.client.gui.modules.IWindowModule;
-import com.minecolonies.core.client.gui.modules.IWindowWithLayoutModule;
 import com.minecolonies.core.network.messages.server.ClickGuiButtonTriggerMessage;
 import com.minecolonies.core.network.messages.server.OpenGuiWindowTriggerMessage;
 import net.minecraft.network.chat.Component;
@@ -143,21 +140,6 @@ public final <T extends IWindowModule, A> T registerModule(final BiFunction<Abst
         return module;
     }
 
-    /**
-     * Add a module to this window. Extending the original logic of the window.
-     *
-     * @param moduleBuilder the new module.
-     */
-    public final <T extends IWindowWithLayoutModule, A> T registerLayoutModule(final BiFunction<AbstractWindowSkeleton, A, T> moduleBuilder, A argument, int xPos, int yPos)
-    {
-        final T module = moduleBuilder.apply(this, argument);
-        final Pane rootPane = Loader.createFromXMLFile(module.getLayout(), this);
-        rootPane.setPosition(xPos, yPos);
-        module.onLayoutMounted(rootPane);
-        this.modules.add(module);
-        return module;
-    }
-
     @Override
     public void onOpened()
     {

src/main/java/com/minecolonies/core/client/gui/WindowClipBoard.java

@@ -51,7 +51,7 @@ public WindowClipBoard(final IColonyView colony, boolean showImportant)
     {
         super(new ResourceLocation(Constants.MOD_ID, "gui/windowclipboard.xml"));
         this.showImportant = showImportant;
-        this.requestTreeWindowModule = registerLayoutModule(ClipboardRequestTreeWindowModule::new, new ClipboardRequestTreeWindowModule.Options(colony, () -> this.showImportant), 16, 44);
+        this.requestTreeWindowModule = registerModule(ClipboardRequestTreeWindowModule::new, new ClipboardRequestTreeWindowModule.Options(colony, () -> this.showImportant));
 
         registerButton(CLIPBOARD_TOGGLE, this::toggleImportant);
         paintButtonState();

src/main/java/com/minecolonies/core/client/gui/WindowPostBoxMain.java

@@ -102,7 +102,7 @@ public WindowPostBoxMain(final PostBox.View postBoxView)
     {
         super(new ResourceLocation(Constants.MOD_ID, "gui/windowpostboxrequest.xml"));
         this.postBoxView = postBoxView;
-        this.requestTreeWindowModule = registerLayoutModule(PostBoxRequestTreeWindowModule::new, postBoxView, 261, 44);
+        this.requestTreeWindowModule = registerModule(PostBoxRequestTreeWindowModule::new, postBoxView);
         registerPostboxTabs(this, postBoxView);
 
         registerButton(BUTTON_INVENTORY, this::inventoryClicked);

src/main/java/com/minecolonies/core/client/gui/citizen/RequestWindowCitizen.java

@@ -67,7 +67,7 @@ public RequestWindowCitizen(final ICitizenDataView citizen, @Nullable final IReq
     {
         super(citizen, WINDOW_ID);
         this.autoOpenRequest = autoOpenRequest;
-        this.requestTreeModule = registerLayoutModule(CitizenRequestTreeWindowModule::new, citizen, 33, 29);
+        this.requestTreeModule = registerModule(CitizenRequestTreeWindowModule::new, citizen);
     }
 
     @Override

src/main/java/com/minecolonies/core/client/gui/modules/RequestTreeWindowModule.java

@@ -12,7 +12,6 @@
 import com.minecolonies.api.colony.requestsystem.token.IToken;
 import com.minecolonies.api.util.InventoryUtils;
 import com.minecolonies.api.util.Log;
-import com.minecolonies.api.util.constant.Constants;
 import com.minecolonies.core.client.gui.AbstractWindowSkeleton;
 import com.minecolonies.core.client.gui.WindowRequestDetail;
 import com.minecolonies.core.colony.requestsystem.requests.StandardRequests;
@@ -21,7 +20,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.items.wrapper.InvWrapper;
@@ -35,7 +33,7 @@
 import static com.minecolonies.api.util.constant.WindowConstants.*;
 import static com.minecolonies.core.colony.requestsystem.requests.AbstractRequest.MISSING;
 
-public abstract class RequestTreeWindowModule implements IWindowWithLayoutModule
+public abstract class RequestTreeWindowModule implements IWindowModule
 {
     private static final int AUTO_REFRESH_TICKS = 100;
 
@@ -94,13 +92,13 @@ public RequestTreeWindowModule(final AbstractWindowSkeleton parent, final IColon
     }
 
     @Override
-    public void onLayoutMounted(final Pane rootPane)
+    public void onOpened()
     {
         parent.registerButton(REQUEST_DETAIL, this::detailedClicked);
         parent.registerButton(REQUEST_CANCEL, this::cancel);
         parent.registerButton(REQUEST_FULFILL, this::onFulfill);
 
-        resourceList = rootPane.findPaneOfTypeByID(WINDOW_ID_LIST_REQUESTS, ScrollingList.class);
+        resourceList = parent.findPaneOfTypeByID(WINDOW_ID_LIST_REQUESTS, ScrollingList.class);
         resourceList.setDataProvider(new ScrollingList.DataProvider()
         {
             @Override
@@ -178,13 +176,6 @@ else if (request instanceof StandardRequests.ItemTagRequest)
         });
     }
 
-    @Override
-    @NotNull
-    public final ResourceLocation getLayout()
-    {
-        return new ResourceLocation(Constants.MOD_ID, "gui/layouthuts/layoutrequeststree.xml");
-    }
-
     @Override
     public void onUpdate()
     {

src/main/resources/assets/minecolonies/gui/citizen/requests.xml

@@ -3,4 +3,5 @@
 
     <text size="164 11" pos="33 14" color="black" textalign="MIDDLE"
            label="$(com.minecolonies.coremod.gui.citizen.requests)"/>
+    <layout source="minecolonies:gui/layouthuts/layoutrequeststree.xml" pos="33 29"/>
 </window>

src/main/resources/assets/minecolonies/gui/layouthuts/layoutrequeststree.xml

@@ -1,20 +1,22 @@
-<list id="requests" size="158 184">
-    <box size="100% 40" linewidth="1">
-        <image id="deliveryImage" source="minecraft:textures/misc/shadow.png" size="16 16" pos="1 3" visible="false"/>
-        <button id="detail" size="16 16" pos="1 23" source="minecolonies:textures/gui/citizen/detail_button.png"/>
-        <itemicon id="requestStack" size="16 16" pos="1 3"/>
+<layout>
+    <list id="requests" size="158 184">
+        <box size="100% 40" linewidth="1">
+            <image id="deliveryImage" source="minecraft:textures/misc/shadow.png" size="16 16" pos="1 3" visible="false"/>
+            <button id="detail" size="16 16" pos="1 23" source="minecolonies:textures/gui/citizen/detail_button.png"/>
+            <itemicon id="requestStack" size="16 16" pos="1 3"/>
 
-        <text id="shortDetail" size="130 9" pos="20 2" color="black"/>
-        <itemicon id="detailIcon" size="9 9" pos="85 1"/>
+            <text id="shortDetail" size="130 9" pos="20 2" color="black"/>
+            <itemicon id="detailIcon" size="9 9" pos="85 1"/>
 
-        <text id="requester" size="130 9" pos="20 13" color="black"/>
+            <text id="requester" size="130 9" pos="20 13" color="black"/>
 
-        <!-- Color green if possible? -->
-        <button id="fulfill" size="37 16" pos="20 23" textcolor="black"
-                label="$(com.minecolonies.coremod.gui.citizen.requestsfulfill)" source="minecolonies:textures/gui/citizen/colonist_button_small.png"/>
+            <!-- Color green if possible? -->
+            <button id="fulfill" size="37 16" pos="20 23" textcolor="black"
+                    label="$(com.minecolonies.coremod.gui.citizen.requestsfulfill)" source="minecolonies:textures/gui/citizen/colonist_button_small.png"/>
 
-        <!-- button to cancel the request-->
-        <button id="cancel" size="37 16" pos="70 23" textcolor="black"
-                label="$(com.minecolonies.coremod.gui.citizen.requestscancel)" source="minecolonies:textures/gui/citizen/colonist_button_small.png"/>
-    </box>
-</list>
+            <!-- button to cancel the request-->
+            <button id="cancel" size="37 16" pos="70 23" textcolor="black"
+                    label="$(com.minecolonies.coremod.gui.citizen.requestscancel)" source="minecolonies:textures/gui/citizen/colonist_button_small.png"/>
+        </box>
+    </list>
+</layout>

src/main/resources/assets/minecolonies/gui/windowclipboard.xml

@@ -4,5 +4,6 @@
 
     <text size="158 11" pos="16 28" textalign="MIDDLE" color="black"
            label="$(com.minecolonies.coremod.gui.citizen.requests)"/>
+    <layout source="minecolonies:gui/layouthuts/layoutrequeststree.xml" pos="16 44"/>
     <button id="important" size="14 15" pos="150 23" color="red" label="!" tooltip="$(com.minecolonies.coremod.gui.request.hideshow)" source="minecolonies:textures/gui/builderhut/builder_button_mini.png"/>
 </window>

src/main/resources/assets/minecolonies/gui/windowpostboxrequest.xml

@@ -19,6 +19,7 @@
 
     <text size="158 11" pos="246 28" textalign="MIDDLE" color="black"
            label="$(com.minecolonies.coremod.gui.citizen.requests)"/>
+    <layout source="minecolonies:gui/layouthuts/layoutrequeststree.xml" pos="261 44"/>
 
     <button id="deliverAvailable" pos="52 195" size="40 15"/>
     <text id="test" pos="100 195" size="158 11" color="black" label="Deliver what's available"/>