From 6b5516d719832aca339086527a4e099a6aabb4c6 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 2 Jul 2015 10:54:20 +0200 Subject: [PATCH] Removed now redundant getOredictName() Methods --- .../java/ellpeck/actuallyadditions/blocks/BlockBreaker.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockCanolaPress.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockColoredLamp.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockCompost.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockDropper.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockFeeder.java | 4 ---- .../actuallyadditions/blocks/BlockFermentingBarrel.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockFishingNet.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockFluidCollector.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockGeneric.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockGiantChest.java | 4 ---- .../actuallyadditions/blocks/BlockGreenhouseGlass.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockGrinder.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockHeatCollector.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockInputter.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockItemRepairer.java | 4 ---- .../actuallyadditions/blocks/BlockLavaFactoryController.java | 4 ---- src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockOilGenerator.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java | 4 ---- .../ellpeck/actuallyadditions/blocks/BlockPhantomface.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockPlant.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockSlabs.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockStair.java | 4 ---- .../java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java | 4 ---- .../java/ellpeck/actuallyadditions/items/ItemBattery.java | 4 ---- .../java/ellpeck/actuallyadditions/items/ItemBucketAA.java | 4 ---- src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java | 4 ---- .../java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java | 4 ---- .../ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java | 4 ---- src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java | 4 ---- .../ellpeck/actuallyadditions/items/ItemDrillUpgrade.java | 4 ---- src/main/java/ellpeck/actuallyadditions/items/ItemDust.java | 4 ---- .../java/ellpeck/actuallyadditions/items/ItemFertilizer.java | 4 ---- src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java | 4 ---- .../java/ellpeck/actuallyadditions/items/ItemHairyBall.java | 4 ---- src/main/java/ellpeck/actuallyadditions/items/ItemJams.java | 4 ---- src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java | 4 ---- .../java/ellpeck/actuallyadditions/items/ItemLeafBlower.java | 4 ---- src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java | 4 ---- .../ellpeck/actuallyadditions/items/ItemPhantomConnector.java | 4 ---- .../java/ellpeck/actuallyadditions/items/ItemPotionRing.java | 4 ---- .../ellpeck/actuallyadditions/items/ItemResonantRice.java | 4 ---- src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java | 4 ---- .../java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java | 4 ---- 51 files changed, 204 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java index 3cb851bd1..7e897bfc3 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java @@ -39,10 +39,6 @@ public class BlockBreaker extends BlockContainerBase implements INameableItem{ this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java index 014415b61..ead177202 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java @@ -32,10 +32,6 @@ public class BlockCanolaPress extends BlockContainerBase implements INameableIte this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityCanolaPress(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java index df06f84e9..eddbfae96 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java @@ -47,10 +47,6 @@ public class BlockCoalGenerator extends BlockContainerBase implements INameableI } } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityCoalGenerator(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java index 7c02d63c1..b18b126dc 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java @@ -98,10 +98,6 @@ public class BlockCoffeeMachine extends BlockContainerBase implements INameableI return "blockCoffeeMachine"; } - private String getOredictName(){ - return this.getName(); - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java index 904e972c3..0bae3152d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java @@ -80,10 +80,6 @@ public class BlockColoredLamp extends Block implements INameableItem{ return this.isOn ? "blockColoredLampOn" : "blockColoredLamp"; } - private String getOredictName(){ - return ""; - } - @Override public IIcon getIcon(int side, int meta){ return meta >= allLampTypes.length ? null : textures[meta]; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java index 99143c119..9d41e097e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -123,10 +123,6 @@ public class BlockCompost extends BlockContainerBase implements INameableItem{ return "blockCompost"; } - private String getOredictName(){ - return this.getName(); - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java index fe2bf7f29..186603e90 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java @@ -36,10 +36,6 @@ public class BlockDropper extends BlockContainerBase implements INameableItem{ this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java index e82a2f670..06cbe841a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java @@ -36,10 +36,6 @@ public class BlockEnergizer extends BlockContainerBase implements INameableItem{ this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return this.isEnergizer ? new TileEntityEnergizer() : new TileEntityEnervator(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java index 1c796c1eb..c367d9012 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java @@ -32,10 +32,6 @@ public class BlockFeeder extends BlockContainerBase implements INameableItem{ this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityFeeder(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java index bc03f4bdc..6a5567a95 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java @@ -32,10 +32,6 @@ public class BlockFermentingBarrel extends BlockContainerBase implements INameab this.setStepSound(soundTypeWood); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityFermentingBarrel(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java index 954709a44..2de61b2b2 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java @@ -30,10 +30,6 @@ public class BlockFishingNet extends BlockContainerBase implements INameableItem this.setBlockBounds(0F, 0F, 0F, 1F, 1F/16F, 1F); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityFishingNet(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java index 72eae71e3..1bc252842 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java @@ -39,10 +39,6 @@ public class BlockFluidCollector extends BlockContainerBase implements INameable this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java index 66a90c05b..abd6dbabd 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java @@ -62,10 +62,6 @@ public class BlockFluidFlowing extends BlockFluidClassic implements INameableIte return this.name; } - private String getOredictName(){ - return this.getName(); - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java index 53dba75a3..a0d624d73 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java @@ -40,10 +40,6 @@ public class BlockFurnaceDouble extends BlockContainerBase implements INameableI this.setTickRandomly(true); } - private String getOredictName(){ - return this.getName(); - } - @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = MathHelper.floor_double((double)(player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java index daa7eaf7c..e718520f6 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java @@ -30,10 +30,6 @@ public class BlockFurnaceSolar extends BlockContainerBase implements INameableIt this.setBlockBounds(0F, 0F, 0F, 1F, 3F/16F, 1F); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityFurnaceSolar(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java index a1390077a..743bf8289 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java @@ -44,10 +44,6 @@ public class BlockGeneric extends Block implements INameableItem{ this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName()); } - private String getOredictName(){ - return this.getName(); - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java index 9459aab9f..3129e4749 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java @@ -33,10 +33,6 @@ public class BlockGiantChest extends BlockContainerBase implements INameableItem this.setStepSound(soundTypeWood); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityGiantChest(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java index bd2675e0c..31b421f4f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java @@ -30,10 +30,6 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements INameabl this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public boolean isOpaqueCube(){ return false; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java index 954b81f44..d6864e2ab 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java @@ -93,10 +93,6 @@ public class BlockGrinder extends BlockContainerBase implements INameableItem{ return true; } - private String getOredictName(){ - return this.getName(); - } - @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java index 9a1fbc8d7..acc2f0c30 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java @@ -31,10 +31,6 @@ public class BlockHeatCollector extends BlockContainerBase implements INameableI this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityHeatCollector(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java index 6997ddbe4..ba5175bbb 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java @@ -36,10 +36,6 @@ public class BlockInputter extends BlockContainerBase implements INameableItem{ this.isAdvanced = isAdvanced; } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return this.isAdvanced ? new TileEntityInputter.TileEntityInputterAdvanced() : new TileEntityInputter(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java index 02f901458..82cf27396 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java @@ -35,10 +35,6 @@ public class BlockItemRepairer extends BlockContainerBase implements INameableIt this.setTickRandomly(true); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityItemRepairer(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java index 127a56ce8..6ba9caa53 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java @@ -33,10 +33,6 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IN this.setStepSound(soundTypeStone); } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityLavaFactoryController(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index 4dcd1aa9c..83b5cfe05 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -61,10 +61,6 @@ public class BlockMisc extends Block implements INameableItem{ return "blockMisc"; } - private String getOredictName(){ - return ""; - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java index 8acccd9d5..6c20be3b7 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java @@ -47,10 +47,6 @@ public class BlockOilGenerator extends BlockContainerBase implements INameableIt } } - private String getOredictName(){ - return this.getName(); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityOilGenerator(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java index 955ef798c..c6a4f29b0 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java @@ -32,10 +32,6 @@ public class BlockPhantomBooster extends BlockContainerBase implements INameable this.setBlockBounds(3*f, 0F, 3*f, 1-3*f, 1F, 1-3*f); } - private String getOredictName(){ - return this.getName(); - } - @Override public boolean isOpaqueCube(){ return false; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomface.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomface.java index 717a8bd96..12dc69441 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomface.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomface.java @@ -51,10 +51,6 @@ public class BlockPhantomface extends BlockContainerBase implements INameableIte super.breakBlock(world, x, y, z, block, par6); } - private String getOredictName(){ - return this.getName(); - } - @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int hitSide, float hitX, float hitY, float hitZ){ if(!world.isRemote){ diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java index ee5b5873e..e719beeeb 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java @@ -96,10 +96,6 @@ public class BlockPlant extends BlockCrops implements INameableItem{ return this.name; } - private String getOredictName(){ - return this.getName(); - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java index c5f3a9556..35ed00357 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java @@ -76,10 +76,6 @@ public class BlockSlabs extends Block implements INameableItem{ return this.name; } - private String getOredictName(){ - return this.getName(); - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java index 3f9412870..928b0991d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java @@ -28,10 +28,6 @@ public class BlockStair extends BlockStairs implements INameableItem{ return this.name; } - private String getOredictName(){ - return this.getName(); - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java index eea2da8bd..e81939fab 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java @@ -70,10 +70,6 @@ public class BlockWildPlant extends BlockBush implements INameableItem{ return meta >= allWildPlants.length ? null : ((BlockPlant)allWildPlants[meta].wildVersionOf).seedItem; } - private String getOredictName(){ - return ""; - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java index b46d15710..8f92dedb0 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java @@ -85,10 +85,6 @@ public class ItemBattery extends ItemEnergyContainer implements INameableItem{ return "itemBattery"; } - private String getOredictName(){ - return this.getName(); - } - @Override @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java index e2ec2dfd5..d6634b9c4 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java @@ -52,8 +52,4 @@ public class ItemBucketAA extends ItemBucket implements INameableItem{ public String getName(){ return this.name; } - - private String getOredictName(){ - return this.getName(); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java index 962d10df0..9905e6bf8 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java @@ -174,10 +174,6 @@ public class ItemCoffee extends ItemFood implements INameableItem{ return EnumAction.drink; } - private String getOredictName(){ - return this.getName(); - } - @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.rare; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java index bccbd6f42..51b67f997 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java @@ -21,10 +21,6 @@ public class ItemCoffeeBean extends ItemFood implements INameableItem{ this.setMaxDamage(0); } - private String getOredictName(){ - return "cropCoffeeBeans"; - } - @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.rare; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java index b51a959c5..dacf6df6e 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java @@ -56,8 +56,4 @@ public class ItemCrafterOnAStick extends Item implements INameableItem{ public String getName(){ return "itemCrafterOnAStick"; } - - private String getOredictName(){ - return this.getName(); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java index 238e40385..f2346a2f0 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java @@ -318,10 +318,6 @@ public class ItemDrill extends ItemEnergyContainer implements INameableItem{ return "itemDrill"; } - private String getOredictName(){ - return this.getName(); - } - @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase living){ if(living instanceof EntityPlayer){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java index 838e96364..e1d65b05e 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java @@ -81,10 +81,6 @@ public class ItemDrillUpgrade extends Item implements INameableItem{ return this.unlocalizedName; } - private String getOredictName(){ - return this.getName(); - } - @Override @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java index ea87a9ab7..f9ab5e20e 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java @@ -29,10 +29,6 @@ public class ItemDust extends Item implements INameableItem{ return "itemDust"; } - private String getOredictName(){ - return ""; - } - @Override public int getMetadata(int damage){ return damage; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java index b55ea9bf9..1134ec574 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java @@ -54,8 +54,4 @@ public class ItemFertilizer extends Item implements INameableItem{ public String getName(){ return "itemFertilizer"; } - - private String getOredictName(){ - return this.getName(); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java index 2adb80f43..88ae0df37 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java @@ -30,10 +30,6 @@ public class ItemFoods extends ItemFood implements INameableItem{ TheFoods.setReturnItems(); } - private String getOredictName(){ - return ""; - } - @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allFoods.length ? EnumRarity.common : allFoods[stack.getItemDamage()].rarity; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java b/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java index 47ad543ff..d62fdef5a 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java @@ -67,8 +67,4 @@ public class ItemHairyBall extends Item implements INameableItem{ public String getName(){ return "itemHairyBall"; } - - private String getOredictName(){ - return this.getName(); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java index 757c12a06..e55ac5fb5 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java @@ -34,10 +34,6 @@ public class ItemJams extends ItemFood implements INameableItem{ this.setMaxDamage(0); } - private String getOredictName(){ - return ""; - } - @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allJams.length ? EnumRarity.common : allJams[stack.getItemDamage()].rarity; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java b/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java index 63ade8365..637071e9f 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java @@ -38,10 +38,6 @@ public class ItemKnife extends Item implements INameableItem{ return false; } - private String getOredictName(){ - return this.getName(); - } - @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.epic; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java b/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java index 1e56ef630..9f5ce8465 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java @@ -48,10 +48,6 @@ public class ItemLeafBlower extends Item implements INameableItem{ } } - private String getOredictName(){ - return this.getName(); - } - public void breakStuff(World world, int x, int y, int z){ for(int reachX = -range; reachX < range+1; reachX++){ for(int reachZ = -range; reachZ < range+1; reachZ++){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java index 29ccbd1f1..516444746 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java @@ -30,10 +30,6 @@ public class ItemMisc extends Item implements INameableItem{ return "itemMisc"; } - private String getOredictName(){ - return ""; - } - @Override public EnumRarity getRarity(ItemStack stack){ return stack.getItemDamage() >= allMiscItems.length ? EnumRarity.common : allMiscItems[stack.getItemDamage()].rarity; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java index 2a8d0e2c2..5ce46bde7 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java @@ -172,10 +172,6 @@ public class ItemPhantomConnector extends Item implements INameableItem{ return "itemPhantomConnector"; } - private String getOredictName(){ - return this.getName(); - } - @Override public boolean getShareTag(){ return true; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java index ea2178c9a..a33957795 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java @@ -32,10 +32,6 @@ public class ItemPotionRing extends Item implements INameableItem{ this.isAdvanced = isAdvanced; } - private String getOredictName(){ - return this.getName(); - } - @Override @SuppressWarnings("unchecked") public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java b/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java index a7c2c0bef..876e8d9f1 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java @@ -54,8 +54,4 @@ public class ItemResonantRice extends Item implements INameableItem{ public String getName(){ return "itemResonantRice"; } - - private String getOredictName(){ - return this.getName(); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java index 6775c5a76..07b43c272 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java @@ -71,8 +71,4 @@ public class ItemSeed extends ItemSeeds implements INameableItem{ public String getName(){ return this.name; } - - private String getOredictName(){ - return this.oredictName; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java index 82be1c79b..685596c68 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java @@ -56,10 +56,6 @@ public class ItemSpecialDrop extends Item implements INameableItem{ return stack.getItemDamage() >= allDrops.length ? EnumRarity.common : allDrops[stack.getItemDamage()].rarity; } - private String getOredictName(){ - return ""; - } - @Override public int getMetadata(int damage){ return damage;