Formatted code

This commit is contained in:
yueh
2015-12-24 02:03:16 +01:00
parent e94a0cfccf
commit c9e8a6e939
216 changed files with 1196 additions and 1187 deletions
@@ -69,7 +69,7 @@ public final class AECableBusFeatureHandler implements IFeatureHandler
* Registration of the {@link TileEntity} will actually be handled by {@link BlockCableBus#setupTile()}.
*/
@Override
public void register( final Side side)
public void register( final Side side )
{
if( this.enabled )
{
@@ -88,13 +88,13 @@ public final class AECableBusFeatureHandler implements IFeatureHandler
// Bypass the forge magic with null to register our own itemblock later.
GameRegistry.registerBlock( this.featured, null, registryName );
GameRegistry.registerItem( this.definition.maybeItem().get(), registryName );
// register the block/item conversion...
if ( this.featured != null && this.definition.maybeItem().isPresent() )
GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() );
if ( side == Side.CLIENT)
CommonHelper.proxy.configureIcon( this.featured, name );
// register the block/item conversion...
if( this.featured != null && this.definition.maybeItem().isPresent() )
GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() );
if( side == Side.CLIENT )
CommonHelper.proxy.configureIcon( this.featured, name );
}
}
}
@@ -85,7 +85,7 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler
GameRegistry.registerBlock( this.featured, null, registryName );
GameRegistry.registerItem( this.definition.maybeItem().get(), registryName );
AEBaseTile.registerTileItem( this.featured.getTileEntityClass(), new BlockStackSrc( this.featured, 0, ActivityState.from( this.isFeatureAvailable() ) ) );
// register the block/item conversion...
if( this.definition.maybeItem().isPresent() )
{
@@ -51,11 +51,11 @@ public class FeatureNameExtractor
{
name = PATTERN_ITEM_MULTI_MATERIAL.matcher( name ).replaceAll( "ItemMaterial" );
}
else if ( name.startsWith( "BlockStairCommon" ) )
else if( name.startsWith( "BlockStairCommon" ) )
{
name = "stair";
}
else if ( name.startsWith( "BlockFluix" ) )
else if( name.startsWith( "BlockFluix" ) )
{
name = "fluix";
}
@@ -29,5 +29,5 @@ public interface IFeatureHandler
IItemDefinition getDefinition();
void register(Side side );
void register( Side side );
}
@@ -71,7 +71,7 @@ public final class ItemFeatureHandler implements IFeatureHandler
String name = this.extractor.get();
final String itemPhysicalName = name;
//this.item.setTextureName( "appliedenergistics2:" + name );
// this.item.setTextureName( "appliedenergistics2:" + name );
this.item.setUnlocalizedName( "appliedenergistics2." + name );
if( this.item instanceof ItemFacade )
@@ -92,7 +92,7 @@ public final class ItemFeatureHandler implements IFeatureHandler
name = "ItemMultiPart";
}
// "item." +
// "item." +
GameRegistry.registerItem( this.item, name );
if( side == Side.CLIENT )
@@ -164,8 +164,8 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
{
return null;
}
final ItemStack myItemStack = new ItemStack( item, 1, meta );
final ItemStack myItemStack = new ItemStack( item, 1, meta );
return myItemStack;
}
@@ -1,3 +1,4 @@
package appeng.core.features.registries.entries;
@@ -1,3 +1,4 @@
package appeng.core.features.registries.entries;
@@ -93,7 +94,7 @@ public class InscriberRecipe implements IInscriberRecipe
{
return true;
}
if( !(o instanceof IInscriberRecipe) )
if( !( o instanceof IInscriberRecipe ) )
{
return false;
}
@@ -112,7 +113,7 @@ public class InscriberRecipe implements IInscriberRecipe
{
return false;
}
if( !this.maybeBot.equals( that.getBottomOptional()) )
if( !this.maybeBot.equals( that.getBottomOptional() ) )
{
return false;
}