Autoformat: spaces to tabs, remove unused imports

This commit is contained in:
mezz committed 2015-01-08 21:48:13 -08:00
1 parent a6d1a9f1a4
commit dac7c0ddef
93 files changed
+3159 -3058

No files matched your search

@@ -17,16 +17,20 @@ public class ItemArmorApiarist extends Item implements IArmorApiarist
{
int count = 0;
if (wearsHelmet(player)) {
if (wearsHelmet(player))
{
count++;
}
if (wearsChest(player)) {
if (wearsChest(player))
{
count++;
}
if (wearsLegs(player)) {
if (wearsLegs(player))
{
count++;
}
if (wearsBoots(player)) {
if (wearsBoots(player))
{
count++;
}
+15 -15
View File
@@ -1,5 +1,7 @@
package magicbees.item;
import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -13,8 +15,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
public class ItemCapsule extends Item
{
private CapsuleType capsuleType;
@@ -66,19 +66,19 @@ public class ItemCapsule extends Item
return true;
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.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 == null)
{
t.liquidIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":liquids/" + t.liquidID.toLowerCase());
}
}
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.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 == null)
{
t.liquidIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":liquids/" + t.liquidID.toLowerCase());
}
}
}
@Override
@SideOnly(Side.CLIENT)
+10 -10
View File
@@ -1,9 +1,10 @@
package magicbees.item;
import java.util.List;
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 magicbees.item.types.CombType;
import magicbees.main.MagicBees;
import magicbees.main.utils.compat.ForestryHelper;
@@ -12,8 +13,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
import forestry.api.core.Tabs;
public class ItemComb extends Item
{
@@ -29,7 +29,7 @@ public class ItemComb extends Item
public ItemStack getStackForType(CombType type)
{
return new ItemStack(this, 1, type.ordinal());
}
}
public ItemStack getStackForType(CombType type, int count)
{
@@ -65,12 +65,12 @@ public class ItemComb extends Item
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":beeCombs.0");
this.secondIcon= par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":beeCombs.1");
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":beeCombs.0");
this.secondIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":beeCombs.1");
}
@Override
public IIcon getIcon(ItemStack stack, int pass)
@@ -1,5 +1,7 @@
package magicbees.item;
import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -11,8 +13,6 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import java.util.List;
public class ItemCrystalAspect extends Item
{
public ItemCrystalAspect()
@@ -38,11 +38,11 @@ public class ItemCrystalAspect extends Item
}*/
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":crystalAspect");
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":crystalAspect");
}
@Override
@SideOnly(Side.CLIENT)
+11 -11
View File
@@ -1,9 +1,10 @@
package magicbees.item;
import java.util.List;
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 magicbees.item.types.DropType;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -11,8 +12,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
import forestry.api.core.Tabs;
public class ItemDrop extends Item
{
@@ -28,7 +28,7 @@ public class ItemDrop extends Item
public ItemStack getStackForType(DropType type)
{
return new ItemStack(this, 1, type.ordinal());
}
}
public ItemStack getStackForType(DropType type, int count)
{
@@ -61,13 +61,13 @@ public class ItemDrop extends Item
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":honeyDrop.0");
this.secondIcon= par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":honeyDrop.1");
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":honeyDrop.0");
this.secondIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":honeyDrop.1");
}
@Override
public IIcon getIcon(ItemStack stack, int pass)
{
+17 -14
View File
@@ -1,27 +1,30 @@
package magicbees.item;
import forestry.core.items.ItemForestryBlock;
import magicbees.block.types.HiveType;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import forestry.core.items.ItemForestryBlock;
/**
* Created by Allen on 7/29/2014.
*/
public class ItemMagicHive extends ItemForestryBlock {
public ItemMagicHive(Block block) {
super(block);
}
public class ItemMagicHive extends ItemForestryBlock
{
public ItemMagicHive(Block block)
{
super(block);
}
@Override
public String getUnlocalizedName(ItemStack itemstack) {
return getBlock().getUnlocalizedName() + "." + HiveType.getHiveFromMeta(itemstack.getItemDamage()).name().toLowerCase();
}
@Override
public String getUnlocalizedName(ItemStack itemstack)
{
return getBlock().getUnlocalizedName() + "." + HiveType.getHiveFromMeta(itemstack.getItemDamage()).name().toLowerCase();
}
@Override
public String getItemStackDisplayName(ItemStack p_77653_1_)
{
return ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(p_77653_1_) + ".name")).trim();
}
@Override
public String getItemStackDisplayName(ItemStack p_77653_1_)
{
return ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(p_77653_1_) + ".name")).trim();
}
}
@@ -3,10 +3,6 @@ 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.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IHiveFrame;
import magicbees.item.types.HiveFrameType;
import magicbees.main.CommonProxy;
import magicbees.main.utils.TabMagicBees;
@@ -14,6 +10,10 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IHiveFrame;
public class ItemMagicHiveFrame extends Item implements IHiveFrame
{
@@ -30,11 +30,11 @@ public class ItemMagicHiveFrame extends Item implements IHiveFrame
GameRegistry.registerItem(this, "frame" + frameType.getName());
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":frame" + type.getName());
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":frame" + type.getName());
}
// --------- IHiveFrame functions -----------------------------------------
@@ -1,5 +1,7 @@
package magicbees.item;
import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -12,8 +14,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
public class ItemMiscResources extends Item
{
private IIcon[] icons = new IIcon[ResourceType.values().length];
@@ -30,7 +30,7 @@ public class ItemMiscResources extends Item
public ItemStack getStackForType(ResourceType type)
{
return new ItemStack(this, 1, type.ordinal());
}
}
public ItemStack getStackForType(ResourceType type, int count)
{
@@ -50,15 +50,15 @@ 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());
}
}
@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());
}
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int meta)
+19 -19
View File
@@ -1,5 +1,7 @@
package magicbees.item;
import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -13,8 +15,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
public class ItemMoonDial extends Item
{
@SideOnly(Side.CLIENT)
@@ -28,33 +28,33 @@ public class ItemMoonDial extends Item
GameRegistry.registerItem(this, "moonDial");
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.icons = new IIcon[MoonPhase.values().length];
for (int i = 0; i < MoonPhase.values().length; ++i)
{
this.icons[i] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":moonDial." + i);
}
this.itemIcon = this.icons[4];
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.icons = new IIcon[MoonPhase.values().length];
for (int i = 0; i < MoonPhase.values().length; ++i)
{
this.icons[i] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":moonDial." + i);
}
this.itemIcon = this.icons[4];
}
@Override
@SideOnly(Side.CLIENT)
@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()];
}
@Override
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List infoList, boolean par4)
{
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List infoList, boolean par4)
{
if (MagicBees.getConfig().MoonDialShowsPhaseInText &&
entityPlayer.getCurrentEquippedItem() != null &&
entityPlayer.getCurrentEquippedItem().getItem() == this)
{
infoList.add("\u00A77" + MoonPhase.getMoonPhaseFromTime(entityPlayer.worldObj.getWorldTime()).getLocalizedName());
}
}
}
}
@@ -1,5 +1,7 @@
package magicbees.item;
import java.util.List;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -19,8 +21,6 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import java.util.List;
public class ItemMysteriousMagnet extends Item
{
@SideOnly(Side.CLIENT)
@@ -180,7 +180,7 @@ public class ItemMysteriousMagnet extends Item
if (world.rand.nextInt(20) == 0)
{
float pitch = 0.85f - world.rand.nextFloat() * 3f / 10f;
world.playSoundEffect(e.posX, e.posY, e.posZ, "mob.endermen.portal", 0.6f, pitch);
world.playSoundEffect(e.posX, e.posY, e.posZ, "mob.endermen.portal", 0.6f, pitch);
}
}
}
+13 -15
View File
@@ -1,19 +1,17 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.item.types.NuggetType;
import magicbees.main.CommonProxy;
import magicbees.main.utils.LogHelper;
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 java.util.List;
public class ItemNugget extends Item
{
@SideOnly(Side.CLIENT)
@@ -50,17 +48,17 @@ public class ItemNugget extends Item
}
}
@SideOnly(Side.CLIENT)
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());
}
}
@SideOnly(Side.CLIENT)
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());
}
}
@Override
@SideOnly(Side.CLIENT)
+12 -11
View File
@@ -1,9 +1,10 @@
package magicbees.item;
import java.util.List;
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 magicbees.item.types.PollenType;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -11,8 +12,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
import forestry.api.core.Tabs;
public class ItemPollen extends Item
{
@@ -24,10 +24,11 @@ public class ItemPollen extends Item
this.setUnlocalizedName("pollen");
GameRegistry.registerItem(this, "pollen");
}
public ItemStack getStackForType(PollenType type)
{
return new ItemStack(this, 1, type.ordinal());
}
}
public ItemStack getStackForType(PollenType type, int count)
{
@@ -60,13 +61,13 @@ public class ItemPollen extends Item
@SideOnly(Side.CLIENT)
private IIcon secondIcon;
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":pollen.0");
this.secondIcon= par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":pollen.1");
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":pollen.0");
this.secondIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":pollen.1");
}
@Override
public IIcon getIcon(ItemStack stack, int pass)
{
@@ -1,17 +1,17 @@
package magicbees.item;
import java.util.List;
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 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 java.util.List;
import forestry.api.core.Tabs;
public class ItemPropolis extends Item
{
@@ -27,7 +27,7 @@ public class ItemPropolis extends Item
public ItemStack getStackForType(PropolisType type)
{
return new ItemStack(this, 1, type.ordinal());
}
}
public ItemStack getStackForType(PropolisType type, int count)
{
@@ -44,11 +44,11 @@ public class ItemPropolis extends Item
}
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":propolis.0");
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(ForestryHelper.Name.toLowerCase() + ":propolis.0");
}
@Override
public int getColorFromItemStack(ItemStack stack, int pass)
@@ -1,11 +1,13 @@
package magicbees.item;
import java.util.HashSet;
import java.util.Set;
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.Config;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
@@ -19,12 +21,11 @@ import thaumcraft.api.IRepairableExtended;
import thaumcraft.api.ThaumcraftApi;
import forestry.api.arboriculture.IToolGrafter;
import java.util.HashSet;
import java.util.Set;
@Optional.InterfaceList(
{@Optional.Interface(iface = "IRepairableExtended", modid = "Thaumcraft", striprefs = true),
@Optional.Interface(iface = "IToolGrafter", modid = "forestry", striprefs = true)}
{
@Optional.Interface(iface = "IRepairableExtended", modid = "Thaumcraft", striprefs = true),
@Optional.Interface(iface = "IToolGrafter", modid = "forestry", striprefs = true)
}
)
public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IToolGrafter
{
@@ -44,14 +45,16 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
}
@Override
public Set<String> getToolClasses(ItemStack itemStack) {
public Set<String> getToolClasses(ItemStack itemStack)
{
HashSet<String> classes = new HashSet<String>(1);
classes.add("grafter");
return classes;
}
@Override
public int getHarvestLevel(ItemStack itemStack, String toolClass) {
public int getHarvestLevel(ItemStack itemStack, String toolClass)
{
return toolClass.equals("grafter") ? 3 : 0;
}
@@ -69,17 +72,19 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
@Override
public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z,
EntityLivingBase entityLiving) {
EntityLivingBase entityLiving)
{
int damage = 1;
if (block == Config.tcLeaf)
{
int meta = world.getBlockMetadata(x, y, z) & 1;
if (meta == 0 || meta == 1)
{
double chance = Math.random();
if (chance <= Config.ThaumcraftSaplingDroprate) {
this.dropItem(world, x, y, z, new ItemStack(Config.tcPlant, 1, meta));
}
double chance = Math.random();
if (chance <= Config.ThaumcraftSaplingDroprate)
{
this.dropItem(world, x, y, z, new ItemStack(Config.tcPlant, 1, meta));
}
}
}
itemstack.damageItem(damage, entityLiving);
@@ -88,48 +93,48 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
private void dropItem(World world, int x, int y, int z, ItemStack item)
{
if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops"))
{
float f = 0.7F;
double d0 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
EntityItem entityitem = new EntityItem(world, (double)x + d0, (double)y + d1, (double)z + d2, item);
entityitem.delayBeforeCanPickup = 10;
world.spawnEntityInWorld(entityitem);
}
if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops"))
{
float f = 0.7F;
double d0 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
EntityItem entityitem = new EntityItem(world, (double)x + d0, (double)y + d1, (double)z + d2, item);
entityitem.delayBeforeCanPickup = 10;
world.spawnEntityInWorld(entityitem);
}
}
/**
* Return the enchantability factor of the item, most of the time is based on material.
*/
@Optional.Method(modid = "Thaumcraft")
public int getItemEnchantability()
{
return ThaumcraftApi.toolMatThaumium.getEnchantability();
}
/**
* Return the enchantability factor of the item, most of the time is based on material.
*/
@Optional.Method(modid = "Thaumcraft")
public int getItemEnchantability()
{
return ThaumcraftApi.toolMatThaumium.getEnchantability();
}
/**
* Return the name for this tool's material.
*/
@Optional.Method(modid = "Thaumcraft")
public String getToolMaterialName()
{
return ThaumcraftApi.toolMatThaumium.toString();
}
/**
* Return the name for this tool's material.
*/
@Optional.Method(modid = "Thaumcraft")
public String getToolMaterialName()
{
return ThaumcraftApi.toolMatThaumium.toString();
}
/**
* Return whether this item is repairable in an anvil.
*/
@Optional.Method(modid = "Thaumcraft")
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
{
return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() ? true : super.getIsRepairable
(par1ItemStack, par2ItemStack);
}
/**
* Return whether this item is repairable in an anvil.
*/
@Optional.Method(modid = "Thaumcraft")
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
{
return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() ? true : super.getIsRepairable
(par1ItemStack, par2ItemStack);
}
@Override
@Optional.Method(modid = "Thaumcraft")
@Optional.Method(modid = "Thaumcraft")
public boolean doRepair(ItemStack stack, EntityPlayer player, int enchantLevel)
{
boolean flag = false;
@@ -141,10 +146,10 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
return flag;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
{
this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":thaumiumGrafter");
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
{
this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":thaumiumGrafter");
}
}
@@ -1,5 +1,8 @@
package magicbees.item;
import java.util.HashSet;
import java.util.Set;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -15,12 +18,11 @@ import thaumcraft.api.IRepairable;
import thaumcraft.api.ThaumcraftApi;
import forestry.api.core.IToolScoop;
import java.util.HashSet;
import java.util.Set;
@Optional.InterfaceList(
{@Optional.Interface(iface = "IRepairable", modid = "Thaumcraft", striprefs = true),
@Optional.Interface(iface = "IToolScoop", modid = "forestry", striprefs = true)}
{
@Optional.Interface(iface = "IRepairable", modid = "Thaumcraft", striprefs = true),
@Optional.Interface(iface = "IToolScoop", modid = "forestry", striprefs = true)
}
)
public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
{
@@ -34,14 +36,16 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
}
@Override
public Set<String> getToolClasses(ItemStack itemStack) {
public Set<String> getToolClasses(ItemStack itemStack)
{
HashSet<String> classes = new HashSet<String>(1);
classes.add("scoop");
return classes;
}
@Override
public int getHarvestLevel(ItemStack itemStack, String toolClass) {
public int getHarvestLevel(ItemStack itemStack, String toolClass)
{
return toolClass.equals("scoop") ? 3 : 0;
}
@@ -59,40 +63,41 @@ 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) {
EntityLivingBase entityliving)
{
itemstack.damageItem(1, entityliving);
return true;
}
/**
* Return the enchantability factor of the item, most of the time is based on material.
*/
public int getItemEnchantability()
{
return ThaumcraftApi.toolMatThaumium.getEnchantability();
}
/**
* Return the enchantability factor of the item, most of the time is based on material.
*/
public int getItemEnchantability()
{
return ThaumcraftApi.toolMatThaumium.getEnchantability();
}
/**
* Return the name for this tool's material.
*/
public String getToolMaterialName()
{
return ThaumcraftApi.toolMatThaumium.toString();
}
/**
* Return the name for this tool's material.
*/
public String getToolMaterialName()
{
return ThaumcraftApi.toolMatThaumium.toString();
}
/**
* Return whether this item is repairable in an anvil.
*/
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
{
return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() ? true : super
.getIsRepairable(par1ItemStack, par2ItemStack);
}
/**
* Return whether this item is repairable in an anvil.
*/
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
{
return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() ? true : super
.getIsRepairable(par1ItemStack, par2ItemStack);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
{
this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":thaumiumScoop");
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister)
{
this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":thaumiumScoop");
}
}
+11 -11
View File
@@ -1,9 +1,10 @@
package magicbees.item;
import java.util.List;
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 magicbees.item.types.WaxType;
import magicbees.main.CommonProxy;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -11,8 +12,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import java.util.List;
import forestry.api.core.Tabs;
public class ItemWax extends Item
{
@@ -37,14 +37,14 @@ public class ItemWax extends Item
{
return new ItemStack(this, count, type.ordinal());
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":wax.0");
this.secondaryIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":wax.1");
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":wax.0");
this.secondaryIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":wax.1");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int meta)
@@ -1,7 +1,6 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum CapsuleType
{
@@ -1,7 +1,6 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import net.minecraft.item.ItemStack;
public enum CombType
{
@@ -40,38 +39,38 @@ public enum CombType
;
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},
{ 0xFF9859, 0xFFC58E },
{ 0xcc3333, 0x1E160E },
{ 0x9872FF, 0x2D2D2D },
{ 0x3EE0D8, 0x3A3820 },
{ 0xE5425D, 0x323291 },
{0xFFDF14, 0x707019},
{0xE21802, 0x3F0E12},
{0x00B6FF, 0x0F373D},
{0x28D328, 0x333004},
{0xDDDDFF, 0x9D9DB5},
{0x555577, 0x2D2D56},
{0xCC8604, 0x41046F},
{0xCCCC04, 0x41046F},
{0xCC002C, 0x6B0118},
{0x454545, 0x0F0F0F},
{0xF5F3A4, 0xC9C87D},
{0x12E3D9, 0x069E97},
{ 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)
@@ -1,7 +1,6 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum DropType
{
@@ -14,14 +14,14 @@ public enum HiveFrameType
;
private HiveFrameType(String name, int damage,
float territory, float mutation, float lifespan, float production, float geneticDecay)
float territory, float mutation, float lifespan, float production, float geneticDecay)
{
this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
}
private 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)
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;
@@ -2,7 +2,6 @@ package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import net.minecraft.item.Item;
import net.minecraftforge.oredict.OreDictionary;
public enum NuggetType
{
@@ -1,7 +1,6 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum PollenType
{
@@ -1,7 +1,6 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum PropolisType
{
@@ -1,7 +1,6 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum ResourceType
{
@@ -1,7 +1,6 @@
package magicbees.item.types;
import magicbees.main.utils.LocalizationManager;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum WaxType
{