idk what happened :(

I lost some stuff.
nicegamer7 · May 3, 2020 · 7ca6587 · 7ca6587
1 parent 7203a82
commit 7ca6587
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 61 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,60 +13,29 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
                 <version>3.8.1</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>me.lucko:commodore</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>me.lucko.commodore</pattern>
-                                    <shadedPattern>xyz.ng7.rSpawn.commodore</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
     <repositories>
         <repository>
-            <id>spigotmc-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/public/</url>
         </repository>
         <repository>
             <id>Multiverse Snapshots</id>
             <url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
         </repository>
-        <repository>
-            <id>minecraft-libraries</id>
-            <name>Minecraft Libraries</name>
-            <url>https://libraries.minecraft.net</url>
-        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
             <version>1.15.2-R0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -79,12 +48,6 @@
             <artifactId>Multiverse-Inventories</artifactId>
             <version>4.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>me.lucko</groupId>
-            <artifactId>commodore</artifactId>
-            <version>1.7</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <properties>

diff --git a/rSpawn.iml b/rSpawn.iml
@@ -10,15 +10,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.bukkit:bukkit:1.15.2-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
     <orderEntry type="library" name="Maven: com.onarandombox.multiversecore:Multiverse-Core:4.1.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.onarandombox.multiverseinventories:Multiverse-Inventories:4.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: me.lucko:commodore:1.7" level="project" />
-    <orderEntry type="library" name="Maven: com.mojang:brigadier:1.0.17" level="project" />
   </component>
 </module>
diff --git a/src/main/java/xyz/ng7/rSpawn/Listeners/OnJoin.java b/src/main/java/xyz/ng7/rSpawn/Listeners/OnJoin.java
@@ -2,14 +2,14 @@
 
 import com.onarandombox.multiverseinventories.MultiverseInventories;
 import com.onarandombox.multiverseinventories.WorldGroup;
-import com.onarandombox.multiverseinventories.share.Sharables;
 import java.util.List;
 import org.bukkit.Location;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
+import xyz.ng7.rSpawn.MultiverseInventories.SpawnPointSharable;
 import xyz.ng7.rSpawn.rSpawn;
 import xyz.ng7.rSpawn.Utils.SpawnLocation;
 
@@ -28,14 +28,14 @@ public void onJoin(PlayerChangedWorldEvent e) {
         Player p = e.getPlayer();
         List<WorldGroup> lwg = this.i.getGroupManager().getGroupsForWorld(p.getWorld().getName());
 
-        for (WorldGroup fg: lwg) if (fg.isSharing(Sharables.SPAWN_LOCATION)) {
+        for (WorldGroup fg: lwg) if (fg.isSharing(SpawnPointSharable.SPAWN_POINT)) {
             g = fg.getName();
             break;
         }
 
-        if (g != null && Sharables.getPlayerSpawnLocation(p) == null) {
+        if (g != null && SpawnPointSharable.getPlayerSpawnPoint(p) == null) {
             Location sp = new SpawnLocation(this.c, p.getWorld()).gen();
-            Sharables.setPlayerSpawnLocation(p, sp);
+            SpawnPointSharable.setPlayerSpawnPoint(p, sp);
             p.teleport(sp);
         }
     }

diff --git a/src/main/java/xyz/ng7/rSpawn/Listeners/OnRespawn.java b/src/main/java/xyz/ng7/rSpawn/Listeners/OnRespawn.java
@@ -2,14 +2,14 @@
 
 import com.onarandombox.multiverseinventories.MultiverseInventories;
 import com.onarandombox.multiverseinventories.WorldGroup;
-import com.onarandombox.multiverseinventories.share.Sharables;
 import java.util.List;
 import org.bukkit.Location;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerRespawnEvent;
+import xyz.ng7.rSpawn.MultiverseInventories.SpawnPointSharable;
 import xyz.ng7.rSpawn.rSpawn;
 import xyz.ng7.rSpawn.Utils.SpawnLocation;
 
@@ -28,25 +28,25 @@ public void onRespawn(PlayerRespawnEvent e) {
         Player p = e.getPlayer();
         List<WorldGroup> lwg = this.i.getGroupManager().getGroupsForWorld(p.getWorld().getName());
 
-        for (WorldGroup fg: lwg) if (fg.isSharing(Sharables.SPAWN_LOCATION)) {
+        for (WorldGroup fg: lwg) if (fg.isSharing(SpawnPointSharable.SPAWN_POINT)) {
             g = fg.getName();
             break;
         }
 
         if (g != null) {
             if (e.isBedSpawn()) return;
 
-            Location sp = Sharables.getPlayerSpawnLocation(p);
+            Location sp = SpawnPointSharable.getPlayerSpawnPoint(p);
             if (sp != null) {
                 if (sp.getY() != sp.getWorld().getHighestBlockYAt(sp)) {
                     sp.setY(sp.getWorld().getHighestBlockYAt(sp));
-                    Sharables.setPlayerSpawnLocation(p, sp);
+                    SpawnPointSharable.setPlayerSpawnPoint(p, sp);
                 }
 
                 e.setRespawnLocation(sp);
             } else {
-                Sharables.setPlayerSpawnLocation(p, new SpawnLocation(this.c, p.getWorld()).gen());
-                e.setRespawnLocation(Sharables.getPlayerSpawnLocation(p));
+                SpawnPointSharable.setPlayerSpawnPoint(p, new SpawnLocation(this.c, p.getWorld()).gen());
+                e.setRespawnLocation(SpawnPointSharable.getPlayerSpawnPoint(p));
             }
         }
     }

diff --git a/src/main/java/xyz/ng7/rSpawn/rSpawn.java b/src/main/java/xyz/ng7/rSpawn/rSpawn.java
@@ -5,10 +5,12 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import xyz.ng7.rSpawn.Listeners.OnJoin;
 import xyz.ng7.rSpawn.Listeners.OnRespawn;
+import xyz.ng7.rSpawn.MultiverseInventories.SpawnPointSharable;
 import xyz.ng7.rSpawn.Utils.ConfigFile;
 
 public class rSpawn extends JavaPlugin {
     private FileConfiguration config;
+    private SpawnPointSharable sharable;
     private MultiverseInventories inventories;
 
     public rSpawn() {
@@ -18,7 +20,7 @@ public rSpawn() {
         if (inventories == null) {
             getLogger().severe("Multiverse Inventories not found. Disabling plugin.");
             getServer().getPluginManager().disablePlugin(this);
-        }
+        } else sharable = new SpawnPointSharable(this);
     }
 
     private void checkConfigVersion() {
@@ -49,4 +51,4 @@ public FileConfiguration getConfigFile() {
     public MultiverseInventories getInventories() {
         return inventories;
     }
-}
+}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,29 @@
 name: rSpawn
 version: 1.2.0
+api-version: 1.15
+author: nicegamer7
 main: xyz.ng7.rSpawn.rSpawn
-depend:
-  - Multiverse-Inventories
+description: Gives each player their own spawn point.
+depend: [Multiverse-Inventories]
+commands:
+  rspawn:
+    description: The rSpawn command.
+    usage: /<command> [get|set]
+permissions:
+  rspawn.get.self:
+    description: Permission to get spawn point for player.
+  rspawn.get.other:
+    description: Permission to get spawn point for other players.
+  rspawn.get:
+    description: Permission to get spawn point for all players.
+    children: [rspawn.get.self, rspawn.get.other]
+  rspawn.set.self:
+    description: Permission to set spawn point for player.
+  rspawn.set.other:
+    description: Permission to set spawn point for other players.
+  rspawn.set:
+    description: Permission to set spawn point for all players.
+    children: [rspawn.set.self, rspawn.set.other]
+  rspawn.*:
+    description: Permission to use all rSpawn commands
+    children: [rspawn.get, rspawn.set]