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

All parameters on one line (for now)

Browse Source 
Easier picking of 1.7 changes
This commit is contained in:
yueh
2016-01-01 02:02:05 +01:00
parent e08ab38c52
commit f84b9a7e1d
147 changed files with 840 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/ItemSorters.java
+4 -8
View File
@@ -34,8 +34,7 @@ public class ItemSorters
private static SortDir Direction = SortDir.ASCENDING;
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_NAME = new Comparator<IAEItemStack>()
{
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_NAME = new Comparator<IAEItemStack>(){
@Override
public int compare( final IAEItemStack o1, final IAEItemStack o2 )
@@ -47,8 +46,7 @@ public class ItemSorters
return Platform.getItemDisplayName( o2 ).compareToIgnoreCase( Platform.getItemDisplayName( o1 ) );
}
};
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_MOD = new Comparator<IAEItemStack>()
{
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_MOD = new Comparator<IAEItemStack>(){
@Override
public int compare( final IAEItemStack o1, final IAEItemStack o2 )
@@ -73,8 +71,7 @@ public class ItemSorters
return compareToIgnoreCase;
}
};
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_SIZE = new Comparator<IAEItemStack>()
{
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_SIZE = new Comparator<IAEItemStack>(){
@Override
public int compare( final IAEItemStack o1, final IAEItemStack o2 )
@@ -87,8 +84,7 @@ public class ItemSorters
}
};
private static IInvTweaks api;
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_INV_TWEAKS = new Comparator<IAEItemStack>()
{
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_INV_TWEAKS = new Comparator<IAEItemStack>(){
@Override
public int compare( final IAEItemStack o1, final IAEItemStack o2 )
src/main/java/appeng/util/inv/AdaptorPlayerInventory.java
+4 -9
View File
@@ -106,16 +106,14 @@ public class AdaptorPlayerInventory implements IInventory
}
@Override
public void openInventory(
final EntityPlayer player )
public void openInventory( final EntityPlayer player )
{
this.src.openInventory( player );
}
@Override
public void closeInventory(
final EntityPlayer player )
public void closeInventory( final EntityPlayer player )
{
this.src.closeInventory( player );
}
@@ -133,16 +131,13 @@ public class AdaptorPlayerInventory implements IInventory
}
@Override
public int getField(
final int id )
public int getField( final int id )
{
return this.src.getField( id );
}
@Override
public void setField(
final int id,
final int value )
public void setField( final int id, final int value )
{
this.src.setField( id, value );
}
src/main/java/appeng/util/inv/WrapperChainedInventory.java
+4 -9
View File
@@ -208,14 +208,12 @@ public class WrapperChainedInventory implements IInventory
}
@Override
public void openInventory(
final EntityPlayer player )
public void openInventory( final EntityPlayer player )
{
}
@Override
public void closeInventory(
final EntityPlayer player )
public void closeInventory( final EntityPlayer player )
{
}
@@ -245,16 +243,13 @@ public class WrapperChainedInventory implements IInventory
}
@Override
public int getField(
final int id )
public int getField( final int id )
{
return 0;
}
@Override
public void setField(
final int id,
final int value )
public void setField( final int id, final int value )
{
}
src/main/java/appeng/util/inv/WrapperInvSlot.java
+4 -9
View File
@@ -118,15 +118,13 @@ public class WrapperInvSlot
}
@Override
public void openInventory(
final EntityPlayer player )
public void openInventory( final EntityPlayer player )
{
this.inv.openInventory( player );
}
@Override
public void closeInventory(
final EntityPlayer player )
public void closeInventory( final EntityPlayer player )
{
this.inv.closeInventory( player );
}
@@ -138,8 +136,7 @@ public class WrapperInvSlot
}
@Override
public int getField(
final int id )
public int getField( final int id )
{
return this.inv.getField( id );
}
@@ -163,9 +160,7 @@ public class WrapperInvSlot
}
@Override
public void setField(
final int id,
final int value )
public void setField( final int id, final int value )
{
this.inv.setField( id, value );
}
src/main/java/appeng/util/inv/WrapperInventoryRange.java
+4 -9
View File
@@ -135,15 +135,13 @@ public class WrapperInventoryRange implements IInventory
}
@Override
public void openInventory(
final EntityPlayer player )
public void openInventory( final EntityPlayer player )
{
this.src.openInventory( player );
}
@Override
public void closeInventory(
final EntityPlayer player )
public void closeInventory( final EntityPlayer player )
{
this.src.closeInventory( player );
}
@@ -155,8 +153,7 @@ public class WrapperInventoryRange implements IInventory
}
@Override
public int getField(
final int id )
public int getField( final int id )
{
return this.src.getField( id );
}
@@ -174,9 +171,7 @@ public class WrapperInventoryRange implements IInventory
}
@Override
public void setField(
final int id,
final int value )
public void setField( final int id, final int value )
{
this.src.setField( id, value );
}
src/main/java/appeng/util/item/OreHelper.java
+1 -2
View File
@@ -45,8 +45,7 @@ public class OreHelper
/**
* A local cache to speed up OreDictionary lookups.
*/
private final LoadingCache<String, List<ItemStack>> oreDictCache = CacheBuilder.newBuilder().build( new CacheLoader<String, List<ItemStack>>()
{
private final LoadingCache<String, List<ItemStack>> oreDictCache = CacheBuilder.newBuilder().build( new CacheLoader<String, List<ItemStack>>(){
@Override
public List<ItemStack> load( final String oreName )
{