[ci skip] spotlessApply with the new settings

This commit is contained in:
Jason Mitchell committed 2023-01-29 10:24:49 -08:00
1 parent 32411450d3
commit f1069a91f1
148 files changed
+2268 -3179

No files matched your search

+14 -8
View File
@@ -1,20 +1,24 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import magicbees.item.types.CapsuleType;
import magicbees.item.types.FluidType;
import magicbees.main.CommonProxy;
import magicbees.main.utils.TabMagicBees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemCapsule extends Item {
private CapsuleType capsuleType;
public ItemCapsule(CapsuleType type, int maxStackSize) {
@@ -34,14 +38,15 @@ public class ItemCapsule extends Item {
@Override
public String getItemStackDisplayName(ItemStack itemStack) {
return String.format(
this.capsuleType.getLocalizedName(), FluidType.values()[itemStack.getItemDamage()].getDisplayName());
this.capsuleType.getLocalizedName(),
FluidType.values()[itemStack.getItemDamage()].getDisplayName());
}
public ItemStack getCapsuleForLiquid(FluidType l) {
return new ItemStack(this, 1, l.ordinal());
}
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List itemList) {
@@ -60,9 +65,10 @@ public class ItemCapsule extends Item {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":capsule"
+ this.capsuleType.getName().substring(0, 1).toUpperCase()
+ this.capsuleType.getName().substring(1));
this.itemIcon = iconRegister.registerIcon(
CommonProxy.DOMAIN + ":capsule"
+ this.capsuleType.getName().substring(0, 1).toUpperCase()
+ this.capsuleType.getName().substring(1));
for (FluidType t : FluidType.values()) {
if (t != FluidType.EMPTY) {
t.liquidIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":liquids/" + t.liquidID);
+9 -5
View File
@@ -1,20 +1,24 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import java.util.List;
import magicbees.item.types.CombType;
import magicbees.main.Config;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
public class ItemComb extends Item {
public ItemComb() {
super();
this.setCreativeTab(Tabs.tabApiculture);
@@ -31,7 +35,7 @@ public class ItemComb extends Item {
return new ItemStack(this, count, type.ordinal());
}
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tabs, List list) {
+9 -5
View File
@@ -1,19 +1,23 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import java.util.List;
import magicbees.item.types.DropType;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
public class ItemDrop extends Item {
public ItemDrop() {
super();
this.setCreativeTab(Tabs.tabApiculture);
@@ -32,7 +36,7 @@ public class ItemDrop extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (DropType type : DropType.values()) {
list.add(this.getStackForType(type));
@@ -1,8 +1,8 @@
package magicbees.item;
import forestry.api.arboriculture.IToolGrafter;
import magicbees.main.Config;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
@@ -11,6 +11,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import forestry.api.arboriculture.IToolGrafter;
public class ItemGrafter extends Item implements IToolGrafter {
public ItemGrafter() {
@@ -26,8 +28,8 @@ public class ItemGrafter extends Item implements IToolGrafter {
}
@Override
public boolean onBlockDestroyed(
ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) {
public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z,
EntityLivingBase entityLiving) {
int damage = 1;
if (ThaumcraftHelper.isActive()) {
if (block == ThaumcraftHelper.leaf) {
@@ -1,17 +1,20 @@
package magicbees.item;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.block.types.HiveType;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Created by Allen on 7/29/2014.
*/
public class ItemMagicHive extends ItemBlock {
public ItemMagicHive(Block block) {
super(block);
setMaxDamage(0);
@@ -1,5 +1,13 @@
package magicbees.item;
import magicbees.item.types.HiveFrameType;
import magicbees.main.CommonProxy;
import magicbees.main.utils.TabMagicBees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -7,14 +15,9 @@ import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IHiveFrame;
import magicbees.item.types.HiveFrameType;
import magicbees.main.CommonProxy;
import magicbees.main.utils.TabMagicBees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class ItemMagicHiveFrame extends Item implements IHiveFrame {
private HiveFrameType type;
public ItemMagicHiveFrame(HiveFrameType frameType) {
@@ -1,20 +1,23 @@
package magicbees.item;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.main.CommonProxy;
import magicbees.main.utils.compat.BotaniaHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import vazkii.botania.api.mana.IManaUsingItem;
@Optional.InterfaceList({
@Optional.Interface(iface = "vazkii.botania.api.mana.IManaUsingItem", modid = BotaniaHelper.Name, striprefs = true)
})
import vazkii.botania.api.mana.IManaUsingItem;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@Optional.InterfaceList({ @Optional.Interface(
iface = "vazkii.botania.api.mana.IManaUsingItem",
modid = BotaniaHelper.Name,
striprefs = true) })
public class ItemManasteelGrafter extends ItemGrafter implements IManaUsingItem {
public static final int MANA_PER_DAMAGE = 90;
@@ -29,7 +32,7 @@ public class ItemManasteelGrafter extends ItemGrafter implements IManaUsingItem
@Optional.Method(modid = BotaniaHelper.Name)
public boolean getIsRepairable(ItemStack toolStack, ItemStack material) {
return (material.getItem() == BotaniaHelper.itemManaResource
&& material.getItemDamage() == BotaniaHelper.ManaResource.MANASTEEL.ordinal())
&& material.getItemDamage() == BotaniaHelper.ManaResource.MANASTEEL.ordinal())
|| super.getIsRepairable(toolStack, material);
}
@@ -43,7 +46,7 @@ public class ItemManasteelGrafter extends ItemGrafter implements IManaUsingItem
public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
// Unsure if the server-side exclusion is necessary, but boy it looks disconcerting on the client if it's in.
if (
/*!world.isRemote && */ stack.getItemDamage() > 0 && player instanceof EntityPlayer) {
/* !world.isRemote && */ stack.getItemDamage() > 0 && player instanceof EntityPlayer) {
if (BotaniaHelper.requestMana(stack, (EntityPlayer) player, MANA_PER_DAMAGE, 1)) {
stack.setItemDamage(stack.getItemDamage() - 1);
}
@@ -1,11 +1,8 @@
package magicbees.item;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.IToolScoop;
import magicbees.main.CommonProxy;
import magicbees.main.utils.compat.BotaniaHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
@@ -14,11 +11,17 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import vazkii.botania.api.mana.IManaUsingItem;
@Optional.InterfaceList({
@Optional.Interface(iface = "vazkii.botania.api.mana.IManaUsingItem", modid = BotaniaHelper.Name, striprefs = true)
})
import vazkii.botania.api.mana.IManaUsingItem;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.IToolScoop;
@Optional.InterfaceList({ @Optional.Interface(
iface = "vazkii.botania.api.mana.IManaUsingItem",
modid = BotaniaHelper.Name,
striprefs = true) })
public class ItemManasteelScoop extends Item implements IManaUsingItem, IToolScoop {
public static final int MANA_PER_DAMAGE = 30;
@@ -33,8 +36,8 @@ public class ItemManasteelScoop extends Item implements IManaUsingItem, IToolSco
}
@Override
public boolean onBlockDestroyed(
ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player) {
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z,
EntityLivingBase player) {
stack.damageItem(1, player);
return true;
}
@@ -48,7 +51,7 @@ public class ItemManasteelScoop extends Item implements IManaUsingItem, IToolSco
@Optional.Method(modid = BotaniaHelper.Name)
public boolean getIsRepairable(ItemStack toolStack, ItemStack material) {
return (material.getItem() == BotaniaHelper.itemManaResource
&& material.getItemDamage() == BotaniaHelper.ManaResource.MANASTEEL.ordinal())
&& material.getItemDamage() == BotaniaHelper.ManaResource.MANASTEEL.ordinal())
|| super.getIsRepairable(toolStack, material);
}
@@ -62,7 +65,7 @@ public class ItemManasteelScoop extends Item implements IManaUsingItem, IToolSco
public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
// Unsure if the server-side exclusion is necessary, but boy it looks disconcerting on the client if it's in.
if (
/*!world.isRemote && */ stack.getItemDamage() > 0 && player instanceof EntityPlayer) {
/* !world.isRemote && */ stack.getItemDamage() > 0 && player instanceof EntityPlayer) {
if (BotaniaHelper.requestMana(stack, (EntityPlayer) player, MANA_PER_DAMAGE, 1)) {
stack.setItemDamage(stack.getItemDamage() - 1);
}
@@ -1,19 +1,23 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import magicbees.item.types.ResourceType;
import magicbees.main.CommonProxy;
import magicbees.main.utils.TabMagicBees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemMiscResources extends Item {
private IIcon[] icons = new IIcon[ResourceType.values().length];
public ItemMiscResources() {
@@ -34,7 +38,7 @@ public class ItemMiscResources extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (ResourceType type : ResourceType.values()) {
if (type.showInList) {
@@ -46,8 +50,8 @@ public class ItemMiscResources extends Item {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
for (int i = 0; i < ResourceType.values().length; i++) {
this.icons[i] =
par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":" + ResourceType.values()[i].getName());
this.icons[i] = par1IconRegister
.registerIcon(CommonProxy.DOMAIN + ":" + ResourceType.values()[i].getName());
}
}
+13 -11
View File
@@ -1,20 +1,24 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import magicbees.main.CommonProxy;
import magicbees.main.Config;
import magicbees.main.utils.MoonPhase;
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.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemMoonDial extends Item {
@SideOnly(Side.CLIENT)
private IIcon[] icons;
@@ -37,20 +41,18 @@ public class ItemMoonDial extends Item {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
return this.icons[
MoonPhase.getMoonPhaseFromTime(player.worldObj.getWorldTime()).ordinal()];
return this.icons[MoonPhase.getMoonPhaseFromTime(player.worldObj.getWorldTime()).ordinal()];
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List infoList, boolean par4) {
if (Config.moonDialShowsPhaseInText
&& entityPlayer.getCurrentEquippedItem() != null
if (Config.moonDialShowsPhaseInText && entityPlayer.getCurrentEquippedItem() != null
&& entityPlayer.getCurrentEquippedItem().getItem() == this) {
infoList.add("\u00A77"
+ MoonPhase.getMoonPhaseFromTime(entityPlayer.worldObj.getWorldTime())
.getLocalizedName());
infoList.add(
"\u00A77"
+ MoonPhase.getMoonPhaseFromTime(entityPlayer.worldObj.getWorldTime()).getLocalizedName());
}
}
}
@@ -1,16 +1,12 @@
package magicbees.item;
import baubles.api.BaubleType;
import baubles.api.IBauble;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import magicbees.main.CommonProxy;
import magicbees.main.Config;
import magicbees.main.utils.LocalizationManager;
import magicbees.main.utils.TabMagicBees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@@ -25,6 +21,13 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import baubles.api.BaubleType;
import baubles.api.IBauble;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@Optional.Interface(modid = "Baubles", iface = "baubles.api.IBauble")
public class ItemMysteriousMagnet extends Item implements IBauble {
@@ -43,7 +46,7 @@ public class ItemMysteriousMagnet extends Item implements IBauble {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) {
String s = LocalizationManager.getLocalizedString("misc.level", getMagnetLevel(itemStack));
if (isMagnetActive(itemStack)) {
@@ -62,7 +65,7 @@ public class ItemMysteriousMagnet extends Item implements IBauble {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (int i = 0; i <= getMaximumLevel(); i++) {
list.add(new ItemStack(this, 1, i * 2));
@@ -169,7 +172,11 @@ public class ItemMysteriousMagnet extends Item implements IBauble {
if ((arrow.canBePickedUp == 1 || world.rand.nextFloat() < 0.3f)
&& arrow.shootingEntity != entity) {
EntityItem replacement = new EntityItem(
world, arrow.posX, arrow.posY, arrow.posZ, new ItemStack(Items.arrow));
world,
arrow.posX,
arrow.posY,
arrow.posZ,
new ItemStack(Items.arrow));
world.spawnEntityInWorld(replacement);
}
world.removeEntity(arrow);
+11 -6
View File
@@ -1,17 +1,21 @@
package magicbees.item;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
import magicbees.item.types.NuggetType;
import magicbees.main.CommonProxy;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemNugget extends Item {
@SideOnly(Side.CLIENT)
private IIcon[] icons;
@@ -32,7 +36,7 @@ public class ItemNugget extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (NuggetType type : NuggetType.values()) {
if (type.isActive()) {
@@ -45,9 +49,10 @@ public class ItemNugget extends Item {
public void registerIcons(IIconRegister par1IconRegister) {
this.icons = new IIcon[NuggetType.values().length];
for (int i = 0; i < NuggetType.values().length; i++) {
this.icons[i] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":nugget"
+ NuggetType.values()[i].name().substring(0, 1)
+ NuggetType.values()[i].name().substring(1).toLowerCase());
this.icons[i] = par1IconRegister.registerIcon(
CommonProxy.DOMAIN + ":nugget"
+ NuggetType.values()[i].name().substring(0, 1)
+ NuggetType.values()[i].name().substring(1).toLowerCase());
}
}
+9 -5
View File
@@ -1,19 +1,23 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import java.util.List;
import magicbees.item.types.PollenType;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
public class ItemPollen extends Item {
public ItemPollen() {
super();
this.setCreativeTab(Tabs.tabApiculture);
@@ -32,7 +36,7 @@ public class ItemPollen extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (PollenType type : PollenType.values()) {
list.add(this.getStackForType(type));
@@ -1,18 +1,22 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import java.util.List;
import magicbees.item.types.PropolisType;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
public class ItemPropolis extends Item {
public ItemPropolis() {
super();
this.setCreativeTab(Tabs.tabApiculture);
@@ -31,7 +35,7 @@ public class ItemPropolis extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (PropolisType type : PropolisType.values()) {
list.add(this.getStackForType(type));
@@ -1,10 +1,8 @@
package magicbees.item;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.main.CommonProxy;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,13 +10,19 @@ import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.IRepairableExtended;
import thaumcraft.api.ThaumcraftApi;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@Optional.InterfaceList({
@Optional.Interface(iface = "thaumcraft.api.IRepairableExtended", modid = ThaumcraftHelper.Name, striprefs = true)
})
@Optional.InterfaceList({ @Optional.Interface(
iface = "thaumcraft.api.IRepairableExtended",
modid = ThaumcraftHelper.Name,
striprefs = true) })
public class ItemThaumiumGrafter extends ItemGrafter implements IRepairableExtended {
public ItemThaumiumGrafter() {
super();
this.setMaxDamage(15);
@@ -1,11 +1,8 @@
package magicbees.item;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.IToolScoop;
import magicbees.main.CommonProxy;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
@@ -15,13 +12,18 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.IRepairable;
import thaumcraft.api.ThaumcraftApi;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.IToolScoop;
@Optional.InterfaceList({
@Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true)
})
@Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true) })
public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop {
public ItemThaumiumScoop() {
super();
this.setMaxStackSize(1);
@@ -42,8 +44,8 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop {
}
@Override
public boolean onBlockDestroyed(
ItemStack itemstack, World world, Block block, int j, int k, int l, EntityLivingBase entityliving) {
public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int j, int k, int l,
EntityLivingBase entityliving) {
itemstack.damageItem(1, entityliving);
return true;
}
@@ -1,10 +1,8 @@
package magicbees.item;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.main.CommonProxy;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
@@ -18,15 +16,22 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.IRepairableExtended;
import thaumcraft.api.IWarpingGear;
import thaumcraft.api.ThaumcraftApi;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@Optional.InterfaceList({
@Optional.Interface(iface = "thaumcraft.api.IRepairableExtended", modid = ThaumcraftHelper.Name, striprefs = true),
@Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = ThaumcraftHelper.Name, striprefs = true)
})
@Optional.Interface(
iface = "thaumcraft.api.IRepairableExtended",
modid = ThaumcraftHelper.Name,
striprefs = true),
@Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = ThaumcraftHelper.Name, striprefs = true) })
public class ItemVoidGrafter extends ItemGrafter implements IRepairableExtended, IWarpingGear {
public ItemVoidGrafter() {
super();
this.setMaxDamage(10);
@@ -90,8 +95,7 @@ public class ItemVoidGrafter extends ItemGrafter implements IRepairableExtended,
public void onUpdate(ItemStack stack, World world, Entity entity, int p_77663_4_, boolean p_77663_5_) {
super.onUpdate(stack, world, entity, p_77663_4_, p_77663_5_);
if ((stack.isItemDamaged())
&& (entity != null)
if ((stack.isItemDamaged()) && (entity != null)
&& (entity.ticksExisted % 20 == 0)
&& ((entity instanceof EntityLivingBase))) {
stack.damageItem(-1, (EntityLivingBase) entity);
@@ -99,10 +103,8 @@ public class ItemVoidGrafter extends ItemGrafter implements IRepairableExtended,
}
public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) {
if ((!player.worldObj.isRemote)
&& ((entity instanceof EntityLivingBase))
&& ((!(entity instanceof EntityPlayer))
|| (MinecraftServer.getServer().isPVPEnabled()))) {
if ((!player.worldObj.isRemote) && ((entity instanceof EntityLivingBase))
&& ((!(entity instanceof EntityPlayer)) || (MinecraftServer.getServer().isPVPEnabled()))) {
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.weakness.getId(), 80));
}
return super.onLeftClickEntity(stack, player, entity);
+14 -15
View File
@@ -1,11 +1,8 @@
package magicbees.item;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.IToolScoop;
import magicbees.main.CommonProxy;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
@@ -20,15 +17,20 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.IRepairable;
import thaumcraft.api.IWarpingGear;
import thaumcraft.api.ThaumcraftApi;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.IToolScoop;
@Optional.InterfaceList({
@Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true),
@Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = ThaumcraftHelper.Name, striprefs = true)
})
@Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true),
@Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = ThaumcraftHelper.Name, striprefs = true) })
public class ItemVoidScoop extends Item implements IRepairable, IToolScoop, IWarpingGear {
public ItemVoidScoop() {
super();
this.setMaxStackSize(1);
@@ -49,8 +51,8 @@ public class ItemVoidScoop extends Item implements IRepairable, IToolScoop, IWar
}
@Override
public boolean onBlockDestroyed(
ItemStack itemstack, World world, Block block, int j, int k, int l, EntityLivingBase entityliving) {
public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int j, int k, int l,
EntityLivingBase entityliving) {
itemstack.damageItem(1, entityliving);
return true;
}
@@ -92,8 +94,7 @@ public class ItemVoidScoop extends Item implements IRepairable, IToolScoop, IWar
public void onUpdate(ItemStack stack, World world, Entity entity, int p_77663_4_, boolean p_77663_5_) {
super.onUpdate(stack, world, entity, p_77663_4_, p_77663_5_);
if ((stack.isItemDamaged())
&& (entity != null)
if ((stack.isItemDamaged()) && (entity != null)
&& (entity.ticksExisted % 20 == 0)
&& ((entity instanceof EntityLivingBase))) {
stack.damageItem(-1, (EntityLivingBase) entity);
@@ -101,10 +102,8 @@ public class ItemVoidScoop extends Item implements IRepairable, IToolScoop, IWar
}
public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) {
if ((!player.worldObj.isRemote)
&& ((entity instanceof EntityLivingBase))
&& ((!(entity instanceof EntityPlayer))
|| (MinecraftServer.getServer().isPVPEnabled()))) {
if ((!player.worldObj.isRemote) && ((entity instanceof EntityLivingBase))
&& ((!(entity instanceof EntityPlayer)) || (MinecraftServer.getServer().isPVPEnabled()))) {
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.weakness.getId(), 80));
}
return super.onLeftClickEntity(stack, player, entity);
+9 -5
View File
@@ -1,19 +1,23 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import java.util.List;
import magicbees.item.types.WaxType;
import magicbees.main.CommonProxy;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
public class ItemWax extends Item {
@SideOnly(Side.CLIENT)
private IIcon secondaryIcon;
@@ -47,7 +51,7 @@ public class ItemWax extends Item {
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({"unchecked", "rawtypes"})
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (WaxType type : WaxType.values()) {
list.add(this.getStackForType(type));
@@ -3,9 +3,10 @@ package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
public enum CapsuleType {
MAGIC("magic", 2000, 0),
VOID("void", 8000, 1),
;
VOID("void", 8000, 1),;
private String name;
public int capacity;
public int iconIdx;
@@ -37,38 +37,16 @@ public enum CombType {
TE_DESTABILIZED("TEelectric", false),
TE_CARBON("TEcarbon", false),
TE_LUX("TElux", false),
TE_ENDEARING("TEendearing", false),
;
TE_ENDEARING("TEendearing", false),;
private static int[][] colours = new int[][] {
{0xFF9859, 0xFFC58E},
{0xcc3333, 0x1E160E},
{0x9872FF, 0x2D2D2D},
{0x3EE0D8, 0x3A3820},
{0xE5425D, 0x323291},
{0xBCA664, 0x35332E},
{0x7F7171, 0x876D53},
{0xB7ACB7, 0x636363},
{0x0092e9, 0x618fff},
{0x2F9381, 0x773C31},
{0xB191D8, 0x35443B},
{0xffff7e, 0x606308},
{0xff3C01, 0x5B0D10},
{0x0090ff, 0x102F6B},
{0x00a000, 0x043004},
{0xFFDF14, 0x707019},
{0xE21802, 0x3F0E12},
{0x00B6FF, 0x0F373D},
{0x28D328, 0x333004},
{0xDDDDFF, 0x9D9DB5},
{0x555577, 0x2D2D56},
{0xCC8604, 0x41046F},
{0xCCCC04, 0x41046F},
{0xCC002C, 0x6B0118},
{0x454545, 0x0F0F0F},
{0xF5F3A4, 0xC9C87D},
{0x12E3D9, 0x069E97},
};
private static int[][] colours = new int[][] { { 0xFF9859, 0xFFC58E }, { 0xcc3333, 0x1E160E },
{ 0x9872FF, 0x2D2D2D }, { 0x3EE0D8, 0x3A3820 }, { 0xE5425D, 0x323291 }, { 0xBCA664, 0x35332E },
{ 0x7F7171, 0x876D53 }, { 0xB7ACB7, 0x636363 }, { 0x0092e9, 0x618fff }, { 0x2F9381, 0x773C31 },
{ 0xB191D8, 0x35443B }, { 0xffff7e, 0x606308 }, { 0xff3C01, 0x5B0D10 }, { 0x0090ff, 0x102F6B },
{ 0x00a000, 0x043004 }, { 0xFFDF14, 0x707019 }, { 0xE21802, 0x3F0E12 }, { 0x00B6FF, 0x0F373D },
{ 0x28D328, 0x333004 }, { 0xDDDDFF, 0x9D9DB5 }, { 0x555577, 0x2D2D56 }, { 0xCC8604, 0x41046F },
{ 0xCCCC04, 0x41046F }, { 0xCC002C, 0x6B0118 }, { 0x454545, 0x0F0F0F }, { 0xF5F3A4, 0xC9C87D },
{ 0x12E3D9, 0x069E97 }, };
private CombType(String pName, boolean show) {
this.name = pName;
@@ -3,13 +3,13 @@ package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
public enum DropType {
ENCHANTED("enchanting", 0x6e1c6d, 0xff8fff),
INTELLECT("intellect", 0x25914D, 0x18E072),
DESTABILIZED("destabilized", 0xCC002C, 0x6B0118),
CARBON("carbon", 0x454545, 0x0F0F0F),
LUX("lux", 0xF5F3A4, 0xC9C87D),
ENDEARING("endearing", 0x12E3D9, 0x069E97),
;
ENDEARING("endearing", 0x12E3D9, 0x069E97),;
private DropType(String pName, int colourA, int colourB) {
this.name = pName;
@@ -1,6 +1,7 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import net.minecraft.util.IIcon;
public enum FluidType {
@@ -45,8 +46,8 @@ public enum FluidType {
PYROTHEUM("pyrotheum"),
CRYOTHEUM("cryotheum"),
MANA("mana"),
COAL("coal"),
;
COAL("coal"),;
public String liquidID;
public int iconIdx;
public boolean available = false;
@@ -1,18 +1,18 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeModifier;
import magicbees.main.utils.LocalizationManager;
public enum HiveFrameType implements IBeeModifier {
MAGIC("Magic", 240, 1f, 1f, 1f, 2f, 0.6f),
RESILIENT("Resilient", 800, 1f, 1f, 1f, 2f, 0.5f),
GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f, 0.01f),
METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 1.2f, 1f),
NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 1.2f),
TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f),
OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f),
;
OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f),;
private final String frameName;
public final int maxDamage;
@@ -28,30 +28,13 @@ public enum HiveFrameType implements IBeeModifier {
private final boolean isSunlit;
private final boolean isHellish;
HiveFrameType(
String name,
int damage,
float territory,
float mutation,
float lifespan,
float production,
HiveFrameType(String name, int damage, float territory, float mutation, float lifespan, float production,
float geneticDecay) {
this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
}
HiveFrameType(
String name,
int damage,
float territory,
float mutation,
float lifespan,
float production,
float flowering,
float geneticDecay,
boolean sealed,
boolean lit,
boolean sunlit,
boolean hellish) {
HiveFrameType(String name, int damage, float territory, float mutation, float lifespan, float production,
float flowering, float geneticDecay, boolean sealed, boolean lit, boolean sunlit, boolean hellish) {
this.frameName = name;
this.maxDamage = damage;
@@ -1,9 +1,11 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import net.minecraft.item.Item;
public enum NuggetType {
IRON,
COPPER,
TIN,
@@ -11,8 +13,7 @@ public enum NuggetType {
LEAD,
DIAMOND,
EMERALD,
APATITE,
;
APATITE,;
private Item targetIngot;
private boolean active;
@@ -38,7 +39,6 @@ public enum NuggetType {
}
public String getName() {
return LocalizationManager.getLocalizedString(
"nugget." + this.toString().toLowerCase());
return LocalizationManager.getLocalizedString("nugget." + this.toString().toLowerCase());
}
}
@@ -3,9 +3,9 @@ package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
public enum PollenType {
UNUSUAL("unusual", 0xD8417B, 0xA03059),
PHASED("phased", 0x4974B4, 0x456BA5),
;
PHASED("phased", 0x4974B4, 0x456BA5),;
private PollenType(String pName, int colourA, int colourB) {
this.name = pName;
@@ -3,6 +3,7 @@ package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
public enum PropolisType {
UNSTABLE("unstable", 0xEFB492),
AIR("air", 0xA19E10),
@@ -10,8 +11,7 @@ public enum PropolisType {
WATER("water", 0x1054A1),
EARTH("earth", 0x00a000),
ORDER("dull", 0xDDDDFF),
CHAOS("magic", 0x555577),
;
CHAOS("magic", 0x555577),;
private PropolisType(String pName, int overlayColour) {
this.name = pName;
@@ -3,6 +3,7 @@ package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
public enum ResourceType {
LORE_FRAGMENT("fragment", true),
AROMATIC_LUMP("lump", true),
EXTENDED_FERTILIZER("fertilizer", true),
@@ -29,10 +30,9 @@ public enum ResourceType {
TC_DUST_CHAOS("TCchaosDust", true),
// Dummy items for Thaumanomicon research icons.
// These won't ever actually exist in-game, and so they can be moved around.
// These won't ever actually exist in-game, and so they can be moved around.
RESEARCH_STARTNODE("startNode", false),
RESEARCH_BEEINFUSION("beeInfusion", false),
;
RESEARCH_BEEINFUSION("beeInfusion", false),;
private ResourceType(String n, boolean show) {
this.name = n;
@@ -3,6 +3,7 @@ package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
public enum WaxType {
MAGIC("magic", true, 0xd242df),
SOUL("soul", false, 0x967C63),
AMNESIC("amnesic", true, 0x856DFF);