diff --git a/src/api/java/appeng/api/networking/IGrid.java b/src/api/java/appeng/api/networking/IGrid.java index 9ddaf7475..d06ba8d7e 100644 --- a/src/api/java/appeng/api/networking/IGrid.java +++ b/src/api/java/appeng/api/networking/IGrid.java @@ -94,4 +94,4 @@ public interface IGrid * @return the node considered the pivot point of the grid. */ IGridNode getPivot(); -} +} \ No newline at end of file diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 7aba776b0..47db06187 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -450,10 +450,10 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection public void setupTile() { - this.setTileEntity( noTesrTile = Api.INSTANCE.getPartHelper().getCombinedInstance( TileCableBus.class.getName() ) ); + this.setTileEntity( noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class.getName() ) ); if( Platform.isClient() ) { - tesrTile = Api.INSTANCE.getPartHelper().getCombinedInstance( TileCableBusTESR.class.getName() ); + tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class.getName() ); GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" ); CommonHelper.proxy.bindTileEntitySpecialRenderer( tesrTile, this ); } diff --git a/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java index f1032abf7..c2d82840a 100644 --- a/src/main/java/appeng/core/Api.java +++ b/src/main/java/appeng/core/Api.java @@ -31,7 +31,6 @@ import appeng.api.features.IRegistryContainer; import appeng.api.networking.IGridBlock; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridNode; -import appeng.api.parts.IPartHelper; import appeng.api.storage.IStorageHelper; import appeng.core.api.ApiPart; import appeng.core.api.ApiStorage; @@ -81,7 +80,7 @@ public final class Api implements IAppEngApi } @Override - public IPartHelper partHelper() + public ApiPart partHelper() { return this.partHelper; } @@ -129,9 +128,4 @@ public final class Api implements IAppEngApi { return new GridConnection( a, b, ForgeDirection.UNKNOWN ); } - - public ApiPart getPartHelper() - { - return this.partHelper; - } } diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 8e605c4de..ef42d170a 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -586,7 +586,7 @@ public final class Registration PlayerMessages.values(); GuiText.values(); - Api.INSTANCE.getPartHelper().initFMPSupport(); + Api.INSTANCE.partHelper().initFMPSupport(); for( Block block : blocks.multiPart().maybeBlock().asSet() ) { ( (BlockCableBus) block ).setupTile(); diff --git a/src/main/java/appeng/fmp/PartRegistry.java b/src/main/java/appeng/fmp/PartRegistry.java index 452061d0d..0b350dc07 100644 --- a/src/main/java/appeng/fmp/PartRegistry.java +++ b/src/main/java/appeng/fmp/PartRegistry.java @@ -74,7 +74,7 @@ public enum PartRegistry try { if( this == CableBusPart ) - return (TMultiPart) Api.INSTANCE.getPartHelper().getCombinedInstance( this.part.getName() ).newInstance(); + return (TMultiPart) Api.INSTANCE.partHelper().getCombinedInstance( this.part.getName() ).newInstance(); else return this.part.getConstructor( int.class ).newInstance( meta ); }