Merge pull request #725 from FTBTeam/1.20.1/dev

1.20.1/dev

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2001.4.3]
+
+### Fixed
+* Fixed positioning of text entry popup when adding XP or XP Levels rewards to a quest
+  * Popup was being positioned off-screen depending on game resolution and quest screen scroll position
+
 ## [2001.4.2]
 
 ### Fixed

common/src/main/java/dev/ftb/mods/ftbquests/FTBQuests.java

@@ -8,14 +8,10 @@
 import dev.ftb.mods.ftbquests.client.FTBQClientProxy;
 import dev.ftb.mods.ftbquests.client.FTBQuestsClient;
 import dev.ftb.mods.ftbquests.integration.RecipeModHelper;
-import dev.ftb.mods.ftbquests.integration.item_filtering.DisplayStacksCache;
 import dev.ftb.mods.ftbquests.net.ClearDisplayCacheMessage;
 import dev.ftb.mods.ftbquests.net.FTBQuestsNetHandler;
 import dev.ftb.mods.ftbquests.quest.reward.RewardTypes;
 import dev.ftb.mods.ftbquests.quest.task.TaskTypes;
-import net.minecraft.gametest.framework.GameTestServer;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;

common/src/main/java/dev/ftb/mods/ftbquests/client/FTBQuestsClient.java

@@ -5,8 +5,8 @@
 import dev.architectury.registry.ReloadListenerRegistry;
 import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
 import dev.architectury.registry.client.rendering.RenderTypeRegistry;
-import dev.ftb.mods.ftblibrary.config.*;
-import dev.ftb.mods.ftblibrary.config.ui.*;
+import dev.ftb.mods.ftblibrary.config.ImageResourceConfig;
+import dev.ftb.mods.ftblibrary.config.ui.EditConfigScreen;
 import dev.ftb.mods.ftblibrary.ui.Widget;
 import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
 import dev.ftb.mods.ftbquests.FTBQuests;

common/src/main/java/dev/ftb/mods/ftbquests/client/GuiProviders.java

@@ -182,28 +182,26 @@ public static void setRewardGuiProviders() {
             IntConfig c = new IntConfig(1, Integer.MAX_VALUE);
             c.setValue(100);
 
-            EditStringConfigOverlay<Integer> overlay = new EditStringConfigOverlay<>(panel, c, accepted -> {
+            EditStringConfigOverlay<Integer> overlay = new EditStringConfigOverlay<>(panel.getGui(), c, accepted -> {
                 if (accepted) {
                     callback.accept(new XPReward(0L, quest, c.getValue()));
                 }
 
                 panel.run();
-            }, RewardTypes.XP.getDisplayName())
-                    .atPosition(panel.width / 3, panel.height + 5);
+            }, RewardTypes.XP.getDisplayName()).atMousePosition();
             panel.getGui().pushModalPanel(overlay);
         });
 
         RewardTypes.XP_LEVELS.setGuiProvider((panel, quest, callback) -> {
             IntConfig c = new IntConfig(1, Integer.MAX_VALUE);
             c.setValue(5);
 
-            EditStringConfigOverlay<Integer> overlay = new EditStringConfigOverlay<>(panel, c, accepted -> {
+            EditStringConfigOverlay<Integer> overlay = new EditStringConfigOverlay<>(panel.getGui(), c, accepted -> {
                 if (accepted) {
                     callback.accept(new XPLevelsReward(0L, quest, c.getValue()));
                 }
                 panel.run();
-            }, RewardTypes.XP_LEVELS.getDisplayName())
-                    .atPosition(panel.width / 3, panel.height + 5);
+            }, RewardTypes.XP_LEVELS.getDisplayName()).atMousePosition();
             panel.getGui().pushModalPanel(overlay);
         });
     }

common/src/main/java/dev/ftb/mods/ftbquests/client/gui/RewardTablesScreen.java

@@ -5,7 +5,10 @@
 import dev.ftb.mods.ftblibrary.icon.Color4I;
 import dev.ftb.mods.ftblibrary.icon.Icons;
 import dev.ftb.mods.ftblibrary.icon.ItemIcon;
