Separate hover message into accept/deny #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

CoolLord22 wants to merge 3 commits into erikzimmermann:develop from Mythrend-Codebase:develop

TradeSystem-Bundle/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
         <parent>
             <artifactId>TradeSystem</artifactId>
             <groupId>de.codingair</groupId>
-            <version>2.6.3_Hotfix-4</version>
+            <version>2.6.3_Hotfix-5</version>
         </parent>
         <modelVersion>4.0.0</modelVersion>
@@ Expand Down @@

TradeSystem-Packets/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
         <parent>
             <artifactId>TradeSystem</artifactId>
             <groupId>de.codingair</groupId>
-            <version>2.6.3_Hotfix-4</version>
+            <version>2.6.3_Hotfix-5</version>
         </parent>
         <modelVersion>4.0.0</modelVersion>
@@ Expand Down @@

TradeSystem-Spigot/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
         <parent>
             <artifactId>TradeSystem</artifactId>
             <groupId>de.codingair</groupId>
-            <version>2.6.3_Hotfix-4</version>
+            <version>2.6.3_Hotfix-5</version>
         </parent>
         <modelVersion>4.0.0</modelVersion>
@@ Expand Down Expand Up / @@ -132,6 +132,16 @@ @@
                 <groupId>net.essentialsx</groupId>
                 <artifactId>EssentialsX</artifactId>
                 <version>2.19.7</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.bstats</groupId>
+                        <artifactId>bstats-bukkit</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>net.md-5</groupId>
+                        <artifactId>bungeecord-chat</artifactId>
+                    </exclusion>
+                </exclusions>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ Expand Down Expand Up / @@ -168,6 +178,12 @@ @@
                 <groupId>com.griefdefender</groupId>
                 <artifactId>api</artifactId>
                 <version>2.1.0-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>net.kyori</groupId>
+                        <artifactId>event-api</artifactId>
+                    </exclusion>
+                </exclusions>
                 <scope>provided</scope>
             </dependency>
@@ Expand Down @@

...m-Spigot/src/main/java/de/codingair/tradesystem/spigot/trade/managers/RequestManager.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -85,11 +85,11 @@ public static void sendRequest(String player, Player recipient) {
  
            TextComponent accept = new TextComponent(Lang.get("Want_To_Trade_Accept", recipient, new Lang.P("player", player)));

            accept.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, commandAccept + " " + player));

            accept.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new net.md_5.bungee.api.chat.BaseComponent[] {new TextComponent(Lang.get("Want_To_Trade_Hover", recipient))}));

            accept.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new net.md_5.bungee.api.chat.BaseComponent[] {new TextComponent(Lang.get("Want_To_Trade_Hover_Accept", recipient))}));

            TextComponent deny = new TextComponent(Lang.get("Want_To_Trade_Deny", recipient, new Lang.P("player", player)));

            deny.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, commandDeny + " " + player));

            deny.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new net.md_5.bungee.api.chat.BaseComponent[] {new TextComponent(Lang.get("Want_To_Trade_Hover", recipient))}));

            deny.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new net.md_5.bungee.api.chat.BaseComponent[] {new TextComponent(Lang.get("Want_To_Trade_Hover_Deny", recipient))}));

            message.replace("%accept%", accept);

            message.replace("%deny%", deny);

TradeSystem-Spigot/src/main/resources/languages/BR.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aAceitar'
     Want_To_Trade_Deny: '&cNegar'
     Want_To_Trade_Hover: '&8» Clique «'
+    Want_To_Trade_Hover_Accept: '&8» Clique «'
+    Want_To_Trade_Hover_Deny: '&8» Clique «'
     Player_Is_Invited: '&7O Jogador &c%player% &7foi convidado.'
     Command_How_To: '&7Use: /trade <player, accept, deny, toggle>'
     Command_How_To_Accept: '&7Use: /trade accept <Jogador>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/CHI.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&a接受'
     Want_To_Trade_Deny: '&c拒绝'
     Want_To_Trade_Hover: '&8» 点击 «'
