Fix Crashes for MJ5.
Disable MJ6
This commit is contained in:
@@ -119,7 +119,14 @@ public class BC extends BaseModule implements IBC
|
|||||||
if ( is == null )
|
if ( is == null )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return is.getItem() instanceof ItemFacade && ItemFacade.getType( is ) == ItemFacade.TYPE_BASIC;
|
try
|
||||||
|
{
|
||||||
|
return is.getItem() instanceof ItemFacade && ItemFacade.getType( is ) == ItemFacade.TYPE_BASIC;
|
||||||
|
}
|
||||||
|
catch (Throwable t)
|
||||||
|
{
|
||||||
|
return is.getItem() instanceof ItemFacade;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ package appeng.integration.modules;
|
|||||||
import appeng.integration.BaseModule;
|
import appeng.integration.BaseModule;
|
||||||
import appeng.integration.abstraction.IMJ6;
|
import appeng.integration.abstraction.IMJ6;
|
||||||
import buildcraft.api.mj.IBatteryObject;
|
import buildcraft.api.mj.IBatteryObject;
|
||||||
|
import buildcraft.api.mj.IBatteryProvider;
|
||||||
|
import buildcraft.api.mj.ISidedBatteryProvider;
|
||||||
|
|
||||||
public class MJ6 extends BaseModule implements IMJ6
|
public class MJ6 extends BaseModule implements IMJ6
|
||||||
{
|
{
|
||||||
@@ -11,6 +13,9 @@ public class MJ6 extends BaseModule implements IMJ6
|
|||||||
|
|
||||||
public MJ6() {
|
public MJ6() {
|
||||||
TestClass( IBatteryObject.class );
|
TestClass( IBatteryObject.class );
|
||||||
|
TestClass( IBatteryProvider.class );
|
||||||
|
TestClass( ISidedBatteryProvider.class );
|
||||||
|
throw new RuntimeException( "Disabled For Now!" );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ import cpw.mods.fml.relauncher.Side;
|
|||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
@InterfaceList(value = { @Interface(iface = "buildcraft.api.mj.ISidedBatteryProvider", iname = "MJ6"),
|
@InterfaceList(value = { @Interface(iface = "buildcraft.api.mj.ISidedBatteryProvider", iname = "MJ6"),
|
||||||
@Interface(iface = "buildcraft.api.power.IPowerReceptor", iname = "MJ5"),
|
@Interface(iface = "buildcraft.api.mj.IBatteryObject", iname = "MJ6"), @Interface(iface = "buildcraft.api.power.IPowerReceptor", iname = "MJ5"),
|
||||||
@Interface(iface = "appeng.api.networking.ticking.IGridTickable", iname = "MJ5") })
|
@Interface(iface = "appeng.api.networking.ticking.IGridTickable", iname = "MJ5") })
|
||||||
public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPowerReceptor, ISidedBatteryProvider, IBatteryObject, IGridTickable
|
public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPowerReceptor, ISidedBatteryProvider, IBatteryObject, IGridTickable
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user