mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 15:18:34 +01:00
Removed now redundant getOredictName() Methods
This commit is contained in:
parent
353b8e1528
commit
6b5516d719
51 changed files with 0 additions and 204 deletions
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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];
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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){
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -52,8 +52,4 @@ public class ItemBucketAA extends ItemBucket implements INameableItem{
|
|||
public String getName(){
|
||||
return this.name;
|
||||
}
|
||||
|
||||
private String getOredictName(){
|
||||
return this.getName();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -56,8 +56,4 @@ public class ItemCrafterOnAStick extends Item implements INameableItem{
|
|||
public String getName(){
|
||||
return "itemCrafterOnAStick";
|
||||
}
|
||||
|
||||
private String getOredictName(){
|
||||
return this.getName();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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){
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -54,8 +54,4 @@ public class ItemFertilizer extends Item implements INameableItem{
|
|||
public String getName(){
|
||||
return "itemFertilizer";
|
||||
}
|
||||
|
||||
private String getOredictName(){
|
||||
return this.getName();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -67,8 +67,4 @@ public class ItemHairyBall extends Item implements INameableItem{
|
|||
public String getName(){
|
||||
return "itemHairyBall";
|
||||
}
|
||||
|
||||
private String getOredictName(){
|
||||
return this.getName();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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++){
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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){
|
||||
|
|
|
@ -54,8 +54,4 @@ public class ItemResonantRice extends Item implements INameableItem{
|
|||
public String getName(){
|
||||
return "itemResonantRice";
|
||||
}
|
||||
|
||||
private String getOredictName(){
|
||||
return this.getName();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -71,8 +71,4 @@ public class ItemSeed extends ItemSeeds implements INameableItem{
|
|||
public String getName(){
|
||||
return this.name;
|
||||
}
|
||||
|
||||
private String getOredictName(){
|
||||
return this.oredictName;
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue