Revert Back To FastChunk Reference, Lunar Client Integration Started

SaberLLC · Nov 3, 2021 · b260a4f · b260a4f
1 parent 28964c1
commit b260a4f
Show file tree

Hide file tree

Showing 14 changed files with 199 additions and 115 deletions.
diff --git a/dependencies/LunarClientAPI.jar → dependencies/bukkitapi.jar b/dependencies/LunarClientAPI.jar → dependencies/bukkitapi.jar
diff --git a/pom.xml b/pom.xml
@@ -25,87 +25,89 @@
                 <directory>src/main/resources/</directory>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <relocations>
-                        <relocation>
-                            <pattern>me.lucko.helper</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.me.lucko.helper</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.github.cryptomorin</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.xseries</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.github.stefvanschie.inventoryframework</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.stefvanschie.inventoryframework</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.org.bstats</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.dv8tion</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.net.dv8tion</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>xyz.xenondevs</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.particlelib</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>mkremins.fanciful</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.mkremins.fanciful</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.google.gson</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.com.google.gson</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.darkblade12</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.com.darkblade12</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>de.tr7zw</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.nbtapi</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <finalName>SaberFactions</finalName>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.1</version>
-            </plugin>
-        </plugins>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>3.2.1</version>
+                    <configuration>
+                        <createDependencyReducedPom>false</createDependencyReducedPom>
+                        <relocations>
+                            <relocation>
+                                <pattern>me.lucko.helper</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.me.lucko.helper</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>com.github.cryptomorin</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.xseries</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>com.github.stefvanschie.inventoryframework</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.stefvanschie.inventoryframework
+                                </shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>org.bstats</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.org.bstats</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>net.dv8tion</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.net.dv8tion</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>xyz.xenondevs</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.particlelib</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>mkremins.fanciful</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.mkremins.fanciful</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>com.google.gson</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.com.google.gson</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>com.darkblade12</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.com.darkblade12</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>de.tr7zw</pattern>
+                                <shadedPattern>com.massivecraft.factions.shade.nbtapi</shadedPattern>
+                            </relocation>
+                        </relocations>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>shade</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <finalName>SaberFactions</finalName>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.0.1</version>
+                </plugin>
+            </plugins>
     </build>
 
     <dependencies>
@@ -295,7 +297,7 @@
             <artifactId>LC-API</artifactId>
             <scope>system</scope>
             <version>1.16</version>
-            <systemPath>${project.basedir}/dependencies/LunarClientAPI.jar</systemPath>
+            <systemPath>${project.basedir}/dependencies/bukkitapi.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>

diff --git a/src/main/java/com/massivecraft/factions/Faction.java b/src/main/java/com/massivecraft/factions/Faction.java
@@ -7,6 +7,7 @@
 import com.massivecraft.factions.struct.BanInfo;
 import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.struct.Role;
+import com.massivecraft.factions.util.FastChunk;
 import com.massivecraft.factions.util.LazyLocation;
 import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.Permissable;
