refactor classes and minor fixes

MyWarpsPlugin -> WarpaliciousPlugin
MyWarpsCommand -> WarpaliciousCommand

Author: oskar3123

resources/plugin.yml

@@ -1,7 +1,7 @@
 name: Warpalicious
-main: nl.datdenkikniet.warpalicious.MyWarpsPlugin
+main: nl.datdenkikniet.warpalicious.Warpalicious
 authors: [datdenkikniet, TastyBlueberry]
-version: 1.6.0
+version: 1.6.1
 commands:
     delwarp:
         description: delete a warp

…nkikniet/warpalicious/MyWarpsPlugin.java …iet/warpalicious/WarpaliciousPlugin.javasrc/nl/datdenkikniet/warpalicious/MyWarpsPlugin.java renamed to src/nl/datdenkikniet/warpalicious/WarpaliciousPlugin.java src/nl/datdenkikniet/warpalicious/MyWarpsPlugin.java renamed to src/nl/datdenkikniet/warpalicious/WarpaliciousPlugin.java

@@ -1,6 +1,6 @@
 package nl.datdenkikniet.warpalicious;
 
-import nl.datdenkikniet.warpalicious.commands.MyWarpsCommand;
+import nl.datdenkikniet.warpalicious.commands.WarpaliciousCommand;
 import nl.datdenkikniet.warpalicious.config.Config;
 import nl.datdenkikniet.warpalicious.config.CustomConfig;
 import nl.datdenkikniet.warpalicious.config.messages.Strings;
@@ -14,7 +14,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.mcstats.Metrics;
 
