Merge pull request #1302 from thatsIch/e-qol-parthelper
Removes unrequired part helper getter, since it already existed
This commit is contained in:
@@ -450,10 +450,10 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
|
|||||||
|
|
||||||
public void setupTile()
|
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() )
|
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" );
|
GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" );
|
||||||
CommonHelper.proxy.bindTileEntitySpecialRenderer( tesrTile, this );
|
CommonHelper.proxy.bindTileEntitySpecialRenderer( tesrTile, this );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ import appeng.api.features.IRegistryContainer;
|
|||||||
import appeng.api.networking.IGridBlock;
|
import appeng.api.networking.IGridBlock;
|
||||||
import appeng.api.networking.IGridConnection;
|
import appeng.api.networking.IGridConnection;
|
||||||
import appeng.api.networking.IGridNode;
|
import appeng.api.networking.IGridNode;
|
||||||
import appeng.api.parts.IPartHelper;
|
|
||||||
import appeng.api.storage.IStorageHelper;
|
import appeng.api.storage.IStorageHelper;
|
||||||
import appeng.core.api.ApiPart;
|
import appeng.core.api.ApiPart;
|
||||||
import appeng.core.api.ApiStorage;
|
import appeng.core.api.ApiStorage;
|
||||||
@@ -81,7 +80,7 @@ public final class Api implements IAppEngApi
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IPartHelper partHelper()
|
public ApiPart partHelper()
|
||||||
{
|
{
|
||||||
return this.partHelper;
|
return this.partHelper;
|
||||||
}
|
}
|
||||||
@@ -129,9 +128,4 @@ public final class Api implements IAppEngApi
|
|||||||
{
|
{
|
||||||
return new GridConnection( a, b, ForgeDirection.UNKNOWN );
|
return new GridConnection( a, b, ForgeDirection.UNKNOWN );
|
||||||
}
|
}
|
||||||
|
|
||||||
public ApiPart getPartHelper()
|
|
||||||
{
|
|
||||||
return this.partHelper;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -586,7 +586,7 @@ public final class Registration
|
|||||||
PlayerMessages.values();
|
PlayerMessages.values();
|
||||||
GuiText.values();
|
GuiText.values();
|
||||||
|
|
||||||
Api.INSTANCE.getPartHelper().initFMPSupport();
|
Api.INSTANCE.partHelper().initFMPSupport();
|
||||||
for( Block block : blocks.multiPart().maybeBlock().asSet() )
|
for( Block block : blocks.multiPart().maybeBlock().asSet() )
|
||||||
{
|
{
|
||||||
( (BlockCableBus) block ).setupTile();
|
( (BlockCableBus) block ).setupTile();
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ public enum PartRegistry
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
if( this == CableBusPart )
|
if( this == CableBusPart )
|
||||||
return (TMultiPart) Api.INSTANCE.getPartHelper().getCombinedInstance( this.part.getName() ).newInstance();
|
return (TMultiPart) Api.INSTANCE.partHelper().getCombinedInstance( this.part.getName() ).newInstance();
|
||||||
else
|
else
|
||||||
return this.part.getConstructor( int.class ).newInstance( meta );
|
return this.part.getConstructor( int.class ).newInstance( meta );
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user