From fd896210c53af2fc4c740d7a2188482d547345df Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Tue, 6 Jul 2021 15:37:35 -0400 Subject: [PATCH] Rename package from displaytools to display. --- .../MultiverseCore/commands/GamerulesCommand.java | 10 ++++------ .../MultiverseCore/commands/ListCommand.java | 13 +++++-------- .../{displaytools => display}/ColorAlternator.java | 2 +- .../{displaytools => display}/ColorTool.java | 2 +- .../{displaytools => display}/ContentDisplay.java | 4 +--- .../{displaytools => display}/ContentFilter.java | 2 +- .../DisplayFormatException.java | 2 +- .../{displaytools => display}/DisplayHandler.java | 2 +- .../{displaytools => display}/DisplayHandlers.java | 2 +- .../{displaytools => display}/DisplaySetting.java | 2 +- .../{displaytools => display}/DisplaySettings.java | 2 +- 11 files changed, 18 insertions(+), 25 deletions(-) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/ColorAlternator.java (96%) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/ColorTool.java (87%) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/ContentDisplay.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/ContentFilter.java (98%) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/DisplayFormatException.java (92%) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/DisplayHandler.java (97%) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/DisplayHandlers.java (99%) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/DisplaySetting.java (84%) rename src/main/java/com/onarandombox/MultiverseCore/{displaytools => display}/DisplaySettings.java (95%) diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java index d4f3ec5d..9f19aa96 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/GamerulesCommand.java @@ -8,11 +8,10 @@ package com.onarandombox.MultiverseCore.commands; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.displaytools.ColorAlternator; -import com.onarandombox.MultiverseCore.displaytools.ContentDisplay; -import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers; -import com.onarandombox.MultiverseCore.displaytools.DisplaySettings; +import com.onarandombox.MultiverseCore.display.ColorAlternator; +import com.onarandombox.MultiverseCore.display.ContentDisplay; +import com.onarandombox.MultiverseCore.display.DisplayHandlers; +import com.onarandombox.MultiverseCore.display.DisplaySettings; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameRule; @@ -21,7 +20,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionDefault; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java index b4a9c7bb..3c321e43 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java @@ -7,14 +7,13 @@ package com.onarandombox.MultiverseCore.commands; -import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MultiverseWorld; -import com.onarandombox.MultiverseCore.displaytools.ColorAlternator; -import com.onarandombox.MultiverseCore.displaytools.ContentDisplay; -import com.onarandombox.MultiverseCore.displaytools.ContentFilter; -import com.onarandombox.MultiverseCore.displaytools.DisplayHandlers; -import com.onarandombox.MultiverseCore.displaytools.DisplaySettings; +import com.onarandombox.MultiverseCore.display.ColorAlternator; +import com.onarandombox.MultiverseCore.display.ContentDisplay; +import com.onarandombox.MultiverseCore.display.ContentFilter; +import com.onarandombox.MultiverseCore.display.DisplayHandlers; +import com.onarandombox.MultiverseCore.display.DisplaySettings; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.command.CommandSender; @@ -22,9 +21,7 @@ import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionDefault; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/ColorAlternator.java b/src/main/java/com/onarandombox/MultiverseCore/display/ColorAlternator.java similarity index 96% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/ColorAlternator.java rename to src/main/java/com/onarandombox/MultiverseCore/display/ColorAlternator.java index a306ad1c..561394a9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/ColorAlternator.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/ColorAlternator.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; import org.bukkit.ChatColor; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/ColorTool.java b/src/main/java/com/onarandombox/MultiverseCore/display/ColorTool.java similarity index 87% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/ColorTool.java rename to src/main/java/com/onarandombox/MultiverseCore/display/ColorTool.java index 42ab445a..1c4fae67 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/ColorTool.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/ColorTool.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/ContentDisplay.java b/src/main/java/com/onarandombox/MultiverseCore/display/ContentDisplay.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/ContentDisplay.java rename to src/main/java/com/onarandombox/MultiverseCore/display/ContentDisplay.java index 8af15ad9..a43463a1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/ContentDisplay.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/ContentDisplay.java @@ -1,15 +1,13 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.Map; import java.util.Objects; import java.util.WeakHashMap; -import java.util.function.Consumer; /** * Helps to display contents such as list and maps in a nicely formatted fashion. diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/ContentFilter.java b/src/main/java/com/onarandombox/MultiverseCore/display/ContentFilter.java similarity index 98% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/ContentFilter.java rename to src/main/java/com/onarandombox/MultiverseCore/display/ContentFilter.java index d2f37dc5..cd0bed8c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/ContentFilter.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/ContentFilter.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; import com.dumptruckman.minecraft.util.Logging; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayFormatException.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayFormatException.java similarity index 92% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayFormatException.java rename to src/main/java/com/onarandombox/MultiverseCore/display/DisplayFormatException.java index 0f71e247..604d6acd 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayFormatException.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayFormatException.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; /** * Thrown when an issue occur while formatting content. diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayHandler.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java similarity index 97% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayHandler.java rename to src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java index 49fb47e0..4704f25e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayHandler.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandler.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; import com.google.common.base.Strings; import org.bukkit.ChatColor; diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayHandlers.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandlers.java similarity index 99% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayHandlers.java rename to src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandlers.java index d7e18978..3bad091d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplayHandlers.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/DisplayHandlers.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; import org.bukkit.ChatColor; import org.bukkit.command.ConsoleCommandSender; diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplaySetting.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplaySetting.java similarity index 84% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplaySetting.java rename to src/main/java/com/onarandombox/MultiverseCore/display/DisplaySetting.java index 11f31b40..6f79744e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplaySetting.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/DisplaySetting.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; /** * Represents a setting option that can be used by {@link DisplayHandler}. diff --git a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplaySettings.java b/src/main/java/com/onarandombox/MultiverseCore/display/DisplaySettings.java similarity index 95% rename from src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplaySettings.java rename to src/main/java/com/onarandombox/MultiverseCore/display/DisplaySettings.java index 238de325..092b80a9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/displaytools/DisplaySettings.java +++ b/src/main/java/com/onarandombox/MultiverseCore/display/DisplaySettings.java @@ -1,4 +1,4 @@ -package com.onarandombox.MultiverseCore.displaytools; +package com.onarandombox.MultiverseCore.display; import org.bukkit.ChatColor;