Reduces visibility of internal fields/methods

Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
This commit is contained in:
yueh
2015-10-08 15:42:42 +02:00
parent f054bd699b
commit e94a0cfccf
497 changed files with 7865 additions and 6908 deletions
@@ -50,17 +50,17 @@ public class AchievementCraftingHandler
for( final Achievements achievement : Achievements.values() )
{
switch( achievement.type )
switch( achievement.getType() )
{
case Craft:
if( Platform.isSameItemPrecise( achievement.stack, event.crafting ) )
if( Platform.isSameItemPrecise( achievement.getStack(), event.crafting ) )
{
achievement.addToPlayer( event.player );
return;
}
break;
case CraftItem:
if( achievement.stack != null && achievement.stack.getItem().getClass() == event.crafting.getItem().getClass() )
if( achievement.getStack() != null && achievement.getStack().getItem().getClass() == event.crafting.getItem().getClass() )
{
achievement.addToPlayer( event.player );
return;
@@ -30,7 +30,7 @@ public class AchievementHierarchy
/**
* Setup hierarchy through assigning parents.
*/
public void registerAchievementHierarchy()
void registerAchievementHierarchy()
{
Achievements.Presses.setParent( Achievements.Compass );
@@ -53,7 +53,7 @@ public class AchievementPickupHandler
for( final Achievements achievement : Achievements.values() )
{
if( achievement.type == AchievementType.Pickup && Platform.isSameItemPrecise( achievement.stack, is ) )
if( achievement.getType() == AchievementType.Pickup && Platform.isSameItemPrecise( achievement.getStack(), is ) )
{
achievement.addToPlayer( event.player );
return;
@@ -105,8 +105,8 @@ public enum Achievements
// done
QNB( 10, 2, AEApi.instance().definitions().blocks().quantumLink(), AchievementType.Craft );
public final ItemStack stack;
public final AchievementType type;
private final ItemStack stack;
private final AchievementType type;
private final int x;
private final int y;
@@ -137,16 +137,16 @@ public enum Achievements
this.y = y;
}
public void setParent( final Achievements parent )
void setParent( final Achievements parent )
{
this.parent = parent.getAchievement();
}
public Achievement getAchievement()
{
if( this.stat == null && this.stack != null )
if( this.stat == null && this.getStack() != null )
{
this.stat = new Achievement( "achievement.ae2." + this.name(), "ae2." + this.name(), this.x, this.y, this.stack, this.parent );
this.stat = new Achievement( "achievement.ae2." + this.name(), "ae2." + this.name(), this.x, this.y, this.getStack(), this.parent );
this.stat.registerStat();
}
@@ -158,4 +158,14 @@ public enum Achievements
player.addStat( this.getAchievement(), 1 );
}
AchievementType getType()
{
return this.type;
}
ItemStack getStack()
{
return this.stack;
}
}
@@ -42,7 +42,7 @@ public class PlayerDifferentiator
*
* @return true if {@param player} is not a real player
*/
public boolean isNoPlayer( final EntityPlayer player )
boolean isNoPlayer( final EntityPlayer player )
{
return player == null || player.isDead || player instanceof FakePlayer;
}
+1 -1
View File
@@ -47,7 +47,7 @@ public enum Stats
player.addStat( this.getStat(), howMany );
}
public StatBasic getStat()
StatBasic getStat()
{
if( this.stat == null )
{