feat: added advance command

Author: d4rpx1

src/main/java/org/matrixnetwork/matrixlifesystem/MatrixLifeSystem.java

@@ -9,9 +9,6 @@
 import lombok.experimental.Accessors;
 import net.kyori.adventure.text.Component;
 import net.milkbowl.vault.economy.Economy;
-import org.matrixnetwork.matrixlifesystem.commands.LifeSystemCommands;
-import org.matrixnetwork.matrixlifesystem.entity.PlayerData;
-import org.matrixnetwork.matrixlifesystem.vault.VaultProvider;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.event.EventHandler;
@@ -20,22 +17,25 @@
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
+import org.matrixnetwork.matrixlifesystem.commands.LifeSystemCommands;
+import org.matrixnetwork.matrixlifesystem.entity.PlayerData;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.logging.Logger;
 
 @PluginMain
 public class MatrixLifeSystem extends JavaPlugin implements Listener {
 
     @Getter
     @Accessors(fluent = true)
     private static MatrixLifeSystem instance;
+    private PaperCommandManager commandManager;
     @Getter
     @Setter(AccessLevel.PACKAGE)
-    private VaultProvider vault;
-    private PaperCommandManager commandManager;
+    private Economy econ;
 
     public MatrixLifeSystem() {
         instance = this;
@@ -66,7 +66,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
             return;
         }
 
-        if (pd.getLifes() < this.getConfig().getInt("min-lifes")) {
+        if (pd.getLives() < this.getConfig().getInt("min-lives")) {
             event.getPlayer()
                     .kick(Component.text(commandManager
                             .getLocales()
@@ -78,12 +78,13 @@ public void onPlayerJoin(PlayerJoinEvent event) {
 
     private void setupVaultIntegration() {
         if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-            vault = new VaultProvider(Objects.requireNonNull(getServer().getServicesManager().getRegistration(Economy.class)).getProvider());
+            econ = Objects.requireNonNull(getServer().getServicesManager().getRegistration(Economy.class)).getProvider();
         } else {
-            vault = new VaultProvider();
+
         }
     }
 
+
     private void setupCommands() {
         commandManager = new PaperCommandManager(this);
         commandManager.enableUnstableAPI("help");

src/main/java/org/matrixnetwork/matrixlifesystem/commands/LifeSystemCommands.java

@@ -7,12 +7,14 @@
 import co.aikar.locales.MessageKey;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.matrixnetwork.matrixlifesystem.MatrixLifeSystem;
 import org.matrixnetwork.matrixlifesystem.entity.PlayerData;
 
 import static org.matrixnetwork.matrixlifesystem.Constants.ACF_BASE_KEY;
 
-@CommandAlias("lifesystem")
+@CommandAlias("livesystem")
 public class LifeSystemCommands extends BaseCommand {
+    private final MatrixLifeSystem plugin = MatrixLifeSystem.instance();
 
     // see https://github.com/aikar/commands/wiki/Locales
     static MessageKey key(String key) {
@@ -31,11 +33,36 @@ public void showHelp(CommandSender sender, CommandHelp help) {
     @Description("{@@commands.descriptions.info}")
     public void info(@Flags("self") Player player) {
         success("info",
-                "{lifes}", String.valueOf(PlayerData.getPlayerData(player
-                        .getUniqueId().toString()).getLifes())
+                "{lives}", String.valueOf(PlayerData.getPlayerData(player
+                        .getUniqueId().toString()).getLives())
         );
     }
 
+    @Subcommand("advance|a")
+    @CommandAlias("advance")
+    @Description("{@@commands.descriptions.info}")
+    public void advance(@Flags("self") Player player) {
+        if(plugin.getEcon().getBalance(player) > getAdvanceCosts()) {
+            plugin.getEcon().withdrawPlayer(player, getAdvanceCosts());
+
+            PlayerData.advance(PlayerData.getPlayerData(player.getUniqueId().toString()));
+
+            success("advance.success",
+                    "{lives}", String.valueOf(PlayerData.getPlayerData(player
+                            .getUniqueId().toString()).getLives())
+            );
+        }
+        else {
+            error("advance.ne-money",
+                    "{cost}", String.valueOf(getAdvanceCosts())
+            );
+        }
+    }
+
+    private double getAdvanceCosts() {
+        return plugin.getConfig().getDouble("advance-cost");
+    }
+
     private void success(String key, String... replacements) {
         getCurrentCommandIssuer().sendMessage(MessageType.INFO, key(key), replacements);
     }

src/main/java/org/matrixnetwork/matrixlifesystem/entity/PlayerData.java

@@ -22,11 +22,11 @@ public class PlayerData {
     private String uuid;
 
     @Getter
-    private int lifes;
+    private int lives;
 
-    public PlayerData(String uuid, int lifes) {
+    public PlayerData(String uuid, int lives) {
         this.uuid = uuid;
-        this.lifes = lifes;
+        this.lives = lives;
     }
 
     public PlayerData() {
@@ -46,19 +46,33 @@ public static PlayerData getPlayerData(String uuid) {
                 session.merge(pd);
                 tx.commit();
             }
-        } catch (Exception ignored) {
-            ignored.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
             pd = null;
         }
 
         return pd;
     }
 
+    public static void advance(PlayerData playerData) {
+        SessionFactory sessionFactory = SessionFactoryMaker.getFactory();
+
+        try (Session session = sessionFactory.openSession()) {
+            Transaction tx = session.beginTransaction();
+            playerData.addLife();
+            session.merge(playerData);
+            tx.commit();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public void addLife() {
-        this.lifes++;
+        this.lives++;
     }
 
     public void removeLife() {
-        this.lifes--;
+        this.lives--;
     }
 }

src/main/java/org/matrixnetwork/matrixlifesystem/vault/VaultProvider.java

@@ -1 +1,5 @@
-min-lifes: 1
+# Minimum amount of lives to be able to join server
+min-lives: 1
+
+# Cost for a new life
+advance-cost: 200

src/main/resources/config.yml

@@ -2,7 +2,11 @@
 commands:
   descriptions:
     info: 'Shows your actual life count.'
-  info: 'You have {lifes} lifes.'
+    advance: 'Buy a new life.'
+  info: 'You have {lives} lives.'
+  advance:
+    success: 'Nice! You have {lives} lives.'
+    ne-money: 'Sorry! You do not have {cost} \$.'
 
 kick:
-  message: 'You cannot join! You do not have enough lifes!'
+  message: 'You cannot join! You do not have enough lives!'

src/main/resources/lang_en.yaml

@@ -51,13 +51,13 @@ public void testExactLifes() {
     }
 
 
-    public static PlayerData addPlayerdData(String uuid, int lifes) {
+    public static PlayerData addPlayerdData(String uuid, int lives) {
         PlayerData pd;
 
         SessionFactory sessionFactory = SessionFactoryMaker.getFactory();
         try (Session session = sessionFactory.openSession()) {
             Transaction tx = session.beginTransaction();
-            pd = new PlayerData(uuid, lifes);
+            pd = new PlayerData(uuid, lives);
             session.merge(pd);
             tx.commit();
         } catch (Exception ignored) {

src/test/java/org/matrixnetwork/matrixlifesystem/TemplatePluginTests.java

@@ -3,7 +3,6 @@
 import be.seeseemelk.mockbukkit.MockBukkit;
 import be.seeseemelk.mockbukkit.ServerMock;
 import net.milkbowl.vault.economy.Economy;
-import org.matrixnetwork.matrixlifesystem.vault.VaultProvider;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
@@ -24,7 +23,7 @@ public void setUp() {
 
     private void mockVaultEconomy() {
         economy = mock(Economy.class);
-        plugin.setVault(new VaultProvider(economy));
+        plugin.setEcon(economy);
     }
 
     @AfterEach

src/test/java/org/matrixnetwork/matrixlifesystem/TestBase.java

@@ -1,14 +1,14 @@
 package org.matrixnetwork.matrixlifesystem.commands;
 
 import be.seeseemelk.mockbukkit.entity.PlayerMock;
-import org.matrixnetwork.matrixlifesystem.Constants;
-import org.bukkit.Statistic;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.matrixnetwork.matrixlifesystem.MatrixLifeSystem;
 import org.matrixnetwork.matrixlifesystem.TestBase;
 import org.matrixnetwork.matrixlifesystem.entity.PlayerData;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
 
 public class LifeSystemCommandsTests extends TestBase {
 
@@ -23,10 +23,34 @@ public void setUp() {
     }
 
     @Test
-    void info_forSelf_printsOwnPlayerName() {
-        player.performCommand("lifesystem info");
+    void test_default() {
+        player.performCommand("livesystem info");
 
-        int lifes = PlayerData.getPlayerData(player.getUniqueId().toString()).getLifes();
-        assertThat(player.nextMessage()).contains(lifes + " lifes");
+        int lives = PlayerData.getPlayerData(player.getUniqueId().toString()).getLives();
+        assertThat(player.nextMessage()).contains(lives + " lives");
+    }
+
+    @Test
+    void test_buy_life_ok() {
+        when(economy.getBalance(player)).thenReturn(400D);
+        int lives = PlayerData.getPlayerData(player.getUniqueId().toString()).getLives();
+
+        player.performCommand("livesystem advance");
+        lives++;
+
+        assertThat(player.nextMessage()).contains(lives + " lives");
+
+        player.performCommand("livesystem info");
+        assertThat(player.nextMessage()).contains("You have " + lives + " lives.");
+    }
+
+    @Test
+    void test_buy_life_no_money() {
+        when(economy.getBalance(player)).thenReturn(100D);
+
+        player.performCommand("livesystem advance");
+
+        assertThat(player.nextMessage()).contains("Sorry! You do not have " +
+                "" + MatrixLifeSystem.instance().getConfig().getDouble("advance-cost") + " $.");
     }
 }