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

@@ -19,7 +19,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class BlockEffectJar extends BlockContainer
{
{
public BlockEffectJar()
{
super(Material.glass);
+17 -18
View File
@@ -1,8 +1,10 @@
package magicbees.block;
import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import magicbees.block.types.HiveType;
import magicbees.main.MagicBees;
import net.minecraft.block.Block;
@@ -14,14 +16,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.IWorldAccess;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.List;
import forestry.api.core.Tabs;
public class BlockHive extends Block
{
{
public BlockHive()
{
super(new MaterialHive());
@@ -38,7 +37,7 @@ public class BlockHive extends Block
}
@Override
public int damageDropped(int meta)
public int damageDropped(int meta)
{
return meta;
}
@@ -96,17 +95,17 @@ public class BlockHive extends Block
{
Block block = world.getBlock(x, y, z);
if (block.isAir(world, x, y, z))
{
return null;
}
if (block.isAir(world, x, y, z))
{
return null;
}
Item item = Item.getItemFromBlock(block);
if (item == null)
{
return null;
}
return new ItemStack(item, 1, getDamageValue(world, x, y, z) & 7);
Item item = Item.getItemFromBlock(block);
if (item == null)
{
return null;
}
return new ItemStack(item, 1, getDamageValue(world, x, y, z) & 7);
}
}
+13 -13
View File
@@ -2,6 +2,8 @@ package magicbees.block;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.block.types.PlankType;
import magicbees.main.CommonProxy;
import magicbees.main.MagicBees;
@@ -13,8 +15,6 @@ import net.minecraft.init.Blocks;
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 BlockPlanks extends Block
{
@@ -49,20 +49,20 @@ public class BlockPlanks extends Block
}
}
@SideOnly(Side.CLIENT)
@SideOnly(Side.CLIENT)
@Override
public IIcon getIcon(int side, int meta)
{
return this.IIcons[Math.max(0, Math.min(meta & 7, IIcons.length-1))];
return this.IIcons[Math.max(0, Math.min(meta & 7, IIcons.length - 1))];
}
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IIconRegister)
{
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IIconRegister)
{
this.IIcons = new IIcon[PlankType.values().length];
for (PlankType t : PlankType.values())
{
this.IIcons[t.ordinal()] = par1IIconRegister.registerIcon(CommonProxy.DOMAIN + ":" + t.name);
}
}
for (PlankType t : PlankType.values())
{
this.IIcons[t.ordinal()] = par1IIconRegister.registerIcon(CommonProxy.DOMAIN + ":" + t.name);
}
}
}
@@ -15,40 +15,41 @@ import net.minecraft.world.World;
public class BlockThaumicApiary extends BlockContainer
{
public BlockThaumicApiary()
{
super(Material.wood);
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setBlockName("thaumicApiary");
this.setHardness(1f);
this.setResistance(1.5f);
this.setHarvestLevel("axe", 0);
}
public BlockThaumicApiary()
{
super(Material.wood);
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setBlockName("thaumicApiary");
this.setHardness(1f);
this.setResistance(1.5f);
this.setHarvestLevel("axe", 0);
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9 )
{
boolean activate = false;
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9)
{
boolean activate = false;
if (!player.isSneaking())
{
player.openGui(MagicBees.object, UIScreens.THAUMIC_APIARY.ordinal(), world, x, y, z);
activate = true;
}
if (!player.isSneaking())
{
player.openGui(MagicBees.object, UIScreens.THAUMIC_APIARY.ordinal(), world, x, y, z);
activate = true;
}
return activate;
}
return activate;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register)
{
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register)
{
}
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileEntityThaumicApiary();
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_)
{
return new TileEntityThaumicApiary();
}
}
@@ -3,6 +3,8 @@ package magicbees.block;
import java.util.List;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.block.types.PlankType;
import magicbees.main.CommonProxy;
import magicbees.main.Config;
@@ -18,8 +20,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockWoodSlab extends BlockSlab
{
@@ -41,15 +41,15 @@ public class BlockWoodSlab extends BlockSlab
}
@Override
public Item getItemDropped(int id, Random rand, int par3)
{
return Item.getItemFromBlock(Config.slabWoodHalf);
}
public Item getItemDropped(int id, Random rand, int par3)
{
return Item.getItemFromBlock(Config.slabWoodHalf);
}
protected ItemStack createStackedBlock(int meta)
{
return new ItemStack(Config.planksWood, 1, meta & 7);
}
protected ItemStack createStackedBlock(int meta)
{
return new ItemStack(Config.planksWood, 1, meta & 7);
}
@Override
public String func_150002_b(int meta)
@@ -71,35 +71,35 @@ public class BlockWoodSlab extends BlockSlab
@Override
public IIcon getIcon(int side, int meta)
{
return this.icons[Math.max(0, Math.min(meta & 7, icons.length-1))];
return this.icons[Math.max(0, Math.min(meta & 7, icons.length - 1))];
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.icons = new IIcon[PlankType.values().length];
for (PlankType t : PlankType.values())
{
this.icons[t.ordinal()] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":" + t.name);
}
}
for (PlankType t : PlankType.values())
{
this.icons[t.ordinal()] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":" + t.name);
}
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
{
Block block = world.getBlock(x, y, z);
if (block.isAir(world, x, y, z))
{
return null;
}
Item item = Item.getItemFromBlock(block);
if (item == null)
{
return null;
}
return new ItemStack(item, 1, getDamageValue(world, x, y, z) & 7);
if (block.isAir(world, x, y, z))
{
return null;
}
Item item = Item.getItemFromBlock(block);
if (item == null)
{
return null;
}
return new ItemStack(item, 1, getDamageValue(world, x, y, z) & 7);
}
}
@@ -1,8 +1,10 @@
package magicbees.block.types;
import java.util.ArrayList;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.apiculture.IHiveDrop;
import magicbees.bees.BeeGenomeManager;
import magicbees.bees.BeeSpecies;
import magicbees.bees.HiveDrop;
@@ -19,9 +21,7 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type;
import java.util.ArrayList;
import java.util.Random;
import forestry.api.apiculture.IHiveDrop;
public enum HiveType
{
@@ -57,7 +57,7 @@ public enum HiveType
public static void initHiveData()
{
ItemStack[] combs = new ItemStack[] {Config.combs.getStackForType(CombType.MUNDANE)};
ItemStack[] combs = new ItemStack[] { Config.combs.getStackForType(CombType.MUNDANE) };
HiveDrop valiantDrop = new HiveDrop(BeeGenomeManager.addRainResist(ForestryHelper.getTemplateForestryForSpecies("Valiant")), combs, 5);
CURIOUS.validBiomes.add(Type.FOREST);
@@ -87,14 +87,14 @@ public enum HiveType
DEEP.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.ATTUNED.getGenome()), combs, 20));
DEEP.drops.add(valiantDrop);
combs = new ItemStack[] {Config.combs.getStackForType(CombType.MOLTEN), new ItemStack(Items.glowstone_dust, 6)};
combs = new ItemStack[] { Config.combs.getStackForType(CombType.MOLTEN), new ItemStack(Items.glowstone_dust, 6) };
INFERNAL.validBiomes.add(Type.NETHER);
INFERNAL.validBiomes.add(Type.MAGICAL);
INFERNAL.drops.add(new HiveDrop(BeeSpecies.INFERNAL.getGenome(), combs, 80).setIgnoblePercentage(0.5f));
INFERNAL.drops.add(new HiveDrop(ForestryHelper.getTemplateForestryForSpecies("Steadfast"), combs, 3));
combs = new ItemStack[] {Config.combs.getStackForType(CombType.FORGOTTEN), new ItemStack(Items.ender_pearl, 1)};
combs = new ItemStack[] { Config.combs.getStackForType(CombType.FORGOTTEN), new ItemStack(Items.ender_pearl, 1) };
OBLIVION.validBiomes.add(Type.END);
OBLIVION.validBiomes.add(Type.MAGICAL);
@@ -217,75 +217,75 @@ public enum HiveType
{
switch (this)
{
case CURIOUS:
for (int i = 0; i < 3; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveCurious(world, random, coordX, coordZ, initialGen))
{
break;
}
}
break;
case UNUSUAL:
for (int i = 0; i < 3; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveUnusual(world, random, coordX, coordZ, initialGen))
{
break;
}
}
break;
case RESONANT:
for (int i = 0; i < 3; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveResonant(world, random, coordX, coordZ, initialGen))
{
break;
}
}
break;
case DEEP:
if (chunkX % 2 == 0 && chunkZ % 2 == 0)
{
for (int i = 0; i < 1; ++i)
case CURIOUS:
for (int i = 0; i < 3; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveDeep(world, random, coordX, coordZ, initialGen))
if (FeatureHive.generateHiveCurious(world, random, coordX, coordZ, initialGen))
{
break;
}
}
}
break;
case INFERNAL:
for (int i = 0; i < 2; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveInfernal(world, random, coordX, coordZ, initialGen))
break;
case UNUSUAL:
for (int i = 0; i < 3; ++i)
{
break;
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveUnusual(world, random, coordX, coordZ, initialGen))
{
break;
}
}
}
break;
case OBLIVION:
for (int i = 0; i < 3; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveOblivion(world, random, coordX, coordZ, initialGen))
break;
case RESONANT:
for (int i = 0; i < 3; ++i)
{
break;
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveResonant(world, random, coordX, coordZ, initialGen))
{
break;
}
}
}
break;
break;
case DEEP:
if (chunkX % 2 == 0 && chunkZ % 2 == 0)
{
for (int i = 0; i < 1; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveDeep(world, random, coordX, coordZ, initialGen))
{
break;
}
}
}
break;
case INFERNAL:
for (int i = 0; i < 2; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveInfernal(world, random, coordX, coordZ, initialGen))
{
break;
}
}
break;
case OBLIVION:
for (int i = 0; i < 3; ++i)
{
int coordX = chunkX * 16 + random.nextInt(16);
int coordZ = chunkZ * 16 + random.nextInt(16);
if (FeatureHive.generateHiveOblivion(world, random, coordX, coordZ, initialGen))
{
break;
}
}
break;
}
}
}