pueblos + hClaims support updated

pom.xml

@@ -45,7 +45,7 @@
                             <repositoryLayout>default</repositoryLayout>
                             <groupId>com.hakan</groupId>
                             <artifactId>claimsystem</artifactId>
-                            <version>1.1.1</version>
+                            <version>2.1.8</version>
                             <packaging>jar</packaging>
                             <generatePom>true</generatePom>
                         </configuration>
@@ -262,6 +262,13 @@
             <version>012e53d</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Peublos (https://www.spigotmc.org/resources/pueblos.91255/) -->
+        <dependency>
+            <groupId>com.github.SuperRonanCraft</groupId>
+            <artifactId>Pueblos</artifactId>
+            <version>master-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- Particles Library -->
         <dependency>
             <groupId>xyz.xenondevs</groupId>

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

@@ -42,17 +42,21 @@ public class RTPSounds {
     }
 
     void playSound(Location loc, Player p, String sound) {
-        try {
+        if (BetterRTP.getInstance().getSettings().protocolLibSounds) {
-            ProtocolManager pm = ProtocolLibrary.getProtocolManager();
+            try {
-            WrapperPlayServerNamedSoundEffect packet = new WrapperPlayServerNamedSoundEffect(pm.createPacket(PacketType.Play.Server.NAMED_SOUND_EFFECT));
+                ProtocolManager pm = ProtocolLibrary.getProtocolManager();
-            packet.setSoundName(sound);
+                WrapperPlayServerNamedSoundEffect packet = new WrapperPlayServerNamedSoundEffect(pm.createPacket(PacketType.Play.Server.NAMED_SOUND_EFFECT));
-            packet.setEffectPositionX(loc.getBlockX());
+                packet.setSoundName(sound);
-            packet.setEffectPositionY(loc.getBlockY());
+                packet.setEffectPositionX(loc.getBlockX());
-            packet.setEffectPositionZ(loc.getBlockZ());
+                packet.setEffectPositionY(loc.getBlockY());
-            packet.sendPacket(p);
+                packet.setEffectPositionZ(loc.getBlockZ());
-        } catch (NoClassDefFoundError | Exception e) {
+                packet.sendPacket(p);
+            } catch (NoClassDefFoundError | Exception e) {
+                BetterRTP.getInstance().getLogger().severe("ProtocolLib Sounds is enabled in the effects.yml file, but no ProtocolLib plugin was found!");
+                p.playSound(p.getLocation(), getSound(sound), 1F, 1F);
+            }
+        } else
             p.playSound(p.getLocation(), getSound(sound), 1F, 1F);
-        }
     }
 
     private Sound getSound(String sound) {

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

@@ -14,9 +14,10 @@ public class Settings {
     public int preloadRadius; //Amount of chunks to load around a safe rtp location (clamped (0 - 16))
     //Dependencies
     private final SoftDepends depends = new SoftDepends();
+    public boolean protocolLibSounds;
 
     public void load() { //Load Settings
-        FileBasics.FILETYPE config = getPl().getFiles().getType(FileBasics.FILETYPE.CONFIG);
+        FileBasics.FILETYPE config = FileBasics.FILETYPE.CONFIG;
         debug = config.getBoolean("Settings.Debugger");
         delayEnabled = config.getBoolean("Settings.Delay.Enabled");
         rtpOnFirstJoin_Enabled = config.getBoolean("Settings.RtpOnFirstJoin.Enabled");
@@ -24,14 +25,11 @@ public class Settings {
         rtpOnFirstJoin_SetAsRespawn = config.getBoolean("Settings.RtpOnFirstJoin.SetAsRespawn");
         preloadRadius = config.getInt("Settings.PreloadRadius");
         statusMessages = config.getBoolean("Settings.StatusMessages");
+        protocolLibSounds = FileBasics.FILETYPE.EFFECTS.getBoolean("Sounds.ProtocolLibSound");
         depends.load();
     }
 
     public SoftDepends getsDepends() {
         return depends;
     }
-
-    private BetterRTP getPl() {
-        return BetterRTP.getInstance();
-    }
 }

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

@@ -19,6 +19,7 @@ public class SoftDepends {
     private boolean respect_hClaims = false;
     private boolean respect_griefDefender = false;
     private boolean respect_ultimateClaims = false;
+    private boolean respect_pueblos = false;
     //RETURNABLES
     private boolean worldguard = false;
     private boolean griefprevention = false;
@@ -31,6 +32,7 @@ public class SoftDepends {
     private boolean hClaims = false;
     private boolean griefDefender = false;
     private boolean ultimateClaims = false;
+    private boolean pueblos = false;
 
     public boolean isWorldguard() {
         return worldguard;
@@ -87,9 +89,10 @@ public class SoftDepends {
         respect_lands = config.getBoolean(              pre + "Lands");
         respect_residence = config.getBoolean(          pre + "Residence");
         respect_kingdomsx = config.getBoolean(          pre + "KingdomsX");
-        respect_hClaims = config.getBoolean(   pre + "hClaims");
+        respect_hClaims = config.getBoolean(            pre + "hClaims");
         respect_griefDefender = config.getBoolean(      pre + "GriefDefender");
-        respect_ultimateClaims = config.getBoolean(      pre + "UltimateClaims");
+        respect_ultimateClaims = config.getBoolean(     pre + "UltimateClaims");
+        respect_pueblos = config.getBoolean(            pre + "Pueblos");
         registerWorldguard();
         registerGriefPrevention();
         registerTowny();
@@ -101,6 +104,7 @@ public class SoftDepends {
         registerClaimAPIPandomim();
         registerGriefDefender();
         registerUltimateClaims();
+        registerPueblos();
     }
 
     public void registerWorldguard() {
@@ -169,6 +173,12 @@ public class SoftDepends {
             debug("Respecting `UltimateClaims` was " + (ultimateClaims ? "SUCCESSFULLY" : "NOT") + " registered");
     }
 
+    public void registerPueblos() {
+        pueblos = respect_pueblos && Bukkit.getPluginManager().isPluginEnabled("Pueblos");
+        if (respect_pueblos)
+            debug("Respecting `Pueblos` was " + (pueblos ? "SUCCESSFULLY" : "NOT") + " registered");
+    }
+
     private void debug(String str) {
         if (BetterRTP.getInstance().getSettings().debug)
             BetterRTP.getInstance().getLogger().log(Level.INFO, str);

src/main/resources/effects.yml

@@ -1,5 +1,6 @@
 Sounds:
   Enabled: true
+  ProtocolLibSound: false
   ## More sounds at https://www.spigotmc.org/wiki/cc-sounds-list/
   Delay: 'entity_tnt_primed'
   Success: 'entity_generic_explode'

src/main/resources/plugin.yml

@@ -16,6 +16,7 @@ softdepend:
     - hClaims
     - GriefDefender
     - UltimateClaims
+    - Pueblos
 api-version: '1.13'
 
 commands: