Merge pull request #19 from JavaJava19/develop

tne対応

Author: Elic0de

pom.xml

@@ -115,12 +115,6 @@
             <version>1.7.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.MilkBowl</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fatboyindustrial.gson-javatime-serialisers</groupId>
             <artifactId>gson-javatime-serialisers</artifactId>
@@ -158,5 +152,12 @@
             <artifactId>HikariCP</artifactId>
             <version>5.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>net.tnemc.TNE</groupId>
+            <artifactId>tne</artifactId>
+            <version>1.1.9.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/TNE-0.1.1.16.jar</systemPath>
+        </dependency>
     </dependencies>
 </project>

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

@@ -15,7 +15,7 @@
 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.TneEconomyHook;
 import com.github.elic0de.thejpspit.item.ItemManager;
 import com.github.elic0de.thejpspit.leveler.Levels;
 import com.github.elic0de.thejpspit.listener.BlockPlaceListener;
@@ -35,7 +35,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import net.william278.annotaml.Annotaml;
 import org.bukkit.Bukkit;
@@ -191,8 +190,8 @@ private void registerListener() {
 
     private void registerHooks() {
         final PluginManager plugins = Bukkit.getPluginManager();
-        if (plugins.getPlugin("Vault") != null) {
-            this.registerHook(new VaultEconomyHook(this));
+        if (plugins.getPlugin("TheNewEconomy") != null) {
+            this.registerHook(new TneEconomyHook(this));
         }
         if (plugins.getPlugin("PlaceholderAPI") != null) {
             new PlaceholderHook().register();

src/main/java/com/github/elic0de/thejpspit/cosmetics/CosmeticManager.java

@@ -24,7 +24,6 @@ public class CosmeticManager {
     ClassToInstanceMap<TrailCosmetic> trailCosmetics;
     ClassToInstanceMap<AuraCosmetic> auraCosmetics;
 
-
     public ClassToInstanceMap<AbstractCosmetic> allCosmetics;
 
     public CosmeticManager() {

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

@@ -0,0 +1,49 @@
+package com.github.elic0de.thejpspit.hook;
+
+import com.github.elic0de.thejpspit.TheJpsPit;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+import java.math.BigDecimal;
+import java.util.logging.Level;
+import net.tnemc.core.TNE;
+import net.tnemc.core.common.api.TNEAPI;
+import org.jetbrains.annotations.NotNull;
+
+public class TneEconomyHook extends EconomyHook {
+
+    protected TNEAPI tneAPI;
+
+    public TneEconomyHook(TheJpsPit plugin) {
+        super(plugin, "TheNewEconomy");
+    }
+
+    @Override
+    public void onEnable() throws IllegalStateException {
+        this.tneAPI = TNE.instance().api();
+        plugin.getLogger().log(Level.INFO, "Enabled Vault economy hook");
+    }
+
+    private BigDecimal getBalance(@NotNull PitPlayer player) {
+        return tneAPI.getAccount(player.getUniqueId()).getHoldings(player.getPlayer().getWorld().getName());
+    }
+
+    @Override
+    public boolean hasMoney(PitPlayer player, BigDecimal amount) {
+        return getBalance(player).compareTo(amount) >= 0;
+    }
+
+    @Override
+    public void takeMoney(PitPlayer player, BigDecimal amount) {
+        tneAPI.getAccount(player.getUniqueId()).addHoldings(amount);
+    }
+
+    @Override
+    public void giveMoney(PitPlayer player, BigDecimal amount) {
+        tneAPI.getAccount(player.getUniqueId()).removeHoldings(amount);
+    }
+
+    @Override
+    public String formatMoney(BigDecimal amount) {
+        return "tneAPI.format(amount.doubleValue(), world);";
+    }
+
+}

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

@@ -4,6 +4,5 @@ main: com.github.elic0de.thejpspit.TheJpsPit
 api-version: 1.19
 author: 'Elic0de#0342'
 softdepend:
-  - Vault
   - TheNewEconomy
   - PlaceholderAPI