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/container/implementations/ContainerCellWorkbench.java
+4 -9
View File
@@ -334,15 +334,13 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
}
@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 )
{
}
@@ -360,16 +358,13 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
}
@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/container/implementations/ContainerQuartzKnife.java
+4 -9
View File
@@ -228,15 +228,13 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
}
@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 )
{
}
@@ -254,16 +252,13 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
}
@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/container/slot/SlotRestrictedInput.java
+23 -6
View File
@@ -289,17 +289,34 @@ public class SlotRestrictedInput extends AppEngSlot
public enum PlacableItemType
{
STORAGE_CELLS( 15 ), ORE( 16 + 15 ), STORAGE_COMPONENT( 3 * 16 + 15 ),
STORAGE_CELLS( 15 ),
ORE( 16 + 15 ),
STORAGE_COMPONENT( 3 * 16 + 15 ),
ENCODABLE_ITEM( 4 * 16 + 15 ), TRASH( 5 * 16 + 15 ), VALID_ENCODED_PATTERN_W_OUTPUT( 7 * 16 + 15 ), ENCODED_PATTERN_W_OUTPUT( 7 * 16 + 15 ),
ENCODABLE_ITEM( 4 * 16 + 15 ),
TRASH( 5 * 16 + 15 ),
VALID_ENCODED_PATTERN_W_OUTPUT( 7 * 16 + 15 ),
ENCODED_PATTERN_W_OUTPUT( 7 * 16 + 15 ),
ENCODED_CRAFTING_PATTERN( 7 * 16 + 15 ), ENCODED_PATTERN( 7 * 16 + 15 ), PATTERN( 8 * 16 + 15 ), BLANK_PATTERN( 8 * 16 + 15 ), POWERED_TOOL( 9 * 16 + 15 ),
ENCODED_CRAFTING_PATTERN( 7 * 16 + 15 ),
ENCODED_PATTERN( 7 * 16 + 15 ),
PATTERN( 8 * 16 + 15 ),
BLANK_PATTERN( 8 * 16 + 15 ),
POWERED_TOOL( 9 * 16 + 15 ),
RANGE_BOOSTER( 6 * 16 + 15 ), QE_SINGULARITY( 10 * 16 + 15 ), SPATIAL_STORAGE_CELLS( 11 * 16 + 15 ),
RANGE_BOOSTER( 6 * 16 + 15 ),
QE_SINGULARITY( 10 * 16 + 15 ),
SPATIAL_STORAGE_CELLS( 11 * 16 + 15 ),
FUEL( 12 * 16 + 15 ), UPGRADES( 13 * 16 + 15 ), WORKBENCH_CELL( 15 ), BIOMETRIC_CARD( 14 * 16 + 15 ), VIEW_CELL( 4 * 16 + 14 ),
FUEL( 12 * 16 + 15 ),
UPGRADES( 13 * 16 + 15 ),
WORKBENCH_CELL( 15 ),
BIOMETRIC_CARD( 14 * 16 + 15 ),
VIEW_CELL( 4 * 16 + 14 ),
INSCRIBER_PLATE( 2 * 16 + 14 ), INSCRIBER_INPUT( 3 * 16 + 14 ), METAL_INGOTS( 3 * 16 + 14 );
INSCRIBER_PLATE( 2 * 16 + 14 ),
INSCRIBER_INPUT( 3 * 16 + 14 ),
METAL_INGOTS( 3 * 16 + 14 );
public final int IIcon;