From a4e095c33099f3d30a8fdcbe08171edb14392e36 Mon Sep 17 00:00:00 2001 From: Brianna Date: Mon, 11 Jan 2021 10:59:41 -0600 Subject: [PATCH 1/3] Updated GUI's to be compatible with the latest version of core. --- .../com/songoda/ultimatemoderation/gui/MainGui.java | 10 +++++----- .../songoda/ultimatemoderation/gui/ModerateGui.java | 12 ++++++------ .../ultimatemoderation/gui/NotesManagerGui.java | 10 +++++----- .../songoda/ultimatemoderation/gui/PlayerGui.java | 10 +++++----- .../songoda/ultimatemoderation/gui/PunishGui.java | 12 ++++++------ .../ultimatemoderation/gui/PunishmentsGui.java | 10 +++++----- .../ultimatemoderation/gui/TemplateManagerGui.java | 10 +++++----- .../songoda/ultimatemoderation/gui/TicketGui.java | 10 +++++----- .../ultimatemoderation/gui/TicketManagerGui.java | 10 +++++----- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/MainGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/MainGui.java index 648918a..408e3ee 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/MainGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/MainGui.java @@ -60,13 +60,13 @@ public class MainGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(0, 1, true, true, glass2); setButton(5, 2, GuiUtils.createButtonItem(CompatibleMaterial.ENDER_PEARL, plugin.getLocale().getMessage("gui.players.search").getMessage()), diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/ModerateGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/ModerateGui.java index 18f62d7..ac2d360 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/ModerateGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/ModerateGui.java @@ -28,14 +28,14 @@ public class ModerateGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 2, 0, false, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(2, 0, false, true, glass2); + mirrorFill(0, 1, true, true, glass2); setButton(8, GuiUtils.createButtonItem(CompatibleMaterial.OAK_DOOR, plugin.getLocale().getMessage("gui.general.back").getMessage()), diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/NotesManagerGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/NotesManagerGui.java index 68c6448..365c78d 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/NotesManagerGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/NotesManagerGui.java @@ -62,13 +62,13 @@ public class NotesManagerGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(0, 1, true, true, glass2); setButton(5, 5, GuiUtils.createButtonItem(CompatibleMaterial.OAK_DOOR, plugin.getLocale().getMessage("gui.general.back").getMessage()), diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/PlayerGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/PlayerGui.java index 68b5859..ff81ecf 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/PlayerGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/PlayerGui.java @@ -32,13 +32,13 @@ public class PlayerGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(0, 1, true, true, glass2); ItemStack head = ItemUtils.getPlayerSkull(toModerate); diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/PunishGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/PunishGui.java index 27a05ab..a0aadea 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/PunishGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/PunishGui.java @@ -72,14 +72,14 @@ public class PunishGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 2, 0, false, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(2, 0, false, true, glass2); + mirrorFill(0, 1, true, true, glass2); if (toModerate != null) setItem(13, GuiUtils.createButtonItem(ItemUtils.getPlayerSkull(toModerate), diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/PunishmentsGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/PunishmentsGui.java index 4e0cc7a..a0e3e71 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/PunishmentsGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/PunishmentsGui.java @@ -53,13 +53,13 @@ public class PunishmentsGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(0, 1, true, true, glass2); PlayerPunishData playerPunishData = plugin.getPunishmentManager().getPlayer(toModerate); diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java index a1de8bf..631b42b 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/TemplateManagerGui.java @@ -53,13 +53,13 @@ public class TemplateManagerGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(0, 1, true, true, glass2); setButton(5, 3, GuiUtils.createButtonItem(CompatibleMaterial.DIAMOND_SWORD, Methods.formatText("&6" + punishmentType.name())), (event) -> { diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TicketGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/TicketGui.java index d385261..ecf0a4b 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/TicketGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/TicketGui.java @@ -64,13 +64,13 @@ public class TicketGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(0, 1, true, true, glass2); // enable page event setNextPage(4, 7, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.next").getMessage())); diff --git a/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java b/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java index fb29c91..d237d28 100644 --- a/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java +++ b/src/main/java/com/songoda/ultimatemoderation/gui/TicketManagerGui.java @@ -61,13 +61,13 @@ public class TicketManagerGui extends Gui { ItemStack glass3 = GuiUtils.getBorderItem(Settings.GLASS_TYPE_3.getMaterial(CompatibleMaterial.LIGHT_BLUE_STAINED_GLASS_PANE)); // edges will be type 3 - GuiUtils.mirrorFill(this, 0, 2, true, true, glass3); - GuiUtils.mirrorFill(this, 1, 1, true, true, glass3); + mirrorFill(0, 2, true, true, glass3); + mirrorFill(1, 1, true, true, glass3); // decorate corners with type 2 - GuiUtils.mirrorFill(this, 0, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 1, 0, true, true, glass2); - GuiUtils.mirrorFill(this, 0, 1, true, true, glass2); + mirrorFill(0, 0, true, true, glass2); + mirrorFill(1, 0, true, true, glass2); + mirrorFill(0, 1, true, true, glass2); // enable page event setNextPage(4, 7, GuiUtils.createButtonItem(CompatibleMaterial.ARROW, plugin.getLocale().getMessage("gui.general.next").getMessage())); From 070bb51eaadec023acb1dc8625275c4665d807d7 Mon Sep 17 00:00:00 2001 From: Brianna Date: Mon, 11 Jan 2021 12:15:42 -0600 Subject: [PATCH 2/3] Modified the way permissions are stored for moderations. --- .../ultimatemoderation/moderate/AbstractModeration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/songoda/ultimatemoderation/moderate/AbstractModeration.java b/src/main/java/com/songoda/ultimatemoderation/moderate/AbstractModeration.java index 789bac4..b5be987 100644 --- a/src/main/java/com/songoda/ultimatemoderation/moderate/AbstractModeration.java +++ b/src/main/java/com/songoda/ultimatemoderation/moderate/AbstractModeration.java @@ -27,7 +27,7 @@ public abstract class AbstractModeration { public abstract String getDescription(); public String getPermission() { - return "ultimatemoderation." + getType().name().toLowerCase(); + return "um." + getProper().toLowerCase(); } public boolean hasPermission(Player player) { @@ -35,7 +35,7 @@ public abstract class AbstractModeration { } public boolean isExempt(OfflinePlayer player) { - return VaultPermissions.hasPermission(player, "ultimatemoderation." + getType().name().toLowerCase() + ".exempt"); + return VaultPermissions.hasPermission(player, getPermission() + ".exempt"); } protected void registerCommand(UltimateModeration plugin) { From 18899d2166125b779580e570fe49f9d1dcddd294 Mon Sep 17 00:00:00 2001 From: Brianna Date: Mon, 11 Jan 2021 12:18:03 -0600 Subject: [PATCH 3/3] version 2.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5ccdaea..5297b32 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda UltimateModeration 4.0.0 - 2.0.3 + 2.0.4 clean install UltimateModeration-${project.version}