Update imports and update to 1.21.11 and invui 1.49

build.gradle.kts

@@ -17,16 +17,16 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT")
     implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
     implementation("com.fasterxml.jackson.core:jackson-annotations:2.16.1")
-    implementation("xyz.xenondevs.invui:invui:1.44")
+    implementation("xyz.xenondevs.invui:invui:1.49")
     implementation("org.incendo:cloud-core:2.0.0")
     implementation("org.incendo:cloud-annotations:2.0.0")
     implementation("org.incendo:cloud-paper:2.0.0-beta.10")
 
     testImplementation("com.github.seeseemelk:MockBukkit-v1.21:3.133.2")
-    testImplementation("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
+    testImplementation("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT")
     testImplementation(platform("org.junit:junit-bom:5.10.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")
 }

src/main/java/dev/brauw/mapper/command/MapperCommand.java

@@ -3,7 +3,6 @@
 import dev.brauw.mapper.MapperPlugin;
 import dev.brauw.mapper.export.ExportStrategy;
 import dev.brauw.mapper.export.JsonExportStrategy;
-import dev.brauw.mapper.gui.metadata.GuiMetadata;
 import dev.brauw.mapper.metadata.MapMetadata;
 import dev.brauw.mapper.metadata.MetadataManager;
 import dev.brauw.mapper.region.Region;
@@ -29,7 +28,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Stream;
 
 @AllArgsConstructor
 @Command("mapper")

src/main/java/dev/brauw/mapper/export/ExportManager.java

@@ -1,13 +1,9 @@
 package dev.brauw.mapper.export;
 
 import dev.brauw.mapper.MapperPlugin;
-import dev.brauw.mapper.region.Region;
 import lombok.CustomLog;
 
-import java.io.File;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

src/main/java/dev/brauw/mapper/export/JsonExportStrategy.java

@@ -15,7 +15,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
 import java.util.List;
 
 /**

src/main/java/dev/brauw/mapper/export/serializer/LocationDeserializer.java

@@ -1,7 +1,6 @@
 package dev.brauw.mapper.export.serializer;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;

src/main/java/dev/brauw/mapper/gui/GuiManager.java

@@ -1,7 +1,6 @@
 package dev.brauw.mapper.gui;
 
 import dev.brauw.mapper.MapperPlugin;
-import dev.brauw.mapper.gui.common.GuiSet;
 import dev.brauw.mapper.gui.common.GuiSetName;
 import dev.brauw.mapper.gui.metadata.GuiMetadata;
 import dev.brauw.mapper.gui.selector.GuiColorSelect;

src/main/java/dev/brauw/mapper/gui/metadata/GameModeButton.java

@@ -5,19 +5,12 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.component.AdventureComponentWrapper;
 import xyz.xenondevs.invui.item.ItemProvider;
-import xyz.xenondevs.invui.item.builder.AbstractItemBuilder;
 import xyz.xenondevs.invui.item.builder.ItemBuilder;
-import xyz.xenondevs.invui.item.impl.CycleItem;
-import xyz.xenondevs.invui.item.impl.controlitem.ControlItem;
 
 @RequiredArgsConstructor
 public class GameModeButton implements ItemProvider {

src/main/java/dev/brauw/mapper/gui/metadata/GuiMetadata.java

@@ -3,7 +3,11 @@
 import dev.brauw.mapper.gui.GuiManager;
 import dev.brauw.mapper.gui.button.BackItem;
 import dev.brauw.mapper.gui.button.ForwardItem;
-import dev.brauw.mapper.gui.metadata.button.*;
+import dev.brauw.mapper.gui.metadata.button.AddAuthorButton;
+import dev.brauw.mapper.gui.metadata.button.AuthorButton;
+import dev.brauw.mapper.gui.metadata.button.HeightButton;
+import dev.brauw.mapper.gui.metadata.button.NameButton;
+import dev.brauw.mapper.gui.metadata.button.SaveButton;
 import dev.brauw.mapper.metadata.MapMetadata;
 import dev.brauw.mapper.metadata.MetadataManager;
 import dev.brauw.mapper.util.BukkitTaskScheduler;

src/main/java/dev/brauw/mapper/gui/metadata/button/AddAuthorButton.java

@@ -1,7 +1,6 @@
 package dev.brauw.mapper.gui.metadata.button;
 
 import dev.brauw.mapper.gui.GuiManager;
-import dev.brauw.mapper.gui.common.GuiSet;
 import dev.brauw.mapper.gui.common.GuiSetName;
 import dev.brauw.mapper.metadata.MapMetadata;
 import dev.brauw.mapper.util.BukkitTaskScheduler;

src/main/java/dev/brauw/mapper/gui/metadata/button/HeightButton.java

@@ -2,7 +2,6 @@
 
 import dev.brauw.mapper.gui.GuiManager;
 import dev.brauw.mapper.gui.common.GuiSet;
-import dev.brauw.mapper.gui.common.GuiSetName;
 import dev.brauw.mapper.metadata.MapMetadata;
 import dev.brauw.mapper.util.BukkitTaskScheduler;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +18,6 @@
 import xyz.xenondevs.invui.item.impl.AbstractItem;
 import xyz.xenondevs.invui.window.AnvilWindow;
 
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 @RequiredArgsConstructor

src/main/java/dev/brauw/mapper/gui/metadata/button/NameButton.java

@@ -1,7 +1,6 @@
 package dev.brauw.mapper.gui.metadata.button;
 
 import dev.brauw.mapper.gui.GuiManager;
-import dev.brauw.mapper.gui.common.GuiSet;
 import dev.brauw.mapper.gui.common.GuiSetName;
 import dev.brauw.mapper.metadata.MapMetadata;
 import dev.brauw.mapper.util.BukkitTaskScheduler;

src/main/java/dev/brauw/mapper/metadata/MetadataManager.java

@@ -5,7 +5,13 @@
 import lombok.CustomLog;
 import org.bukkit.World;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;

src/main/java/dev/brauw/mapper/region/CuboidRegion.java

@@ -2,13 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Preconditions;
-import lombok.Builder;
 import lombok.CustomLog;
 import lombok.Getter;
 import lombok.Setter;
-import lombok.extern.jackson.Jacksonized;
 import org.bukkit.Location;
 import org.bukkit.World;
 

src/main/java/dev/brauw/mapper/region/PerspectiveRegion.java

@@ -1,12 +1,8 @@
 package dev.brauw.mapper.region;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import lombok.Builder;
 import lombok.Getter;
-import lombok.extern.jackson.Jacksonized;
 import org.bukkit.Location;
 
 import java.util.UUID;

src/main/java/dev/brauw/mapper/region/PointRegion.java

@@ -2,11 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
 import lombok.CustomLog;
 import lombok.Getter;
 import lombok.Setter;
-import lombok.extern.jackson.Jacksonized;
 import org.bukkit.Location;
 import org.bukkit.World;
 

src/main/java/dev/brauw/mapper/region/PolygonRegion.java

@@ -1,12 +1,9 @@
 package dev.brauw.mapper.region;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Preconditions;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
-import lombok.extern.jackson.Jacksonized;
 import org.bukkit.Location;
 import org.bukkit.World;
 

src/main/java/dev/brauw/mapper/region/RegionOptions.java

@@ -3,7 +3,6 @@
 import lombok.Builder;
 import lombok.Value;
 import lombok.extern.jackson.Jacksonized;
-import org.bukkit.Color;
 import org.jetbrains.annotations.NotNull;
 
 /**

src/main/java/dev/brauw/mapper/selection/SelectionHandler.java

@@ -2,8 +2,8 @@
 
 import dev.brauw.mapper.gui.GuiManager;
 import dev.brauw.mapper.region.CuboidRegion;
-import dev.brauw.mapper.region.PointRegion;
 import dev.brauw.mapper.region.PerspectiveRegion;
+import dev.brauw.mapper.region.PointRegion;
 import dev.brauw.mapper.region.RegionOptions;
 import dev.brauw.mapper.session.EditSession;
 import lombok.RequiredArgsConstructor;
@@ -16,7 +16,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.util.RayTraceResult;
-import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;

src/main/java/dev/brauw/mapper/session/EditSession.java

@@ -1,6 +1,5 @@
 package dev.brauw.mapper.session;
 
-import dev.brauw.mapper.MapperPlugin;
 import dev.brauw.mapper.region.Region;
 import lombok.CustomLog;
 import lombok.Getter;

src/main/java/dev/brauw/mapper/session/SessionManager.java

@@ -2,14 +2,22 @@
 
 import dev.brauw.mapper.MapperPlugin;
 import dev.brauw.mapper.region.Region;
-import dev.brauw.mapper.session.display.*;
+import dev.brauw.mapper.session.display.ArmorStandStrategy;
+import dev.brauw.mapper.session.display.BlockStrategy;
+import dev.brauw.mapper.session.display.ItemStrategy;
+import dev.brauw.mapper.session.display.PolygonStrategy;
+import dev.brauw.mapper.session.display.RegionDisplayStrategy;
 import dev.brauw.mapper.session.event.SessionCreateEvent;
 import dev.brauw.mapper.session.event.SessionEndEvent;
 import lombok.CustomLog;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 /**

src/main/java/dev/brauw/mapper/session/display/ArmorStandStrategy.java

@@ -7,7 +7,9 @@
 import io.papermc.paper.entity.LookAnchor;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
-import org.bukkit.*;
+import org.bukkit.Color;
+import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;

src/main/java/dev/brauw/mapper/tool/InventoryCacheManager.java

@@ -1,6 +1,5 @@
 package dev.brauw.mapper.tool;
 
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.HashMap;

src/main/java/dev/brauw/mapper/tool/ToolRegistry.java

@@ -9,7 +9,6 @@
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
 /**

src/main/java/dev/brauw/mapper/util/BukkitTaskScheduler.java

@@ -1,10 +1,8 @@
 package dev.brauw.mapper.util;
 
-import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
-import xyz.xenondevs.invui.window.Window;
 
 public class BukkitTaskScheduler {
 

src/test/java/dev/brauw/mapper/region/RegionOptionsTest.java

@@ -1,7 +1,6 @@
 package dev.brauw.mapper.region;
 
 import org.junit.jupiter.api.Test;
-import org.bukkit.Color;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;