diff --git a/gradle.properties b/gradle.properties index 523b67b5d11..4143f7a8bbb 100755 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/com/minecolonies/core/client/gui/AbstractWindowSkeleton.java b/src/main/java/com/minecolonies/core/client/gui/AbstractWindowSkeleton.java index 9d95869a0e5..a0a3f1adc98 100755 --- a/src/main/java/com/minecolonies/core/client/gui/AbstractWindowSkeleton.java +++ b/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 registerModule(final BiFunction T registerLayoutModule(final BiFunction 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() { diff --git a/src/main/java/com/minecolonies/core/client/gui/WindowClipBoard.java b/src/main/java/com/minecolonies/core/client/gui/WindowClipBoard.java index d23588ce299..4bbd61baaea 100755 --- a/src/main/java/com/minecolonies/core/client/gui/WindowClipBoard.java +++ b/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(); diff --git a/src/main/java/com/minecolonies/core/client/gui/WindowPostBoxMain.java b/src/main/java/com/minecolonies/core/client/gui/WindowPostBoxMain.java index 25281414652..395c26a53dd 100755 --- a/src/main/java/com/minecolonies/core/client/gui/WindowPostBoxMain.java +++ b/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); diff --git a/src/main/java/com/minecolonies/core/client/gui/citizen/RequestWindowCitizen.java b/src/main/java/com/minecolonies/core/client/gui/citizen/RequestWindowCitizen.java index f1b846c1826..c8caa776bf0 100644 --- a/src/main/java/com/minecolonies/core/client/gui/citizen/RequestWindowCitizen.java +++ b/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 diff --git a/src/main/java/com/minecolonies/core/client/gui/modules/IWindowWithLayoutModule.java b/src/main/java/com/minecolonies/core/client/gui/modules/IWindowWithLayoutModule.java deleted file mode 100644 index f804b23dc59..00000000000 --- a/src/main/java/com/minecolonies/core/client/gui/modules/IWindowWithLayoutModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.minecolonies.core.client.gui.modules; - -import com.ldtteam.blockui.Pane; -import net.minecraft.resources.ResourceLocation; -import org.jetbrains.annotations.NotNull; - -/** - * Extensible logic for windows, without having to use new base classes. - * Additionally, this class requires you to implement a layout, which will be automatically constructed and injected into the window. - */ -public interface IWindowWithLayoutModule extends IWindowModule -{ - /** - * Called after the layout is mounted to the parenting window. - * - * @param rootPane the root pane that was made from the layout. - */ - default void onLayoutMounted(final Pane rootPane) {} - - /** - * Get the layout used for rendering. - * - * @return the id of the layout file. - */ - @NotNull - ResourceLocation getLayout(); -} diff --git a/src/main/java/com/minecolonies/core/client/gui/modules/RequestTreeWindowModule.java b/src/main/java/com/minecolonies/core/client/gui/modules/RequestTreeWindowModule.java index 6e0d3b9de57..3a37766c7e3 100644 --- a/src/main/java/com/minecolonies/core/client/gui/modules/RequestTreeWindowModule.java +++ b/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() { diff --git a/src/main/resources/assets/minecolonies/gui/citizen/requests.xml b/src/main/resources/assets/minecolonies/gui/citizen/requests.xml index bef68881801..0ff3049876f 100755 --- a/src/main/resources/assets/minecolonies/gui/citizen/requests.xml +++ b/src/main/resources/assets/minecolonies/gui/citizen/requests.xml @@ -3,4 +3,5 @@ + diff --git a/src/main/resources/assets/minecolonies/gui/dialogdonecancel.xml b/src/main/resources/assets/minecolonies/gui/dialogdonecancel.xml deleted file mode 100755 index 9c11e3a28da..00000000000 --- a/src/main/resources/assets/minecolonies/gui/dialogdonecancel.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - -