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

Formatted code

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/parts/ItemFacade.java
+5 -5
View File
@@ -229,9 +229,9 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
{
if( data.hasKey( "modid" ) && data.hasKey( "itemname" ) )
{
if ( data.getString( "modid" ).equals( "minecraft" ) )
if( data.getString( "modid" ).equals( "minecraft" ) )
return Block.getBlockFromName( data.getString( "itemname" ) );
return GameRegistry.findBlock( data.getString( "modid" ), data.getString( "itemname" ) );
}
else
@@ -294,11 +294,11 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
return false;
}
@Override
public void registerCustomIcon(
public void registerCustomIcon(
final TextureMap map )
{
this.myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) ));
this.myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) ) );
}
}
src/main/java/appeng/items/parts/ItemMultiPart.java
+7 -8
View File
@@ -182,7 +182,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
{
return false;
}
return AEApi.instance().partHelper().placeBus( is, pos, side, player, w );
}
@@ -192,15 +192,14 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
return "item.appliedenergistics2." + this.getName( is );
}
@Override
@SideOnly(Side.CLIENT)
@SideOnly( Side.CLIENT )
public void registerCustomIcon(
final TextureMap map )
{
for( final Entry<Integer, PartTypeWithVariant> part : this.registered.entrySet() )
{
part.getValue().texture= new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/" + this.getName( new ItemStack( this, 1, part.getKey() ) ) )) );
part.getValue().texture = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/" + this.getName( new ItemStack( this, 1, part.getKey() ) ) ) ) );
}
}
@@ -213,10 +212,10 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
{
return registeredType.texture;
}
return new MissingIcon( this );
}
@Override
public String getItemStackDisplayName( final ItemStack is )
{
@@ -376,9 +375,9 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
private final PartType part;
private final int variant;
@SideOnly(Side.CLIENT)
@SideOnly( Side.CLIENT )
public IAESprite texture = null;
private PartTypeWithVariant( final PartType part, final int variant )
{
assert part != null;
src/main/java/appeng/items/parts/PartType.java
+8 -4
View File
@@ -148,15 +148,19 @@ public enum PartType
P2PTunnelLiquids( 463, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ),
//P2PTunnelEU( 465, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelEU ), EnumSet.of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel ),
// P2PTunnelEU( 465, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelEU ), EnumSet.of( IntegrationType.IC2 ),
// PartP2PIC2Power.class, GuiText.EUTunnel ),
//P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ), PartP2PRFPower.class, GuiText.RFTunnel ),
// P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ),
// PartP2PRFPower.class, GuiText.RFTunnel ),
P2PTunnelLight( 467, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLight ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ),
// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of( IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ),
// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of(
// IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ),
// P2PTunnelPressure( 469, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelPressure ), EnumSet.of( IntegrationType.PneumaticCraft ), PartP2PPressure.class, GuiText.PressureTunnel ),
// P2PTunnelPressure( 469, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelPressure ), EnumSet.of(
// IntegrationType.PneumaticCraft ), PartP2PPressure.class, GuiText.PressureTunnel ),
InterfaceTerminal( 480, EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class );