From c50535ab216ecf9b46847f7a4425b7ed130b6460 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 18 Feb 2014 11:43:02 -0600 Subject: [PATCH] Fixed Bug: #0165 - DSU Crash. --- integration/BaseModule.java | 10 ++++++++++ integration/modules/BC.java | 9 ++++++++- integration/modules/DSU.java | 5 +++-- integration/modules/MJ.java | 8 +++----- integration/modules/helpers/BCPipeInventory.java | 2 +- integration/modules/helpers/MFRDSU.java | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 integration/BaseModule.java diff --git a/integration/BaseModule.java b/integration/BaseModule.java new file mode 100644 index 00000000..6af43231 --- /dev/null +++ b/integration/BaseModule.java @@ -0,0 +1,10 @@ +package appeng.integration; + +public class BaseModule { + + protected void TestClass( Class clz ) + { + clz.isInstance(this); + } + +} diff --git a/integration/modules/BC.java b/integration/modules/BC.java index 8f44eddf..4bfb4825 100644 --- a/integration/modules/BC.java +++ b/integration/modules/BC.java @@ -12,12 +12,15 @@ import appeng.api.config.TunnelType; import appeng.api.features.IP2PTunnelRegistry; import appeng.api.parts.IFacadePart; import appeng.facade.FacadePart; +import appeng.integration.BaseModule; import appeng.integration.IIntegrationModule; import appeng.integration.abstraction.IBC; import appeng.integration.modules.helpers.BCPipeHandler; +import appeng.integration.modules.helpers.MJPerdition; import buildcraft.BuildCraftEnergy; import buildcraft.BuildCraftTransport; import buildcraft.api.tools.IToolWrench; +import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; import buildcraft.transport.ItemFacade; @@ -25,7 +28,7 @@ import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TileGenericPipe; import cpw.mods.fml.common.event.FMLInterModComms; -public class BC implements IIntegrationModule, IBC +public class BC extends BaseModule implements IIntegrationModule, IBC { public static BC instance; @@ -173,6 +176,10 @@ public class BC implements IIntegrationModule, IBC @Override public void Init() { + TestClass(IPipeConnection.class); + TestClass(ItemFacade.class); + TestClass(IToolWrench.class); + AEApi.instance().partHelper().registerNewLayer( "appeng.api.parts.layers.LayerIPipeConnection", "buildcraft.api.transport.IPipeConnection" ); AEApi.instance().registries().externalStorage().addExternalStorageInterface( new BCPipeHandler() ); } diff --git a/integration/modules/DSU.java b/integration/modules/DSU.java index 287c05f0..b68167f1 100644 --- a/integration/modules/DSU.java +++ b/integration/modules/DSU.java @@ -4,12 +4,13 @@ import net.minecraft.tileentity.TileEntity; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import appeng.api.AEApi; import appeng.api.storage.IMEInventory; +import appeng.integration.BaseModule; import appeng.integration.IIntegrationModule; import appeng.integration.abstraction.IDSU; import appeng.integration.modules.helpers.MFRDSU; import appeng.integration.modules.helpers.MFRDSUHandler; -public class DSU implements IIntegrationModule, IDSU +public class DSU extends BaseModule implements IIntegrationModule, IDSU { public static DSU instance; @@ -31,7 +32,7 @@ public class DSU implements IIntegrationModule, IDSU @Override public void Init() { - + TestClass(IDeepStorageUnit.class ); } @Override diff --git a/integration/modules/MJ.java b/integration/modules/MJ.java index 9c315ad9..135be792 100644 --- a/integration/modules/MJ.java +++ b/integration/modules/MJ.java @@ -1,5 +1,6 @@ package appeng.integration.modules; +import appeng.integration.BaseModule; import appeng.integration.IIntegrationModule; import appeng.integration.abstraction.IMJ; import appeng.integration.abstraction.helpers.BaseMJperdition; @@ -7,7 +8,7 @@ import appeng.integration.modules.helpers.MJPerdition; import appeng.tile.powersink.BuildCraft; import buildcraft.api.power.IPowerReceptor; -public class MJ implements IIntegrationModule, IMJ +public class MJ extends BaseModule implements IIntegrationModule, IMJ { public static MJ instance; @@ -23,10 +24,7 @@ public class MJ implements IIntegrationModule, IMJ @Override public void Init() throws Throwable { - if ( ((Object) this) instanceof MJPerdition ) - { - - } + TestClass(MJPerdition.class); } @Override diff --git a/integration/modules/helpers/BCPipeInventory.java b/integration/modules/helpers/BCPipeInventory.java index 6b1e9909..b16af716 100644 --- a/integration/modules/helpers/BCPipeInventory.java +++ b/integration/modules/helpers/BCPipeInventory.java @@ -49,7 +49,7 @@ public class BCPipeInventory implements IMEInventory } @Override - public IItemList getAvailableItems(IItemList out) + public IItemList getAvailableItems(IItemList out) { return out; } diff --git a/integration/modules/helpers/MFRDSU.java b/integration/modules/helpers/MFRDSU.java index a873b193..6b999005 100644 --- a/integration/modules/helpers/MFRDSU.java +++ b/integration/modules/helpers/MFRDSU.java @@ -89,7 +89,7 @@ public class MFRDSU implements IMEInventory } @Override - public IItemList getAvailableItems(IItemList out) + public IItemList getAvailableItems(IItemList out) { ItemStack is = dsu.getStoredItemType(); if ( is != null )