-import dev.ftb.mods.ftblibrary.ui.*;
+import dev.ftb.mods.ftblibrary.ui.ContextMenuItem;
+import dev.ftb.mods.ftblibrary.ui.Panel;
+import dev.ftb.mods.ftblibrary.ui.SimpleTextButton;
+import dev.ftb.mods.ftblibrary.ui.Theme;
 import dev.ftb.mods.ftblibrary.ui.input.Key;
 import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
 import dev.ftb.mods.ftblibrary.ui.misc.AbstractButtonListScreen;

common/src/main/java/dev/ftb/mods/ftbquests/client/gui/quests/RewardButton.java

@@ -8,7 +8,6 @@
 import dev.ftb.mods.ftblibrary.util.TooltipList;
 import dev.ftb.mods.ftblibrary.util.client.PositionedIngredient;
 import dev.ftb.mods.ftbquests.client.ClientQuestFile;
-import dev.ftb.mods.ftbquests.client.FTBQClientProxy;
 import dev.ftb.mods.ftbquests.client.FTBQuestsClient;
 import dev.ftb.mods.ftbquests.client.gui.ContextMenuBuilder;
 import dev.ftb.mods.ftbquests.quest.reward.ItemReward;

common/src/main/java/dev/ftb/mods/ftbquests/net/ClearDisplayCacheMessage.java

@@ -4,7 +4,6 @@
 import dev.architectury.networking.simple.BaseS2CMessage;
 import dev.architectury.networking.simple.MessageType;
 import dev.architectury.utils.Env;
-import dev.architectury.utils.GameInstance;
 import dev.ftb.mods.ftbquests.FTBQuests;
 import dev.ftb.mods.ftbquests.integration.item_filtering.DisplayStacksCache;
 import net.minecraft.network.FriendlyByteBuf;

common/src/main/java/dev/ftb/mods/ftbquests/net/CreateObjectMessage.java

@@ -10,8 +10,6 @@
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.TickTask;
 import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.Nullable;
 

common/src/main/java/dev/ftb/mods/ftbquests/quest/ChapterGroup.java

@@ -12,7 +12,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author LatvianModder

common/src/main/java/dev/ftb/mods/ftbquests/quest/task/TaskTypes.java

@@ -1,13 +1,11 @@
 package dev.ftb.mods.ftbquests.quest.task;
 
 import dev.architectury.fluid.FluidStack;
-import dev.architectury.hooks.fluid.FluidStackHooks;
 import dev.ftb.mods.ftblibrary.icon.Color4I;
 import dev.ftb.mods.ftblibrary.icon.Icon;
 import dev.ftb.mods.ftblibrary.icon.Icons;
 import dev.ftb.mods.ftblibrary.util.client.ClientUtils;
 import dev.ftb.mods.ftbquests.api.FTBQuestsAPI;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.material.Fluids;
 

forge/src/main/java/dev/ftb/mods/ftbquests/forge/ClientSetup.java

@@ -2,8 +2,6 @@
 
 import dev.ftb.mods.ftbquests.client.FTBQuestsClientEventHandler;
 import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.event.IModBusEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 public class ClientSetup {

forge/src/main/java/dev/ftb/mods/ftbquests/forge/FTBQuestsForge.java

@@ -3,8 +3,8 @@
 import dev.architectury.platform.forge.EventBuses;
 import dev.ftb.mods.ftblibrary.icon.Icon;
 import dev.ftb.mods.ftbquests.FTBQuests;
-import dev.ftb.mods.ftbquests.api.FTBQuestsTags;
 import dev.ftb.mods.ftbquests.api.FTBQuestsAPI;
+import dev.ftb.mods.ftbquests.api.FTBQuestsTags;
 import dev.ftb.mods.ftbquests.command.ChangeProgressArgument;
 import dev.ftb.mods.ftbquests.command.QuestObjectArgument;
 import dev.ftb.mods.ftbquests.item.FTBQuestsItems;

gradle.properties

@@ -5,7 +5,7 @@ mod_id=ftbquests
 archives_base_name=ftb-quests
 minecraft_version=1.20.1
 # Build time
-mod_version=2001.4.2
+mod_version=2001.4.3
 maven_group=dev.ftb.mods
 mod_author=FTB Team
 # Curse release