Upstream/UltimateRepairing
1
0
Fork 0
mirror of https://github.com/songoda/UltimateRepairing.git synced 2024-11-25 20:16:14 +01:00
Code Issues Projects Releases Wiki Activity

Support 1.17

Browse Source
This commit is contained in:
Brianna 2021-06-13 14:46:03 -05:00
parent 23ffd75ecb
commit 24f77b0079
2 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -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>

66
src/main/java/com/songoda/ultimaterepairing/utils/Methods.java
View File

@ -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;
}