From f6eb9849e803e7620f9eb958cb192b69559cdf33 Mon Sep 17 00:00:00 2001 From: walrus Date: Tue, 21 Jan 2025 18:18:56 -0500 Subject: [PATCH] update --- .../FactionNodes/FactionItemRepair.java | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/java/jesse/keeblarcraft/AttributeMgr/AttributeNodes/FactionNodes/FactionItemRepair.java b/src/main/java/jesse/keeblarcraft/AttributeMgr/AttributeNodes/FactionNodes/FactionItemRepair.java index f95c64e..d36c2ea 100644 --- a/src/main/java/jesse/keeblarcraft/AttributeMgr/AttributeNodes/FactionNodes/FactionItemRepair.java +++ b/src/main/java/jesse/keeblarcraft/AttributeMgr/AttributeNodes/FactionNodes/FactionItemRepair.java @@ -7,8 +7,10 @@ import java.util.Timer; import java.util.TimerTask; import jesse.keeblarcraft.AttributeMgr.AttributeNodes.AbstractNode; +import jesse.keeblarcraft.Commands.FactionCommands; import jesse.keeblarcraft.FactionMgr.FactionManager; import jesse.keeblarcraft.FactionMgr.Callbacks.PlayerInBaseCallback; +import jesse.keeblarcraft.FactionMgr.FactionTier.FactionTierEnum; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; @@ -17,8 +19,8 @@ public class FactionItemRepair extends AbstractNode { private Boolean resetTimer = true; Timer timer = new Timer(); Date date = new Date(); - int repairTier = -1; int tempValue = 0; + int repairTier = -1; @Override public String GetNodeTitle() { @@ -41,54 +43,48 @@ public class FactionItemRepair extends AbstractNode { /* * BaseRepair tier 1 speed */ - public void RepairInventory(ServerPlayerEntity player) { + public void RepairInventory(ServerPlayerEntity player, FactionTierEnum tier) { //probably will end up using this List> combinedInventory; from PlayerInventory //PlayerInventory playerInv = player.getInventory();// main is all your inventory you can see exluding your off hand and armor i think - switch (FactionManager.GetInstance().GetFactionTier(FactionManager.GetInstance().GetFactionOfPlayer(player.getUuidAsString()))) {//should be the faction power - case 0: + switch (tier) {//should be the faction power + case TIER_I: repairTier = -1; break; - case 1: + case TIER_II: repairTier = -2; break; - case 2: + case TIER_III: repairTier = -3; break; - case 3: + case TIER_IV: repairTier = -4; break; - case 4: + case TIER_V: repairTier = -5; break; - case 5: + case TIER_VI: repairTier = -6; - break; - case 6: - repairTier = -7; - break; - + break; default: repairTier = -1; break; } for (ItemStack item : player.getInventory().main) { if (item.isDamageable() && item.isDamaged()) { - item.setDamage(item.getDamage() + repairTier); + item.setDamage(item.getDamage() - repairTier); } } for (ItemStack item : player.getInventory().armor) { if (item.isDamageable() && item.isDamaged()) { - item.setDamage(item.getDamage() + repairTier); + item.setDamage(item.getDamage() - repairTier); } } - if (player.getInventory().offHand.isEmpty()) { - return; - } + if (player.getInventory().offHand.isEmpty()) { return; } if (player.getOffHandStack().isDamaged()) { - player.getOffHandStack().setDamage(player.getOffHandStack().getDamage() + repairTier); + player.getOffHandStack().setDamage(player.getOffHandStack().getDamage() - repairTier); } return; } @@ -105,7 +101,7 @@ public class FactionItemRepair extends AbstractNode { timer.schedule(new TimerTask() { @Override public void run() { - RepairInventory((ServerPlayerEntity) player); + RepairInventory((ServerPlayerEntity) player, tier); resetTimer = true; } }, 15000);//TESTING PURPOSES WILL CAHNGE HIGHER VALUE