api update

Addon-FlashBack/pom.xml

@@ -9,9 +9,17 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>Addon-TimedRTP</artifactId>
+    <artifactId>Addon-FlashBack</artifactId>
     <version>1.0</version>
     <build>
         <finalName>${project.parent.artifactId}-${project.name}-${project.version}</finalName>
     </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.SuperRonanCraft</groupId>
+            <artifactId>Main</artifactId>
+            <version>2.14.5</version>
+        </dependency>
+    </dependencies>
 </project>

Addon-FlashBack/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/FlashBack/Events.java

@@ -0,0 +1,12 @@
+package me.SuperRonanCraft.BetterRTP.Addon.FlashBack;
+
+import me.SuperRonanCraft.BetterRTP.player.events.RTPEventListener;
+import org.bukkit.entity.Player;
+
+public class Events implements RTPEventListener {
+
+    @Override
+    public void teleportedEvent(Player p) {
+
+    }
+}

Addon-FlashBack/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/FlashBack/Main.java

@@ -0,0 +1,12 @@
+package me.SuperRonanCraft.BetterRTP.Addon.FlashBack;
+
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class Main extends JavaPlugin {
+
+    @Override
+    public void onEnable() {
+        BetterRTP.getInstance().getEvents().addListener(new Events());
+    }
+}

Addon-FlashBack/src/main/resources/plugin.yml

@@ -0,0 +1,6 @@
+main: me.SuperRonanCraft.BetterRTP.Addon.FlashBack
+version: 1.0
+api-version: '1.13'
+name: BetterRTP-Addon-FlashBack
+depend: [BetterRTP]
+

Addon-TimedRTP/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/TimedRTP/Main.java

@@ -1,8 +0,0 @@
-package me.SuperRonanCraft.BetterRTP.Addon.TimedRTP;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class Main extends JavaPlugin {
-
-
-}

Main/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java

@@ -3,6 +3,7 @@ package me.SuperRonanCraft.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.PlayerInfo;
 import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
 import me.SuperRonanCraft.BetterRTP.player.events.Listener;
+import me.SuperRonanCraft.BetterRTP.player.events.RTPEventInitiator;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP;
 import me.SuperRonanCraft.BetterRTP.references.Permissions;
 import me.SuperRonanCraft.BetterRTP.references.depends.DepEconomy;
@@ -18,18 +19,19 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.List;
 
