Merge #104 to master (#105)

This commit is contained in:
koolkrafter5 authored and GitHub committed 2025-09-29 20:17:26 +02:00
1 parent 33be87e896
commit c047644908
1 file changed
+20 -5
@@ -10,6 +10,7 @@
*/
package vazkii.botania.common.item;
import baubles.common.lib.PlayerHandler;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.RecipeSorter.Category;
@@ -37,12 +38,26 @@ public class ItemRegenIvy extends ItemMod {
}
public void onTick(PlayerTickEvent event) {
if(event.phase == Phase.END && !event.player.worldObj.isRemote)
for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) {
ItemStack stack = event.player.inventory.getStackInSlot(i);
if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_REGEN, false) && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, event.player, MANA_PER_DAMAGE, true))
stack.setItemDamage(stack.getItemDamage() - 1);
if (event.phase != Phase.END || event.player.worldObj.isRemote) {
return;
}
for (int i = 0; i < event.player.inventory.getSizeInventory(); i++) {
ItemStack stack = event.player.inventory.getStackInSlot(i);
if (canBeRepaired(event, stack)) stack.setItemDamage(stack.getItemDamage() - 1);
}
ItemStack[] baubles = PlayerHandler.getPlayerBaubles(event.player).stackList;
if (baubles != null) {
for (int i = 0; i < baubles.length; i++) { // Basic for loop to avoid iterator in onTick method
ItemStack bauble = baubles[i];
if (canBeRepaired(event, bauble)) bauble.setItemDamage(bauble.getItemDamage() - 1);
}
}
}
private static boolean canBeRepaired(PlayerTickEvent event, ItemStack stack) {
return stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_REGEN, false) && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, event.player, MANA_PER_DAMAGE, true);
}
public class EventHandler {