Merge remote-tracking branch 'origin/master'

Author: Elic0de

pom.xml

@@ -78,6 +78,10 @@
             <id>placeholderapi</id>
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
+        <repository>
+            <id>himajyun-repo</id>
+            <url>https://himajyun.github.io/mvn-repo/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -165,5 +169,11 @@
             <version>1.7</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>jp.jyn</groupId>
+            <artifactId>Jecon</artifactId>
+            <version>2.2.1</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/com/github/elic0de/thejpspit/TheJpsPit.java

@@ -12,10 +12,7 @@
 import com.github.elic0de.thejpspit.database.MySqlDatabase;
 import com.github.elic0de.thejpspit.database.SqLiteDatabase;
 import com.github.elic0de.thejpspit.game.Game;
-import com.github.elic0de.thejpspit.hook.EconomyHook;
-import com.github.elic0de.thejpspit.hook.Hook;
-import com.github.elic0de.thejpspit.hook.PlaceholderHook;
-import com.github.elic0de.thejpspit.hook.VaultEconomyHook;
+import com.github.elic0de.thejpspit.hook.*;
 import com.github.elic0de.thejpspit.item.ItemManager;
 import com.github.elic0de.thejpspit.leveler.Levels;
 import com.github.elic0de.thejpspit.listener.BlockPlaceListener;
@@ -29,13 +26,15 @@
 import com.github.elic0de.thejpspit.villager.villagers.ShopVillager;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.logging.Level;
+
 import net.william278.annotaml.Annotaml;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
@@ -95,7 +94,7 @@ public void onEnable() {
         this.database = this.loadDatabase();
         if (!database.hasLoaded()) {
             Bukkit.getLogger().log(Level.SEVERE,
-                "Failed to load database! Please check your credentials! Disabling plugin...");
+                    "Failed to load database! Please check your credentials! Disabling plugin...");
             Bukkit.getPluginManager().disablePlugin(this);
             return;
         }
@@ -191,7 +190,9 @@ private void registerListener() {
 
     private void registerHooks() {
         final PluginManager plugins = Bukkit.getPluginManager();
-        if (plugins.getPlugin("Vault") != null) {
+        if (plugins.getPlugin("Jecon") != null) {
+            this.registerHook(new JeconEconomyHook(this));
+        } else if (plugins.getPlugin("Vault") != null) {
             this.registerHook(new VaultEconomyHook(this));
         }
         if (plugins.getPlugin("PlaceholderAPI") != null) {

src/main/java/com/github/elic0de/thejpspit/hook/JeconEconomyHook.java

@@ -0,0 +1,55 @@
+package com.github.elic0de.thejpspit.hook;
+
+import com.github.elic0de.thejpspit.TheJpsPit;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+import jp.jyn.jecon.Jecon;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+import java.math.BigDecimal;
+
+public class JeconEconomyHook extends EconomyHook {
+
+    private Jecon jecon;
+
+    public JeconEconomyHook(TheJpsPit plugin) {
+        super(plugin, "Jecon");
+    }
+
+    @Override
+    protected void onEnable() throws IllegalStateException {
+        Plugin p = Bukkit.getPluginManager().getPlugin("Jecon");
+        if (p == null || !plugin.isEnabled()) {
+            throw new IllegalStateException("Could not find Jecon plugin");
+        }
+        this.jecon = (Jecon) p;
+    }
+
+    @Override
+    public BigDecimal getBalance(PitPlayer player) {
+        return jecon.getRepository().get(player.getUniqueId()).orElse(BigDecimal.ZERO);
+    }
+
+    @Override
+    public boolean hasMoney(PitPlayer player, BigDecimal amount) {
+        return jecon.getRepository().has(player.getUniqueId(), amount);
+    }
+
+    @Override
+    public void takeMoney(PitPlayer player, BigDecimal amount) {
+        jecon.getRepository().withdraw(player.getUniqueId(), amount);
+        player.getBoard().updateCoins();
+    }
+
+    @Override
+    public void giveMoney(PitPlayer player, BigDecimal amount) {
+        jecon.getRepository().deposit(player.getUniqueId(), amount);
+        player.getBoard().updateCoins();
+    }
+
+    @Override
+    public String formatMoney(BigDecimal amount) {
+        return jecon.getRepository().format(amount);
+    }
+
+}

src/main/java/com/github/elic0de/thejpspit/scoreboard/PitPlayerScoreboard.java

@@ -9,6 +9,7 @@
 import java.util.stream.Stream;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 
 public class PitPlayerScoreboard {
@@ -61,6 +62,11 @@ private void updateLine(int line, String text) {
     }
 
     private List<String> init(PitPlayer player) {
+        Bukkit.getScheduler().runTaskLater(TheJpsPit.getInstance(), () -> {
+            if (!board.isDeleted()) {
+                updateCoins();
+            }
+        }, 20);
         return Stream.of(
                 "",
                 "レベル: [%level%]",

src/main/resources/plugin.yml

@@ -7,3 +7,4 @@ softdepend:
   - PlaceholderAPI
   - Vault
   - MysqlEcoBridge
+  - Jecon