-public class Main extends JavaPlugin {
+public class BetterRTP extends JavaPlugin {
     private final Permissions perms = new Permissions();
     private final Messages text = new Messages();
     private final DepEconomy eco = new DepEconomy();
     private final Commands cmd = new Commands(this);
     private final RTP rtp = new RTP();
     private final Listener listener = new Listener();
-    private static Main instance;
+    private static BetterRTP instance;
     private final Files files = new Files();
     private final RTPInventories invs = new RTPInventories();
     private final PlayerInfo pInfo = new PlayerInfo();
     private final Settings settings = new Settings();
+    private final RTPEventInitiator events = new RTPEventInitiator();
 
     public void onEnable() {
         instance = this;
@@ -47,7 +49,7 @@ public class Main extends JavaPlugin {
         return files;
     }
 
-    public static Main getInstance() {
+    public static BetterRTP getInstance() {
         return instance;
     }
 
@@ -121,4 +123,8 @@ public class Main extends JavaPlugin {
         if (getInstance().getSettings().debug)
             getInstance().getLogger().info(str);
     }
+
+    public RTPEventInitiator getEvents() {
+        return events;
+    }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.commands;
 
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTPCooldown;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import org.bukkit.block.Biome;
@@ -15,12 +15,12 @@ import java.util.UUID;
 
 public class Commands {
 
-    private final Main pl;
+    private final BetterRTP pl;
     public HashMap<UUID, Boolean> rtping = new HashMap<>();
     public RTPCooldown cooldowns = new RTPCooldown();
     private int delayTimer;
 
-    public Commands(Main pl) {
+    public Commands(BetterRTP pl) {
         this.pl = pl;
     }
 
@@ -104,7 +104,7 @@ public class Commands {
     public List<String> getBiomes(String[] args, int start, CommandSender sendi) {
         List<String> biomes = new ArrayList<>();
         boolean error_sent = false;
-        if (Main.getInstance().getPerms().getBiome(sendi))
+        if (BetterRTP.getInstance().getPerms().getBiome(sendi))
             for (int i = start; i < args.length; i++) {
                 String str = args[i];
                 try {

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
@@ -14,7 +14,7 @@ public class CmdBiome implements RTPCommand, RTPCommandHelpable {
     //rtp biome <biome1, biome2...>
     public void execute(CommandSender sendi, String label, String[] args) {
         if (args.length >= 2)
-            Main.getInstance().getCmd().rtp(sendi, label, null, Main.getInstance().getCmd().getBiomes(args, 1, sendi));
+            BetterRTP.getInstance().getCmd().rtp(sendi, label, null, BetterRTP.getInstance().getCmd().getBiomes(args, 1, sendi));
         else
             usage(sendi, label);
     }
@@ -27,19 +27,19 @@ public class CmdBiome implements RTPCommand, RTPCommandHelpable {
     }
 
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getBiome(sendi);
+        return BetterRTP.getInstance().getPerms().getBiome(sendi);
     }
 
     public void usage(CommandSender sendi, String label) {
-        Main.getInstance().getText().getUsageBiome(sendi, label);
+        BetterRTP.getInstance().getText().getUsageBiome(sendi, label);
     }
 
     private Commands getCmd() {
-        return Main.getInstance().getCmd();
+        return BetterRTP.getInstance().getCmd();
     }
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpBiome();
+        return BetterRTP.getInstance().getText().getHelpBiome();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
@@ -34,7 +34,7 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
                                         return;
                                     }
                                 }
-                                Main.getInstance().getText().getNotExist(sendi, label);
+                                BetterRTP.getInstance().getText().getNotExist(sendi, label);
                                 return;
                             }
                             usage(sendi, label, cmd);
@@ -65,7 +65,7 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
             value = cmd.getResult(val);
         } catch (Exception e) {
             e.printStackTrace();
-            Main.getInstance().getText().getEditError(sendi);
+            BetterRTP.getInstance().getText().getEditError(sendi);
             return;
         }
 
@@ -81,7 +81,7 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
                     Map<Object, Object> values = (Map<Object, Object>) map2;
                     values.put(cmd.get(), value);
 
-                    Main.getInstance().getText().getEditSet(sendi, cmd.get(), val);
+                    BetterRTP.getInstance().getText().getEditSet(sendi, cmd.get(), val);
                 }
                 break;
             }
@@ -98,7 +98,7 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
 
         try {
             config.save(file.getFile());
-            Main.getInstance().getRTP().loadWorldSettings();
+            BetterRTP.getInstance().getRTP().loadWorldSettings();
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -110,7 +110,7 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
             value = cmd.getResult(val);
         } catch (Exception e) {
             e.printStackTrace();
-            Main.getInstance().getText().getEditError(sendi);
+            BetterRTP.getInstance().getText().getEditError(sendi);
             return;
         }
 
@@ -121,8 +121,8 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
 
         try {
             config.save(file.getFile());
-            Main.getInstance().getRTP().loadWorldSettings();
+            BetterRTP.getInstance().getRTP().loadWorldSettings();
-            Main.getInstance().getText().getEditSet(sendi, cmd.get(), val);
+            BetterRTP.getInstance().getText().getEditSet(sendi, cmd.get(), val);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -187,24 +187,24 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
 
     @Override
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getEdit(sendi);
+        return BetterRTP.getInstance().getPerms().getEdit(sendi);
     }
 
     private void usage(CommandSender sendi, String label, RTP_CMD_EDIT type) {
         if (type != null)
             switch (type) {
                 case DEFAULT:
-                    Main.getInstance().getText().getUsageEditDefault(sendi, label); break;
+                    BetterRTP.getInstance().getText().getUsageEditDefault(sendi, label); break;
                 case WORLD:
-                    Main.getInstance().getText().getUsageEditWorld(sendi, label); break;
+                    BetterRTP.getInstance().getText().getUsageEditWorld(sendi, label); break;
             }
         else
-            Main.getInstance().getText().getUsageEdit(sendi, label);
+            BetterRTP.getInstance().getText().getUsageEdit(sendi, label);
     }
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpEdit();
+        return BetterRTP.getInstance().getText().getHelpEdit();
     }
 
     enum RTP_CMD_EDIT {

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java

@@ -3,7 +3,7 @@ package me.SuperRonanCraft.BetterRTP.player.commands.types;
 import me.SuperRonanCraft.BetterRTP.player.commands.CommandTypes;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.references.file.Messages;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
 
@@ -13,12 +13,12 @@ import java.util.List;
 public class CmdHelp implements RTPCommand, RTPCommandHelpable {
 
     public void execute(CommandSender sendi, String label, String[] args) {
-        Messages txt = Main.getInstance().getText();
+        Messages txt = BetterRTP.getInstance().getText();
         List<String> list = new ArrayList<>();
         list.add(txt.getHelpPrefix());
         list.add(txt.getHelpMain());
         for (CommandTypes cmd : CommandTypes.values())
-            if (!cmd.isDebugOnly() || Main.getInstance().getSettings().debug)
+            if (!cmd.isDebugOnly() || BetterRTP.getInstance().getSettings().debug)
                 if (cmd.getCmd().permission(sendi))
                     if (cmd.getCmd() instanceof RTPCommandHelpable) {
                         String help = ((RTPCommandHelpable) cmd.getCmd()).getHelp();
@@ -26,7 +26,7 @@ public class CmdHelp implements RTPCommand, RTPCommandHelpable {
                     }
         for (int i = 0; i < list.size(); i++)
             list.set(i, list.get(i).replace("%command%", label));
-        Main.getInstance().getText().sms(sendi, list);
+        BetterRTP.getInstance().getText().sms(sendi, list);
 //        if (pl.getPerms().getRtpOther(sendi))
 //            pl.getText().getHelpPlayer(sendi, label);
 //        if (sendi instanceof Player) {
@@ -51,6 +51,6 @@ public class CmdHelp implements RTPCommand, RTPCommandHelpable {
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpHelp();
+        return BetterRTP.getInstance().getText().getHelpHelp();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTPParticles;
 import me.SuperRonanCraft.BetterRTP.references.worlds.WorldPlayer;
@@ -49,7 +49,7 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpInfo();
+        return BetterRTP.getInstance().getText().getHelpInfo();
     }
 
     enum CmdInfoSub { //Sub commands, future expansions
@@ -59,7 +59,7 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
     //Particles
     private void infoParticles(CommandSender sendi) {
         List<String> info = new ArrayList<>();
-        Main pl = Main.getInstance();
+        BetterRTP pl = BetterRTP.getInstance();
 
         for (ParticleEffect eff : ParticleEffect.VALUES) {
             if (info.isEmpty() || info.size() % 2 == 0) {
@@ -85,7 +85,7 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
         }
 
         info.forEach(str ->
-                info.set(info.indexOf(str), Main.getInstance().getText().color(str)));
+                info.set(info.indexOf(str), BetterRTP.getInstance().getText().color(str)));
         sendi.sendMessage(info.toString());
     }
 
@@ -93,7 +93,7 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
     private void sendInfoWorld(CommandSender sendi, List<String> list) { //Send info
         list.add(0, "&e&m-----&6 BetterRTP &8| Info &e&m-----");
         list.forEach(str ->
-                list.set(list.indexOf(str), Main.getInstance().getText().color(str)));
+                list.set(list.indexOf(str), BetterRTP.getInstance().getText().color(str)));
         sendi.sendMessage(list.toArray(new String[0]));
     }
 
@@ -106,7 +106,7 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
 
     private List<String> infoGetWorld(CommandSender sendi, World w, boolean personal) { //Specific world
         List<String> info = new ArrayList<>();
-        Main pl = Main.getInstance();
+        BetterRTP pl = BetterRTP.getInstance();
         String _true = "&aTrue", _false = "&bFalse";
         info.add("&eWorld: &7" + w.getName() + (personal ? " &7(personalized)" : ""));
         if (personal)
@@ -120,8 +120,8 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
             else {
                 info.add("&7- &6WorldType: &f" + pl.getRTP().world_type.getOrDefault(w.getName(), WORLD_TYPE.NORMAL).name());
                 info.add("&7- &6Overriden: " + _false);
-                WorldPlayer _rtpworld = Main.getInstance().getRTP().getPlayerWorld(sendi, w.getName(), null, personal);
+                WorldPlayer _rtpworld = BetterRTP.getInstance().getRTP().getPlayerWorld(sendi, w.getName(), null, personal);
-                info.add("&7- &6Custom: " + (Main.getInstance().getRTP().customWorlds.containsKey(w.getName()) ? _true : _false));
+                info.add("&7- &6Custom: " + (BetterRTP.getInstance().getRTP().customWorlds.containsKey(w.getName()) ? _true : _false));
                 info.add("&7- &6UseWorldBorder: " + (_rtpworld.getUseWorldborder() ? _true : _false));
                 info.add("&7- &6Permission Group: " + (_rtpworld.getConfig() != null ? "&e" + _rtpworld.getConfig().name : "&cN/A"));
                 info.add("&7- &6Center X: &f" + _rtpworld.getCenterX());
@@ -145,7 +145,7 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
         }
 
         info.forEach(str ->
-                info.set(info.indexOf(str), Main.getInstance().getText().color(str)));
+                info.set(info.indexOf(str), BetterRTP.getInstance().getText().color(str)));
         sendi.sendMessage(info.toString());
     }
 
@@ -167,6 +167,6 @@ public class CmdInfo implements RTPCommand, RTPCommandHelpable {
     }
 
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getInfo(sendi);
+        return BetterRTP.getInstance().getPerms().getInfo(sendi);
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.CommandTypes;
 import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
@@ -44,7 +44,7 @@ public class CmdPlayer implements RTPCommand, RTPCommandHelpable {
                     list.add(p.getName());
         } else if (args.length == 3) {
             for (World w : Bukkit.getWorlds())
-                if (w.getName().startsWith(args[2]) && !Main.getInstance().getRTP().disabledWorlds().contains(w.getName()))
+                if (w.getName().startsWith(args[2]) && !BetterRTP.getInstance().getRTP().disabledWorlds().contains(w.getName()))
                     list.add(w.getName());
         } else if (args.length > 3) {
             if (CommandTypes.BIOME.getCmd().permission(sendi))
@@ -54,19 +54,19 @@ public class CmdPlayer implements RTPCommand, RTPCommandHelpable {
     }
 
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getRtpOther(sendi);
+        return BetterRTP.getInstance().getPerms().getRtpOther(sendi);
     }
 
     public void usage(CommandSender sendi, String label) {
-        Main.getInstance().getText().getUsageRTPOther(sendi, label);
+        BetterRTP.getInstance().getText().getUsageRTPOther(sendi, label);
     }
 
     private Commands getCmd() {
-        return Main.getInstance().getCmd();
+        return BetterRTP.getInstance().getCmd();
     }
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpPlayer();
+        return BetterRTP.getInstance().getText().getHelpPlayer();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
@@ -10,7 +10,7 @@ import java.util.List;
 public class CmdReload implements RTPCommand, RTPCommandHelpable {
 
     public void execute(CommandSender sendi, String label, String[] args) {
-        Main.getInstance().reload(sendi);
+        BetterRTP.getInstance().reload(sendi);
     }
 
     public List<String> tabComplete(CommandSender sendi, String[] args) {
@@ -18,11 +18,11 @@ public class CmdReload implements RTPCommand, RTPCommandHelpable {
     }
 
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getReload(sendi);
+        return BetterRTP.getInstance().getPerms().getReload(sendi);
     }
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpReload();
+        return BetterRTP.getInstance().getText().getHelpReload();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.references.invs.RTP_INV_SETTINGS;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
@@ -13,9 +13,9 @@ public class CmdSettings implements RTPCommand, RTPCommandHelpable {
 
     public void execute(CommandSender sendi, String label, String[] args) {
         if (sendi instanceof Player)
-            Main.getInstance().getInvs().getInv(RTP_INV_SETTINGS.MAIN).show((Player) sendi);
+            BetterRTP.getInstance().getInvs().getInv(RTP_INV_SETTINGS.MAIN).show((Player) sendi);
         else
-            Main.getInstance().getCmd().msgNotPlayer(sendi, label);
+            BetterRTP.getInstance().getCmd().msgNotPlayer(sendi, label);
     }
 
     public List<String> tabComplete(CommandSender sendi, String[] args) {
@@ -23,11 +23,11 @@ public class CmdSettings implements RTPCommand, RTPCommandHelpable {
     }
 
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getSettings(sendi);
+        return BetterRTP.getInstance().getPerms().getSettings(sendi);
     }
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpSettings();
+        return BetterRTP.getInstance().getText().getHelpSettings();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
@@ -15,7 +15,7 @@ public class CmdTest implements RTPCommand, RTPCommandHelpable {
     public void execute(CommandSender sendi, String label, String[] args) {
         if (sendi instanceof Player) {
             Player p = (Player) sendi;
-            Main.getInstance().getRTP().getTeleport().afterTeleport(p, p.getLocation(), 0, 0);
+            BetterRTP.getInstance().getRTP().getTeleport().afterTeleport(p, p.getLocation(), 0, 0);
         } else
             sendi.sendMessage("Console is not able to execute this command! Try '/rtp help'");
     }
@@ -27,12 +27,12 @@ public class CmdTest implements RTPCommand, RTPCommandHelpable {
 
     @Override
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getTest(sendi);
+        return BetterRTP.getInstance().getPerms().getTest(sendi);
     }
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpTest();
+        return BetterRTP.getInstance().getText().getHelpTest();
     }
 
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.command.CommandSender;
 
@@ -10,7 +10,7 @@ import java.util.List;
 public class CmdVersion implements RTPCommand, RTPCommandHelpable {
 
     public void execute(CommandSender sendi, String label, String[] args) {
-        sendi.sendMessage(Main.getInstance().getText().colorPre("&aVersion #&e" + Main.getInstance().getDescription().getVersion()));
+        sendi.sendMessage(BetterRTP.getInstance().getText().colorPre("&aVersion #&e" + BetterRTP.getInstance().getDescription().getVersion()));
     }
 
     public List<String> tabComplete(CommandSender sendi, String[] args) {
@@ -18,11 +18,11 @@ public class CmdVersion implements RTPCommand, RTPCommandHelpable {
     }
 
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getVersion(sendi);
+        return BetterRTP.getInstance().getPerms().getVersion(sendi);
     }
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpVersion();
+        return BetterRTP.getInstance().getText().getHelpVersion();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java

@@ -2,7 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.commands.types;
 
 import me.SuperRonanCraft.BetterRTP.player.commands.Commands;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.CommandTypes;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import org.bukkit.Bukkit;
@@ -17,7 +17,7 @@ public class CmdWorld implements RTPCommand, RTPCommandHelpable {
     //rtp world <world> <biome1, biome2...>
     public void execute(CommandSender sendi, String label, String[] args) {
         if (args.length >= 2)
-            Main.getInstance().getCmd().rtp(sendi, label, args[1], Main.getInstance().getCmd().getBiomes(args, 2, sendi));
+            BetterRTP.getInstance().getCmd().rtp(sendi, label, args[1], BetterRTP.getInstance().getCmd().getBiomes(args, 2, sendi));
         else
             usage(sendi, label);
     }
@@ -27,8 +27,8 @@ public class CmdWorld implements RTPCommand, RTPCommandHelpable {
         if (args.length == 2) {
             for (World w : Bukkit.getWorlds()) {
                 String _wName = w.getName().replace(" ", "_");
-                if (w.getName().startsWith(args[1]) && !Main.getInstance().getRTP().disabledWorlds().contains(_wName)
+                if (w.getName().startsWith(args[1]) && !BetterRTP.getInstance().getRTP().disabledWorlds().contains(_wName)
-                        && Main.getInstance().getPerms().getAWorld(sendi, _wName))
+                        && BetterRTP.getInstance().getPerms().getAWorld(sendi, _wName))
                     list.add(_wName);
             }
         } else if (args.length >= 3) {
@@ -39,19 +39,19 @@ public class CmdWorld implements RTPCommand, RTPCommandHelpable {
     }
 
     public boolean permission(CommandSender sendi) {
-        return Main.getInstance().getPerms().getWorld(sendi);
+        return BetterRTP.getInstance().getPerms().getWorld(sendi);
     }
 
     public void usage(CommandSender sendi, String label) {
-        Main.getInstance().getText().getUsageWorld(sendi, label);
+        BetterRTP.getInstance().getText().getUsageWorld(sendi, label);
     }
 
     private Commands getCmd() {
-        return Main.getInstance().getCmd();
+        return BetterRTP.getInstance().getCmd();
     }
 
     @Override
     public String getHelp() {
-        return Main.getInstance().getText().getHelpWorld();
+        return BetterRTP.getInstance().getText().getHelpWorld();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.events;
 
 import me.SuperRonanCraft.BetterRTP.references.invs.RTPInventories;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.PlayerInfo;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -18,9 +18,9 @@ public class Click {
 
     private void handler(InventoryClickEvent e) {
         try {
-            PlayerInfo pInfo = Main.getInstance().getpInfo();
+            PlayerInfo pInfo = BetterRTP.getInstance().getpInfo();
             Player p = (Player) e.getWhoClicked();
-            RTPInventories menu = Main.getInstance().getInvs();
+            RTPInventories menu = BetterRTP.getInstance().getInvs();
             menu.getInv(pInfo.getInvType(p)).clickEvent(e);
         } catch (NullPointerException ex) {
             //ex.printStackTrace();
@@ -36,10 +36,10 @@ public class Click {
             return false;
         else if (e.getWhoClicked() instanceof Player) {
             // Clicks the inventory
-            if (!e.getInventory().equals(Main.getInstance().getpInfo().getInv((Player) e.getWhoClicked())))
+            if (!e.getInventory().equals(BetterRTP.getInstance().getpInfo().getInv((Player) e.getWhoClicked())))
                 return false;
                 // Clicks their own inventory
-            else if (!e.getClickedInventory().equals(Main.getInstance().getpInfo().getInv((Player) e
+            else if (!e.getClickedInventory().equals(BetterRTP.getInstance().getpInfo().getInv((Player) e
                     .getWhoClicked()))) {
                 e.setCancelled(true);
                 return false;

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java

@@ -2,7 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.events;
 
 import me.SuperRonanCraft.BetterRTP.player.commands.CommandTypes;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Player;
@@ -19,10 +19,10 @@ class Interact {
 
     void load() {
         String pre = "Settings.";
-        FileBasics.FILETYPE file = Main.getInstance().getFiles().getType(FileBasics.FILETYPE.SIGNS);
+        FileBasics.FILETYPE file = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.SIGNS);
         enabled = file.getBoolean(pre + "Enabled");
         title = file.getString(pre + "Title");
-        coloredTitle = Main.getInstance().getText().color(title);
+        coloredTitle = BetterRTP.getInstance().getText().color(title);
     }
 
     void event(PlayerInteractEvent e) {
@@ -39,25 +39,25 @@ class Interact {
                             action(e.getPlayer(), cmd(sign.getLines()).split(" "));
                             return;
                         }
-                e.getPlayer().sendMessage(Main.getInstance().getText().colorPre("&cError! &7Command &a"
+                e.getPlayer().sendMessage(BetterRTP.getInstance().getText().colorPre("&cError! &7Command &a"
                         + Arrays.toString(cmd(sign.getLines()).split(" ")) + "&7 does not exist! Defaulting command to /rtp!"));
             }
         }
     }
 
     void createSign(SignChangeEvent e) {
-        if (enabled && Main.getInstance().getPerms().getSignCreate(e.getPlayer())) {
+        if (enabled && BetterRTP.getInstance().getPerms().getSignCreate(e.getPlayer())) {
             String line = e.getLine(0);
             if (line != null && (line.equalsIgnoreCase(title) ||
                     line.equalsIgnoreCase("[RTP]"))) {
                 e.setLine(0, coloredTitle != null ? coloredTitle : "[RTP]");
-                Main.getInstance().getText().getSignCreated(e.getPlayer(), cmd(e.getLines()));
+                BetterRTP.getInstance().getText().getSignCreated(e.getPlayer(), cmd(e.getLines()));
             }
         }
     }
 
     private void action(Player p, String[] line) {
-        Main.getInstance().getCmd().commandExecuted(p, "rtp", line);
+        BetterRTP.getInstance().getCmd().commandExecuted(p, "rtp", line);
     }
 
     private String cmd(String[] signArray) {

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java

@@ -3,7 +3,7 @@ package me.SuperRonanCraft.BetterRTP.player.events;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE;
 import me.SuperRonanCraft.BetterRTP.references.Updater;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -30,7 +30,7 @@ public class Join {
             getPl().getCmd().tp(p, Bukkit.getConsoleSender(), getPl().getSettings().rtpOnFirstJoin_World, null, RTP_TYPE.JOIN); //Console is sender to override delays
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java

@@ -1,11 +1,11 @@
 package me.SuperRonanCraft.BetterRTP.player.events;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 class Leave {
 
     void event(PlayerQuitEvent e) {
-        Main.getInstance().getCmd().rtping.remove(e.getPlayer().getUniqueId());
+        BetterRTP.getInstance().getCmd().rtping.remove(e.getPlayer().getUniqueId());
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.events;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -16,7 +16,7 @@ public class Listener implements org.bukkit.event.Listener {
     private final Click click = new Click();
     //private final PluginEnable pEnable = new PluginEnable();
 
-    public void registerEvents(Main pl) {
+    public void registerEvents(BetterRTP pl) {
         PluginManager pm = pl.getServer().getPluginManager();
         pm.registerEvents(this, pl);
     }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.events;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.event.server.PluginEnableEvent;
 
 public class PluginEnable {
@@ -10,9 +10,9 @@ public class PluginEnable {
         String name = e.getPlugin().getName();
         //System.out.println(name);
         if (name.equalsIgnoreCase("WorldGuard"))
-            Main.getInstance().getSettings().getsDepends().registerWorldguard();
+            BetterRTP.getInstance().getSettings().getsDepends().registerWorldguard();
         else if (name.equalsIgnoreCase("GriefPrevention"))
-            Main.getInstance().getSettings().getsDepends().registerGriefPrevention();
+            BetterRTP.getInstance().getSettings().getsDepends().registerGriefPrevention();
 
     }
 

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/RTPEventInitiator.java

@@ -0,0 +1,22 @@
+package me.SuperRonanCraft.BetterRTP.player.events;
+
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RTPEventInitiator {
+    private final List<RTPEventListener> listeners = new ArrayList<>();
+
+    public void addListener(RTPEventListener toAdd) {
+        listeners.add(toAdd);
+    }
+
+    public void eventCall_Teleport(Player p) {
+        System.out.println("Hello!!");
+
+        // Notify everybody that may be interested.
+        for (RTPEventListener l : listeners)
+            l.teleportedEvent(p);
+    }
+}

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/RTPEventListener.java

@@ -0,0 +1,9 @@
+package me.SuperRonanCraft.BetterRTP.player.events;
+
+import org.bukkit.entity.Player;
+
+public interface RTPEventListener {
+
+    void teleportedEvent(Player p);
+
+}

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.worlds.*;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -79,7 +79,7 @@ public class RTP {
                 }
             if (getPl().getSettings().debug)
                 for (String world : world_type.keySet())
-                    Main.debug("- World Type for '" + world + "' set to '" + world_type.get(world) + "'");
+                    BetterRTP.debug("- World Type for '" + world + "' set to '" + world_type.get(world) + "'");
         } catch (Exception e) {
             e.printStackTrace();
             //No World Types
@@ -101,7 +101,7 @@ public class RTP {
                 for (Map.Entry<?, ?> entry : m.entrySet()) {
                     customWorlds.put(entry.getKey().toString(), new WorldCustom(entry.getKey().toString()));
                     if (getPl().getSettings().debug)
-                        Main.debug("- Custom World '" + entry.getKey() + "' registered");
+                        BetterRTP.debug("- Custom World '" + entry.getKey() + "' registered");
                 }
         } catch (Exception e) {
             //No Custom Worlds
@@ -132,8 +132,8 @@ public class RTP {
         return pWorld;
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 
     public void start(Player p, CommandSender sendi, String world_name, List<String> biomes, boolean delay, RTP_TYPE rtpType) {
@@ -167,7 +167,7 @@ public class RTP {
         // Economy
         if (!getPl().getEco().hasBalance(sendi, pWorld))
             return;
-        Main.getInstance().getpInfo().setRTPType(p, rtpType);
+        BetterRTP.getInstance().getpInfo().setRTPType(p, rtpType);
         rtp(sendi, pWorld, delay);
     }
 

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -123,7 +123,7 @@ public class RTPCooldown {
 
     private void loadFile() {
         config = null;
-        configfile = new File(Main.getInstance().getDataFolder(), "data/cooldowns.yml");
+        configfile = new File(BetterRTP.getInstance().getDataFolder(), "data/cooldowns.yml");
         YamlConfiguration config = getFile();
         if (config != null)
             for (String id : config.getKeys(false)) {
@@ -136,7 +136,7 @@ public class RTPCooldown {
                     locked.put(uuid, attempts);
                 }
             } catch (IllegalArgumentException e) {
-                Main.getInstance().getLogger().info("UUID of `" + id + "` is invalid, please delete this!");
+                BetterRTP.getInstance().getLogger().info("UUID of `" + id + "` is invalid, please delete this!");
                 //Bad uuid
             }
         }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -24,9 +24,9 @@ class RTPDelay implements Listener {
 
     private void delay(CommandSender sendi, int delay) {
         getPl().getRTP().getTeleport().beforeTeleportDelay(rtp.getPlayer(), delay);
-        run = Bukkit.getScheduler().scheduleSyncDelayedTask(Main.getInstance(), run(sendi, this), delay * 20);
+        run = Bukkit.getScheduler().scheduleSyncDelayedTask(BetterRTP.getInstance(), run(sendi, this), delay * 20);
         if (cancelOnMove || cancelOnDamage)
-            Bukkit.getPluginManager().registerEvents(this, Main.getInstance());
+            Bukkit.getPluginManager().registerEvents(this, BetterRTP.getInstance());
     }
 
     @EventHandler
@@ -72,7 +72,7 @@ class RTPDelay implements Listener {
         };
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -105,7 +105,7 @@ public class RTPParticles {
         return new Vector(x2 - x1, 0, z2 - z1);
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -13,7 +13,7 @@ public class RTPPermissionGroup {
 
     public RTPPermConfiguration getGroup(CommandSender p) {
         for (RTPPermConfiguration group : groups)
-            if (Main.getInstance().getPerms().getPermissionGroup(p, group.name))
+            if (BetterRTP.getInstance().getPerms().getPermissionGroup(p, group.name))
                 return group;
         return null;
     }
@@ -22,7 +22,7 @@ public class RTPPermissionGroup {
         for (RTPPermConfiguration group : groups)
             group.worlds.clear();
         groups.clear();
-        YamlConfiguration config = Main.getInstance().getFiles().getType(FileBasics.FILETYPE.CONFIG).getConfig();
+        YamlConfiguration config = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.CONFIG).getConfig();
         if (!config.getBoolean("PermissionGroup.Enabled")) return;
         List<Map<?, ?>> list = config.getMapList("PermissionGroup.Groups");
         for (Map<?, ?> m : list)
@@ -30,12 +30,12 @@ public class RTPPermissionGroup {
                 RTPPermConfiguration group = new RTPPermConfiguration(entry);
                 if (group.isValid()) {
                     groups.add(group);
-                    Main.debug("- Group " + group.name + " has " + group.worlds.size() + " worlds setup, permission: 'betterrtp.group." + group.name + "'");
+                    BetterRTP.debug("- Group " + group.name + " has " + group.worlds.size() + " worlds setup, permission: 'betterrtp.group." + group.name + "'");
                     for (RTPPermConfigurationWorld world : group.worlds) {
-                        Main.debug("  - World '" + world.name + "' MaxRad = " + world.maxRad + ", MinRad = " + world.minRad);
+                        BetterRTP.debug("  - World '" + world.name + "' MaxRad = " + world.maxRad + ", MinRad = " + world.minRad);
                     }
                 } else {
-                    Main.debug("ERROR! Group " + group.name + " was not setup correctly!");
+                    BetterRTP.debug("ERROR! Group " + group.name + " was not setup correctly!");
                 }
             }
     }
@@ -55,7 +55,7 @@ public class RTPPermissionGroup {
                     if (worldConfig.isValid())
                         this.worlds.add(worldConfig);
                     else
-                        Main.debug("ERROR! Group " + group + " world " + worldConfig.name + " was not setup correctly!");
+                        BetterRTP.debug("ERROR! Group " + group + " world " + worldConfig.name + " was not setup correctly!");
                 }
             }
             this.name = group;

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java

@@ -2,7 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.references.worlds.WorldPlayer;
 import io.papermc.lib.PaperLib;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -36,7 +36,7 @@ public class RTPPlayer {
             Location loc = pWorld.generateRandomXZ(settings.defaultWorld); //randomLoc(pWorld);
             CompletableFuture<Chunk> chunk = PaperLib.getChunkAtAsync(pWorld.getWorld(), loc.getBlockX(), loc.getBlockZ());
             chunk.thenAccept(result -> {
-                Main.debug("Checking location for " + p.getName());
+                BetterRTP.debug("Checking location for " + p.getName());
                 Location tpLoc;
                 float yaw = p.getLocation().getYaw();
                 float pitch = p.getLocation().getPitch();
@@ -133,7 +133,7 @@ public class RTPPlayer {
         //FALSE MEANS NO BAD BLOCKS/BIOME WHERE FOUND!
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java

@@ -11,7 +11,7 @@ import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
 import com.sk89q.worldguard.protection.regions.RegionQuery;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.angeschossen.lands.api.integration.LandsIntegration;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import org.bukkit.Location;
@@ -116,7 +116,7 @@ public class RTPPluginValidation { //Safe locations depending on enabled depende
         boolean result = true;
         if (getPl().getSettings().getsDepends().isLands())
             try {
-                result = new LandsIntegration(Main.getInstance()).isClaimed(loc);
+                result = new LandsIntegration(BetterRTP.getInstance()).isClaimed(loc);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -137,7 +137,7 @@ public class RTPPluginValidation { //Safe locations depending on enabled depende
         return result;
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
@@ -39,10 +39,10 @@ public class RTPPotions { //Potions AND Invincibility
                         int amplifier = ary.length >= 3 ? Integer.parseInt(ary[2]) : 1;
                         potionEffects.put(effect, new Integer[] {duration, amplifier});
                     } catch (NumberFormatException e) {
-                        Main.getInstance().getLogger().info("The potion duration or amplifier `" + ary[1] + "` is not an integer. Effect was removed!");
+                        BetterRTP.getInstance().getLogger().info("The potion duration or amplifier `" + ary[1] + "` is not an integer. Effect was removed!");
                     }
                 } else
-                    Main.getInstance().getLogger().info("The potion effect `" + type + "` does not exist! " +
+                    BetterRTP.getInstance().getLogger().info("The potion effect `" + type + "` does not exist! " +
                             "Please fix or remove this potion effect! Try '/rtp info potion_effects' to get a list of valid effects!");
             }
         }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -37,7 +37,7 @@ public class RTPSounds {
         try {
             return Sound.valueOf(sound.toUpperCase());
         } catch (IllegalArgumentException e) {
-            Main.getInstance().getLogger().info("The sound '" + sound + "' is invalid!");
+            BetterRTP.getInstance().getLogger().info("The sound '" + sound + "' is invalid!");
             return null;
         }
     }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import io.papermc.lib.PaperLib;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -58,8 +58,8 @@ public class RTPTeleport {
                                     sendSuccessMsg(sendi, p.getName(), loc, price, false, attempts);
                                 getPl().getCmd().rtping.remove(p.getUniqueId()); //No longer rtp'ing
                                 //Save respawn location if first join
-                                if (Main.getInstance().getpInfo().getRTPType(p) == RTP_TYPE.JOIN) //RTP Type was Join
+                                if (BetterRTP.getInstance().getpInfo().getRTPType(p) == RTP_TYPE.JOIN) //RTP Type was Join
-                                    if (Main.getInstance().getSettings().rtpOnFirstJoin_SetAsRespawn) //Save as respawn is enabled
+                                    if (BetterRTP.getInstance().getSettings().rtpOnFirstJoin_SetAsRespawn) //Save as respawn is enabled
                                         p.setBedSpawnLocation(loc, true); //True means to force a respawn even without a valid bed
                             }
                         });
@@ -81,6 +81,7 @@ public class RTPTeleport {
         eTitles.showTitle(RTPTitles.RTP_TITLE_TYPE.TELEPORT, p, loc, attempts, 0);
         if (eTitles.sendMsg(RTPTitles.RTP_TITLE_TYPE.TELEPORT))
             sendSuccessMsg(p, p.getName(), loc, price, true, attempts);
+        getPl().getEvents().eventCall_Teleport(p);
     }
 
     public void beforeTeleportInstant(CommandSender sendi, Player p) {
@@ -113,9 +114,9 @@ public class RTPTeleport {
         eTitles.showTitle(RTPTitles.RTP_TITLE_TYPE.FAILED, p, p.getLocation(), 0, 0);
         if (eTitles.sendMsg(RTPTitles.RTP_TITLE_TYPE.FAILED))
             if (p == sendi)
-                getPl().getText().getFailedNotSafe(sendi, Main.getInstance().getRTP().maxAttempts);
+                getPl().getText().getFailedNotSafe(sendi, BetterRTP.getInstance().getRTP().maxAttempts);
             else
-                getPl().getText().getOtherNotSafe(sendi, Main.getInstance().getRTP().maxAttempts, p.getName());
+                getPl().getText().getOtherNotSafe(sendi, BetterRTP.getInstance().getRTP().maxAttempts, p.getName());
     }
 
     //Processing
@@ -148,7 +149,7 @@ public class RTPTeleport {
             getPl().getText().getOtherSuccess(sendi, player, x, y, z, world, attempts);
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -46,8 +46,8 @@ public class RTPTitles {
         // int fadeIn = getPl().text.getFadeIn();
         // int stay = text.getStay();
         // int fadeOut = text.getFadeOut();
-        title = Main.getInstance().getText().color(title);
+        title = BetterRTP.getInstance().getText().color(title);
-        sub = Main.getInstance().getText().color(sub);
+        sub = BetterRTP.getInstance().getText().color(sub);
         p.sendTitle(title, sub);
         // player.sendTitle(title, subTitle, fadeIn, stay, fadeOut);
     }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Bukkit;
 
 import java.io.BufferedReader;
@@ -12,7 +12,7 @@ public class Updater {
 
     public static String updatedVersion;
 
-    public Updater(Main pl) {
+    public Updater(BetterRTP pl) {
         try {
             URLConnection con = new URL(getUrl() + project()).openConnection();
             updatedVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.depends;
 
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.worlds.WorldPlayer;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
@@ -25,7 +25,7 @@ public class DepEconomy {
                 && (player.getGameMode() == GameMode.SURVIVAL || player.getGameMode() == GameMode.ADVENTURE)) {
             boolean has_hunger = player.getFoodLevel() > hunger;
             if (!has_hunger) {
-                Main.getInstance().getText().getFailedHunger(sendi);
+                BetterRTP.getInstance().getText().getFailedHunger(sendi);
                 return false;
             } else {
                 player.setFoodLevel(player.getFoodLevel() - hunger);
@@ -33,12 +33,12 @@ public class DepEconomy {
             }
         }
         //Economy Stuff
-        if (e != null && pWorld.getPrice() != 0 && !Main.getInstance().getPerms().getBypassEconomy(sendi)) {
+        if (e != null && pWorld.getPrice() != 0 && !BetterRTP.getInstance().getPerms().getBypassEconomy(sendi)) {
             try {
                 EconomyResponse r = e.withdrawPlayer(player, pWorld.getPrice());
                 boolean passed_economy = r.transactionSuccess();
                 if (!passed_economy) {
-                    Main.getInstance().getText().getFailedPrice(sendi, pWorld.getPrice());
+                    BetterRTP.getInstance().getText().getFailedPrice(sendi, pWorld.getPrice());
                     if (took_food)
                         player.setFoodLevel(player.getFoodLevel() + hunger);
                 } else
@@ -57,20 +57,20 @@ public class DepEconomy {
         Player player = pWorld.getPlayer();
         //Hunger Stuff
         if (hunger != 0
-                && !Main.getInstance().getPerms().getBypassHunger(sendi)
+                && !BetterRTP.getInstance().getPerms().getBypassHunger(sendi)
                 && (player.getGameMode() == GameMode.SURVIVAL || player.getGameMode() == GameMode.ADVENTURE)) {
             boolean has_hunger = player.getFoodLevel() > hunger;
             if (!has_hunger) {
-                Main.getInstance().getText().getFailedHunger(sendi);
+                BetterRTP.getInstance().getText().getFailedHunger(sendi);
                 return false;
             }
         }
         //Economy Stuff
-        if (e != null && pWorld.getPrice() != 0 && !Main.getInstance().getPerms().getBypassEconomy(sendi)) {
+        if (e != null && pWorld.getPrice() != 0 && !BetterRTP.getInstance().getPerms().getBypassEconomy(sendi)) {
             try {
                 boolean passed_economy = e.getBalance(player) >= pWorld.getPrice();
                 if (!passed_economy) {
-                    Main.getInstance().getText().getFailedPrice(sendi, pWorld.getPrice());
+                    BetterRTP.getInstance().getText().getFailedPrice(sendi, pWorld.getPrice());
                     return false;
                 }
             } catch (Exception e) {
@@ -93,17 +93,17 @@ public class DepEconomy {
     private void check(boolean force) {
         if (!checked || force)
             registerEconomy();
-        if (Main.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Hunger.Enabled"))
+        if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Hunger.Enabled"))
-            hunger = Main.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getInt("Hunger.Honches");
+            hunger = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getInt("Hunger.Honches");
         else
             hunger = 0;
     }
 
     private void registerEconomy() {
         try {
-            if (Main.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled"))
+            if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled"))
-                if (Main.getInstance().getServer().getPluginManager().isPluginEnabled("Vault")) {
+                if (BetterRTP.getInstance().getServer().getPluginManager().isPluginEnabled("Vault")) {
-                    RegisteredServiceProvider<Economy> rsp = Main.getInstance().getServer().getServicesManager().getRegistration(Economy.class);
+                    RegisteredServiceProvider<Economy> rsp = BetterRTP.getInstance().getServer().getServicesManager().getRegistration(Economy.class);
                     e = rsp.getProvider();
                 }
         } catch (NullPointerException e) {

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.depends;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.RegisteredServiceProvider;
@@ -17,8 +17,8 @@ public class DepPerms {
 
     public void register() {
         try {
-            if (Main.getInstance().getServer().getPluginManager().isPluginEnabled("Vault")) {
+            if (BetterRTP.getInstance().getServer().getPluginManager().isPluginEnabled("Vault")) {
-                RegisteredServiceProvider<Permission> permissionProvider = Main.getInstance().getServer()
+                RegisteredServiceProvider<Permission> permissionProvider = BetterRTP.getInstance().getServer()
                         .getServicesManager().getRegistration(Permission.class);
                 p = permissionProvider.getProvider();
             } else

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.file;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
@@ -14,7 +14,7 @@ public class EcoFile {
     private File langFile;
 
     void load() {
-        Main pl = Main.getInstance();
+        BetterRTP pl = BetterRTP.getInstance();
         langFile = new File(pl.getDataFolder(), "economy.yml");
         if (!langFile.exists())
             pl.saveResource("economy.yml", false);
@@ -54,7 +54,7 @@ public class EcoFile {
     }
 
     private void setDefaults() {
-        final InputStream defConfigStream = Main.getInstance().getResource("economy.yml");
+        final InputStream defConfigStream = BetterRTP.getInstance().getResource("economy.yml");
         if (defConfigStream == null)
             return;
         lang.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(defConfigStream)));

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.file;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -30,7 +30,7 @@ public class FileBasics {
 
         FILETYPE(String str) {
             this.fileName = str + ".yml";
-            this.file = new File(Main.getInstance().getDataFolder(), fileName);
+            this.file = new File(BetterRTP.getInstance().getDataFolder(), fileName);
         }
 
         //PUBLIC
@@ -85,7 +85,7 @@ public class FileBasics {
         //PROCCESSING
         private void load() {
             if (!file.exists()) {
-                Main.getInstance().saveResource(fileName, false);
+                BetterRTP.getInstance().saveResource(fileName, false);
                 try {
                     config.load(file);
                 } catch (Exception e) {
@@ -94,7 +94,7 @@ public class FileBasics {
             } else {
                 try {
                     config.load(file);
-                    final InputStream in = Main.getInstance().getResource(fileName);
+                    final InputStream in = BetterRTP.getInstance().getResource(fileName);
                     if (in != null) {
                         config.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(in)));
                         config.options().copyDefaults(true);

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.file;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
@@ -40,7 +40,7 @@ public class LangFile {
         }
         try {
             config.load(file);
-            InputStream in = Main.getInstance().getResource(fileName);
+            InputStream in = BetterRTP.getInstance().getResource(fileName);
             if (in == null)
                 in = getPl().getResource(fileName.replace(File.separator, "/"));
             if (in != null) {
@@ -74,7 +74,7 @@ public class LangFile {
             YamlConfiguration config = new YamlConfiguration();
             config.load(file);
             String fileNameDef = "lang" + File.separator + fNameDef;
-            InputStream in = Main.getInstance().getResource(fileNameDef);
+            InputStream in = BetterRTP.getInstance().getResource(fileNameDef);
             if (in == null)
                 in = getPl().getResource(fileNameDef.replace(File.separator, "/"));
             if (in != null) {
@@ -89,7 +89,7 @@ public class LangFile {
 
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.file;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
@@ -10,7 +10,7 @@ public class Messages {
     private final String preM = "Messages.", preH = "Help.", preU = "Usage.";
 
     private LangFile getLang() {
-        return Main.getInstance().getFiles().getLang();
+        return BetterRTP.getInstance().getFiles().getLang();
     }
 
     public void sms(CommandSender sendi, String msg) {

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.invs;
 
 import me.SuperRonanCraft.BetterRTP.references.invs.enums.RTPInventory_Defaults;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -20,7 +20,7 @@ public class RTPInventories {
     }
 
     public void closeAll() {
-        Main main = Main.getInstance();
+        BetterRTP main = BetterRTP.getInstance();
         for (Player p : Bukkit.getOnlinePlayers())
             if (main.getpInfo().playerExists(p)) {
                 //main.getText().getReloadMenu(p);

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.invs;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics.FILETYPE;
 
 public enum RTP_SETTINGS {
@@ -30,7 +30,7 @@ public enum RTP_SETTINGS {
     }
 
     void setValue(Object value) {
-        Main.getInstance().getFiles().getType(filetype).setValue(path, value);
+        BetterRTP.getInstance().getFiles().getType(filetype).setValue(path, value);
     }
 
     public Object[] getInfo() {return info;}
@@ -38,7 +38,7 @@ public enum RTP_SETTINGS {
     public Object getValue() {
         String path = this.path;
         if (path == null && condition != null) {
-            if (Main.getInstance().getFiles().getType(filetype).getBoolean(condition[0]))
+            if (BetterRTP.getInstance().getFiles().getType(filetype).getBoolean(condition[0]))
                 path = condition[1];
             else
                 path = condition[2];
@@ -49,11 +49,11 @@ public enum RTP_SETTINGS {
     private Object getValuePath(String path) {
         if (path != null) {
             if (getType() == SETTINGS_TYPE.BOOLEAN)
-                return Main.getInstance().getFiles().getType(filetype).getBoolean(path);
+                return BetterRTP.getInstance().getFiles().getType(filetype).getBoolean(path);
             else if (getType() == SETTINGS_TYPE.STRING)
-                return Main.getInstance().getFiles().getType(filetype).getString(path);
+                return BetterRTP.getInstance().getFiles().getType(filetype).getString(path);
             else if (getType() == SETTINGS_TYPE.INTEGER)
-                return Main.getInstance().getFiles().getType(filetype).getInt(path);
+                return BetterRTP.getInstance().getFiles().getType(filetype).getInt(path);
         }
         return null;
     }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.invs.enums;
 
 import me.SuperRonanCraft.BetterRTP.references.invs.RTP_INV_SETTINGS;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.PlayerInfo;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -27,20 +27,20 @@ public interface RTPInventory_Defaults {
             if (lore != null)
                 _meta.setLore(lore);
             if (name != null)
-                _meta.setDisplayName(Main.getInstance().getText().color(name));
+                _meta.setDisplayName(BetterRTP.getInstance().getText().color(name));
         }
         _stack.setItemMeta(_meta);
         return _stack;
     }
 
     default void cacheInv(Player p, Inventory inv, RTP_INV_SETTINGS type) {
-        PlayerInfo info = Main.getInstance().getpInfo();
+        PlayerInfo info = BetterRTP.getInstance().getpInfo();
         info.setInv(p, inv);
         info.setInvType(p, type);
     }
 
     default Inventory createInv(int size, String title) {
-        title = Main.getInstance().getText().color(title);
+        title = BetterRTP.getInstance().getText().color(title);
         return Bukkit.createInventory(null, size, title);
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.invs.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.invs.RTP_INV_SETTINGS;
 import me.SuperRonanCraft.BetterRTP.references.invs.enums.RTPInventory;
 import me.SuperRonanCraft.BetterRTP.references.invs.enums.RTP_INV_ITEMS;
@@ -40,7 +40,7 @@ public class RTPInvBlacklist extends RTPInventory {
                 switch (type) {
                     case BACK:
                         if (slot == e.getInventory().getSize() - 9 + type.slot)
-                            Main.getInstance().getInvs().getInv(RTP_INV_SETTINGS.MAIN).show((Player) e.getWhoClicked());
+                            BetterRTP.getInstance().getInvs().getInv(RTP_INV_SETTINGS.MAIN).show((Player) e.getWhoClicked());
                     default:
                         break;
                 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.invs.types;
 
 import me.SuperRonanCraft.BetterRTP.references.invs.enums.RTPInventory;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics.FILETYPE;
 import me.SuperRonanCraft.BetterRTP.references.invs.RTP_INV_SETTINGS;
 import me.SuperRonanCraft.BetterRTP.references.invs.enums.RTP_INV_ITEMS;
@@ -15,9 +15,9 @@ import java.util.ArrayList;
 public class RTPInvCoordinates extends RTPInventory {
 
     public void show(Player p) {
-        if (Main.getInstance().getpInfo().getInvWorld(p) == null) {
+        if (BetterRTP.getInstance().getpInfo().getInvWorld(p) == null) {
-            Main.getInstance().getpInfo().setNextInv(p, this.type);
+            BetterRTP.getInstance().getpInfo().setNextInv(p, this.type);
-            Main.getInstance().getInvs().getInv(RTP_INV_SETTINGS.WORLDS).show(p);
+            BetterRTP.getInstance().getInvs().getInv(RTP_INV_SETTINGS.WORLDS).show(p);
             return;
         }
         int slots = (RTP_COORDINATES_SETTINGS.values().length - (RTP_COORDINATES_SETTINGS.values().length % 9) + 1) * 9;
@@ -47,7 +47,7 @@ public class RTPInvCoordinates extends RTPInventory {
                 switch (type) {
                     case BACK:
                         if (slot == e.getInventory().getSize() - 9 + type.slot)
-                            Main.getInstance().getInvs().getInv(RTP_INV_SETTINGS.MAIN).show((Player) e.getWhoClicked());
+                            BetterRTP.getInstance().getInvs().getInv(RTP_INV_SETTINGS.MAIN).show((Player) e.getWhoClicked());
                     default:
                         break;
                 }
@@ -94,7 +94,7 @@ enum RTP_COORDINATES_SETTINGS {
     }
 
     void setValue(Object value) {
-        Main.getInstance().getFiles().getType(filetype).setValue(path, value);
+        BetterRTP.getInstance().getFiles().getType(filetype).setValue(path, value);
     }
 
     public Object[] getInfo() {return info;}
@@ -102,7 +102,7 @@ enum RTP_COORDINATES_SETTINGS {
     public Object getValue() {
         String path = this.path;
         if (path == null && condition != null) {
-            if (Main.getInstance().getFiles().getType(filetype).getBoolean(condition[0]))
+            if (BetterRTP.getInstance().getFiles().getType(filetype).getBoolean(condition[0]))
                 path = condition[1];
             else
                 path = condition[2];
@@ -113,11 +113,11 @@ enum RTP_COORDINATES_SETTINGS {
     private Object getValuePath(String path) {
         if (path != null) {
             if (getType() == SETTINGS_TYPE.BOOLEAN)
-                return Main.getInstance().getFiles().getType(filetype).getBoolean(path);
+                return BetterRTP.getInstance().getFiles().getType(filetype).getBoolean(path);
             else if (getType() == SETTINGS_TYPE.STRING)
-                return Main.getInstance().getFiles().getType(filetype).getString(path);
+                return BetterRTP.getInstance().getFiles().getType(filetype).getString(path);
             else if (getType() == SETTINGS_TYPE.INTEGER)
-                return Main.getInstance().getFiles().getType(filetype).getInt(path);
+                return BetterRTP.getInstance().getFiles().getType(filetype).getInt(path);
         }
         return null;
     }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java

@@ -1,6 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.invs.types;
 
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.invs.RTP_INV_SETTINGS;
 import me.SuperRonanCraft.BetterRTP.references.invs.enums.RTPInventory;
 import me.SuperRonanCraft.BetterRTP.references.invs.enums.RTP_INV_ITEMS;
@@ -41,7 +41,7 @@ public class RTPInvWorlds extends RTPInventory {
                 switch (type) {
                     case BACK:
                         if (slot == e.getInventory().getSize() - 9 + type.slot) {
-                            Main.getInstance().getInvs().getInv(RTP_INV_SETTINGS.MAIN).show(p);
+                            BetterRTP.getInstance().getInvs().getInv(RTP_INV_SETTINGS.MAIN).show(p);
                             return;
                         }
                     default:
@@ -52,8 +52,8 @@ public class RTPInvWorlds extends RTPInventory {
         int _index = 0;
         for (World world : Bukkit.getWorlds()) {
             if (_index == slot) {
-                Main.getInstance().getpInfo().setInvWorld(p, world);
+                BetterRTP.getInstance().getpInfo().setInvWorld(p, world);
-                Main.getInstance().getInvs().getInv(Main.getInstance().getpInfo().getNextInv(p)).show(p);
+                BetterRTP.getInstance().getInvs().getInv(BetterRTP.getInstance().getpInfo().getNextInv(p)).show(p);
             }
             _index ++;
         }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.settings;
 
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 
 public class Settings {
 
@@ -29,7 +29,7 @@ public class Settings {
         return depends;
     }
 
-    private Main getPl() {
+    private BetterRTP getPl() {
-        return Main.getInstance();
+        return BetterRTP.getInstance();
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.settings;
 
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Bukkit;
 
 import java.util.logging.Level;
@@ -53,7 +53,7 @@ public class SoftDepends {
     }
 
     void load() {
-        FileBasics.FILETYPE config = Main.getInstance().getFiles().getType(FileBasics.FILETYPE.CONFIG);
+        FileBasics.FILETYPE config = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.CONFIG);
         String pre = "Settings.Respect.";
         respect_worldguard = config.getBoolean(     pre + "WorldGuard");
         respect_griefprevention = config.getBoolean(pre + "GriefPrevention");
@@ -114,7 +114,7 @@ public class SoftDepends {
     }
 
     private void debug(String str) {
-        if (Main.getInstance().getSettings().debug)
+        if (BetterRTP.getInstance().getSettings().debug)
-            Main.getInstance().getLogger().log(Level.INFO, str);
+            BetterRTP.getInstance().getLogger().log(Level.INFO, str);
     }
 }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.worlds;
 
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
@@ -17,7 +17,7 @@ public class WorldCustom implements RTPWorld {
 
     public WorldCustom(String world) {
         String pre = "CustomWorlds.";
-        FileBasics.FILETYPE config = Main.getInstance().getFiles().getType(FileBasics.FILETYPE.CONFIG);
+        FileBasics.FILETYPE config = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.CONFIG);
         List<Map<?, ?>> map = config.getMapList("CustomWorlds");
         this.world = world;
 
@@ -46,20 +46,20 @@ public class WorldCustom implements RTPWorld {
                     if (test.get("MaxRadius").getClass() == Integer.class)
                         maxBorderRad = Integer.parseInt((test.get("MaxRadius")).toString());
                     if (maxBorderRad <= 0) {
-                        Main.getInstance().getText().sms(Bukkit.getConsoleSender(),
+                        BetterRTP.getInstance().getText().sms(Bukkit.getConsoleSender(),
                                 "WARNING! Custom world '" + world + "' Maximum radius of '" + maxBorderRad + "' is not allowed! Set to default value!");
-                        maxBorderRad = Main.getInstance().getRTP().defaultWorld.getMaxRad();
+                        maxBorderRad = BetterRTP.getInstance().getRTP().defaultWorld.getMaxRad();
                     }
                 }
                 if (test.get("MinRadius") != null) {
                     if (test.get("MinRadius").getClass() == Integer.class)
                         minBorderRad = Integer.parseInt((test.get("MinRadius")).toString());
                     if (minBorderRad < 0 || minBorderRad >= maxBorderRad) {
-                        Main.getInstance().getText().sms(Bukkit.getConsoleSender(),
+                        BetterRTP.getInstance().getText().sms(Bukkit.getConsoleSender(),
                                 "WARNING! Custom world '" + world + "' Minimum radius of '" + minBorderRad + "' is not allowed! Set to default value!");
-                        minBorderRad = Main.getInstance().getRTP().defaultWorld.getMinRad();
+                        minBorderRad = BetterRTP.getInstance().getRTP().defaultWorld.getMinRad();
                         if (minBorderRad >= maxBorderRad)
-                            maxBorderRad = Main.getInstance().getRTP().defaultWorld.getMaxRad();
+                            maxBorderRad = BetterRTP.getInstance().getRTP().defaultWorld.getMaxRad();
                     }
                 }
                 if (test.get("Biomes") != null) {
@@ -86,10 +86,10 @@ public class WorldCustom implements RTPWorld {
             minBorderRad = Main.getInstance().getRTP().Default.getMinRad();
         }
         */
-        if (Main.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled"))
+        if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled"))
-            if (Main.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean(pre + "Enabled")) {
+            if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean(pre + "Enabled")) {
                 map.clear();
-                map = Main.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getMapList("CustomWorlds");
+                map = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getMapList("CustomWorlds");
                 for (Map<?, ?> m : map)
                     for (Map.Entry<?, ?> entry : m.entrySet()) {
                         String key = entry.getKey().toString();
@@ -101,7 +101,7 @@ public class WorldCustom implements RTPWorld {
                             price = Integer.valueOf((test.get("Price")).toString());
                     }
             } else
-                price = Main.getInstance().getRTP().defaultWorld.getPrice();
+                price = BetterRTP.getInstance().getRTP().defaultWorld.getPrice();
         //Other
         this.Biomes = config.getStringList(pre + world + ".Biomes");
     }

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java

@@ -2,7 +2,7 @@ package me.SuperRonanCraft.BetterRTP.references.worlds;
 
 
 import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
@@ -16,7 +16,7 @@ public class WorldDefault implements RTPWorld {
     public void setup() {
         //Setups
         String pre = "Default";
-        FileBasics.FILETYPE config = Main.getInstance().getFiles().getType(FileBasics.FILETYPE.CONFIG);
+        FileBasics.FILETYPE config = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.CONFIG);
         //Booleans
         useWorldborder = config.getBoolean(pre + ".UseWorldBorder");
         //Integers
@@ -24,18 +24,18 @@ public class WorldDefault implements RTPWorld {
         CenterZ = config.getInt(pre + ".CenterZ");
         maxBorderRad = config.getInt(pre + ".MaxRadius");
         if (maxBorderRad <= 0) {
-            Main.getInstance().getText().sms(Bukkit.getConsoleSender(),
+            BetterRTP.getInstance().getText().sms(Bukkit.getConsoleSender(),
                     "WARNING! Default Maximum radius of '" + maxBorderRad + "' is not allowed! Set to '1000'");
             maxBorderRad = 1000;
         }
         minBorderRad = config.getInt(pre + ".MinRadius");
         if (minBorderRad < 0 || minBorderRad >= maxBorderRad) {
-            Main.getInstance().getText().sms(Bukkit.getConsoleSender(),
+            BetterRTP.getInstance().getText().sms(Bukkit.getConsoleSender(),
                     "WARNING! Default Minimum radius of '" + minBorderRad + "' is not allowed! Set to '0'");
             minBorderRad = 0;
         }
-        if (Main.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled"))
+        if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled"))
-            price = Main.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getInt("Economy.Price");
+            price = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getInt("Economy.Price");
         else
             price = 0;
         //Other

Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java

@@ -1,7 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.references.worlds;
 
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTPPermissionGroup;
-import me.SuperRonanCraft.BetterRTP.Main;
+import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.WorldBorder;
@@ -40,10 +40,10 @@ public class WorldPlayer implements RTPWorld {
             list.addAll(biomes);
         setBiomes(list);
         if (personal)
-            setupGroup(Main.getInstance().getRTP().permConfig);
+            setupGroup(BetterRTP.getInstance().getRTP().permConfig);
         //Make sure our borders will not cause an invalid integer
         if (getMaxRad() <= getMinRad()) {
-            setMinRad(Main.getInstance().getRTP().defaultWorld.getMinRad());
+            setMinRad(BetterRTP.getInstance().getRTP().defaultWorld.getMinRad());
             if (getMaxRad() <= getMinRad())
                 setMinRad(0);
         }

pom.xml

@@ -10,7 +10,7 @@
     <version>2.14.5</version>
 
     <modules>
-        <module>Addon-TimedRTP</module>
+        <module>Addon-FlashBack</module>
         <module>Main</module>
     </modules>