Show amount of levels player can receive from accepting xp offers.

Trophonix · Jun 6, 2020 · 27bd791 · 27bd791
1 parent e8b232a
commit 27bd791
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,11 +6,11 @@
 
     <groupId>com.trophonix</groupId>
     <artifactId>TradePlus</artifactId>
-    <version>3.70</version>
+    <version>3.71</version>
 
     <properties>
         <res>${project.basedir}/res/</res>
-        <revision>3.70</revision>
+        <revision>3.71</revision>
     </properties>
 
     <repositories>
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.6</version>
+            <version>1.18.12</version>
             <scope>provided</scope>
         </dependency>
 
@@ -204,6 +204,17 @@
         </resources>
 
         <plugins>
+            <plugin>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok-maven-plugin</artifactId>
+                <version>1.18.12.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

diff --git a/src/main/java/com/trophonix/tradeplus/TradePlus.java b/src/main/java/com/trophonix/tradeplus/TradePlus.java
@@ -349,7 +349,7 @@ private void loadConfig() {
       config.set(
           "extras.experience.material", Sounds.version < 113 ? "exp_bottle" : "experience_bottle");
       config.set("extras.experience.display", "&aYour current XP offer is &2%AMOUNT%");
-      config.set("extras.experience.theirdisplay", "&aTheir current XP offer is &2%AMOUNT%");
+      config.set("extras.experience.theirdisplay", "&aTheir current XP offer is &2%AMOUNT% &a(+%LEVELS% levels)");
       config.set(
           "extras.experience.lore",
           Arrays.asList("&fClick to edit your offer!", "&fYou have %BALANCE% XP."));
@@ -1038,6 +1038,12 @@ private void loadConfig() {
         config.set("extras.votingplugin.taxpercent", 0);
       }
 
+      if (configVersion < 3.71) {
+        if (!config.getString("extras.experience.theirdisplay").contains("%LEVELS%")) {
+          config.set("extras.experience.theirdisplay", config.getString("extras.experience.theirdisplay", "&aTheir current XP offer is &2%AMOUNT%") + " &a(+%LEVELS% levels)");
+        }
+      }
+
     }
   }
 }
diff --git a/src/main/java/com/trophonix/tradeplus/extras/ExperienceExtra.java b/src/main/java/com/trophonix/tradeplus/extras/ExperienceExtra.java
@@ -54,7 +54,14 @@ public ItemStack _getIcon(Player player) {
   @Override
   public ItemStack _getTheirIcon(Player player) {
     return ItemFactory.replaceInMeta(
-        theirIcon, "%AMOUNT%", decimalFormat.format(player.equals(player1) ? value1 : value2));
+        theirIcon, "%AMOUNT%", decimalFormat.format(player.equals(player1) ? value1 : value2),
+            "%LEVELS%", Integer.toString(player.equals(player1) ? getLevelsFromXp(player2, value1) : getLevelsFromXp(player1, value2)));
+  }
+
+  private int getLevelsFromXp(Player receiver, double amount) {
+    int currentXp = XP.getExp(receiver);
+    double currentLevel = XP.getLevelFromExp(currentXp);
+    return (int)(XP.getLevelFromExp(currentXp + (int)amount) - currentLevel);
   }
 
   private void changeXp(Player player, Number amount) {