+    Want_To_Trade_Hover_Accept: '&8» 点击 «'
+    Want_To_Trade_Hover_Deny: '&8» 点击 «'
     Player_Is_Invited: '&7已邀请玩家&c%player%&7.'
     Command_How_To: '&7使用: /trade <玩家名, accept, deny, toggle>进行交易'
     Command_How_To_Accept: '&7使用: /trade accept <玩家名>接受交易请求'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/CS.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aPřijmout'
     Want_To_Trade_Deny: '&cOdmítnout'
     Want_To_Trade_Hover: '&8» Klikni «'
+    Want_To_Trade_Hover_Accept: '&8» Klikni «'
+    Want_To_Trade_Hover_Deny: '&8» Klikni «'
     Player_Is_Invited: '&7Hráč &c%player% &7 dostal pozvánku k obchodu.'
     Command_How_To: '&7Zadej: /trade <player, accept, deny, toggle>'
     Command_How_To_Accept: '&7Zadej: /trade accept <JménoHráče>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/ENG.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aAccept'
     Want_To_Trade_Deny: '&cDeny'
     Want_To_Trade_Hover: '&8» Click «'
+    Want_To_Trade_Hover_Accept: '&8» Click «'
+    Want_To_Trade_Hover_Deny: '&8» Click «'
     Player_Is_Invited: '&7The player &c%player% &7was invited.'
     Command_How_To: '&7Use: /trade <player, accept, deny, toggle>'
     Command_How_To_Accept: '&7Use: /trade accept <Player>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/ES.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aAceptar'
     Want_To_Trade_Deny: '&cRechazar'
     Want_To_Trade_Hover: '&8» Clic «'
+    Want_To_Trade_Hover_Accept: '&8» Clic «'
+    Want_To_Trade_Hover_Deny: '&8» Clic «'
     Player_Is_Invited: '&7Has enviado una petición de intercambio al jugador &2%player%&7.'
     Command_How_To: '&7Usa: /trade <jugador, accept, deny, toggle>'
     Command_How_To_Accept: '&7Usa: /trade accept <Jugador>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/FA.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aGhabool'
     Want_To_Trade_Deny: '&cRad'
     Want_To_Trade_Hover: '&8» Click Konid «'
+    Want_To_Trade_Hover_Accept: '&8» Click Konid «'
+    Want_To_Trade_Hover_Deny: '&8» Click Konid «'
     Player_Is_Invited: '&7Bazikon &c%player% &7daevat shodeh ast.'
     Command_How_To: '&7Estefade konid: /trade <bazikon, ghabool, rad, toggle>'
     Command_How_To_Accept: '&7Estefade konid: /trade accept <Bazikon>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/FR.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: "&aAccepter"
     Want_To_Trade_Deny: "&cRefuser"
     Want_To_Trade_Hover: "&8» Click «"
+    Want_To_Trade_Hover_Accept: "&8» Click «"
+    Want_To_Trade_Hover_Deny: "&8» Click «"
     Player_Is_Invited: "&7Le joueur &c%player% &7a été invité."
     Command_How_To: "&7Utilisation: /trade <player, accept, deny, toggle>"
     Command_How_To_Accept: "&7Utilisation: /trade accept <Player>"
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/GER.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: "&aAkzeptieren"
     Want_To_Trade_Deny: "&cAblehnen"
     Want_To_Trade_Hover: "&8» Klick «"
+    Want_To_Trade_Hover_Accept: "&8» Klick «"
+    Want_To_Trade_Hover_Deny: "&8» Klick «"
     Player_Is_Invited: "&7Der Spieler &c%player% &7wurde eingeladen."
     Command_How_To: "&7Benutze: /trade <Spieler, accept, deny, toggle>"
     Command_How_To_Accept: "&7Benutze: /trade accept <Spieler>"
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/IT.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aAccetta'
     Want_To_Trade_Deny: '&cRifiuta'
     Want_To_Trade_Hover: '&8» Clicca «'
+    Want_To_Trade_Hover_Accept: '&8» Clicca «'
+    Want_To_Trade_Hover_Deny: '&8» Clicca «'
     Player_Is_Invited: '&7Il giocatore &c%player% &7è statp invitato.'
     Command_How_To: '&7Usa: /trade <giocatore, accept, deny, toggle>'
     Command_How_To_Accept: '&7Usa: /trade accept <giocatore>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/JA.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&a承認'
     Want_To_Trade_Deny: '&c拒否'
     Want_To_Trade_Hover: '&8» クリック «'
