From 24f77b0079c3a74fd005840a71527e7e8321c417 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Sun, 13 Jun 2021 14:46:03 -0500
Subject: [PATCH] Support 1.17

---
 pom.xml                                       | 10 ++-
 .../ultimaterepairing/utils/Methods.java      | 66 ++++++++-----------
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/pom.xml b/pom.xml
index 41448a9..6a69f57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>shaded</id>
@@ -79,6 +79,12 @@
             </plugin>
         </plugins>
     </build>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
     <repositories>
         <repository>
             <id>public</id>
@@ -93,7 +99,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.16.4</version>
+            <version>1.17</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/com/songoda/ultimaterepairing/utils/Methods.java b/src/main/java/com/songoda/ultimaterepairing/utils/Methods.java
index 741b145..60b67ee 100644
--- a/src/main/java/com/songoda/ultimaterepairing/utils/Methods.java
+++ b/src/main/java/com/songoda/ultimaterepairing/utils/Methods.java
@@ -1,6 +1,7 @@
 package com.songoda.ultimaterepairing.utils;
 
 import com.songoda.core.compatibility.CompatibleMaterial;
+import com.songoda.core.math.MathUtils;
 import com.songoda.ultimaterepairing.UltimateRepairing;
 import com.songoda.ultimaterepairing.repair.RepairType;
 import com.songoda.ultimaterepairing.settings.Settings;
@@ -12,9 +13,6 @@ import org.bukkit.block.Block;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -33,48 +31,40 @@ public class Methods {
     }
 
     public static int getCost(RepairType type, ItemStack item) {
-        try {
+        String equationXP = Settings.EXPERIENCE_EQUATION.getString();
+        String equationECO = Settings.ECONOMY_EQUATION.getString();
+        String equationITEM = Settings.ITEM_EQUATION.getString();
 
-            ScriptEngineManager mgr = new ScriptEngineManager(null);
-            ScriptEngine engine = mgr.getEngineByName("JavaScript");
+        equationXP = equationXP.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
+                .replace("{Durability}", Short.toString(item.getDurability()));
+        int XPCost = (int) Math.round(MathUtils.eval(equationXP));
 
-            String equationXP = Settings.EXPERIENCE_EQUATION.getString();
-            String equationECO = Settings.ECONOMY_EQUATION.getString();
-            String equationITEM = Settings.ITEM_EQUATION.getString();
+        equationECO = equationECO.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
+                .replace("{Durability}", Short.toString(item.getDurability()))
+                .replace("{XPCost}", Integer.toString(XPCost));
 
-            equationXP = equationXP.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
-                    .replace("{Durability}", Short.toString(item.getDurability()));
-            int XPCost = (int) Math.round(Double.parseDouble(engine.eval(equationXP).toString()));
+        int ECOCost = (int) Math.round(MathUtils.eval(equationECO));
 
-            equationECO = equationECO.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
-                    .replace("{Durability}", Short.toString(item.getDurability()))
-                    .replace("{XPCost}", Integer.toString(XPCost));
+        equationITEM = equationITEM.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
+                .replace("{Durability}", Short.toString(item.getDurability()))
+                .replace("{XPCost}", Integer.toString(XPCost));
 
-            int ECOCost = (int) Math.round(Double.parseDouble(engine.eval(equationECO).toString()));
+        int ITEMCost = (int) Math.round(MathUtils.eval(equationITEM));
 
-            equationITEM = equationITEM.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
-                    .replace("{Durability}", Short.toString(item.getDurability()))
-                    .replace("{XPCost}", Integer.toString(XPCost));
-
-            int ITEMCost = (int) Math.round(Double.parseDouble(engine.eval(equationITEM).toString()));
-
-            if (item.hasItemMeta() &&
-                    item.getItemMeta().hasEnchants()) {
-                int multi = UltimateRepairing.getInstance().getConfig().getInt("Main.Cost Multiplier For Enchanted Items");
-                XPCost = XPCost * multi;
-                ECOCost = ECOCost * multi;
-                ITEMCost = ITEMCost * multi;
-            }
-
-            if (type == RepairType.EXPERIENCE)
-                return XPCost;
-            else if (type == RepairType.ITEM)
-                return ITEMCost;
-            else if (type == RepairType.ECONOMY)
-                return ECOCost;
-        } catch (ScriptException e) {
-            e.printStackTrace();
+        if (item.hasItemMeta() &&
+                item.getItemMeta().hasEnchants()) {
+            int multi = UltimateRepairing.getInstance().getConfig().getInt("Main.Cost Multiplier For Enchanted Items");
+            XPCost = XPCost * multi;
+            ECOCost = ECOCost * multi;
+            ITEMCost = ITEMCost * multi;
         }
+
+        if (type == RepairType.EXPERIENCE)
+            return XPCost;
+        else if (type == RepairType.ITEM)
+            return ITEMCost;
+        else if (type == RepairType.ECONOMY)
+            return ECOCost;
         return 9999999;
     }