diff --git a/core/Registration.java b/core/Registration.java index a8dde27c0..4f34516eb 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -267,8 +267,8 @@ public class Registration else { Field f = partClass.getField( "part" + type.name() ); - Enum varients[] = type.getVariants(); - if ( varients == null ) + Enum variants[] = type.getVariants(); + if ( variants == null ) { ItemStackSrc is = ((ItemMultiPart) partItem.item()).createPart( type, null ); if ( is != null ) @@ -278,11 +278,11 @@ public class Registration } else { - if ( varients[0] instanceof AEColor ) + if ( variants[0] instanceof AEColor ) { ColoredItemDefinition def = new ColoredItemDefinition(); - for (Enum v : varients) + for (Enum v : variants) { ItemStackSrc is = ((ItemMultiPart) partItem.item()).createPart( type, v ); if ( is != null ) diff --git a/items/parts/ItemMultiPart.java b/items/parts/ItemMultiPart.java index d4869b01f..ff59731c6 100644 --- a/items/parts/ItemMultiPart.java +++ b/items/parts/ItemMultiPart.java @@ -37,7 +37,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup { PartType part; - int varient; + int variant; @SideOnly(Side.CLIENT) IIcon ico; @@ -55,7 +55,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup instance = this; } - public ItemStackSrc createPart(PartType mat, Enum varient) + public ItemStackSrc createPart(PartType mat, Enum variant) { try { @@ -69,12 +69,12 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup return null; // part not supported.. } - int varID = varient == null ? 0 : varient.ordinal(); + int varID = variant == null ? 0 : variant.ordinal(); // verify for (PartTypeIst p : dmgToPart.values()) { - if ( p.part == mat && p.varient == varID ) + if ( p.part == mat && p.variant == varID ) throw new RuntimeException( "Cannot create the same material twice..." ); } @@ -89,7 +89,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup PartTypeIst pti = new PartTypeIst(); pti.part = mat; - pti.varient = varID; + pti.variant = varID; if ( dmgToPart.get( newPartNum ) == null ) { @@ -157,10 +157,10 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup if ( pt == null ) return "Unnamed"; - Enum[] varients = pt.getVariants(); + Enum[] variants = pt.getVariants(); - if ( varients != null ) - return super.getItemStackDisplayName( is ) + " - " + varients[dmgToPart.get( is.getItemDamage() ).varient].toString(); + if ( variants != null ) + return super.getItemStackDisplayName( is ) + " - " + variants[dmgToPart.get( is.getItemDamage() ).variant].toString(); if ( pt.getExtraName() != null ) return super.getItemStackDisplayName( is ) + " - " + pt.getExtraName().getLocal(); @@ -224,10 +224,10 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup cList.add( new ItemStack( this, 1, part.getKey() ) ); } - public int varientOf(int itemDamage) + public int variantOf(int itemDamage) { if ( dmgToPart.containsKey( itemDamage ) ) - return dmgToPart.get( itemDamage ).varient; + return dmgToPart.get( itemDamage ).variant; return 0; } @@ -266,8 +266,8 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup return null; } - public ItemStack getStackFromTypeAndVarient(PartType mt, int varient) + public ItemStack getStackFromTypeAndVarient(PartType mt, int variant) { - return new ItemStack( this, 1, mt.baseDamage + varient ); + return new ItemStack( this, 1, mt.baseDamage + variant ); } } diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index 3741c4373..b2c5c60b7 100644 --- a/parts/networking/PartCable.java +++ b/parts/networking/PartCable.java @@ -55,7 +55,7 @@ public class PartCable extends AEBasePart implements IPartCable super( c, is ); proxy.setFlags( GridFlags.PREFERRED ); proxy.setIdlePowerUsage( 0.0 ); - proxy.myColor = AEColor.values()[((ItemMultiPart) is.getItem()).varientOf( is.getItemDamage() )]; + proxy.myColor = AEColor.values()[((ItemMultiPart) is.getItem()).variantOf( is.getItemDamage() )]; } @Override