From 4681d39d7d48bc13befa5e7973664ebce40c9741 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Fri, 21 Nov 2014 02:35:59 -0500 Subject: [PATCH] Fix failing integration with AE2 and Waila --- .../minecraft/storagedrawers/config/CompTierRegistry.java | 1 + .../storagedrawers/integration/AppliedEnergistics.java | 8 ++++++++ .../storagedrawers/integration/IntegrationRegistry.java | 6 ++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java b/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java index dbeab30..5eb006a 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java +++ b/src/com/jaquadro/minecraft/storagedrawers/config/CompTierRegistry.java @@ -25,6 +25,7 @@ public class CompTierRegistry register(new ItemStack(Blocks.nether_brick), new ItemStack(Items.netherbrick), 4); register(new ItemStack(Blocks.quartz_block), new ItemStack(Items.quartz), 4); register(new ItemStack(Blocks.melon_block), new ItemStack(Items.melon), 9); + register(new ItemStack(Blocks.sandstone), new ItemStack(Blocks.sand), 4); } public void register (ItemStack upper, ItemStack lower, int convRate) { diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java b/src/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java index 0e116bb..e9d7253 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java @@ -51,6 +51,14 @@ public class AppliedEnergistics extends IntegrationModule } } + private static class APIFactory implements IStorageBusMonitorFactory { + + @Override + public IMEMonitor createStorageBusMonitor (IMEInventory inventory, BaseActionSource src) { + return null; + } + } + private IStorageBusMonitorFactory factory; @Override diff --git a/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java index 2d19f09..3d5e364 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java +++ b/src/com/jaquadro/minecraft/storagedrawers/integration/IntegrationRegistry.java @@ -16,8 +16,10 @@ public class IntegrationRegistry static { IntegrationRegistry reg = instance(); - reg.add(new AppliedEnergistics()); - reg.add(new Waila()); + if (Loader.isModLoaded("appliedenergistics2")) + reg.add(new AppliedEnergistics()); + if (Loader.isModLoaded("Waila")) + reg.add(new Waila()); } private IntegrationRegistry () {