From c7c47b9a1b271fb6f2a9fbd04b7b51feedb75bc8 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Thu, 27 Apr 2023 22:11:12 -0400 Subject: [PATCH] fer fecks sake spotless --- .../magicbees/item/types/HiveFrameType.java | 1 - .../compat/bloodmagic/ItemBloodFrame.java | 32 +++++++++---------- .../compat/bloodmagic/ItemFrenziedFrame.java | 30 +++++++++-------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index aa71438..ad9c2d1 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -14,7 +14,6 @@ public enum HiveFrameType implements IBeeModifier { TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f), OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f); - private final String frameName; public final int maxDamage; 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 5b11b0b..def220d 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -1,20 +1,20 @@ package magicbees.main.utils.compat.bloodmagic; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.*; +import java.util.List; + import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.*; public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @@ -104,14 +104,14 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { - owner = par3EntityPlayer; - if (par1ItemStack.getItemDamage() > 0) { - if (EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); - } - } - } + if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + owner = par3EntityPlayer; + if (par1ItemStack.getItemDamage() > 0) { + if (EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + } + } + } return par1ItemStack; } @@ -123,7 +123,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { if (owner != null) { EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear); } - // EnergyItems.syphonWhileInContainer(frame, 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 c7043f1..464c23c 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -1,18 +1,20 @@ package magicbees.main.utils.compat.bloodmagic; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.*; +import java.util.List; + import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.*; public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @@ -101,14 +103,14 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { - owner = par3EntityPlayer; - if (par1ItemStack.getItemDamage() > 0) { - if (EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); - } - } - } + if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + owner = par3EntityPlayer; + if (par1ItemStack.getItemDamage() > 0) { + if (EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + } + } + } return par1ItemStack; } @@ -120,7 +122,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { if (owner != null) { EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear); } - // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear); + // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear); } else { frame.setItemDamage(frame.getItemDamage() + wear); if (frame.getItemDamage() >= frame.getMaxDamage()) {