tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #1065 from thatsIch/e-api-access

Browse source 
instance() does not return null anymore, since else it would represent catching a major bug
This commit is contained in:
thatsIch 2015-03-29 21:02:41 +02:00
parent 67d9a48d75 371588ed79
commit 08505e1fa3
3 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/api/java/appeng/api/AEApi.java
View file

@ -24,7 +24,9 @@
package appeng.api;
import appeng.api.exceptions.CouldNotAccessCoreAPI;
import java.lang.reflect.Field;
import appeng.api.exceptions.CoreInaccessibleException;
/**
@ -35,34 +37,42 @@ import appeng.api.exceptions.CouldNotAccessCoreAPI;
public enum AEApi
{
;
private static final String CORE_API_PATH = "appeng.core.Api";
private static final String API_INSTANCE_NAME = "INSTANCE";
private static IAppEngApi instance = null;
private static final String CORE_API_FQN = "appeng.core.Api";
private static final String CORE_API_FIELD = "INSTANCE";
private static final IAppEngApi HELD_API;
static
{
try
{
final Class<?> apiClass = Class.forName( CORE_API_FQN );
final Field apiField = apiClass.getField( CORE_API_FIELD );
HELD_API = (IAppEngApi) apiField.get( apiClass );
}
catch ( ClassNotFoundException e )
{
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared." );
}
catch ( NoSuchFieldException e )
{
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without it being declared." );
}
catch ( IllegalAccessException e )
{
throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without enough access permissions.");
}
}
/**
* API Entry Point.
*
* @return the {@link IAppEngApi}
*
* @throws CouldNotAccessCoreAPI if the INSTANCE could not be retrieved
*/
public static IAppEngApi instance()
{
if ( instance == null )
{
try
{
Class<?> c = Class.forName( CORE_API_PATH );
instance = (IAppEngApi) c.getField( API_INSTANCE_NAME ).get( c );
}
catch ( Throwable e )
{
throw new CouldNotAccessCoreAPI( "Either core API was not in " + CORE_API_PATH + " or " + API_INSTANCE_NAME + " was not accessible" );
}
}
return instance;
return HELD_API;
}
}

10
src/api/java/appeng/api/exceptions/CoreInaccessibleException.java Normal file
View file

@ -0,0 +1,10 @@
package appeng.api.exceptions;
public class CoreInaccessibleException extends RuntimeException
{
public CoreInaccessibleException( String message )
{
super( message );
}
}

10
src/api/java/appeng/api/exceptions/CouldNotAccessCoreAPI.java
View file

@ -1,10 +0,0 @@
package appeng.api.exceptions;
public class CouldNotAccessCoreAPI extends RuntimeException
{
public CouldNotAccessCoreAPI( String message )
{
super( message );
}
}