From 0efc169ef7038ab049fca6eaee5dd3387969cb0e Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 15:11:52 -0400 Subject: [PATCH] Revert "Remove comments + add helper" This reverts commit d83a0cc7755fce2a57c7f67164c8598679129d2d. --- src/main/java/magicbees/main/utils/compat/ModHelperManager.java | 1 - .../magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java | 2 ++ .../main/utils/compat/bloodmagic/ItemFrenziedFrame.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 5c9c7bf..c40d60b 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,6 +39,5 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); - helpers.add(new BloodHelper()); } } diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java index 0a6c162..c45a47e 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -117,10 +117,12 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @Override public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) { + // TODO Auto-generated method stub if (EnergyItems.canSyphonInContainer(frame, getEnergyUsed() * wear)) { if (owner != null) { EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear); } + // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear); } else { frame.setItemDamage(frame.getItemDamage() + wear); if (frame.getItemDamage() >= frame.getMaxDamage()) { diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java index f5590eb..66f96e3 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -116,10 +116,12 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @Override public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) { + // TODO Auto-generated method stub if (EnergyItems.canSyphonInContainer(frame, getEnergyUsed() * wear)) { if (owner != null) { EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear); } + // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear); } else { frame.setItemDamage(frame.getItemDamage() + wear); if (frame.getItemDamage() >= frame.getMaxDamage()) {