fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1420 from thatsIch/e-method-parameter-naming-conventions

Browse Source 
Replaces all method parameter regarding their naming conventions
This commit is contained in:
thatsIch
2015-05-08 23:45:28 +02:00
parent c451a25c7f f193c2adc4
commit 5832e2d828
76 changed files with 381 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/item/AEItemStack.java
+13 -13
View File
@@ -259,7 +259,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
}
@Override
public boolean fuzzyComparison( Object st, FuzzyMode Mode )
public boolean fuzzyComparison( Object st, FuzzyMode mode )
{
if( st instanceof IAEItemStack )
{
@@ -279,11 +279,11 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
try
{
if( Mode == FuzzyMode.IGNORE_ALL )
if( mode == FuzzyMode.IGNORE_ALL )
{
return true;
}
else if( Mode == FuzzyMode.PERCENT_99 )
else if( mode == FuzzyMode.PERCENT_99 )
{
return ( a.getItemDamageForDisplay() > 1 ) == ( b.getItemDamageForDisplay() > 1 );
}
@@ -292,16 +292,16 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float BPercentDamaged = 1.0f - (float) b.getItemDamageForDisplay() / (float) b.getMaxDamage();
return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
}
}
catch( Throwable e )
{
if( Mode == FuzzyMode.IGNORE_ALL )
if( mode == FuzzyMode.IGNORE_ALL )
{
return true;
}
else if( Mode == FuzzyMode.PERCENT_99 )
else if( mode == FuzzyMode.PERCENT_99 )
{
return ( a.getItemDamage() > 1 ) == ( b.getItemDamage() > 1 );
}
@@ -310,7 +310,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
float BPercentDamaged = (float) b.getItemDamage() / (float) b.getMaxDamage();
return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
}
}
}
@@ -333,11 +333,11 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
try
{
if( Mode == FuzzyMode.IGNORE_ALL )
if( mode == FuzzyMode.IGNORE_ALL )
{
return true;
}
else if( Mode == FuzzyMode.PERCENT_99 )
else if( mode == FuzzyMode.PERCENT_99 )
{
return ( a.getItemDamageForDisplay() > 1 ) == ( o.getItemDamageForDisplay() > 1 );
}
@@ -346,16 +346,16 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float BPercentDamaged = 1.0f - (float) o.getItemDamageForDisplay() / (float) o.getMaxDamage();
return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
}
}
catch( Throwable e )
{
if( Mode == FuzzyMode.IGNORE_ALL )
if( mode == FuzzyMode.IGNORE_ALL )
{
return true;
}
else if( Mode == FuzzyMode.PERCENT_99 )
else if( mode == FuzzyMode.PERCENT_99 )
{
return ( a.getItemDamage() > 1 ) == ( o.getItemDamage() > 1 );
}
@@ -364,7 +364,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
float BPercentDamaged = (float) o.getItemDamage() / (float) o.getMaxDamage();
return ( APercentDamaged > Mode.breakPoint ) == ( BPercentDamaged > Mode.breakPoint );
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
}
}
}
src/main/java/appeng/util/item/OreHelper.java
+8 -8
View File
@@ -26,14 +26,14 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import appeng.api.storage.data.IAEItemStack;
@@ -59,13 +59,13 @@ public class OreHelper
/**
* Test if the passed {@link ItemStack} is an ore.
*
* @param ItemStack the itemstack to test
* @param itemStack the itemstack to test
*
* @return true if an ore entry exists, false otherwise
*/
public OreReference isOre( ItemStack ItemStack )
public OreReference isOre( ItemStack itemStack )
{
ItemRef ir = new ItemRef( ItemStack );
ItemRef ir = new ItemRef( itemStack );
if( !this.references.containsKey( ir ) )
{
@@ -85,7 +85,7 @@ public class OreHelper
for( ItemStack oreItem : this.oreDictCache.getUnchecked( ore ) )
{
if( OreDictionary.itemMatches( oreItem, ItemStack, false ) )
if( OreDictionary.itemMatches( oreItem, itemStack, false ) )
{
toAdd.add( ore );
break;