Always use qualified access for fields and methods

This commit is contained in:
yueh
2017-07-20 21:27:22 +02:00
parent f9cad0758d
commit 15582fd1df
211 changed files with 1086 additions and 1086 deletions
+3 -3
View File
@@ -42,8 +42,8 @@ public abstract class AEBaseItem extends Item
@Override
public String toString()
{
String regName = getRegistryName() != null ? getRegistryName().getResourcePath() : "unregistered";
return getClass().getSimpleName() + "[" + regName + "]";
String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered";
return this.getClass().getSimpleName() + "[" + regName + "]";
}
@SideOnly( Side.CLIENT )
@@ -58,7 +58,7 @@ public abstract class AEBaseItem extends Item
@SuppressWarnings( "unchecked" )
public final void getSubItems( final CreativeTabs creativeTab, final NonNullList<ItemStack> itemStacks )
{
if( isInCreativeTab( creativeTab ) )
if( this.isInCreativeTab( creativeTab ) )
{
this.getCheckedSubItems( creativeTab, itemStacks );
}
@@ -233,7 +233,7 @@ public enum MaterialType
public ModelResourceLocation getModel()
{
return model;
return this.model;
}
}
@@ -55,7 +55,7 @@ public class ItemCrystalSeedRendering extends ItemRenderingCustomizer
public void customize( IItemRendering rendering )
{
rendering.variants( ImmutableList.<ResourceLocation>builder().add( MODELS_CERTUS ).add( MODELS_FLUIX ).add( MODELS_NETHER ).build() );
rendering.meshDefinition( getItemMeshDefinition() );
rendering.meshDefinition( this.getItemMeshDefinition() );
}
private ItemMeshDefinition getItemMeshDefinition()
@@ -267,7 +267,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
public IBlockState getTextureBlockState( ItemStack is )
{
ItemStack baseItemStack = getTextureItem( is );
ItemStack baseItemStack = this.getTextureItem( is );
if( baseItemStack.isEmpty() )
{
@@ -166,7 +166,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup
public String getUnlocalizedName( final ItemStack is )
{
Preconditions.checkNotNull( is );
return "item.appliedenergistics2.multi_part." + getTypeByStack( is ).getUnlocalizedName().toLowerCase();
return "item.appliedenergistics2.multi_part." + this.getTypeByStack( is ).getUnlocalizedName().toLowerCase();
}
@Override
@@ -111,13 +111,13 @@ public class ItemPartRendering extends ItemRenderingCustomizer
List<ResourceLocation> partResourceLocs = modelNames.stream()
.map( name -> new ResourceLocation( AppEng.MOD_ID, name ) )
.collect( Collectors.toList() );
partModels.registerModels( partResourceLocs );
this.partModels.registerModels( partResourceLocs );
}
private ModelResourceLocation getItemMeshDefinition( ItemStack is )
{
PartType partType = item.getTypeByStack( is );
int variant = item.variantOf( is.getItemDamage() );
PartType partType = this.item.getTypeByStack( is );
int variant = this.item.variantOf( is.getItemDamage() );
return partType.getItemModels().get( variant );
}
}
@@ -314,13 +314,13 @@ public enum PartType
this.enabled = features.stream().allMatch( AEConfig.instance()::isFeatureEnabled ) && integrations.stream()
.allMatch( IntegrationRegistry.INSTANCE::isEnabled );
if( enabled )
if( this.enabled )
{
// Only load models if the part is enabled, otherwise we also run into class-loading issues while
// scanning for annotations
if( Platform.isClientInstall() )
{
this.itemModels = createItemModels( itemModel );
this.itemModels = this.createItemModels( itemModel );
}
if( c != null )
{
@@ -355,7 +355,7 @@ public enum PartType
public boolean isEnabled()
{
return enabled;
return this.enabled;
}
int getBaseDamage()
@@ -385,7 +385,7 @@ public enum PartType
String getUnlocalizedName()
{
return name().toLowerCase();
return this.name().toLowerCase();
}
GuiText getExtraName()
@@ -406,12 +406,12 @@ public enum PartType
@SideOnly( Side.CLIENT )
public List<ModelResourceLocation> getItemModels()
{
return itemModels;
return this.itemModels;
}
public Set<ResourceLocation> getModels()
{
return models;
return this.models;
}
}
@@ -77,7 +77,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
}
else if( capability == Capabilities.TESLA_CONSUMER || capability == Capabilities.TESLA_HOLDER )
{
return (T) teslaAdapter;
return (T) this.teslaAdapter;
}
return null;
}
@@ -87,7 +87,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
{
if( simulate )
{
final int required = (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAEMaxPower( is ) - item.getAECurrentPower( is ) );
final int required = (int) PowerUnits.AE.convertTo( PowerUnits.RF, this.item.getAEMaxPower( this.is ) - this.item.getAECurrentPower( this.is ) );
if( maxReceive < required )
{
@@ -97,7 +97,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
}
else
{
final double powerRemainder = item.injectAEPower( is, PowerUnits.RF.convertTo( PowerUnits.AE, maxReceive ) );
final double powerRemainder = this.item.injectAEPower( this.is, PowerUnits.RF.convertTo( PowerUnits.AE, maxReceive ) );
return maxReceive - (int) PowerUnits.AE.convertTo( PowerUnits.RF, powerRemainder );
}
}
@@ -111,13 +111,13 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
@Override
public int getEnergyStored()
{
return (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAECurrentPower( is ) );
return (int) PowerUnits.AE.convertTo( PowerUnits.RF, this.item.getAECurrentPower( this.is ) );
}
@Override
public int getMaxEnergyStored()
{
return (int) PowerUnits.AE.convertTo( PowerUnits.RF, item.getAEMaxPower( is ) );
return (int) PowerUnits.AE.convertTo( PowerUnits.RF, this.item.getAEMaxPower( this.is ) );
}
@Override
@@ -138,19 +138,19 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage
@Override
public long givePower( long power, boolean simulated )
{
return receiveEnergy( (int) power, simulated );
return PoweredItemCapabilities.this.receiveEnergy( (int) power, simulated );
}
@Override
public long getStoredPower()
{
return getEnergyStored();
return PoweredItemCapabilities.this.getEnergyStored();
}
@Override
public long getCapacity()
{
return getMaxEnergyStored();
return PoweredItemCapabilities.this.getMaxEnergyStored();
}
}
}