Melhorias do sistema de chat de clãs (#15)

* Pequenas melhorias do ChatManager * Removido comandos de join, leave e mute * Adicionado anotação Optional no comando * Removendo workflows não utilizados * Adicionado VentureChat como softdepend * Add VentureChatListener * Alterar apenas se estiver em algum canal de clã * Alterado groupId do VentureChat * Adicionado método para instanciar listener * Pequena melhoiria SCPlayerListener
ArmaRealms · Aug 15, 2024 · 709c5b3 · 709c5b3
1 parent 4c959cc
commit 709c5b3
Show file tree

Hide file tree

Showing 16 changed files with 195 additions and 202 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -27,6 +27,8 @@ jobs:
           java-version: "${{ matrix.java-version }}"
           distribution: 'adopt'
           cache: 'maven'
+      - name: Install VentureChat
+        run: mvn install:install-file -Dfile=libs/VentureChat-3.7.1.jar -DgroupId=mineverse.Aust1n46.chat -DartifactId=VentureChat -Dversion=3.7.1 -Dpackaging=jar -f pom.xml
       - name: Build with Maven
         run: ./mvnw -B -U package --file pom.xml
       - name: Upload Build Artifact

diff --git a/.github/workflows/publish_curseforge.yml b/.github/workflows/publish_curseforge.yml
diff --git a/.github/workflows/publish_modrinth.yml b/.github/workflows/publish_modrinth.yml
diff --git a/.github/workflows/publish_reposilite.yml b/.github/workflows/publish_reposilite.yml
diff --git a/.github/workflows/release_please.yml b/.github/workflows/release_please.yml
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
 /target/
 /.idea/
 /bin/
+${env.TEST_SERVER}/
 /.classpath
 /.project
-*.jar
 .settings
 .factorypath
 SimpleClans.iml

diff --git a/.run/SimpleClans [install-VentureChat].run.xml b/.run/SimpleClans [install-VentureChat].run.xml
@@ -0,0 +1,37 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SimpleClans [install-VentureChat]" type="MavenRunConfiguration" factoryName="Maven">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings" />
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="cmdOptions" />
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="install:install-file" />
+              <option value="-Dfile=libs/VentureChat-3.7.1.jar" />
+              <option value="-DgroupId=mineverse.Aust1n46.chat" />
+              <option value="-DartifactId=VentureChat" />
+              <option value="-Dversion=3.7.1" />
+              <option value="-Dpackaging=jar" />
+            </list>
+          </option>
+          <option name="multimoduleDir" />
+          <option name="pomFileName" value="pom.xml" />
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="projectsCmdOptionValues">
+            <list />
+          </option>
+          <option name="resolveToWorkspace" value="false" />
+          <option name="workingDirPath" value="$PROJECT_DIR$" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/libs/VentureChat-3.7.1.jar b/libs/VentureChat-3.7.1.jar
diff --git a/pom.xml b/pom.xml
@@ -263,7 +263,11 @@
             <artifactId>gson</artifactId>
             <version>2.10.1</version>
         </dependency>
-
+        <dependency>
+            <groupId>mineverse.Aust1n46.chat</groupId>
+            <artifactId>VentureChat</artifactId>
+            <version>3.7.1</version>
+        </dependency>
         <!--    Test frameworks    -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/SimpleClans.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/SimpleClans.java
@@ -126,6 +126,7 @@ public void onEnable() {
         startTasks();
         startMetrics();
         hookIntoPAPI();
+        hookIntoVentureChat();
         new UpdateChecker(this).check();
     }
 
@@ -154,6 +155,13 @@ private void hookIntoPAPI() {
         }
     }
 
