upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-13 00:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fer fecks sake spotless

Browse Source
This commit is contained in:
Alastors committed 2023-04-27 22:11:12 -04:00
1 parent e12eda73fc
commit c7c47b9a1b
3 files changed
+32 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/item/types/HiveFrameType.java
-1
View File
@@ -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;
src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java
+16 -16
View File
@@ -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()) {
src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java
+16 -14
View File
@@ -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()) {