@@ -101,9 +102,9 @@ public interface Faction extends EconomyParticipator {
 
     List<String> getCompletedMissions();
 
-    Set<FLocation> getSpawnerChunks();
+    Set<FastChunk> getSpawnerChunks();
 
-    void setSpawnerChunks(Set<FLocation> fastChunks);
+    void setSpawnerChunks(Set<FastChunk> fastChunks);
 
     void clearSpawnerChunks();
 

diff --git a/src/main/java/com/massivecraft/factions/FactionsPlugin.java b/src/main/java/com/massivecraft/factions/FactionsPlugin.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.lunarclient.bukkitapi.LunarClientAPI;
 import com.massivecraft.factions.addon.AddonManager;
 import com.massivecraft.factions.addon.FactionsAddon;
 import com.massivecraft.factions.cmd.CmdAutoHelp;
@@ -89,6 +90,7 @@ public class FactionsPlugin extends MPlugin {
     private boolean mvdwPlaceholderAPIManager = false;
     private Listener[] eventsListener;
     private Worldguard wg;
+    public LunarClientAPI lunarClientAPI;
 
     public FactionsPlugin() {
         instance = this;
@@ -423,6 +425,10 @@ public void logFactionEvent(Faction faction, FLogType type, String... arguments)
         this.fLogManager.log(faction, type, arguments);
     }
 
+    public LunarClientAPI getLunarClientAPI() {
+        return lunarClientAPI;
+    }
+
     public List<ReserveObject> getFactionReserves() {
         return this.reserveObjects;
     }

diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
@@ -43,6 +43,7 @@ public void perform(CommandContext context) {
             context.player.sendMessage(ChatColor.translateAlternateColorCodes('&', TL.DISCORD_LINK_REQUIRED.toString()));
             return;
         }
+
         String tag = context.argAsString(0);
 
         if (context.fPlayer.hasFaction()) {

diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSpawnerChunk.java b/src/main/java/com/massivecraft/factions/cmd/CmdSpawnerChunk.java
@@ -4,6 +4,7 @@
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
+import com.massivecraft.factions.util.FastChunk;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Location;
@@ -26,11 +27,11 @@ public CmdSpawnerChunk() {
     public void perform(CommandContext context) {
         Faction fac = context.faction;
         Location location = context.player.getLocation();
-        FLocation fLocation = new FLocation(location);
+        FastChunk fastChunk = new FastChunk(location.getWorld().getName(), location.getChunk().getX(), location.getChunk().getZ());
         if (fac.getSpawnerChunkCount() < fac.getAllowedSpawnerChunks()) {
-            if (context.fPlayer.attemptClaim(fac, fLocation, true)) {
-                if (!fac.getSpawnerChunks().contains(fLocation)) {
-                    fac.getSpawnerChunks().add(fLocation);
+            if (context.fPlayer.attemptClaim(fac, new FLocation(context.player.getLocation()), true)) {
+                if (!fac.getSpawnerChunks().contains(fastChunk)) {
+                    fac.getSpawnerChunks().add(fastChunk);
                     context.fPlayer.msg(TL.COMMAND_SPAWNERCHUNK_CLAIM_SUCCESSFUL);
                 } else {
                     context.fPlayer.msg(TL.COMMAND_SPAWNERCHUNK_ALREADY_CHUNK);

diff --git a/src/main/java/com/massivecraft/factions/integration/LunarAPI.java b/src/main/java/com/massivecraft/factions/integration/LunarAPI.java
@@ -1,30 +1,29 @@
 package com.massivecraft.factions.integration;
 
 
-import com.lunarclient.bukkitapi.LunarClientAPI;
 import com.lunarclient.bukkitapi.object.LCWaypoint;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.FactionsPlugin;
+import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.entity.Player;
 
 public class LunarAPI {
 
-    public static void initLunarUser(FPlayer fPlayer) {
-        if(fPlayer.hasFaction()) {
-            Player player = fPlayer.getPlayer();
-            Faction faction = fPlayer.getFaction();
-            if(LunarClientAPI.getInstance().isRunningLunarClient(player)) {
-                LunarClientAPI.getInstance().registerPlayer(player);
-                LCWaypoint waypoint = new LCWaypoint("Faction Home", faction.getHome(), Color.LIME.asRGB(), true);
-                LunarClientAPI.getInstance().sendWaypoint(player, waypoint);
-            }
-        }
+
+    public static boolean isLunarAPIEnabled() {
+        return Bukkit.getServer().getPluginManager().isPluginEnabled("LunarClient-API");
     }
 
-    public static  void exilLunarUser(FPlayer fPlayer) {
-        if(LunarClientAPI.getInstance().isRunningLunarClient(fPlayer.getPlayer())) {
-            LunarClientAPI.getInstance().unregisterPlayer(fPlayer.getPlayer(), true);
+
+    public static void sendHomeWaypoint(FPlayer fPlayer) {
+        Player player = fPlayer.getPlayer();
+        Faction faction = fPlayer.getFaction();
+        if(fPlayer.hasFaction() && fPlayer.getFaction().getHome() != null) {
+            //FactionsPlugin.getInstance().getLunarClientAPI().registerPlayer(player);
+            LCWaypoint waypoint = new LCWaypoint("Faction Home", faction.getHome(), Color.LIME.asRGB(), true);
+            FactionsPlugin.getInstance().getLunarClientAPI().sendWaypoint(player, waypoint);
         }
     }
 

diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -11,6 +11,7 @@
 import com.massivecraft.factions.event.FPlayerEnteredFactionEvent;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.event.FPlayerLeaveEvent;
+import com.massivecraft.factions.integration.LunarAPI;
 import com.massivecraft.factions.scoreboards.FScoreboard;
 import com.massivecraft.factions.scoreboards.FTeamWrapper;
 import com.massivecraft.factions.scoreboards.sidebar.FDefaultSidebar;
@@ -421,6 +422,10 @@ private void initPlayer(Player player) {
             me.setFlying(false);
         }
 
+        if(LunarAPI.isLunarAPIEnabled()) {
+            LunarAPI.sendHomeWaypoint(me);
+        }
+
     }
 
     @EventHandler

diff --git a/src/main/java/com/massivecraft/factions/listeners/SpawnerChunkListener.java b/src/main/java/com/massivecraft/factions/listeners/SpawnerChunkListener.java
@@ -2,6 +2,7 @@
 
 import com.cryptomorin.xseries.XMaterial;
 import com.massivecraft.factions.*;
+import com.massivecraft.factions.util.FastChunk;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
@@ -12,10 +13,9 @@ public class SpawnerChunkListener implements Listener {
 
     @EventHandler
     public void onSpawnerPlace(BlockPlaceEvent e) {
-
-
         if (e.getBlockPlaced().getType() == XMaterial.SPAWNER.parseMaterial()) {
             Location location = e.getBlockPlaced().getLocation();
+            FastChunk fastChunk = new FastChunk(location.getWorld().getName(), location.getChunk().getX(), location.getChunk().getZ());
             FLocation fLoc = new FLocation(location);
             Faction fac = Board.getInstance().getFactionAt(fLoc);
             FPlayer fPlayer = FPlayers.getInstance().getByPlayer(e.getPlayer());
@@ -26,7 +26,7 @@ public void onSpawnerPlace(BlockPlaceEvent e) {
 
             if (!Conf.allowSpawnersPlacedInWilderness) {
                 if (fac.isNormal()) {
-                    if (!fac.getSpawnerChunks().contains(fLoc)) {
+                    if (!fac.getSpawnerChunks().contains(fastChunk)) {
                         e.setCancelled(true);
                         e.getPlayer().sendMessage(TL.SPAWNER_CHUNK_PLACE_DENIED_NOT_SPAWNERCHUNK.toString());
                     }