From ee107595ea4431f3294bf99395c80fbad5b6a738 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 2 Jul 2014 11:39:37 -0500 Subject: [PATCH 1/2] Remove InvTweaks Annotation, was no-op. --- container/implementations/ContainerMEMonitorable.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/container/implementations/ContainerMEMonitorable.java b/container/implementations/ContainerMEMonitorable.java index 8816358ed..f1be06bb1 100644 --- a/container/implementations/ContainerMEMonitorable.java +++ b/container/implementations/ContainerMEMonitorable.java @@ -1,7 +1,5 @@ package appeng.container.implementations; -import invtweaks.api.container.IgnoreContainer; - import java.io.IOException; import java.nio.BufferOverflowException; @@ -47,7 +45,6 @@ import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; -@IgnoreContainer public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigureableObject, IMEMonitorHandlerReceiver { From 5c8327f040fe9b0ec64187ab493eb31ec9cafba0 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Sat, 28 Jun 2014 00:21:37 -0500 Subject: [PATCH 2/2] Post Cache Construction Event should fire before things access grid caches. --- me/Grid.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/me/Grid.java b/me/Grid.java index dce6123a9..cb6c0d7ac 100644 --- a/me/Grid.java +++ b/me/Grid.java @@ -40,10 +40,10 @@ public class Grid implements IGrid caches.put( c, new GridCacheWrapper( myCaches.get( c ) ) ); } + postEvent( new MENetworkPostCacheConstruction() ); + TickHandler.instance.addNetwork( this ); center.setGrid( this ); - - postEvent( new MENetworkPostCacheConstruction() ); } public Set> getMachineClasses()