From 9f638ed51d6cc4368c09b9cb79ccad211c955135 Mon Sep 17 00:00:00 2001 From: Refrac <31602472+RefracDevelopment@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:24:32 -0600 Subject: [PATCH 1/7] Update SpeedInv.java --- .../staffmodegui2/Inv/SpeedInv.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/SpeedInv.java b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/SpeedInv.java index d0f023e..6893ed8 100644 --- a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/SpeedInv.java +++ b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/SpeedInv.java @@ -1,7 +1,7 @@ -package net.noodles.staffmodegui2.Inv; +package net.noodles.staffmodegui2.staffmodegui2.Inv; -import net.noodles.staffmodegui2.Inv.InvItems.MainInvItems; -import net.noodles.staffmodegui2.Inv.InvItems.SpeedInvItems; +import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.MainInvItems; +import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.SpeedInvItems; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -11,7 +11,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import net.noodles.staffmodegui2.StaffModeGUI2; +import net.noodles.staffmodegui2.staffmodegui2.StaffModeGUI2; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -41,7 +41,7 @@ public Inventory getInventory() { inv.setItem(5, SpeedInvItems.speed6()); inv.setItem(6, SpeedInvItems.speed7()); inv.setItem(7, SpeedInvItems.speed8()); - inv.setItem(8, MainInvItems.mainMenuReturn()); + inv.setItem(8, SpeedInvItems.menuReturn()); for (int i = 0; i < 9; ++i) { if (inv.getItem(i) == null) { @@ -113,12 +113,12 @@ public void onInventoryClick(InventoryClickEvent event) { player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 180000000, 8)); player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("speedMenu.messageItemSpeed8").replace("&", "§")); player.closeInventory(); - } else if (event.getCurrentItem().isSimilar(MainInvItems.mainMenuReturn())) { - player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message").replace("&", "§")); - player.openInventory(StaffModeGUI2.getInstance().getMainInv().getInventory()); + } else if (event.getCurrentItem().isSimilar(SpeedInvItems.menuReturn())) { + player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message4").replace("&", "§")); + player.openInventory(StaffModeGUI2.getInstance().getEffectsInv().getInventory()); } } -} \ No newline at end of file +} From b27c024b0eca7ff316d4e8383e130218abfc0f50 Mon Sep 17 00:00:00 2001 From: Refrac <31602472+RefracDevelopment@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:24:54 -0600 Subject: [PATCH 2/7] Update config.yml --- src/main/resources/config.yml | 49 +++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index f2b4315..4963d1f 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -11,13 +11,40 @@ defaultMessages: noPermission: "&cSorry you don't have permission!" mainMenuReturn: + # Main Menu return title title: "&7Main Menu" + # Server Manager return title + title1: "&7Server Manager Menu" + # Mob Menu return title + title2: "&7Mob Menu" + # Tools Menu return title + title3: "&7Tools Menu" + # Effects Menu return title + title4: "&7Effects Menu" + # Main Menu return lore lore: "&7Click to return to main menu." + # Server Manager return lore + lore1: "&7Click to return to server manager menu." + # Mob Menu return lore + lore2: "&7Click to return to mob menu." + # Tools Menu return lore + lore3: "&7Click to return to tools menu." + # Effects Menu return lore + lore4: "&7Click to return to effects menu." + # Main Menu return message(All menus in the main gui) message: "&7Returned to Main Menu!" + # Server Manager return message(Whitelist & Weather Menus) + message1: "&7Returned to the Server Manager Menu!" + # Mob Menu return message(Extra Mob Menu) + message2: "&7Returned to the Mob Menu!" + # Tools Menu return message(Fly, Vanish, FeedAndHeal Menus) + message3: "&7Returned to the Tools Menu!" + # Effects Menu return message + message4: "&7Returned to the Effects Menu!" #======================================================= -# Whitelist Menu +# Whitelist Menu Messages whitelistMenu: # Permission Needed: staffmodegui.whitelistmenu - title: "&8Whitelist Menu" + title: "&8Whitelist Control" lore: "&7Control the server whitelist" openGUI: "&7Opened the whitelist control panel." # Whitelist Menu Items @@ -28,7 +55,7 @@ whitelistMenu: # Permission Needed: staffmodegui.whitelistmenu loreItemOFF: "&7Click to toggle the whitelist OFF." messageItemOFF: "&7You toggled the whitelist OFF." #======================================================= -# Time Menu +# Time Menu Messages timeMenu: # Permission Needed: staffmodegui.timemenu title: "&8Time Control" lore: "&7Control the server time" @@ -107,7 +134,7 @@ timeMenu: # Permission Needed: staffmodegui.timemenu time11PMLore: "&7Click to change the server time to 11PM" messageTime11PM: "&7Changed the server time to 11PM" #======================================================= -# Weather Menu +# Weather Menu Messages weatherMenu: # Permission Needed: staffmodegui.weathermenu title: "&8Weather Control" lore: "&7Control the server weather" @@ -122,7 +149,7 @@ weatherMenu: # Permission Needed: staffmodegui.weathermenu #======================================================= # Gamemode Menu Messages gamemodeMenu: # Permission Needed: staffmodegui.gamemodemenu - title: '&8Gamemode Menu' + title: '&8Gamemode Control' lore: '&7Control your Gamemode' openGUI: '&7Opened The Gamemode Menu!' # Gamemode Menu Items @@ -141,7 +168,7 @@ gamemodeMenu: # Permission Needed: staffmodegui.gamemodemenu #======================================================= # Fly Menu Messages flyMenu: # Permission Needed: staffmodegui.flymenu - title: '&bFly Menu' + title: '&bFlight Control' lore: '&7Control your Flight' openGUI: '&7Opened The Fly Menu!' # Fly Menu Items @@ -153,8 +180,8 @@ flyMenu: # Permission Needed: staffmodegui.flymenu messageItemOFF: "&cFly OFF!" #======================================================== # Vanish Menu Messages -vanishMenu: # Permsission Needed: staffmodegui.vanishmenu - title: '&bVanish Menu' +vanishMenu: # Permission Needed: staffmodegui.vanishmenu + title: '&bVanish Control' lore: '&7Control your Vanish' openGUI: '&7Opened The Vanish Menu!' # Vanish Menu Items @@ -167,7 +194,7 @@ vanishMenu: # Permsission Needed: staffmodegui.vanishmenu #======================================================== # Mob Menu Messages mobMenu: # Permission Needed: staffmodegui.mobmenu - title: '&8Mob Menu' + title: '&8Mob Control' lore: '&7Control your Mob Population' openGUI: '&7Opened The Mob Menu!' # Mob Menu Items @@ -246,7 +273,7 @@ mobMenu: # Permission Needed: staffmodegui.mobmenu #======================================================== # Extra Mob Menu Messages extraMobMenu: # Permission Needed: staffmodegui.extramobmenu - title: '&8Extra Mob Menu' + title: '&8Extra Mob Control' lore: '&7Dangerous mobs' openGUI: '&7Opened The Extra Mob Menu!' # Extra Mob Menu Items @@ -401,7 +428,7 @@ strengthMenu: #Permission Needed: staffmodegui.strengthmenu titleItemStrength4: "&bStrength 4" loreItemStrength4: "&7Ability to deal more damage!" messageItemStrength4: "&7Strength 4 effect applied!" - titleItemStrength5: "&bSStrength 5" + titleItemStrength5: "&bStrength 5" loreItemStrength5: "&7Ability to deal more damage!" messageItemStrength5: "&7Strength 5 effect applied!" titleItemStrength6: "&bStrength 6" From ae66caad35fab9a37436701bcdbff91045ba9306 Mon Sep 17 00:00:00 2001 From: Refrac <31602472+RefracDevelopment@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:25:19 -0600 Subject: [PATCH 3/7] Update VanishInv.java --- .../staffmodegui2/Inv/VanishInv.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/VanishInv.java b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/VanishInv.java index 3a8b75c..9e34678 100644 --- a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/VanishInv.java +++ b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/VanishInv.java @@ -36,7 +36,7 @@ public Inventory getInventory() { inv.setItem(2, VanishInvItems.VanishON()); inv.setItem(6, VanishInvItems.VanishOFF()); - inv.setItem(8, MainInvItems.mainMenuReturn()); + inv.setItem(8, VanishInvItems.menuReturn()); for (int i = 0; i < 9; ++i) { if (inv.getItem(i) == null) { @@ -76,17 +76,16 @@ public void onInventoryClick(InventoryClickEvent event) { player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("vanishMenu.messageItemON").replace("&", "§")); player.closeInventory(); } else if (event.getCurrentItem().isSimilar(VanishInvItems.VanishOFF())) { - for (Player players : Bukkit.getOnlinePlayers()) { - players.showPlayer(player); - player.setAllowFlight(false); - player.setFlying(false); - } + for (Player players : Bukkit.getOnlinePlayers()) { + players.showPlayer(player); + player.setAllowFlight(false); + player.setFlying(false); + } player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("vanishMenu.messageItemOFF").replace("&", "§")); player.closeInventory(); - } else if (event.getCurrentItem().isSimilar(MainInvItems.mainMenuReturn())) { - player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message").replace("&", "§")); - player.openInventory(StaffModeGUI2.getInstance().getMainInv().getInventory()); - + } else if (event.getCurrentItem().isSimilar(VanishInvItems.menuReturn())) { + player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message3").replace("&", "§")); + player.openInventory(StaffModeGUI2.getInstance().getToolsInv().getInventory()); } } } From 755ab8a11f22d1cec5f7804e6cc1eb019bd5368e Mon Sep 17 00:00:00 2001 From: Refrac <31602472+RefracDevelopment@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:25:38 -0600 Subject: [PATCH 4/7] Update WeatherInv.java --- .../staffmodegui2/staffmodegui2/Inv/WeatherInv.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WeatherInv.java b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WeatherInv.java index 75757dc..99c2f87 100644 --- a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WeatherInv.java +++ b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WeatherInv.java @@ -1,7 +1,5 @@ package net.noodles.staffmodegui2.staffmodegui2.Inv; -import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.MainInvItems; -import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.TimeInvItems; import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.WeatherInvItems; import net.noodles.staffmodegui2.staffmodegui2.StaffModeGUI2; import org.bukkit.Bukkit; @@ -38,7 +36,7 @@ public Inventory getInventory() { inv.setItem(2, WeatherInvItems.weatherClear()); inv.setItem(6, WeatherInvItems.weatherStorm()); - inv.setItem(8, MainInvItems.mainMenuReturn()); + inv.setItem(8, WeatherInvItems.menuReturn()); for (int i = 0; i < 9; ++i) { @@ -81,9 +79,9 @@ public void onInventoryClick(InventoryClickEvent event) { player.closeInventory(); World world = player.getWorld(); world.setStorm(true); - } else if (event.getCurrentItem().isSimilar(MainInvItems.mainMenuReturn())) { - player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message").replace("&", "§")); - player.openInventory(StaffModeGUI2.getInstance().getMainInv().getInventory()); + } else if (event.getCurrentItem().isSimilar(WeatherInvItems.menuReturn())) { + player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message1").replace("&", "§")); + player.openInventory(StaffModeGUI2.getInstance().getServerManagerInv().getInventory()); } } From 8e860c826cc2f2e6c036976faf9746e9049aa001 Mon Sep 17 00:00:00 2001 From: Refrac <31602472+RefracDevelopment@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:27:18 -0600 Subject: [PATCH 5/7] Update WhitelistInv.java --- .../staffmodegui2/Inv/WhitelistInv.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WhitelistInv.java b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WhitelistInv.java index 1c33f42..d801415 100644 --- a/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WhitelistInv.java +++ b/src/main/java/net/noodles/staffmodegui2/staffmodegui2/Inv/WhitelistInv.java @@ -1,9 +1,7 @@ package net.noodles.staffmodegui2.staffmodegui2.Inv; -import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.MainInvItems; import net.noodles.staffmodegui2.staffmodegui2.Inv.InvItems.WhitelistInvItems; import net.noodles.staffmodegui2.staffmodegui2.StaffModeGUI2; -import net.noodles.staffmodegui2.staffmodegui2.util.ItemBuilder; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -15,8 +13,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import java.util.Arrays; - public class WhitelistInv implements Listener { @@ -37,9 +33,9 @@ private int getSize() { public Inventory getInventory() { Inventory inv = Bukkit.createInventory(null, getSize(), getTitle()); - inv.setItem(2, WhitelistInvItems.whitelistON()); - inv.setItem(6, WhitelistInvItems.whitelistOFF()); - inv.setItem(8, MainInvItems.mainMenuReturn()); + inv.setItem(2, WhitelistInvItems.whitelistON()); + inv.setItem(6, WhitelistInvItems.whitelistOFF()); + inv.setItem(8, WhitelistInvItems.menuReturn()); for (int i = 0; i < 9; ++i) { if (inv.getItem(i) == null) { @@ -79,9 +75,9 @@ public void onInventoryClick(InventoryClickEvent event) { Bukkit.getServer().setWhitelist(false); player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("whitelistMenu.messageItemOFF").replace("&", "§")); player.closeInventory(); - } else if (event.getCurrentItem().isSimilar(MainInvItems.mainMenuReturn())) { - player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message").replace("&", "§")); - player.openInventory(StaffModeGUI2.getInstance().getMainInv().getInventory()); + } else if (event.getCurrentItem().isSimilar(WhitelistInvItems.menuReturn())) { + player.sendMessage(StaffModeGUI2.getPlugin().getConfig().getString("mainMenuReturn.message1").replace("&", "§")); + player.openInventory(StaffModeGUI2.getInstance().getServerManagerInv().getInventory()); } } From 1afbe1057d43ce6049cc49677dee23a981cdafa1 Mon Sep 17 00:00:00 2001 From: Refrac <31602472+RefracDevelopment@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:38:25 -0600 Subject: [PATCH 6/7] Update WeatherInv.java From 883141f0bee052ed230ddf1e3a95dcabb50cbd8a Mon Sep 17 00:00:00 2001 From: Refrac <31602472+RefracDevelopment@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:38:44 -0600 Subject: [PATCH 7/7] Update WhitelistInv.java