Merge pull request #6 from CherryCraftMC/ServerNameChange

Rename package from 'reefrealm' to 'cherrycraft'

pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>net.reefrealm</groupId>
-  <artifactId>ReefRealmSkyPVP</artifactId>
+  <groupId>net.cherrycraft</groupId>
+  <artifactId>CherrySkyPVP</artifactId>
   <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <name>ReefRealmSkyPVP</name>
+  <name>CherrySkyPVP</name>
 
     <properties>
         <java.version>1.8</java.version>

src/main/java/net/reefrealm/reefrealmskypvp/ReefRealmSkyPVP.java → src/main/java/net/cherrycraft/cherryskypvp/CherrySkyPVP.java

@@ -1,19 +1,19 @@
-package net.reefrealm.reefrealmskypvp;
+package net.cherrycraft.cherryskypvp;
 
-import net.reefrealm.reefrealmskypvp.data.MySQL;
+import net.cherrycraft.cherryskypvp.data.MySQL;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.logging.Logger;
 
-public final class ReefRealmSkyPVP extends JavaPlugin {
+public final class CherrySkyPVP extends JavaPlugin {
 
-    static ReefRealmSkyPVP instance;
+    static CherrySkyPVP instance;
 
     private final YamlConfiguration conf = new YamlConfiguration();
     Logger logger = Logger.getLogger("ReefCore");
 
-    public static ReefRealmSkyPVP getInstance() {
+    public static CherrySkyPVP getInstance() {
         return instance;
     }
 

src/main/java/net/reefrealm/reefrealmskypvp/Loader.java → src/main/java/net/cherrycraft/cherryskypvp/Loader.java

@@ -1,33 +1,33 @@
-package net.reefrealm.reefrealmskypvp;
-
-import net.reefrealm.reefrealmskypvp.bounty.commands.BountyCommand;
-import net.reefrealm.reefrealmskypvp.economy.command.CoinsCommand;
-import net.reefrealm.reefrealmskypvp.launcher.LaunchpadSystem;
-import net.reefrealm.reefrealmskypvp.manager.CommandManager;
-import net.reefrealm.reefrealmskypvp.placeholders.StatsPlaceholderExpansion;
-import net.reefrealm.reefrealmskypvp.spawn.AlwaysSpawn;
-import net.reefrealm.reefrealmskypvp.spawn.SetSpawnCommand;
-import net.reefrealm.reefrealmskypvp.stats.SkyPVPStats;
+package net.cherrycraft.cherryskypvp;
+
+import net.cherrycraft.cherryskypvp.bounty.commands.BountyCommand;
+import net.cherrycraft.cherryskypvp.launcher.LaunchpadSystem;
+import net.cherrycraft.cherryskypvp.manager.CommandManager;
+import net.cherrycraft.cherryskypvp.economy.command.CoinsCommand;
+import net.cherrycraft.cherryskypvp.placeholders.StatsPlaceholderExpansion;
+import net.cherrycraft.cherryskypvp.spawn.AlwaysSpawn;
+import net.cherrycraft.cherryskypvp.spawn.SetSpawnCommand;
+import net.cherrycraft.cherryskypvp.stats.SkyPVPStats;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
 
 public class Loader implements Listener {
 
 
-    public static void registerCommands(ReefRealmSkyPVP plugin) {
+    public static void registerCommands(CherrySkyPVP plugin) {
         //registeredCommand(new LanguageCommand("language"), plugin);
         registeredCommand(new SetSpawnCommand("setspawn"), plugin);
         registeredCommand(new CoinsCommand("coins"), plugin);
         registeredCommand(new BountyCommand("bounty"), plugin);
     }
 
 
-    private static void registeredCommand(CommandManager command, ReefRealmSkyPVP plugin) {
+    private static void registeredCommand(CommandManager command, CherrySkyPVP plugin) {
         command.register(plugin);
         plugin.getLogger().info("Command '" + command.getCommandName() + "' has been registered.");
     }
 
-    public static void registerListeners(ReefRealmSkyPVP plugin) {
+    public static void registerListeners(CherrySkyPVP plugin) {
         // Register listeners here
         //Bukkit.getPluginManager().registerEvents(new ExampleListener(), plugin);
         Bukkit.getPluginManager().registerEvents(new SkyPVPStats(),plugin);

src/main/java/net/reefrealm/reefrealmskypvp/bounty/commands/BountyCommand.java → src/main/java/net/cherrycraft/cherryskypvp/bounty/commands/BountyCommand.java

@@ -1,7 +1,7 @@
-package net.reefrealm.reefrealmskypvp.bounty.commands;
+package net.cherrycraft.cherryskypvp.bounty.commands;
 
-import net.reefrealm.reefrealmskypvp.data.MySQL;
-import net.reefrealm.reefrealmskypvp.manager.CommandManager;
+import net.cherrycraft.cherryskypvp.data.MySQL;
+import net.cherrycraft.cherryskypvp.manager.CommandManager;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

src/main/java/net/reefrealm/reefrealmskypvp/data/MySQL.java → src/main/java/net/cherrycraft/cherryskypvp/data/MySQL.java

@@ -1,4 +1,4 @@
-package net.reefrealm.reefrealmskypvp.data;
+package net.cherrycraft.cherryskypvp.data;
 
 import org.bukkit.Bukkit;
 

src/main/java/net/reefrealm/reefrealmskypvp/economy/CoinsSystem.java → src/main/java/net/cherrycraft/cherryskypvp/economy/CoinsSystem.java

@@ -1,10 +1,7 @@
-package net.reefrealm.reefrealmskypvp.economy;
+package net.cherrycraft.cherryskypvp.economy;
 
-import net.reefrealm.reefrealmskypvp.data.MySQL;
+import net.cherrycraft.cherryskypvp.data.MySQL;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.UUID;
 
 public class CoinsSystem{
 

src/main/java/net/reefrealm/reefrealmskypvp/economy/command/CoinsCommand.java → src/main/java/net/cherrycraft/cherryskypvp/economy/command/CoinsCommand.java

@@ -1,8 +1,8 @@
-package net.reefrealm.reefrealmskypvp.economy.command;
+package net.cherrycraft.cherryskypvp.economy.command;
 
-import net.reefrealm.reefrealmskypvp.data.MySQL;
-import net.reefrealm.reefrealmskypvp.economy.CoinsSystem;
-import net.reefrealm.reefrealmskypvp.manager.CommandManager;
+import net.cherrycraft.cherryskypvp.data.MySQL;
+import net.cherrycraft.cherryskypvp.economy.CoinsSystem;
+import net.cherrycraft.cherryskypvp.manager.CommandManager;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -12,7 +12,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class CoinsCommand extends CommandManager implements TabCompleter {

src/main/java/net/reefrealm/reefrealmskypvp/launcher/LaunchpadSystem.java → src/main/java/net/cherrycraft/cherryskypvp/launcher/LaunchpadSystem.java

@@ -1,4 +1,4 @@
-package net.reefrealm.reefrealmskypvp.launcher;
+package net.cherrycraft.cherryskypvp.launcher;
 
 import org.bukkit.Material;
 import org.bukkit.Sound;

src/main/java/net/reefrealm/reefrealmskypvp/level/LevelSystem.java → src/main/java/net/cherrycraft/cherryskypvp/level/LevelSystem.java

@@ -1,6 +1,6 @@
-package net.reefrealm.reefrealmskypvp.level;
+package net.cherrycraft.cherryskypvp.level;
 
-import net.reefrealm.reefrealmskypvp.data.MySQL;
+import net.cherrycraft.cherryskypvp.data.MySQL;
 import org.bukkit.entity.Player;
 
 public class LevelSystem {

src/main/java/net/reefrealm/reefrealmskypvp/manager/CommandManager.java → src/main/java/net/cherrycraft/cherryskypvp/manager/CommandManager.java

@@ -1,4 +1,4 @@
-package net.reefrealm.reefrealmskypvp.manager;
+package net.cherrycraft.cherryskypvp.manager;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/net/reefrealm/reefrealmskypvp/placeholders/StatsPlaceholderExpansion.java → src/main/java/net/cherrycraft/cherryskypvp/placeholders/StatsPlaceholderExpansion.java

@@ -1,8 +1,8 @@
-package net.reefrealm.reefrealmskypvp.placeholders;
+package net.cherrycraft.cherryskypvp.placeholders;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import net.reefrealm.reefrealmskypvp.data.MySQL;
-import net.reefrealm.reefrealmskypvp.level.LevelSystem;
+import net.cherrycraft.cherryskypvp.data.MySQL;
+import net.cherrycraft.cherryskypvp.level.LevelSystem;
 import org.bukkit.entity.Player;
 
 public class StatsPlaceholderExpansion extends PlaceholderExpansion {

src/main/java/net/reefrealm/reefrealmskypvp/spawn/AlwaysSpawn.java → src/main/java/net/cherrycraft/cherryskypvp/spawn/AlwaysSpawn.java

@@ -1,6 +1,6 @@
-package net.reefrealm.reefrealmskypvp.spawn;
+package net.cherrycraft.cherryskypvp.spawn;
 
-import net.reefrealm.reefrealmskypvp.ReefRealmSkyPVP;
+import net.cherrycraft.cherryskypvp.CherrySkyPVP;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -23,12 +23,12 @@ public void onPlayerRespawn(PlayerRespawnEvent event) {
     }
 
     private void teleportToSpawn(Player player) {
-        String worldName = ReefRealmSkyPVP.getInstance().getConfig().getString("spawn.world");
-        double x = ReefRealmSkyPVP.getInstance().getConfig().getDouble("spawn.x");
-        double y = ReefRealmSkyPVP.getInstance().getConfig().getDouble("spawn.y");
-        double z = ReefRealmSkyPVP.getInstance().getConfig().getDouble("spawn.z");
-        float yaw = (float) ReefRealmSkyPVP.getInstance().getConfig().getDouble("spawn.yaw");
-        float pitch = (float) ReefRealmSkyPVP.getInstance().getConfig().getDouble("spawn.pitch");
+        String worldName = CherrySkyPVP.getInstance().getConfig().getString("spawn.world");
+        double x = CherrySkyPVP.getInstance().getConfig().getDouble("spawn.x");
+        double y = CherrySkyPVP.getInstance().getConfig().getDouble("spawn.y");
+        double z = CherrySkyPVP.getInstance().getConfig().getDouble("spawn.z");
+        float yaw = (float) CherrySkyPVP.getInstance().getConfig().getDouble("spawn.yaw");
+        float pitch = (float) CherrySkyPVP.getInstance().getConfig().getDouble("spawn.pitch");
 
         World world = Bukkit.getWorld(worldName);
         if (world != null) {

src/main/java/net/cherrycraft/cherryskypvp/spawn/SetSpawnCommand.java

@@ -0,0 +1,35 @@
+package net.cherrycraft.cherryskypvp.spawn;
+
+import net.cherrycraft.cherryskypvp.CherrySkyPVP;
+import net.cherrycraft.cherryskypvp.manager.CommandManager;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class SetSpawnCommand extends CommandManager {
+    public SetSpawnCommand(String commandName) {
+        super("setspawn");
+        setPermission("reefrealmskypvp.setspawn");
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!(sender instanceof Player)) {
+            sender.sendMessage("This command can only be executed by a player.");
+            return;
+        }
+
+        Player player = (Player) sender;
+        Location location = player.getLocation();
+
+        CherrySkyPVP.getInstance().getConfig().set("spawn.world", location.getWorld().getName());
+        CherrySkyPVP.getInstance().getConfig().set("spawn.x", location.getX());
+        CherrySkyPVP.getInstance().getConfig().set("spawn.y", location.getY());
+        CherrySkyPVP.getInstance().getConfig().set("spawn.z", location.getZ());
+        CherrySkyPVP.getInstance().getConfig().set("spawn.yaw", location.getYaw());
+        CherrySkyPVP.getInstance().getConfig().set("spawn.pitch", location.getPitch());
+
+        CherrySkyPVP.getInstance().saveConfig();
+        player.sendMessage("Spawn location saved.");
+    }
+}

src/main/java/net/reefrealm/reefrealmskypvp/stats/SkyPVPStats.java → src/main/java/net/cherrycraft/cherryskypvp/stats/SkyPVPStats.java

@@ -1,16 +1,15 @@
-package net.reefrealm.reefrealmskypvp.stats;
+package net.cherrycraft.cherryskypvp.stats;
 
+import net.cherrycraft.cherryskypvp.data.MySQL;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import net.reefrealm.reefrealmskypvp.data.MySQL;
-import net.reefrealm.reefrealmskypvp.level.LevelSystem;
+import net.cherrycraft.cherryskypvp.level.LevelSystem;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 
 import java.util.HashMap;

src/main/java/net/reefrealm/reefrealmskypvp/store/Store.java → src/main/java/net/cherrycraft/cherryskypvp/store/Store.java

@@ -1,4 +1,4 @@
-package net.reefrealm.reefrealmskypvp.store;
+package net.cherrycraft.cherryskypvp.store;
 
 public class Store {
     /*TODO

src/main/java/net/reefrealm/reefrealmskypvp/trading/TradeSystem.java → src/main/java/net/cherrycraft/cherryskypvp/trading/TradeSystem.java

@@ -1,4 +1,4 @@
-package net.reefrealm.reefrealmskypvp.trading;
+package net.cherrycraft.cherryskypvp.trading;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
-name: ReefRealmSkyPVP
+name: CherrySkyPVP
 version: '${project.version}'
-main: net.reefrealm.reefrealmskypvp.ReefRealmSkyPVP
+main: net.cherrycraft.cherryskypvp.CherrySkyPVP
 api-version: '1.20'
 commands:
   setspawn: