From ace86625dcf1b949a82225350b8db115c97dc396 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 4 May 2014 13:42:54 +0100 Subject: [PATCH] Cleanup. --- MODSRC/vazkii/botania/common/block/BlockOpenCrate.java | 9 ++++----- MODSRC/vazkii/botania/common/block/ModBlocks.java | 2 +- .../vazkii/botania/common/block/tile/TileOpenCrate.java | 7 ++----- .../botania/common/crafting/ModCrafingRecipes.java | 4 ++-- MODSRC/vazkii/botania/common/item/ItemManaGun.java | 8 ++++---- MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 2 +- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java b/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java index 1bbb78307..72bf2d3b3 100644 --- a/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java +++ b/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -29,20 +28,20 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockOpenCrate extends BlockModContainer implements ILexiconable { IIcon iconBottom; - + public BlockOpenCrate() { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); setBlockName(LibBlockNames.OPEN_CRATE); } - + @Override public void registerBlockIcons(IIconRegister par1IconRegister) { blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); iconBottom = IconHelper.forBlock(par1IconRegister, this, 1); } - + @Override public IIcon getIcon(int side, int meta) { return side == 0 ? iconBottom : blockIcon; @@ -57,5 +56,5 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable { public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.openCrate; } - + } diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index a9e74943d..4fb55e6d7 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -97,7 +97,7 @@ public final class ModBlocks { tinyPlanet = new BlockTinyPlanet(); alchemyCatalyst = new BlockAlchemyCatalyst(); openCrate = new BlockOpenCrate(); - + for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java b/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java index e72ff1991..db46ba3f4 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -11,13 +11,10 @@ */ package vazkii.botania.common.block.tile; -import vazkii.botania.common.lib.LibBlockNames; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import vazkii.botania.common.lib.LibBlockNames; public class TileOpenCrate extends TileSimpleInventory { @@ -30,7 +27,7 @@ public class TileOpenCrate extends TileSimpleInventory { public String getInventoryName() { return LibBlockNames.OPEN_CRATE; } - + @Override public void updateEntity() { Block blockBelow = worldObj.getBlock(xCoord, yCoord - 1, zCoord); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 9710c396b..b6c372ec0 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -569,9 +569,9 @@ public final class ModCrafingRecipes { 'B', new ItemStack(Items.brewing_stand), 'P', LibOreDict.MANA_PEARL); recipeAlchemyCatalyst = BotaniaAPI.getLatestAddedRecipe(); - + // Open Crate Recipe - GameRegistry.addRecipe(new ItemStack(ModBlocks.openCrate), + GameRegistry.addRecipe(new ItemStack(ModBlocks.openCrate), "WWW", "W W", "W W", 'W', new ItemStack(ModBlocks.livingwood, 1, 1)); recipeOpenCrate = BotaniaAPI.getLatestAddedRecipe(); diff --git a/MODSRC/vazkii/botania/common/item/ItemManaGun.java b/MODSRC/vazkii/botania/common/item/ItemManaGun.java index 40e99c8b1..33a3c51c3 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaGun.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaGun.java @@ -41,7 +41,7 @@ public class ItemManaGun extends ItemMod { private static final int COOLDOWN = 30; IIcon[] icons; - + public ItemManaGun() { super(); setMaxDamage(COOLDOWN); @@ -78,15 +78,15 @@ public class ItemManaGun extends ItemMod { return par1ItemStack; } - + @Override public void registerIcons(IIconRegister par1IconRegister) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) icons[i] = IconHelper.forItem(par1IconRegister, this, i); } - - @Override + + @Override public boolean requiresMultipleRenderPasses() { return true; } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index d3f1f15a8..16de4dbf1 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -308,7 +308,7 @@ public final class LexiconData { openCrate = new BLexiconEntry(LibLexicon.DEVICE_OPEN_CRATE, categoryDevices); openCrate.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeOpenCrate)); - + // TOOLS ENTRIES manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipeManaBlaster));