Upstream
/
UltimateRepairing
mirror of https://github.com/songoda/UltimateRepairing.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: Upstream:7a6d8db52706a4420ca2e6d249646ed9b66f0fdf
Branches Tags
Upstream:master
Upstream:development
...
compare: Upstream:466b53307f8be8dd1b68308d7cac695342f5306c
Branches Tags
Upstream:master
Upstream:development

3 Commits
7a6d8db527 ... 466b53307f

Author SHA1 Message Date
ceze88 466b53307f Release 1.5.8 2023-04-28 14:47:10 +02:00
ceze88 083b37f2af Add Damageable check for repairing items 2023-04-28 14:19:49 +02:00
ceze88 21ecb30354 Fix {Durability} placeholder. Add {Damage} placeholder. 2023-04-28 14:11:31 +02:00
2 changed files with 11 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>com.songoda</groupId>
<artifactId>UltimateRepairing</artifactId>
<version>1.5.7</version>
<version>1.5.8</version>
<build>
<defaultGoal>clean install</defaultGoal>

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

@ -12,6 +12,7 @@ import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.Damageable;
import java.util.Arrays;
import java.util.HashMap;
@ -30,22 +31,28 @@ public class Methods {
}
public static int getCost(RepairType type, ItemStack item) {
if (!(item instanceof Damageable)) {
return Integer.MAX_VALUE;
}
String equationXP = Settings.EXPERIENCE_EQUATION.getString();
String equationECO = Settings.ECONOMY_EQUATION.getString();
String equationITEM = Settings.ITEM_EQUATION.getString();
equationXP = equationXP.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
.replace("{Durability}", Short.toString(item.getDurability()));
.replace("{Durability}", Integer.toString(item.getType().getMaxDurability() - ((Damageable)item.getItemMeta()).getDamage()))
.replace("{Damage}", Short.toString(item.getDurability()));
int XPCost = (int) Math.round(MathUtils.eval(equationXP));
equationECO = equationECO.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
.replace("{Durability}", Short.toString(item.getDurability()))
.replace("{Durability}", Integer.toString(item.getType().getMaxDurability() - ((Damageable)item.getItemMeta()).getDamage()))
.replace("{Damage}", Short.toString(item.getDurability()))
.replace("{XPCost}", Integer.toString(XPCost));
int ECOCost = (int) Math.round(MathUtils.eval(equationECO));
equationITEM = equationITEM.replace("{MaxDurability}", Short.toString(item.getType().getMaxDurability()))
.replace("{Durability}", Short.toString(item.getDurability()))
.replace("{Durability}", Integer.toString(item.getType().getMaxDurability() - ((Damageable)item.getItemMeta()).getDamage()))
.replace("{Damage}", Short.toString(item.getDurability()))
.replace("{XPCost}", Integer.toString(XPCost));
int ITEMCost = (int) Math.round(MathUtils.eval(equationITEM));