+    private void hookIntoVentureChat() {
+        if (getPluginManager().getPlugin("VentureChat") != null) {
+            getLogger().info("VentureChat found. Registering hook...");
+            getPluginManager().registerEvents(new VentureChatListener(this), this);
+        }
+    }
+
     private void startMetrics() {
         Metrics metrics = new Metrics(this, 7131);
         SettingsManager sm = getSettingsManager();

diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/AllyChatCommand.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/AllyChatCommand.java
@@ -1,11 +1,18 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.clan;
 
 import co.aikar.commands.BaseCommand;
-import co.aikar.commands.annotation.*;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Conditions;
+import co.aikar.commands.annotation.Default;
+import co.aikar.commands.annotation.Dependency;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.HelpSearchTags;
+import co.aikar.commands.annotation.Name;
+import co.aikar.commands.annotation.Optional;
 import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
 import net.sacredlabyrinth.phaed.simpleclans.managers.ChatManager;
-import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
 
 import static net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel.ALLY;
@@ -22,13 +29,11 @@ public class AllyChatCommand extends BaseCommand {
     @Dependency
     private ChatManager chatManager;
     @Dependency
-    private SettingsManager settingsManager;
-    @Dependency
     private StorageManager storageManager;
 
     @Default
     @HelpSearchTags("chat")
-    public void sendMessage(ClanPlayer cp, @Name("message") String message) {
+    public void sendMessage(ClanPlayer cp, @Optional @Name("message") String message) {
         if (message == null || message.isBlank()) {
             if (cp.getChannel() == ALLY) {
                 cp.setChannel(NONE);
@@ -44,37 +49,37 @@ public void sendMessage(ClanPlayer cp, @Name("message") String message) {
         }
     }
 
-    @Subcommand("%join")
-    public void join(ClanPlayer clanPlayer) {
-        if (clanPlayer.getChannel() == ALLY) {
-            ChatBlock.sendMessage(clanPlayer, lang("already.joined.ally.chat"));
-            return;
-        }
-
-        clanPlayer.setChannel(ALLY);
-        storageManager.updateClanPlayer(clanPlayer);
-        ChatBlock.sendMessage(clanPlayer, lang("joined.ally.chat"));
-    }
-
-    @Subcommand("%leave")
-    public void leave(ClanPlayer clanPlayer) {
-        if (clanPlayer.getChannel() == ALLY) {
-            clanPlayer.setChannel(NONE);
-            storageManager.updateClanPlayer(clanPlayer);
-            ChatBlock.sendMessage(clanPlayer, lang("left.ally.chat", clanPlayer));
-        } else {
-            ChatBlock.sendMessage(clanPlayer, lang("chat.didnt.join", clanPlayer));
-        }
-    }
-
-    @Subcommand("%mute")
-    public void mute(ClanPlayer clanPlayer) {
-        if (!clanPlayer.isMutedAlly()) {
-            clanPlayer.mute(ALLY, true);
-            ChatBlock.sendMessage(clanPlayer, lang("muted.ally.chat", clanPlayer));
-        } else {
-            clanPlayer.mute(ALLY, false);
-            ChatBlock.sendMessage(clanPlayer, lang("unmuted.ally.chat", clanPlayer));
-        }
-    }
+//    @Subcommand("%join")
+//    public void join(ClanPlayer clanPlayer) {
+//        if (clanPlayer.getChannel() == ALLY) {
+//            ChatBlock.sendMessage(clanPlayer, lang("already.joined.ally.chat"));
+//            return;
+//        }
+//
+//        clanPlayer.setChannel(ALLY);
+//        storageManager.updateClanPlayer(clanPlayer);
+//        ChatBlock.sendMessage(clanPlayer, lang("joined.ally.chat"));
+//    }
+//
+//    @Subcommand("%leave")
+//    public void leave(ClanPlayer clanPlayer) {
+//        if (clanPlayer.getChannel() == ALLY) {
+//            clanPlayer.setChannel(NONE);
+//            storageManager.updateClanPlayer(clanPlayer);
+//            ChatBlock.sendMessage(clanPlayer, lang("left.ally.chat", clanPlayer));
+//        } else {
+//            ChatBlock.sendMessage(clanPlayer, lang("chat.didnt.join", clanPlayer));
+//        }
+//    }
+//
+//    @Subcommand("%mute")
+//    public void mute(ClanPlayer clanPlayer) {
+//        if (!clanPlayer.isMutedAlly()) {
+//            clanPlayer.mute(ALLY, true);
+//            ChatBlock.sendMessage(clanPlayer, lang("muted.ally.chat", clanPlayer));
+//        } else {
+//            clanPlayer.mute(ALLY, false);
+//            ChatBlock.sendMessage(clanPlayer, lang("unmuted.ally.chat", clanPlayer));
+//        }
+//    }
 }