+    Want_To_Trade_Hover_Accept: '&8» クリック «'
+    Want_To_Trade_Hover_Deny: '&8» クリック «'
     Player_Is_Invited: '&7プレイヤー &c%player% &7が招待されました'
     Command_How_To: '&7使用方法: /trade <player, accept, deny, toggle>'
     Command_How_To_Accept: '&7使用方法: /trade accept <Player>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/POL.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: "&aZaakceptuj"
     Want_To_Trade_Deny: "&cOdrzuć"
     Want_To_Trade_Hover: "&8» Kliknij «"
+    Want_To_Trade_Hover_Accept: "&8» Kliknij «"
+    Want_To_Trade_Hover_Deny: "&8» Kliknij «"
     Player_Is_Invited: "&7Gracz &c%player% &7został zaproszony."
     Command_How_To: "&7Użycie: /trade <Gracz, accept, deny, toggle>"
     Command_How_To_Accept: "&7Użycie: /trade accept <Gracz>"
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/RUS.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aПринять'
     Want_To_Trade_Deny: '&cОтклонить'
     Want_To_Trade_Hover: '&8» Нажмите «'
+    Want_To_Trade_Hover_Accept: '&8» Нажмите «'
+    Want_To_Trade_Hover_Deny: '&8» Нажмите «'
     Player_Is_Invited: '&7Игрок &c%player% &7приглашен.'
     Command_How_To: '&7Использование: /trade <player, accept, deny, toggle>'
     Command_How_To_Accept: '&7Использование: /trade accept <игрока>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/TR.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aKabul et'
     Want_To_Trade_Deny: '&cReddet'
     Want_To_Trade_Hover: '&8» Tıkla «'
+    Want_To_Trade_Hover_Accept: '&8» Tıkla «'
+    Want_To_Trade_Hover_Deny: '&8» Tıkla «'
     Player_Is_Invited: '&c%player% &7adlı oyuncuya istek gönderildi.'
     Command_How_To: '&7Komut: /trade <oyuncu adı, accept, deny, toggle>'
     Command_How_To_Accept: '&7Komut: /trade accept <Player>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/UA.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aПрийняти'
     Want_To_Trade_Deny: '&cВідхилити'
     Want_To_Trade_Hover: '&8» Натисніть «'
+    Want_To_Trade_Hover_Accept: '&8» Натисніть «'
+    Want_To_Trade_Hover_Deny: '&8» Натисніть «'
     Player_Is_Invited: '&7Гравець &c%player% &7запрошений.'
     Command_How_To: '&7Використання: /trade <player, accept, deny, toggle>'
     Command_How_To_Accept: '&7Використання: /trade accept <гравця>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/languages/VI.yml

-Original file line number
+Diff line change
@@ Expand Up @@
     Want_To_Trade_Accept: '&aĐồng ý'
     Want_To_Trade_Deny: '&cTừ chối'
     Want_To_Trade_Hover: '&8» Nhấp vào «'
+    Want_To_Trade_Hover_Accept: '&8» Nhấp vào «'
+    Want_To_Trade_Hover_Deny: '&8» Nhấp vào «'
     Player_Is_Invited: '&7Người chơi &c%player% &7được mời.'
     Command_How_To: '&7Dùng: /trade <player, accept, deny, toggle>'
     Command_How_To_Accept: '&7Dùng: /trade accept <Người chơi>'
@@ Expand Down @@

TradeSystem-Spigot/src/main/resources/plugin.yml

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     name: TradeSystem
-    author: CodingAir
+    author: [ CodingAir, CoolLord22]
     version: "${project.version}"
     description: A beautiful way to trade with other players.
     main: de.codingair.tradesystem.spigot.TradeSystem
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Separate hover message into accept/deny #582

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Separate hover message into accept/deny #582

Are you sure you want to change the base?

Uh oh!

Separate hover message into accept/deny #582

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing