From f4f7d72dd0adc151bd75e5c9270ec2704559a289 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Mon, 22 Apr 2024 10:17:17 +0100 Subject: [PATCH] fix: fix textfield popup for checkbox task creation not rendering https://github.com/FTBTeam/FTB-Mods-Issues/issues/1151 --- .../mods/ftbquests/client/GuiProviders.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/dev/ftb/mods/ftbquests/client/GuiProviders.java b/common/src/main/java/dev/ftb/mods/ftbquests/client/GuiProviders.java index 6daf4c74..4a40336f 100644 --- a/common/src/main/java/dev/ftb/mods/ftbquests/client/GuiProviders.java +++ b/common/src/main/java/dev/ftb/mods/ftbquests/client/GuiProviders.java @@ -1,7 +1,10 @@ package dev.ftb.mods.ftbquests.client; import dev.ftb.mods.ftblibrary.config.*; -import dev.ftb.mods.ftblibrary.config.ui.*; +import dev.ftb.mods.ftblibrary.config.ui.EditConfigScreen; +import dev.ftb.mods.ftblibrary.config.ui.EditStringConfigOverlay; +import dev.ftb.mods.ftblibrary.config.ui.SelectFluidScreen; +import dev.ftb.mods.ftblibrary.config.ui.SelectItemStackScreen; import dev.ftb.mods.ftbquests.api.FTBQuestsAPI; import dev.ftb.mods.ftbquests.client.gui.SelectQuestObjectScreen; import dev.ftb.mods.ftbquests.quest.QuestObjectType; @@ -37,6 +40,7 @@ public static RewardType.GuiProvider defaultRewardGuiProvider(RewardType.Provide s.setHasSearchBox(true); s.openGui(); } else { + ConfigGroup group = new ConfigGroup(FTBQuestsAPI.MOD_ID, accepted -> { if (accepted) { callback.accept(reward); @@ -67,14 +71,7 @@ public static TaskType.GuiProvider defaultTaskGuiProvider(TaskType.Provider prov overlay.setExtraZlevel(300); panel.getGui().pushModalPanel(overlay); } else { - ConfigGroup group = new ConfigGroup(FTBQuestsAPI.MOD_ID, accepted -> { - if (accepted) { - callback.accept(task); - } - panel.run(); - }); - task.fillConfigGroup(task.createSubGroup(group)); - new EditConfigScreen(group).openGui(); + openSetupGui(panel.getGui(), callback, task); } }; } @@ -96,15 +93,16 @@ public static void setTaskGuiProviders() { StringConfig c = new StringConfig(null); c.setValue(""); - EditStringConfigOverlay overlay = new EditStringConfigOverlay<>(panel, c, accepted -> { + EditStringConfigOverlay overlay = new EditStringConfigOverlay<>(panel.getGui(), c, accepted -> { if (accepted) { CheckmarkTask checkmarkTask = new CheckmarkTask(0L, quest); checkmarkTask.setRawTitle(c.getValue()); callback.accept(checkmarkTask); } panel.run(); - }, TaskTypes.CHECKMARK.getDisplayName()) - .atPosition(panel.width / 3, panel.height + 5); + }, TaskTypes.CHECKMARK.getDisplayName()).atMousePosition(); + overlay.setWidth(150); + overlay.setExtraZlevel(300); panel.getGui().pushModalPanel(overlay); });