diff --git a/Addon-FlashBack/pom.xml b/Addon-FlashBack/pom.xml deleted file mode 100644 index 8744928..0000000 --- a/Addon-FlashBack/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - BetterRTP - me.SuperRonanCraft - 2.14.5 - - 4.0.0 - - Addon-FlashBack - 1.0 - - ${project.parent.artifactId}-${project.name}-${project.version} - - - - - me.SuperRonanCraft - Main - 2.14.5 - - - \ No newline at end of file diff --git a/Addon-FlashBack/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/FlashBack/Events.java b/Addon-FlashBack/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/FlashBack/Events.java deleted file mode 100644 index 307ead6..0000000 --- a/Addon-FlashBack/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/FlashBack/Events.java +++ /dev/null @@ -1,12 +0,0 @@ -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) { - - } -} diff --git a/Addon-FlashBack/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/FlashBack/Main.java b/Addon-FlashBack/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/FlashBack/Main.java deleted file mode 100644 index d74dc40..0000000 --- a/Addon-FlashBack/src/main/java/me/SuperRonanCraft/BetterRTP/Addon/FlashBack/Main.java +++ /dev/null @@ -1,12 +0,0 @@ -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()); - } -} diff --git a/Addon-FlashBack/src/main/resources/plugin.yml b/Addon-FlashBack/src/main/resources/plugin.yml deleted file mode 100644 index 2c7b1d6..0000000 --- a/Addon-FlashBack/src/main/resources/plugin.yml +++ /dev/null @@ -1,6 +0,0 @@ -main: me.SuperRonanCraft.BetterRTP.Addon.FlashBack -version: 1.0 -api-version: '1.13' -name: BetterRTP-Addon-FlashBack -depend: [BetterRTP] - diff --git a/BetterRTPAddons/pom.xml b/BetterRTPAddons/pom.xml new file mode 100644 index 0000000..46ed013 --- /dev/null +++ b/BetterRTPAddons/pom.xml @@ -0,0 +1,94 @@ + + + 4.0.0 + + me.SuperRonanCraft + BetterRTPAddons + jar + 1.0 + + + 1.8 + 1.8 + + + ${project.artifactId}-${project.version} + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + ${project.build.directory}/dependency-reduced-pom.xml + + + io.papermc.lib + me.SuperRonanCraft.BetterRTPAddons.paperlib + + + + + + package + + shade + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + ../../../Java/plugins + + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + papermc + https://papermc.io/repo/repository/maven-public/ + + + + + + org.spigotmc + spigot-api + 1.8.8-R0.1-SNAPSHOT + provided + + + + org.spigotmc + spigot + 1.8.8-R0.1-SNAPSHOT + provided + + + + io.papermc + paperlib + 1.0.5 + compile + + + me.SuperRonanCraft + BetterRTP + 2.14.5 + provided + + + \ No newline at end of file diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Events.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Events.java new file mode 100644 index 0000000..d8d5b02 --- /dev/null +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Events.java @@ -0,0 +1,20 @@ +package me.SuperRonanCraft.BetterRTPAddons; + +import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportEvent; +import org.bukkit.Bukkit; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +public class Events implements Listener { + + void load() { + Bukkit.getPluginManager().registerEvents(this, Main.getInstance()); + } + + @EventHandler + void onTeleport(RTP_TeleportEvent e) { + System.out.println("Player " + e.getPlayer().getName() + " was rtp'd!"); + new PlayerFlashback(e.getPlayer(), e.getOldLocation(), 20L * 10); + } + +} diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Main.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Main.java new file mode 100644 index 0000000..377401b --- /dev/null +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Main.java @@ -0,0 +1,23 @@ +package me.SuperRonanCraft.BetterRTPAddons; + +import org.bukkit.plugin.java.JavaPlugin; + +public class Main extends JavaPlugin { + + private static Main instance; + private final Events events = new Events(); + + @Override + public void onEnable() { + instance = this; + load(); + } + + void load() { + events.load(); + } + + public static Main getInstance() { + return instance; + } +} diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/PlayerFlashback.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/PlayerFlashback.java new file mode 100644 index 0000000..88538e0 --- /dev/null +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/PlayerFlashback.java @@ -0,0 +1,25 @@ +package me.SuperRonanCraft.BetterRTPAddons; + +import io.papermc.lib.PaperLib; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.entity.Player; + +public class PlayerFlashback { + + Player p; + Location oldLoc; + + PlayerFlashback(Player p, Location oldLoc, Long delayInTicks) { + this.p = p; + this.oldLoc = oldLoc; + Bukkit.getScheduler().runTaskLater(Main.getInstance(), getTimedFlash(), delayInTicks); + } + + private Runnable getTimedFlash() { + return () -> { + System.out.println("Player teleported back to old spot!"); + PaperLib.teleportAsync(p, oldLoc); + }; + } +} diff --git a/BetterRTPAddons/src/main/resources/ideas.yml b/BetterRTPAddons/src/main/resources/ideas.yml new file mode 100644 index 0000000..443ae4e --- /dev/null +++ b/BetterRTPAddons/src/main/resources/ideas.yml @@ -0,0 +1,6 @@ +- Pre-rtp effects +- Mute/Disable chat feature +- More post-rtp effects +- gui with configured/dynamic parameters +- save previous rtps in database and show in gui +- gui all the things! \ No newline at end of file diff --git a/BetterRTPAddons/src/main/resources/plugin.yml b/BetterRTPAddons/src/main/resources/plugin.yml new file mode 100644 index 0000000..1656b12 --- /dev/null +++ b/BetterRTPAddons/src/main/resources/plugin.yml @@ -0,0 +1,6 @@ +main: me.SuperRonanCraft.BetterRTPAddons.Main +version: 1.0 +api-version: '1.13' +name: BetterRTPAddons +depend: [BetterRTP] + diff --git a/Main/pom.xml b/Main/pom.xml deleted file mode 100644 index cd754c0..0000000 --- a/Main/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - BetterRTP - me.SuperRonanCraft - 2.14.5 - - 4.0.0 - - Main - - - ${project.parent.artifactId}-${project.parent.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - ${project.build.directory}/dependency-reduced-pom.xml - - - io.papermc.lib - me.SuperRonanCraft.BetterRTP.paperlib - - - - - - package - - shade - - - - - - org.apache.maven.plugins - maven-install-plugin - - - hack-binary - clean - - ${basedir}/../LocalJars/Residence4.9.1.9.jar - default - com.bekvon.bukkit - residence - 4.9.1.9 - jar - true - - - install-file - - - - - - - - - \ No newline at end of file diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/RTPEventInitiator.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/RTPEventInitiator.java deleted file mode 100644 index 30f6fa4..0000000 --- a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/RTPEventInitiator.java +++ /dev/null @@ -1,22 +0,0 @@ -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 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); - } -} diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/RTPEventListener.java b/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/RTPEventListener.java deleted file mode 100644 index ba89a8d..0000000 --- a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/RTPEventListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package me.SuperRonanCraft.BetterRTP.player.events; - -import org.bukkit.entity.Player; - -public interface RTPEventListener { - - void teleportedEvent(Player p); - -} diff --git a/pom.xml b/pom.xml index 12393cb..38c1c8c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,28 +6,69 @@ me.SuperRonanCraft BetterRTP - pom + jar 2.14.5 - - Addon-FlashBack - Main - - 1.8 1.8 + ${project.artifactId}-${project.version} + + org.apache.maven.plugins + maven-install-plugin + + + hack-binary + clean + + ${basedir}/LocalJars/Residence4.9.1.9.jar + default + com.bekvon.bukkit + residence + 4.9.1.9 + jar + true + + + install-file + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + ${project.build.directory}/dependency-reduced-pom.xml + + + io.papermc.lib + me.SuperRonanCraft.BetterRTP.paperlib + + + + + + package + + shade + + + + org.apache.maven.plugins maven-jar-plugin 3.2.0 - ../../../Java/plugins + ../../Java/plugins @@ -103,12 +144,6 @@ 1.0.5 compile - - - xyz.xenondevs - particle - 1.5.1 - com.sk89q.worldguard @@ -116,6 +151,12 @@ 7.0.3 provided + + + xyz.xenondevs + particle + 1.5.1 + com.github.TechFortress diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java similarity index 94% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java index ba739a9..13225da 100644 --- a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java @@ -3,7 +3,6 @@ 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; @@ -31,7 +30,7 @@ public class BetterRTP extends JavaPlugin { private final RTPInventories invs = new RTPInventories(); private final PlayerInfo pInfo = new PlayerInfo(); private final Settings settings = new Settings(); - private final RTPEventInitiator events = new RTPEventInitiator(); + private final RTPEventRegistry events = new RTPEventRegistry(); public void onEnable() { instance = this; @@ -124,7 +123,7 @@ public class BetterRTP extends JavaPlugin { getInstance().getLogger().info(str); } - public RTPEventInitiator getEvents() { + public RTPEventRegistry getEvents() { return events; } } diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/PlayerInfo.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/PlayerInfo.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/PlayerInfo.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/PlayerInfo.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/CommandTypes.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/CommandTypes.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/CommandTypes.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/CommandTypes.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommand.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommand.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommand.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommand.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommandHelpable.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommandHelpable.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommandHelpable.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/RTPCommandHelpable.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdBiome.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdInfo.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdReload.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdSettings.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java similarity index 95% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java index 4755504..8454711 100644 --- a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdTest.java @@ -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; - BetterRTP.getInstance().getRTP().getTeleport().afterTeleport(p, p.getLocation(), 0, 0); + BetterRTP.getInstance().getRTP().getTeleport().afterTeleport(p, p.getLocation(), 0, 0, p.getLocation()); } else sendi.sendMessage("Console is not able to execute this command! Try '/rtp help'"); } diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdVersion.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Click.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Interact.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Leave.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Listener.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/events/PluginEnable.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPCooldown.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPermissionGroup.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPSounds.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java similarity index 95% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java index 5d944ab..9b7f2b3 100644 --- a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java @@ -2,6 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp; import io.papermc.lib.PaperLib; import me.SuperRonanCraft.BetterRTP.BetterRTP; +import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportEvent; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.command.CommandSender; @@ -42,6 +43,7 @@ public class RTPTeleport { void sendPlayer(final CommandSender sendi, final Player p, final Location loc, final int price, final int attempts) throws NullPointerException { + Location oldLoc = p.getLocation(); loadingTeleport(p, sendi); //Send loading message to player who requested List> asyncChunks = getChunks(loc); //Get a list of chunks //playerLoads.put(p, asyncChunks); @@ -53,7 +55,7 @@ public class RTPTeleport { PaperLib.teleportAsync(p, loc).thenRun(new BukkitRunnable() { //Async teleport @Override public void run() { - afterTeleport(p, loc, price, attempts); + afterTeleport(p, loc, price, attempts, oldLoc); if (sendi != p) //Tell player who requested that the player rtp'd sendSuccessMsg(sendi, p.getName(), loc, price, false, attempts); getPl().getCmd().rtping.remove(p.getUniqueId()); //No longer rtp'ing @@ -74,14 +76,14 @@ public class RTPTeleport { //Effects - public void afterTeleport(Player p, Location loc, int price, int attempts) { //Only a successful rtp should run this OR '/rtp test' + public void afterTeleport(Player p, Location loc, int price, int attempts, Location oldLoc) { //Only a successful rtp should run this OR '/rtp test' eSounds.playTeleport(p); eParticles.display(p); ePotions.giveEffects(p); 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); + getPl().getServer().getPluginManager().callEvent(new RTP_TeleportEvent(p, loc, oldLoc)); } public void beforeTeleportInstant(CommandSender sendi, Player p) { diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_TYPE.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_TYPE.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_TYPE.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_TYPE.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/Updater.java diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java new file mode 100644 index 0000000..bdaa898 --- /dev/null +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java @@ -0,0 +1,41 @@ +package me.SuperRonanCraft.BetterRTP.references.customEvents; + +import org.bukkit.Location; +import org.bukkit.entity.Player; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +public class RTP_TeleportEvent extends Event { + + Player p; + Location loc; + Location oldLoc; + private static final HandlerList handler = new HandlerList(); + + public RTP_TeleportEvent(Player p, Location loc, Location oldLoc) { + this.p = p; + this.loc = loc; + this.oldLoc = oldLoc; + } + + public Player getPlayer() { + return p; + } + + public Location getLocation() { + return loc; + } + + public Location getOldLocation() { + return oldLoc; + } + + @Override + public HandlerList getHandlers() { + return handler; + } + + public static HandlerList getHandlerList() { + return handler; + } +} diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPerms.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/file/EcoFile.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Files.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Files.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Files.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Files.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/file/LangFile.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/file/Messages.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTPInventories.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_INV_SETTINGS.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_INV_SETTINGS.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_INV_SETTINGS.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_INV_SETTINGS.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/RTP_SETTINGS.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTPInventory_Defaults.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTP_INV_ITEMS.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTP_INV_ITEMS.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTP_INV_ITEMS.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/enums/RTP_INV_ITEMS.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvBlacklist.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvCoordinates.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvMain.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvMain.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvMain.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvMain.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/invs/types/RTPInvWorlds.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/web/Metrics.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTPWorld.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTPWorld.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTPWorld.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTPWorld.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WORLD_TYPE.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WORLD_TYPE.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WORLD_TYPE.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WORLD_TYPE.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldCustom.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java diff --git a/Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java similarity index 100% rename from Main/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java rename to src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java diff --git a/Main/src/main/resources/config.yml b/src/main/resources/config.yml similarity index 100% rename from Main/src/main/resources/config.yml rename to src/main/resources/config.yml diff --git a/Main/src/main/resources/economy.yml b/src/main/resources/economy.yml similarity index 100% rename from Main/src/main/resources/economy.yml rename to src/main/resources/economy.yml diff --git a/Main/src/main/resources/effects.yml b/src/main/resources/effects.yml similarity index 100% rename from Main/src/main/resources/effects.yml rename to src/main/resources/effects.yml diff --git a/Main/src/main/resources/lang/README.md b/src/main/resources/lang/README.md similarity index 100% rename from Main/src/main/resources/lang/README.md rename to src/main/resources/lang/README.md diff --git a/Main/src/main/resources/lang/chs.yml b/src/main/resources/lang/chs.yml similarity index 100% rename from Main/src/main/resources/lang/chs.yml rename to src/main/resources/lang/chs.yml diff --git a/Main/src/main/resources/lang/cht.yml b/src/main/resources/lang/cht.yml similarity index 100% rename from Main/src/main/resources/lang/cht.yml rename to src/main/resources/lang/cht.yml diff --git a/Main/src/main/resources/lang/cs.yml b/src/main/resources/lang/cs.yml similarity index 100% rename from Main/src/main/resources/lang/cs.yml rename to src/main/resources/lang/cs.yml diff --git a/Main/src/main/resources/lang/du.yml b/src/main/resources/lang/du.yml similarity index 100% rename from Main/src/main/resources/lang/du.yml rename to src/main/resources/lang/du.yml diff --git a/Main/src/main/resources/lang/en.yml b/src/main/resources/lang/en.yml similarity index 100% rename from Main/src/main/resources/lang/en.yml rename to src/main/resources/lang/en.yml diff --git a/Main/src/main/resources/lang/es.yml b/src/main/resources/lang/es.yml similarity index 100% rename from Main/src/main/resources/lang/es.yml rename to src/main/resources/lang/es.yml diff --git a/Main/src/main/resources/lang/fr.yml b/src/main/resources/lang/fr.yml similarity index 100% rename from Main/src/main/resources/lang/fr.yml rename to src/main/resources/lang/fr.yml diff --git a/Main/src/main/resources/lang/ja.yml b/src/main/resources/lang/ja.yml similarity index 100% rename from Main/src/main/resources/lang/ja.yml rename to src/main/resources/lang/ja.yml diff --git a/Main/src/main/resources/lang/ru.yml b/src/main/resources/lang/ru.yml similarity index 100% rename from Main/src/main/resources/lang/ru.yml rename to src/main/resources/lang/ru.yml diff --git a/Main/src/main/resources/locations.yml b/src/main/resources/locations.yml similarity index 100% rename from Main/src/main/resources/locations.yml rename to src/main/resources/locations.yml diff --git a/Main/src/main/resources/permissions.yml b/src/main/resources/permissions.yml similarity index 100% rename from Main/src/main/resources/permissions.yml rename to src/main/resources/permissions.yml diff --git a/Main/src/main/resources/plugin.yml b/src/main/resources/plugin.yml similarity index 97% rename from Main/src/main/resources/plugin.yml rename to src/main/resources/plugin.yml index 023253f..1c50bbc 100644 --- a/Main/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -main: me.SuperRonanCraft.BetterRTP.Main +main: me.SuperRonanCraft.BetterRTP.BetterRTP version: '2.14.4' name: BetterRTP author: SuperRonanCraft diff --git a/Main/src/main/resources/signs.yml b/src/main/resources/signs.yml similarity index 100% rename from Main/src/main/resources/signs.yml rename to src/main/resources/signs.yml