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/items/misc/ItemPaintBall.java
+3 -3
View File
@@ -61,7 +61,7 @@ public class ItemPaintBall extends AEBaseItem
if( dmg >= AEColor.values().length )
{
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
return AEColor.values()[dmg];
@@ -72,7 +72,7 @@ public class ItemPaintBall extends AEBaseItem
{
for( final AEColor c : AEColor.values() )
{
if( c != AEColor.Transparent )
if( c != AEColor.TRANSPARENT )
{
itemStacks.add( new ItemStack( this, 1, c.ordinal() ) );
}
@@ -80,7 +80,7 @@ public class ItemPaintBall extends AEBaseItem
for( final AEColor c : AEColor.values() )
{
if( c != AEColor.Transparent )
if( c != AEColor.TRANSPARENT )
{
itemStacks.add( new ItemStack( this, 1, DAMAGE_THRESHOLD + c.ordinal() ) );
}
src/main/java/appeng/items/parts/ItemMultipartRendering.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class ItemMultipartRendering extends ItemRenderingCustomizer
rendering.meshDefinition( this::getItemMeshDefinition );
rendering.color( new StaticItemColor( AEColor.Transparent ) );
rendering.color( new StaticItemColor( AEColor.TRANSPARENT ) );
// Register all item models as variants so they get loaded
rendering.variants( Arrays.stream( PartType.values() )
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+5 -5
View File
@@ -89,7 +89,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
for( final AEColor col : AEColor.values() )
{
if( col == AEColor.Transparent )
if( col == AEColor.TRANSPARENT )
{
continue;
}
@@ -142,9 +142,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
// clean cables.
if( te instanceof IColorableTile )
{
if( this.getAECurrentPower( is ) > powerPerUse && ( (IColorableTile) te ).getColor() != AEColor.Transparent )
if( this.getAECurrentPower( is ) > powerPerUse && ( (IColorableTile) te ).getColor() != AEColor.TRANSPARENT )
{
if( ( (IColorableTile) te ).recolourBlock( side, AEColor.Transparent, p ) )
if( ( (IColorableTile) te ).recolourBlock( side, AEColor.TRANSPARENT, p ) )
{
inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() );
this.extractAEPower( is, powerPerUse );
@@ -170,7 +170,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( color != null && this.getAECurrentPower( is ) > powerPerUse )
{
if( color != AEColor.Transparent && this.recolourBlock( blk, side, w, pos, side, color, p ) )
if( color != AEColor.TRANSPARENT && this.recolourBlock( blk, side, w, pos, side, color, p ) )
{
inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() );
this.extractAEPower( is, powerPerUse );
@@ -217,7 +217,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( paintBall.getItem() instanceof ItemSnowball )
{
return AEColor.Transparent;
return AEColor.TRANSPARENT;
}
if( paintBall.getItem() instanceof ItemPaintBall )