Wrapping up update 1.1

Author: Wiicart

strings-api/src/main/java/com/pedestriamc/strings/api/StringsAPI.java

@@ -11,6 +11,7 @@
 /**
  * The API for Strings
  */
+@SuppressWarnings("unused")
 public interface StringsAPI {
 
     /**

strings-api/src/main/java/com/pedestriamc/strings/api/StringsChannel.java

@@ -5,12 +5,12 @@
 
 import java.util.Optional;
 import java.util.OptionalDouble;
-import java.util.OptionalInt;
 import java.util.Set;
 
 /**
  * An API Wrapper for all types of Channels.
  */
+@SuppressWarnings("unused")
 public interface StringsChannel {
 
     /**

strings-api/src/main/java/com/pedestriamc/strings/api/StringsUser.java

@@ -8,6 +8,7 @@
 /**
  * This represents the Strings internal User object which stores data on individual players.
  */
+@SuppressWarnings("unused")
 public interface StringsUser {
 
     /**
@@ -77,7 +78,7 @@ public interface StringsUser {
     void setDisplayName(@NotNull String displayName);
 
     /**
-     * Provides a the active StringsChannel of the StringsUser.
+     * Provides the active StringsChannel of the StringsUser.
      * @return The active StringsChannel.
      */
     @NotNull

strings-api/src/main/java/com/pedestriamc/strings/api/event/PlayerDirectMessageEvent.java

@@ -39,11 +39,19 @@ public PlayerDirectMessageEvent(Player sender, Player recipient, String message)
         return HANDLER_LIST;
     }
 
+    /**
+     * Checks if the Event is cancelled.
+     * @return A boolean.
+     */
     @Override
     public boolean isCancelled(){
         return this.isCancelled;
     }
 
+    /**
+     * Sets the Event to cancelled.
+     * @param isCancelled boolean if the event should be cancelled.
+     */
     @Override
     public void setCancelled(boolean isCancelled){
         this.isCancelled = isCancelled;

strings-bukkit/src/main/java/com/pedestriamc/strings/User.java

@@ -75,7 +75,7 @@ public User(UUID uuid, String chatColor, String prefix, String suffix, String di
     }
 
     /**
-     * Provides a Map containing all of the User's information.
+     * Provides a Map containing all the User's information.
      * @return The populated Map.
      */
     public Map<String, Object> getData(){

strings-bukkit/src/main/java/com/pedestriamc/strings/channels/ChannelManager.java

@@ -81,9 +81,9 @@ private void loadChannelsFromConfig(){
                             membershipString = "permission";
                         }
                         switch(membershipString){
-                            case "default" -> {membership = Membership.DEFAULT;}
-                            case "permission" -> {membership = Membership.PERMISSION;}
-                            default -> {membership = Membership.PROTECTED;}
+                            case "default" -> membership = Membership.DEFAULT;
+                            case "permission" -> membership = Membership.PERMISSION;
+                            default -> membership = Membership.PROTECTED;
                         }
                         switch(type){
                             case "stringchannel" -> {
@@ -196,14 +196,14 @@ public void registerChannel(Channel channel){
             world = ((ProximityChannel) channel).getWorld();
             isWorldOrProx = true;
         }
-        if(channel.getMembership() == Membership.DEFAULT){
+        if(channel.getMembership() == Membership.DEFAULT && !isWorldOrProx){
             defaultMembershipChannels.add(channel);
         }
 
         if(!isWorldOrProx){
             ArrayList<Channel> prChannels = new ArrayList<>();
             for(Map.Entry<String, Channel> entry : channels.entrySet()){
-                if(entry.getValue().getMembership() == Membership.DEFAULT){
+                if(entry.getValue().getMembership() == Membership.DEFAULT && !(entry.getValue() instanceof ProximityChannel) && !(entry.getValue() instanceof WorldChannel)){
                     prChannels.add(entry.getValue());
                 }
             }
@@ -220,12 +220,8 @@ public void registerChannel(Channel channel){
                 }
 
             }
-            ArrayList<Channel> prWChannels = new ArrayList<>();
-            for(Map.Entry<World, Channel> entry : worldChannels.entrySet()){
-                if(entry.getKey().equals(world) && entry.getValue().getMembership() == Membership.DEFAULT){
-                    prWChannels.add(entry.getValue());
-                }
-            }
+
+            ArrayList<Channel> prWChannels = getChannels(world);
             prWChannels.sort(Comparator.comparing(Channel::getPriority).reversed());
             wChannelsByPriority.put(world, prWChannels.toArray(new Channel[0]));
         }
@@ -235,6 +231,26 @@ public void registerChannel(Channel channel){
         Bukkit.getLogger().info("[Strings] Channel '" + channel.getName() + "' registered.");
     }
 
+    private @NotNull ArrayList<Channel> getChannels(World world) {
+        ArrayList<Channel> prWChannels = new ArrayList<>();
+        for(Map.Entry<String, Channel> entry : channels.entrySet()){
+            Channel c = entry.getValue();
+            World w = null;
+
+            if(c instanceof WorldChannel){
+                w = ((WorldChannel) c).getWorld();
+            }
+            if(c instanceof ProximityChannel){
+                w = ((ProximityChannel) c).getWorld();
+            }
+            if(w != null && w.equals(world) && c.getMembership() == Membership.DEFAULT){
+                prWChannels.add(c);
+            }
+
+        }
+        return prWChannels;
+    }
+
     /**
      * Unregisters a Channel.
      * @param channel The Channel to be unregistered.

strings-bukkit/src/main/java/com/pedestriamc/strings/channels/DefaultChannel.java

@@ -5,7 +5,6 @@
 import com.pedestriamc.strings.api.Membership;
 import com.pedestriamc.strings.api.StringsChannel;
 import com.pedestriamc.strings.api.Type;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -33,27 +32,18 @@ public DefaultChannel(Strings strings, @NotNull ChannelManager channelManager){
     @Override
     public void sendMessage(Player player, String message) {
         Channel[] worldChannels = channelManager.getWorldPriorityChannels(player.getWorld());
-        Bukkit.broadcastMessage(ChatColor.AQUA + "----------------------------");
-        Bukkit.broadcastMessage("WORLD CHANNELS");
-        Bukkit.broadcastMessage(Arrays.toString(worldChannels));
-        Bukkit.broadcastMessage(ChatColor.AQUA + "----------------------------");
         if(worldChannels.length > 0){
             worldChannels[0].sendMessage(player, message);
             return;
         }
         Channel[] defaultMembership = channelManager.getPriorityChannels();
-        Bukkit.broadcastMessage("DEFAULT MEMBERSHIP");
-        Bukkit.broadcastMessage(Arrays.toString(defaultMembership));
         if(defaultMembership.length > 0){
             defaultMembership[0].sendMessage(player, message);
             return;
         }
-
-        Bukkit.broadcastMessage(ChatColor.AQUA + "----------------------------");
-        Bukkit.broadcastMessage("USERS CHANNELS");
         User user = strings.getUser(player);
         Set<Channel> usersChannels = user.getChannels();
-        if(usersChannels.size() > 0){
+        if(!usersChannels.isEmpty()){
             Optional<Channel> optional =  usersChannels.stream().max(Comparator.comparingInt(Channel::getPriority));
             optional.get().sendMessage(player, message);
         }