From c2a641fd60390216418535f37a4477f9d86c78da Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Sat, 18 Nov 2017 17:38:39 +0100 Subject: [PATCH 1/8] Open SF Guide with a command #491 From the suggestion of @oddare (https://github.com/TheBusyBiscuit/Slimefun4/issues/491), I've added the command to open the Slimefun Guide directly with the command "/sf open_guide". I also added the tab completion "open_guide" and a description of it. --- .../mrCookieSlime/Slimefun/Commands/SlimefunCommand.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java b/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java index df436c4e8..90fc38b97 100644 --- a/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java +++ b/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java @@ -84,6 +84,10 @@ public class SlimefunCommand implements CommandExecutor, Listener { tabs.add("teleporter"); descriptions.add(Messages.local.getTranslation("commands.teleporter").get(0)); + arguments.add("/sf open_guide"); + tabs.add("open_guide"); + descriptions.add(Messages.local.getTranslation("commands.open_guide").get(0)); + plugin.getServer().getPluginManager().registerEvents(this, plugin); } @@ -101,6 +105,9 @@ public class SlimefunCommand implements CommandExecutor, Listener { } else Messages.local.sendTranslation(sender, "messages.only-players", true); } + else if(args[0].equalsIgnoreCase("open_guide")) { + if (sender instanceof Player) SlimefunGuide.openGuide((Player) sender, SlimefunStartup.getCfg().getBoolean("guide.default-view-book")); + } else if (args[0].equalsIgnoreCase("guide")) { if (sender instanceof Player) { ((Player) sender).getInventory().addItem(SlimefunGuide.getItem(SlimefunStartup.getCfg().getBoolean("guide.default-view-book"))); From cb354cd6ebb7589496e3cff1079c553e2931b404 Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Sat, 18 Nov 2017 17:43:25 +0100 Subject: [PATCH 2/8] Added "commands.open_guide" description --- src/me/mrCookieSlime/Slimefun/Setup/Messages.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/me/mrCookieSlime/Slimefun/Setup/Messages.java b/src/me/mrCookieSlime/Slimefun/Setup/Messages.java index 12f734f9d..fd5dd2e34 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/Messages.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/Messages.java @@ -20,6 +20,7 @@ public class Messages { local.setDefault("commands.timings", "Lag-Info about your Server"); local.setDefault("commands.teleporter", "See other Player's Waypoints"); local.setDefault("commands.versions", "Lists all installed Addons"); + local.setDefault("commands.open_guide", "Opens Slimefun's guide without using the book"); local.setDefault("messages.only-players", "&4This Command is only for Players"); local.setDefault("messages.no-permission", "&4You do not have the required Permission to do this"); From e3ed803856510709a98877733f29a6b7678893d5 Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Sat, 18 Nov 2017 18:03:19 +0100 Subject: [PATCH 3/8] Added slimefun.command.open_guide permission --- src/plugin.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugin.yml b/src/plugin.yml index ff654d566..b8ff50fed 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: Slimefun -version: ${project.version} +version: 4.1.11 author: The Slimefun 4 Community description: Slimefun basically turns your entire Server into a FTB modpack without installing a single mod website: http://TheBusyBiscuit.github.io/ @@ -34,6 +34,9 @@ permissions: slimefun.command.versions: description: Allows you to do /sf versions default: op + slimefun.command.open_guide: + description: Allows you to open the SF guide without the book + default: op slimefun.android.bypass: description: Allows you to edit other Players Androids default: op From d6794c582046e6499281eceaf06eeac3e23115d6 Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Sat, 18 Nov 2017 18:05:50 +0100 Subject: [PATCH 4/8] Added permission check to open_guide Now the command "/sf open_guide" will be executed only if the player has the "slimefun.command.open_guide" permission. (Default: op) --- src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java b/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java index 90fc38b97..446b68e55 100644 --- a/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java +++ b/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java @@ -106,7 +106,11 @@ public class SlimefunCommand implements CommandExecutor, Listener { else Messages.local.sendTranslation(sender, "messages.only-players", true); } else if(args[0].equalsIgnoreCase("open_guide")) { - if (sender instanceof Player) SlimefunGuide.openGuide((Player) sender, SlimefunStartup.getCfg().getBoolean("guide.default-view-book")); + if (sender instanceof Player) { + if(sender.hasPermission("slimefun.command.open_guide")) SlimefunGuide.openGuide((Player) sender, SlimefunStartup.getCfg().getBoolean("guide.default-view-book")); + else Messages.local.sendTranslation(sender, "messages.no-permission", true); + } + else Messages.local.sendTranslation(sender, "messages.only-players", true); } else if (args[0].equalsIgnoreCase("guide")) { if (sender instanceof Player) { From 3f60207be727ec8c27b906ad65a7fc22914dbfba Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Sat, 18 Nov 2017 18:09:07 +0100 Subject: [PATCH 5/8] Made a mistake version reverted to: version: ${project.version} --- src/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugin.yml b/src/plugin.yml index b8ff50fed..66c4fd790 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: Slimefun -version: 4.1.11 +version: ${project.version} author: The Slimefun 4 Community description: Slimefun basically turns your entire Server into a FTB modpack without installing a single mod website: http://TheBusyBiscuit.github.io/ From 3bba53b20d3d3bf2630dbcf827d80c166c6f7424 Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Sun, 19 Nov 2017 22:59:58 +0100 Subject: [PATCH 6/8] Added permission check to /sf guide command The /sf guide command will now only be executed if the player has the permission "slimefun.command.guide" --- .../Slimefun/Commands/SlimefunCommand.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java b/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java index 446b68e55..82c480427 100644 --- a/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java +++ b/src/me/mrCookieSlime/Slimefun/Commands/SlimefunCommand.java @@ -105,16 +105,17 @@ public class SlimefunCommand implements CommandExecutor, Listener { } else Messages.local.sendTranslation(sender, "messages.only-players", true); } - else if(args[0].equalsIgnoreCase("open_guide")) { - if (sender instanceof Player) { - if(sender.hasPermission("slimefun.command.open_guide")) SlimefunGuide.openGuide((Player) sender, SlimefunStartup.getCfg().getBoolean("guide.default-view-book")); + else if (args[0].equalsIgnoreCase("guide")) { + if (sender instanceof Player) { + if(sender.hasPermission("slimefun.command.guide"))((Player) sender).getInventory().addItem(SlimefunGuide.getItem(SlimefunStartup.getCfg().getBoolean("guide.default-view-book"))); else Messages.local.sendTranslation(sender, "messages.no-permission", true); } else Messages.local.sendTranslation(sender, "messages.only-players", true); } - else if (args[0].equalsIgnoreCase("guide")) { - if (sender instanceof Player) { - ((Player) sender).getInventory().addItem(SlimefunGuide.getItem(SlimefunStartup.getCfg().getBoolean("guide.default-view-book"))); + else if(args[0].equalsIgnoreCase("open_guide")) { + if (sender instanceof Player) { + if(sender.hasPermission("slimefun.command.open_guide")) SlimefunGuide.openGuide((Player) sender, SlimefunStartup.getCfg().getBoolean("guide.default-view-book")); + else Messages.local.sendTranslation(sender, "messages.no-permission", true); } else Messages.local.sendTranslation(sender, "messages.only-players", true); } From d100d03b8c7c105a945424c07db950fa57a88866 Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Sun, 19 Nov 2017 23:01:18 +0100 Subject: [PATCH 7/8] Added slimefun.command.guide permission --- src/plugin.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugin.yml b/src/plugin.yml index 66c4fd790..2988a7afe 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -34,6 +34,9 @@ permissions: slimefun.command.versions: description: Allows you to do /sf versions default: op + slimefun.command.guide: + description: Allows you to obtain the Slimefun guide book + default: op slimefun.command.open_guide: description: Allows you to open the SF guide without the book default: op From 373765d1ac2173078e0b12bf132b21b1d510274c Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Sun, 19 Nov 2017 23:06:36 +0100 Subject: [PATCH 8/8] Changed guide's default permission to true --- src/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugin.yml b/src/plugin.yml index 2988a7afe..fa6052318 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -36,7 +36,7 @@ permissions: default: op slimefun.command.guide: description: Allows you to obtain the Slimefun guide book - default: op + default: true slimefun.command.open_guide: description: Allows you to open the SF guide without the book default: op