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

Capitalised enums to match conventions

Browse Source
This commit is contained in:
yueh
2016-09-17 15:02:51 +02:00
parent 2d1d29eb37
commit f185bc07a6
43 changed files with 105 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/AEBasePart.java
+3 -3
View File
@@ -140,7 +140,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
{
if( this.host == null )
{
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
return this.host.getColor();
}
@@ -212,7 +212,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
@Override
public ItemStack getItemStack( final PartItemStack type )
{
if( type == PartItemStack.Network )
if( type == PartItemStack.NETWORK )
{
final ItemStack copy = this.is.copy();
copy.setTagCompound( null );
@@ -437,7 +437,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
{
final IMemoryCard memoryCard = (IMemoryCard) memCardIS.getItem();
ItemStack is = this.getItemStack( PartItemStack.Network );
ItemStack is = this.getItemStack( PartItemStack.NETWORK );
// Blocks and parts share the same soul!
final IDefinitions definitions = AEApi.instance().definitions();
src/main/java/appeng/parts/CableBusContainer.java
+6 -6
View File
@@ -388,7 +388,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPartCable c = this.getCenter();
return c.getCableColor();
}
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
@Override
@@ -928,7 +928,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPart p = this.getPart( AEPartLocation.fromOrdinal( x ) );
if( p != null )
{
final ItemStack is = p.getItemStack( PartItemStack.Network );
final ItemStack is = p.getItemStack( PartItemStack.NETWORK );
data.writeShort( Item.getIdFromItem( is.getItem() ) );
data.writeShort( is.getItemDamage() );
@@ -958,7 +958,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final Item myItem = Item.getItemById( itemID );
final ItemStack current = p != null ? p.getItemStack( PartItemStack.Network ) : null;
final ItemStack current = p != null ? p.getItemStack( PartItemStack.NETWORK ) : null;
if( current != null && current.getItem() == myItem && current.getItemDamage() == dmgValue )
{
if( p.readFromStream( data ) )
@@ -1008,7 +1008,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
if( part != null )
{
final NBTTagCompound def = new NBTTagCompound();
part.getItemStack( PartItemStack.World ).writeToNBT( def );
part.getItemStack( PartItemStack.WORLD ).writeToNBT( def );
final NBTTagCompound extra = new NBTTagCompound();
part.writeToNBT( extra );
@@ -1061,7 +1061,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
continue;
}
final ItemStack current = p == null ? null : p.getItemStack( PartItemStack.World );
final ItemStack current = p == null ? null : p.getItemStack( PartItemStack.WORLD );
if( Platform.isSameItemType( iss, current ) )
{
@@ -1098,7 +1098,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPart part = this.getPart( s );
if( part != null )
{
drops.add( part.getItemStack( PartItemStack.Break ) );
drops.add( part.getItemStack( PartItemStack.BREAK ) );
part.getDrops( drops, false );
}
src/main/java/appeng/parts/PartPlacement.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class PartPlacement
if( sp.part != null )
{
is.add( sp.part.getItemStack( PartItemStack.Wrench ) );
is.add( sp.part.getItemStack( PartItemStack.WRENCH ) );
sp.part.getDrops( is, true );
host.removePart( sp.side, false );
}
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+2 -2
View File
@@ -115,7 +115,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
@Override
public ItemStack getItemStack( final PartItemStack type )
{
if( type == PartItemStack.World || type == PartItemStack.Network || type == PartItemStack.Wrench || type == PartItemStack.Pick )
if( type == PartItemStack.WORLD || type == PartItemStack.NETWORK || type == PartItemStack.WRENCH || type == PartItemStack.PICK )
{
return super.getItemStack( type );
}
@@ -339,7 +339,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
this.onTunnelConfigChange();
final ItemStack p2pItem = this.getItemStack( PartItemStack.Wrench );
final ItemStack p2pItem = this.getItemStack( PartItemStack.WRENCH );
final String type = p2pItem.getUnlocalizedName();
p2pItem.writeToNBT( data );