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

Format sourcecode

Browse Source
This commit is contained in:
yueh
2017-07-20 21:17:10 +02:00
parent 66437897be
commit 621910df91
295 changed files with 2142 additions and 1562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/slot/AppEngCraftingSlot.java
+51 -50
View File
@@ -88,55 +88,56 @@ public class AppEngCraftingSlot extends AppEngSlot
par1ItemStack.onCrafting( this.thePlayer.world, this.thePlayer, this.amountCrafted );
this.amountCrafted = 0;
// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.CRAFTING_TABLE ) )
// {
// this.thePlayer.addStat( AchievementList.BUILD_WORK_BENCH, 1 );
// }
//
// if( par1ItemStack.getItem() instanceof ItemPickaxe )
// {
// this.thePlayer.addStat( AchievementList.BUILD_PICKAXE, 1 );
// }
//
// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.FURNACE ) )
// {
// this.thePlayer.addStat( AchievementList.BUILD_FURNACE, 1 );
// }
//
// if( par1ItemStack.getItem() instanceof ItemHoe )
// {
// this.thePlayer.addStat( AchievementList.BUILD_HOE, 1 );
// }
//
// if( par1ItemStack.getItem() == Items.BREAD )
// {
// this.thePlayer.addStat( AchievementList.MAKE_BREAD, 1 );
// }
//
// if( par1ItemStack.getItem() == Items.CAKE )
// {
// this.thePlayer.addStat( AchievementList.BAKE_CAKE, 1 );
// }
//
// if( par1ItemStack.getItem() instanceof ItemPickaxe && ( (ItemTool) par1ItemStack.getItem() ).getToolMaterial() != Item.ToolMaterial.WOOD )
// {
// this.thePlayer.addStat( AchievementList.BUILD_BETTER_PICKAXE, 1 );
// }
//
// if( par1ItemStack.getItem() instanceof ItemSword )
// {
// this.thePlayer.addStat( AchievementList.BUILD_SWORD, 1 );
// }
//
// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.ENCHANTING_TABLE ) )
// {
// this.thePlayer.addStat( AchievementList.ENCHANTMENTS, 1 );
// }
//
// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.BOOKSHELF ) )
// {
// this.thePlayer.addStat( AchievementList.BOOKCASE, 1 );
// }
// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.CRAFTING_TABLE ) )
// {
// this.thePlayer.addStat( AchievementList.BUILD_WORK_BENCH, 1 );
// }
//
// if( par1ItemStack.getItem() instanceof ItemPickaxe )
// {
// this.thePlayer.addStat( AchievementList.BUILD_PICKAXE, 1 );
// }
//
// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.FURNACE ) )
// {
// this.thePlayer.addStat( AchievementList.BUILD_FURNACE, 1 );
// }
//
// if( par1ItemStack.getItem() instanceof ItemHoe )
// {
// this.thePlayer.addStat( AchievementList.BUILD_HOE, 1 );
// }
//
// if( par1ItemStack.getItem() == Items.BREAD )
// {
// this.thePlayer.addStat( AchievementList.MAKE_BREAD, 1 );
// }
//
// if( par1ItemStack.getItem() == Items.CAKE )
// {
// this.thePlayer.addStat( AchievementList.BAKE_CAKE, 1 );
// }
//
// if( par1ItemStack.getItem() instanceof ItemPickaxe && ( (ItemTool) par1ItemStack.getItem()
// ).getToolMaterial() != Item.ToolMaterial.WOOD )
// {
// this.thePlayer.addStat( AchievementList.BUILD_BETTER_PICKAXE, 1 );
// }
//
// if( par1ItemStack.getItem() instanceof ItemSword )
// {
// this.thePlayer.addStat( AchievementList.BUILD_SWORD, 1 );
// }
//
// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.ENCHANTING_TABLE ) )
// {
// this.thePlayer.addStat( AchievementList.ENCHANTMENTS, 1 );
// }
//
// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.BOOKSHELF ) )
// {
// this.thePlayer.addStat( AchievementList.BOOKCASE, 1 );
// }
}
@Override
@@ -183,7 +184,7 @@ public class AppEngCraftingSlot extends AppEngSlot
}
}
}
return stack;
}
src/main/java/appeng/container/slot/SlotCraftingTerm.java
+3 -2
View File
@@ -164,7 +164,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
{
final ItemStack[] set = new ItemStack[this.getPattern().getSizeInventory()];
// Safeguard for empty slots in the inventory for now
Arrays.fill(set, ItemStack.EMPTY);
Arrays.fill( set, ItemStack.EMPTY );
// add one of each item to the items on the board...
if( Platform.isServer() )
@@ -214,7 +214,8 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
{
if( !this.getPattern().getStackInSlot( x ).isEmpty() )
{
set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.world, r, is, ic, this.getPattern().getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.container.getViewCells() ) );
set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.world, r, is, ic, this.getPattern().getStackInSlot( x ),
x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.container.getViewCells() ) );
ic.setInventorySlotContents( x, set[x] );
}
}
src/main/java/appeng/container/slot/SlotRestrictedInput.java
+2 -1
View File
@@ -81,7 +81,8 @@ public class SlotRestrictedInput extends AppEngSlot
{
if( this.which == PlacableItemType.VALID_ENCODED_PATTERN_W_OUTPUT )
{
final ICraftingPatternDetails ap = is.getItem() instanceof ICraftingPatternItem ? ( (ICraftingPatternItem) is.getItem() ).getPatternForItem( is, theWorld ) : null;
final ICraftingPatternDetails ap = is.getItem() instanceof ICraftingPatternItem ? ( (ICraftingPatternItem) is.getItem() ).getPatternForItem( is,
theWorld ) : null;
return ap != null;
}
return true;