Removed now redundant getOredictName() Methods

This commit is contained in:
Ellpeck 2015-07-02 10:54:20 +02:00
parent 353b8e1528
commit 6b5516d719
51 changed files with 0 additions and 204 deletions

View file

@ -39,10 +39,6 @@ public class BlockBreaker extends BlockContainerBase implements INameableItem{
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){
int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player);

View file

@ -32,10 +32,6 @@ public class BlockCanolaPress extends BlockContainerBase implements INameableIte
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityCanolaPress(); return new TileEntityCanolaPress();

View file

@ -47,10 +47,6 @@ public class BlockCoalGenerator extends BlockContainerBase implements INameableI
} }
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityCoalGenerator(); return new TileEntityCoalGenerator();

View file

@ -98,10 +98,6 @@ public class BlockCoffeeMachine extends BlockContainerBase implements INameableI
return "blockCoffeeMachine"; return "blockCoffeeMachine";
} }
private String getOredictName(){
return this.getName();
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -80,10 +80,6 @@ public class BlockColoredLamp extends Block implements INameableItem{
return this.isOn ? "blockColoredLampOn" : "blockColoredLamp"; return this.isOn ? "blockColoredLampOn" : "blockColoredLamp";
} }
private String getOredictName(){
return "";
}
@Override @Override
public IIcon getIcon(int side, int meta){ public IIcon getIcon(int side, int meta){
return meta >= allLampTypes.length ? null : textures[meta]; return meta >= allLampTypes.length ? null : textures[meta];

View file

@ -123,10 +123,6 @@ public class BlockCompost extends BlockContainerBase implements INameableItem{
return "blockCompost"; return "blockCompost";
} }
private String getOredictName(){
return this.getName();
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -36,10 +36,6 @@ public class BlockDropper extends BlockContainerBase implements INameableItem{
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){
int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player);

View file

@ -36,10 +36,6 @@ public class BlockEnergizer extends BlockContainerBase implements INameableItem{
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return this.isEnergizer ? new TileEntityEnergizer() : new TileEntityEnervator(); return this.isEnergizer ? new TileEntityEnergizer() : new TileEntityEnervator();

View file

@ -32,10 +32,6 @@ public class BlockFeeder extends BlockContainerBase implements INameableItem{
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFeeder(); return new TileEntityFeeder();

View file

@ -32,10 +32,6 @@ public class BlockFermentingBarrel extends BlockContainerBase implements INameab
this.setStepSound(soundTypeWood); this.setStepSound(soundTypeWood);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFermentingBarrel(); return new TileEntityFermentingBarrel();

View file

@ -30,10 +30,6 @@ public class BlockFishingNet extends BlockContainerBase implements INameableItem
this.setBlockBounds(0F, 0F, 0F, 1F, 1F/16F, 1F); this.setBlockBounds(0F, 0F, 0F, 1F, 1F/16F, 1F);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFishingNet(); return new TileEntityFishingNet();

View file

@ -39,10 +39,6 @@ public class BlockFluidCollector extends BlockContainerBase implements INameable
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){
int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player);

View file

@ -62,10 +62,6 @@ public class BlockFluidFlowing extends BlockFluidClassic implements INameableIte
return this.name; return this.name;
} }
private String getOredictName(){
return this.getName();
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -40,10 +40,6 @@ public class BlockFurnaceDouble extends BlockContainerBase implements INameableI
this.setTickRandomly(true); this.setTickRandomly(true);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ 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; int rotation = MathHelper.floor_double((double)(player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;

View file

@ -30,10 +30,6 @@ public class BlockFurnaceSolar extends BlockContainerBase implements INameableIt
this.setBlockBounds(0F, 0F, 0F, 1F, 3F/16F, 1F); this.setBlockBounds(0F, 0F, 0F, 1F, 3F/16F, 1F);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityFurnaceSolar(); return new TileEntityFurnaceSolar();

View file

@ -44,10 +44,6 @@ public class BlockGeneric extends Block implements INameableItem{
this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName()); this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName());
} }
private String getOredictName(){
return this.getName();
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -33,10 +33,6 @@ public class BlockGiantChest extends BlockContainerBase implements INameableItem
this.setStepSound(soundTypeWood); this.setStepSound(soundTypeWood);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityGiantChest(); return new TileEntityGiantChest();

View file

@ -30,10 +30,6 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements INameabl
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public boolean isOpaqueCube(){ public boolean isOpaqueCube(){
return false; return false;

View file

@ -93,10 +93,6 @@ public class BlockGrinder extends BlockContainerBase implements INameableItem{
return true; return true;
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public void breakBlock(World world, int x, int y, int z, Block block, int par6){ public void breakBlock(World world, int x, int y, int z, Block block, int par6){
this.dropInventory(world, x, y, z); this.dropInventory(world, x, y, z);

View file

@ -31,10 +31,6 @@ public class BlockHeatCollector extends BlockContainerBase implements INameableI
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityHeatCollector(); return new TileEntityHeatCollector();

View file

@ -36,10 +36,6 @@ public class BlockInputter extends BlockContainerBase implements INameableItem{
this.isAdvanced = isAdvanced; this.isAdvanced = isAdvanced;
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return this.isAdvanced ? new TileEntityInputter.TileEntityInputterAdvanced() : new TileEntityInputter(); return this.isAdvanced ? new TileEntityInputter.TileEntityInputterAdvanced() : new TileEntityInputter();

View file

@ -35,10 +35,6 @@ public class BlockItemRepairer extends BlockContainerBase implements INameableIt
this.setTickRandomly(true); this.setTickRandomly(true);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityItemRepairer(); return new TileEntityItemRepairer();

View file

@ -33,10 +33,6 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IN
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityLavaFactoryController(); return new TileEntityLavaFactoryController();

View file

@ -61,10 +61,6 @@ public class BlockMisc extends Block implements INameableItem{
return "blockMisc"; return "blockMisc";
} }
private String getOredictName(){
return "";
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -47,10 +47,6 @@ public class BlockOilGenerator extends BlockContainerBase implements INameableIt
} }
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public TileEntity createNewTileEntity(World world, int par2){ public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityOilGenerator(); return new TileEntityOilGenerator();

View file

@ -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); this.setBlockBounds(3*f, 0F, 3*f, 1-3*f, 1F, 1-3*f);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public boolean isOpaqueCube(){ public boolean isOpaqueCube(){
return false; return false;

View file

@ -51,10 +51,6 @@ public class BlockPhantomface extends BlockContainerBase implements INameableIte
super.breakBlock(world, x, y, z, block, par6); super.breakBlock(world, x, y, z, block, par6);
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int hitSide, float hitX, float hitY, float hitZ){ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int hitSide, float hitX, float hitY, float hitZ){
if(!world.isRemote){ if(!world.isRemote){

View file

@ -96,10 +96,6 @@ public class BlockPlant extends BlockCrops implements INameableItem{
return this.name; return this.name;
} }
private String getOredictName(){
return this.getName();
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -76,10 +76,6 @@ public class BlockSlabs extends Block implements INameableItem{
return this.name; return this.name;
} }
private String getOredictName(){
return this.getName();
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -28,10 +28,6 @@ public class BlockStair extends BlockStairs implements INameableItem{
return this.name; return this.name;
} }
private String getOredictName(){
return this.getName();
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -70,10 +70,6 @@ public class BlockWildPlant extends BlockBush implements INameableItem{
return meta >= allWildPlants.length ? null : ((BlockPlant)allWildPlants[meta].wildVersionOf).seedItem; return meta >= allWildPlants.length ? null : ((BlockPlant)allWildPlants[meta].wildVersionOf).seedItem;
} }
private String getOredictName(){
return "";
}
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{
private Block theBlock; private Block theBlock;

View file

@ -85,10 +85,6 @@ public class ItemBattery extends ItemEnergyContainer implements INameableItem{
return "itemBattery"; return "itemBattery";
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -52,8 +52,4 @@ public class ItemBucketAA extends ItemBucket implements INameableItem{
public String getName(){ public String getName(){
return this.name; return this.name;
} }
private String getOredictName(){
return this.getName();
}
} }

View file

@ -174,10 +174,6 @@ public class ItemCoffee extends ItemFood implements INameableItem{
return EnumAction.drink; return EnumAction.drink;
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public EnumRarity getRarity(ItemStack stack){ public EnumRarity getRarity(ItemStack stack){
return EnumRarity.rare; return EnumRarity.rare;

View file

@ -21,10 +21,6 @@ public class ItemCoffeeBean extends ItemFood implements INameableItem{
this.setMaxDamage(0); this.setMaxDamage(0);
} }
private String getOredictName(){
return "cropCoffeeBeans";
}
@Override @Override
public EnumRarity getRarity(ItemStack stack){ public EnumRarity getRarity(ItemStack stack){
return EnumRarity.rare; return EnumRarity.rare;

View file

@ -56,8 +56,4 @@ public class ItemCrafterOnAStick extends Item implements INameableItem{
public String getName(){ public String getName(){
return "itemCrafterOnAStick"; return "itemCrafterOnAStick";
} }
private String getOredictName(){
return this.getName();
}
} }

View file

@ -318,10 +318,6 @@ public class ItemDrill extends ItemEnergyContainer implements INameableItem{
return "itemDrill"; return "itemDrill";
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase living){ public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase living){
if(living instanceof EntityPlayer){ if(living instanceof EntityPlayer){

View file

@ -81,10 +81,6 @@ public class ItemDrillUpgrade extends Item implements INameableItem{
return this.unlocalizedName; return this.unlocalizedName;
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -29,10 +29,6 @@ public class ItemDust extends Item implements INameableItem{
return "itemDust"; return "itemDust";
} }
private String getOredictName(){
return "";
}
@Override @Override
public int getMetadata(int damage){ public int getMetadata(int damage){
return damage; return damage;

View file

@ -54,8 +54,4 @@ public class ItemFertilizer extends Item implements INameableItem{
public String getName(){ public String getName(){
return "itemFertilizer"; return "itemFertilizer";
} }
private String getOredictName(){
return this.getName();
}
} }

View file

@ -30,10 +30,6 @@ public class ItemFoods extends ItemFood implements INameableItem{
TheFoods.setReturnItems(); TheFoods.setReturnItems();
} }
private String getOredictName(){
return "";
}
@Override @Override
public EnumRarity getRarity(ItemStack stack){ public EnumRarity getRarity(ItemStack stack){
return stack.getItemDamage() >= allFoods.length ? EnumRarity.common : allFoods[stack.getItemDamage()].rarity; return stack.getItemDamage() >= allFoods.length ? EnumRarity.common : allFoods[stack.getItemDamage()].rarity;

View file

@ -67,8 +67,4 @@ public class ItemHairyBall extends Item implements INameableItem{
public String getName(){ public String getName(){
return "itemHairyBall"; return "itemHairyBall";
} }
private String getOredictName(){
return this.getName();
}
} }

View file

@ -34,10 +34,6 @@ public class ItemJams extends ItemFood implements INameableItem{
this.setMaxDamage(0); this.setMaxDamage(0);
} }
private String getOredictName(){
return "";
}
@Override @Override
public EnumRarity getRarity(ItemStack stack){ public EnumRarity getRarity(ItemStack stack){
return stack.getItemDamage() >= allJams.length ? EnumRarity.common : allJams[stack.getItemDamage()].rarity; return stack.getItemDamage() >= allJams.length ? EnumRarity.common : allJams[stack.getItemDamage()].rarity;

View file

@ -38,10 +38,6 @@ public class ItemKnife extends Item implements INameableItem{
return false; return false;
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public EnumRarity getRarity(ItemStack stack){ public EnumRarity getRarity(ItemStack stack){
return EnumRarity.epic; return EnumRarity.epic;

View file

@ -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){ public void breakStuff(World world, int x, int y, int z){
for(int reachX = -range; reachX < range+1; reachX++){ for(int reachX = -range; reachX < range+1; reachX++){
for(int reachZ = -range; reachZ < range+1; reachZ++){ for(int reachZ = -range; reachZ < range+1; reachZ++){

View file

@ -30,10 +30,6 @@ public class ItemMisc extends Item implements INameableItem{
return "itemMisc"; return "itemMisc";
} }
private String getOredictName(){
return "";
}
@Override @Override
public EnumRarity getRarity(ItemStack stack){ public EnumRarity getRarity(ItemStack stack){
return stack.getItemDamage() >= allMiscItems.length ? EnumRarity.common : allMiscItems[stack.getItemDamage()].rarity; return stack.getItemDamage() >= allMiscItems.length ? EnumRarity.common : allMiscItems[stack.getItemDamage()].rarity;

View file

@ -172,10 +172,6 @@ public class ItemPhantomConnector extends Item implements INameableItem{
return "itemPhantomConnector"; return "itemPhantomConnector";
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
public boolean getShareTag(){ public boolean getShareTag(){
return true; return true;

View file

@ -32,10 +32,6 @@ public class ItemPotionRing extends Item implements INameableItem{
this.isAdvanced = isAdvanced; this.isAdvanced = isAdvanced;
} }
private String getOredictName(){
return this.getName();
}
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5){ public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5){

View file

@ -54,8 +54,4 @@ public class ItemResonantRice extends Item implements INameableItem{
public String getName(){ public String getName(){
return "itemResonantRice"; return "itemResonantRice";
} }
private String getOredictName(){
return this.getName();
}
} }

View file

@ -71,8 +71,4 @@ public class ItemSeed extends ItemSeeds implements INameableItem{
public String getName(){ public String getName(){
return this.name; return this.name;
} }
private String getOredictName(){
return this.oredictName;
}
} }

View file

@ -56,10 +56,6 @@ public class ItemSpecialDrop extends Item implements INameableItem{
return stack.getItemDamage() >= allDrops.length ? EnumRarity.common : allDrops[stack.getItemDamage()].rarity; return stack.getItemDamage() >= allDrops.length ? EnumRarity.common : allDrops[stack.getItemDamage()].rarity;
} }
private String getOredictName(){
return "";
}
@Override @Override
public int getMetadata(int damage){ public int getMetadata(int damage){
return damage; return damage;