-public class MyWarpsPlugin extends JavaPlugin {
+public class WarpaliciousPlugin extends JavaPlugin {
 
     public CustomConfig cfgHandler = new CustomConfig(this);
 
@@ -37,7 +37,7 @@ public void onEnable() {
         handler = new WarpHandler(this, warps);
         handler.load();
         getServer().getPluginManager().registerEvents(new SignEventListener(str, handler), this);
-        getCommand("warpalicious").setExecutor(new MyWarpsCommand(this, str));
+        getCommand("warpalicious").setExecutor(new WarpaliciousCommand(this, str));
         getLogger().info("Warpalicious version " + getDescription().getVersion() + " has been enabled!");
     }
 

src/nl/datdenkikniet/warpalicious/commands/FindWarpCommand.java

@@ -1,6 +1,6 @@
 package nl.datdenkikniet.warpalicious.commands;
 
-import nl.datdenkikniet.warpalicious.MyWarpsPlugin;
+import nl.datdenkikniet.warpalicious.WarpaliciousPlugin;
 import nl.datdenkikniet.warpalicious.config.messages.Strings;
 import nl.datdenkikniet.warpalicious.handling.WarpHandler;
 import org.bukkit.command.Command;
@@ -11,7 +11,7 @@ public class FindWarpCommand implements CommandExecutor {
     private Strings str;
     private WarpHandler handler;
 
-    public FindWarpCommand(MyWarpsPlugin instance){
+    public FindWarpCommand(WarpaliciousPlugin instance){
         str = instance.getStrings();
         handler = instance.getWarpHandler();
     }

…arpalicious/commands/MyWarpsCommand.java …icious/commands/WarpaliciousCommand.javasrc/nl/datdenkikniet/warpalicious/commands/MyWarpsCommand.java renamed to src/nl/datdenkikniet/warpalicious/commands/WarpaliciousCommand.java src/nl/datdenkikniet/warpalicious/commands/MyWarpsCommand.java renamed to src/nl/datdenkikniet/warpalicious/commands/WarpaliciousCommand.java

@@ -1,6 +1,6 @@
 package nl.datdenkikniet.warpalicious.commands;
 
-import nl.datdenkikniet.warpalicious.MyWarpsPlugin;
+import nl.datdenkikniet.warpalicious.WarpaliciousPlugin;
 import nl.datdenkikniet.warpalicious.config.messages.Strings;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -9,10 +9,10 @@
 /**
  * Created by Jona on 21/10/2016.
  */
-public class MyWarpsCommand implements CommandExecutor {
-    private MyWarpsPlugin plugin;
+public class WarpaliciousCommand implements CommandExecutor {
+    private WarpaliciousPlugin plugin;
     private Strings str;
-    public MyWarpsCommand(MyWarpsPlugin pl, Strings instance){
+    public WarpaliciousCommand(WarpaliciousPlugin pl, Strings instance){
         str = instance;
         plugin = pl;
     }

src/nl/datdenkikniet/warpalicious/config/CustomConfig.java

@@ -3,7 +3,7 @@
  */
 package nl.datdenkikniet.warpalicious.config;
 
-import nl.datdenkikniet.warpalicious.MyWarpsPlugin;
+import nl.datdenkikniet.warpalicious.WarpaliciousPlugin;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -13,8 +13,8 @@
 import java.util.logging.Level;
 
 public class CustomConfig{
-	MyWarpsPlugin plugin;
-	public CustomConfig(MyWarpsPlugin instance){
+	private WarpaliciousPlugin plugin;
+	public CustomConfig(WarpaliciousPlugin instance){
 		plugin = instance;
 	}
 	public FileConfiguration getCustomConfig(Config config) {

src/nl/datdenkikniet/warpalicious/config/messages/MessageNotFoundException.java

@@ -1,12 +1,12 @@
 package nl.datdenkikniet.warpalicious.config.messages;
 
-import nl.datdenkikniet.warpalicious.MyWarpsPlugin;
+import nl.datdenkikniet.warpalicious.WarpaliciousPlugin;
 
 class MessageNotFoundException extends Exception {
     private String messageName;
-    private MyWarpsPlugin plugin;
+    private WarpaliciousPlugin plugin;
 
-    MessageNotFoundException(String name, MyWarpsPlugin instance) {
+    MessageNotFoundException(String name, WarpaliciousPlugin instance) {
         messageName = name;
         plugin = instance;
     }

src/nl/datdenkikniet/warpalicious/config/messages/MessagesGetter.java

@@ -4,23 +4,23 @@
 package nl.datdenkikniet.warpalicious.config.messages;
 
 
-import nl.datdenkikniet.warpalicious.MyWarpsPlugin;
+import nl.datdenkikniet.warpalicious.WarpaliciousPlugin;
 import nl.datdenkikniet.warpalicious.config.Config;
 import nl.datdenkikniet.warpalicious.config.CustomConfig;
 
 import java.util.ArrayList;
 
 class MessagesGetter {
     private ArrayList<Message> messages = new ArrayList<>();
-    private MyWarpsPlugin plugin;
-    MessagesGetter(CustomConfig handler, Config cfg, MyWarpsPlugin instance) {
+    private WarpaliciousPlugin plugin;
+    MessagesGetter(CustomConfig handler, Config cfg, WarpaliciousPlugin instance) {
         plugin = instance;
         if ((cfg.file == null) || (cfg.fileConfig == null)) {
             handler.saveDefaultConfig(cfg);
         }
         handler.reloadCustomConfig(cfg);
         System.out.println("loading messages....");
-        handler.getCustomConfig(cfg).getKeys(false).stream().forEach(key -> messages.add(new Message(key, handler.getCustomConfig(cfg).getString(key))));
+        handler.getCustomConfig(cfg).getKeys(false).forEach(key -> messages.add(new Message(key, handler.getCustomConfig(cfg).getString(key))));
     }
 
     String getMessage(String name) throws MessageNotFoundException{

src/nl/datdenkikniet/warpalicious/config/messages/Strings.java

@@ -1,6 +1,6 @@
 package nl.datdenkikniet.warpalicious.config.messages;
 
-import nl.datdenkikniet.warpalicious.MyWarpsPlugin;
+import nl.datdenkikniet.warpalicious.WarpaliciousPlugin;
 import nl.datdenkikniet.warpalicious.config.Config;
 import nl.datdenkikniet.warpalicious.config.CustomConfig;
 import org.bukkit.command.Command;
@@ -14,7 +14,7 @@ public class Strings {
     private String permission = "warpalicious.";
     private MessagesGetter messages;
 
-    public Strings(CustomConfig cu, Config cfg, MyWarpsPlugin plugin) {
+    public Strings(CustomConfig cu, Config cfg, WarpaliciousPlugin plugin) {
         configHandler = cu;
         config = cfg;
         messages = new MessagesGetter(configHandler, config, plugin);

src/nl/datdenkikniet/warpalicious/handling/Warp.java

@@ -1,6 +1,6 @@
 package nl.datdenkikniet.warpalicious.handling;
 
-import nl.datdenkikniet.warpalicious.MyWarpsPlugin;
+import nl.datdenkikniet.warpalicious.WarpaliciousPlugin;
 import nl.datdenkikniet.warpalicious.config.messages.Strings;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -17,10 +17,10 @@ public class Warp {
     private String name;
     private HashMap<Flag, Boolean> flags;
     private int timesWarpedTo;
-    private MyWarpsPlugin plugin;
+    private WarpaliciousPlugin plugin;
 
 
-    public Warp(MyWarpsPlugin instance, UUID owner, Location loc, String name, HashMap<Flag, Boolean> flags, WarpHandler handler, int time) {
+    public Warp(WarpaliciousPlugin instance, UUID owner, Location loc, String name, HashMap<Flag, Boolean> flags, WarpHandler handler, int time) {
         this.owner = owner;
         this.loc = loc;
         this.name = name;
@@ -80,9 +80,7 @@ public void warp(Player player, TeleportMode mode, Strings str) {
                 player.sendMessage(str.noMove);
             }
             final int taskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new TeleportRunnable(player, mode, this, str, delay), 0L, 20L);
-            Bukkit.getScheduler().runTaskLater(plugin, () -> {
-                Bukkit.getScheduler().cancelTask(taskId);
-            }, delay * 20 + 10L);
+            Bukkit.getScheduler().runTaskLater(plugin, () -> Bukkit.getScheduler().cancelTask(taskId), delay * 20 + 10L);
         }
     }
 

src/nl/datdenkikniet/warpalicious/handling/WarpHandler.java

@@ -1,6 +1,6 @@
 package nl.datdenkikniet.warpalicious.handling;
 
-import nl.datdenkikniet.warpalicious.MyWarpsPlugin;
+import nl.datdenkikniet.warpalicious.WarpaliciousPlugin;
 import nl.datdenkikniet.warpalicious.commands.*;
 import nl.datdenkikniet.warpalicious.config.Config;
 import nl.datdenkikniet.warpalicious.config.CustomConfig;
@@ -18,14 +18,14 @@
 
 public class WarpHandler {
 
-    private MyWarpsPlugin plugin;
+    private WarpaliciousPlugin plugin;
     private Config config;
     private CustomConfig cfg;
     private ArrayList<Warp> warps = new ArrayList<>();
     private Strings str;
 
 
-    public WarpHandler(MyWarpsPlugin instance, Config config) {
+    public WarpHandler(WarpaliciousPlugin instance, Config config) {
         plugin = instance;
         this.config = config;
         cfg = plugin.cfgHandler;
@@ -385,7 +385,7 @@ private String getWarpListString(Warp warp, int i) {
         }
         return toRet;
     }
-    public MyWarpsPlugin getPlugin(){
+    public WarpaliciousPlugin getPlugin(){
         return plugin;
     }
 }