GH-41 Some style fixes (#41)

* Some style fixes

* Fix

* Update gradle.yml

---------

Co-authored-by: Martin Sulikowski <[email protected]>

Author: igoyek

.github/workflows/gradle.yml

@@ -1,10 +1,3 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
-
 name: Java CI with Gradle
 
 on:
@@ -13,22 +6,33 @@ on:
   pull_request:
     branches: [ "master" ]
 
-permissions:
-  contents: read
-
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-    - name: Build with Gradle
-      uses: gradle/gradle-build-action@1b2daf58338ede8c62b0fa54355d1f515f659ad8
-      with:
-        arguments: build
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew clean shadowJar
+      - name: Upload a Build Artifact
+        uses: actions/[email protected]
+        with:
+          name: 'EternalFriends.jar'
+          path: build/libs/EternalFriends*

src/main/java/com/eternalcode/friends/command/handler/InvalidUsage.java

@@ -19,7 +19,7 @@ public InvalidUsage(MessagesConfig messages, NotificationAnnouncer announcer) {
 
     @Override
     public void handle(CommandSender sender, LiteInvocation invocation, Schematic schematic) {
-        schematic.getSchematics().stream().forEach(str -> {
+        schematic.getSchematics().forEach(str -> {
             this.announcer.announceMessage(sender, str);
         });
 

src/main/java/com/eternalcode/friends/command/implementation/FriendIgnoreCommand.java

@@ -43,7 +43,7 @@ public void ignore(Player sender, @Arg @Name("player") Player target) {
         if (this.friendManager.isIgnoredByPlayer(targetUuid, senderUuid)) {
             this.friendManager.removeIgnoredPlayer(senderUuid, targetUuid);
 
-            this.announcer.announceMessage(senderUuid, friendsConfig.youUnignoredPlayer.replace("{player}", target.getName()));
+            this.announcer.announceMessage(senderUuid, friendsConfig.playerNoLongerIgnored.replace("{player}", target.getName()));
 
             return;
         }

src/main/java/com/eternalcode/friends/command/implementation/FriendInviteCommand.java

@@ -43,7 +43,7 @@ public void invite(Player sender, @Arg @Name("player") Player target) {
         }
 
         if (this.friendManager.isIgnoredByPlayer(senderUuid, targetUuid)) {
-            this.announcer.announceMessage(senderUuid, friendsConfig.youreIgnored);
+            this.announcer.announceMessage(senderUuid, friendsConfig.cannotSendInvite);
 
             return;
         }
@@ -54,12 +54,12 @@ public void invite(Player sender, @Arg @Name("player") Player target) {
             return;
         }
 
-        if (inviteManager.hasReceivedInvite(targetUuid, senderUuid) || this.inviteManager.hasSendedInvite(targetUuid, senderUuid)) {
+        if (inviteManager.hasReceivedInvite(targetUuid, senderUuid) || this.inviteManager.hasSentInvite(targetUuid, senderUuid)) {
             this.announcer.announceMessage(senderUuid, friendsConfig.alreadyReceivedInvite);
 
             return;
         }
-        if (inviteManager.hasSendedInvite(senderUuid, targetUuid) || this.inviteManager.hasReceivedInvite(senderUuid, targetUuid)) {
+        if (inviteManager.hasSentInvite(senderUuid, targetUuid) || this.inviteManager.hasReceivedInvite(senderUuid, targetUuid)) {
             this.announcer.announceMessage(senderUuid, friendsConfig.alreadySentInvite);
 
             return;

src/main/java/com/eternalcode/friends/config/implementation/MessagesConfig.java

@@ -31,7 +31,7 @@ public static class Friends {
         public String chatFormat = "&9[FRIENDS] &f{player} &8» &7{message}";
         public String inviteSent = "&aInvitation to friends sent to player &f{invited}";
         public String inviteReceived = "&aYou have received a friend request from player &f{player}&a. To accept it, use the command <hover:show_text:\"/friends accept {player}\"><click:suggest_command:/friends accept {player}>&7/friends accept {player} &8[click]</click></hover>, &cor to decline it, use the command <hover:show_text:\"/friends deny {player}\"><click:suggest_command:/friends deny {player}>&7/friends deny {player} &8[click]</click></hover>.";
-        public String youreIgnored = "&cYou cannot send invitation to this player!";
+        public String cannotSendInvite = "&cYou cannot send invitation to this player!";
         public String emptyFriendList = "&cYou have no friends :(";
         public String emptyFriendListAdmin = "&cThis player has no friends.";
         public String acceptedInvite = "&aYou accepted a friend request from player &f{player}";
@@ -50,9 +50,9 @@ public static class Friends {
         public String inviteInstruction = "&aTo send a friend request, use the command &7/friends invite {player_name}";
         public String configReloaded = "&aConfiguration successfully reloaded!";
         public String inviteDenied = "&cYou declined the friend request from player &7{player}";
-        public String yourInvitationHasBeenDenied = "&cYour inivtation to &7{player} &chas been denied.";
+        public String yourInvitationHasBeenDenied = "&cYour invitation to &7{player} &chas been denied.";
         public String youIgnoredPlayer = "&cYou will no longer receive friend requests from player &7{player}";
-        public String youUnignoredPlayer = "&aYou can now receive friend requests from player &7{player} again.";
+        public String playerNoLongerIgnored = "&aYou can now receive friend requests from player &7{player} again.";
         public String inviteExpired = "&cThe friend request from this player has expired!";
         public String friendJoined = "&9{friend} &ahas joined the server!";
         public List<String> helpCommand = List.of(

src/main/java/com/eternalcode/friends/config/implementation/PluginConfig.java

@@ -20,11 +20,11 @@ public Resource resource(File folder) {
     @Description("# Configuration of Database")
     public Database database = new Database();
 
-    @Description("# Color of player's nametag displayed to his friends")
+    @Description("# Color of player's name tag displayed to his friends")
     public ChatColor friendColor = ChatColor.BLUE;
 
     @Description("# Does server should message displayed to player when his friend joins the server?")
-    public boolean anounceFriendJoin = true;
+    public boolean announceFriendJoin = true;
 
     @Description("# Configuration of command and subcommands names")
     public Command friendCommand = new Command();
@@ -47,7 +47,6 @@ public static class SubCommand {
         public String list = "list";
         public String help = "help";
         public String ignore = "ignore";
-        public String reload = "reload";
     }
 
     @Contextual

src/main/java/com/eternalcode/friends/invite/InviteManager.java

@@ -72,14 +72,14 @@ public void removeInvite(UUID from, UUID to) {
         if (hasReceivedInvite(from, to)) {
             this.receivedInvites.get(to).removeIf(invite -> invite.getFrom().equals(from));
         }
-        if (hasSendedInvite(from, to)) {
+        if (hasSentInvite(from, to)) {
             this.sentInvites.get(from).removeIf(invite -> invite.getTo().equals(to));
         }
 
         this.inviteDatabaseService.removeInvite(from, to);
     }
 
-    public boolean hasSendedInvite(UUID from, UUID to) {
+    public boolean hasSentInvite(UUID from, UUID to) {
         if (!this.sentInvites.containsKey(from)) {
             return false;
         }

src/main/java/com/eternalcode/friends/listener/AnnounceJoinListener.java

@@ -27,12 +27,12 @@ public AnnounceJoinListener(PluginConfig pluginConfig, MessagesConfig messagesCo
 
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
-        if (this.pluginConfig.anounceFriendJoin) {
-            this.anounceToFriends(event.getPlayer());
+        if (this.pluginConfig.announceFriendJoin) {
+            this.announceToFriends(event.getPlayer());
         }
     }
 
-    private void anounceToFriends(Player player) {
+    private void announceToFriends(Player player) {
         UUID playerUUID = player.getUniqueId();
 
         for (UUID friendUuid : this.friendManager.getFriends(playerUUID)) {

src/main/java/com/eternalcode/friends/listener/EntityDamageByEntityListener.java

@@ -16,17 +16,14 @@ public EntityDamageByEntityListener(FriendManager friendManager) {
 
     @EventHandler
     public void onDamage(EntityDamageByEntityEvent event) {
-        if (!(event.getDamager() instanceof Player)) {
+        if (!(event.getDamager() instanceof Player attacker)) {
             return;
         }
-        if (!(event.getEntity() instanceof Player)) {
+        if (!(event.getEntity() instanceof Player damaged)) {
             return;
         }
 
-        Player damager = (Player) event.getDamager();
-        Player damaged = (Player) event.getEntity();
-
-        if (this.friendManager.areFriends(damager.getUniqueId(), damaged.getUniqueId())) {
+        if (this.friendManager.areFriends(attacker.getUniqueId(), damaged.getUniqueId())) {
             event.setDamage(0D);
         }
     }