level emitter dying fix

src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java

@@ -237,22 +237,6 @@ public class PacketJEIRecipe extends AppEngPacket
 										// Fall back using an existing item
 										out = storage.extractItems( request, Actionable.SIMULATE, cct.getActionSource() );
 									}
-
-									if( out == null )
-									{
-										IItemList<IAEItemStack> items = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-										Iterator<IAEItemStack> iterator = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getAvailableItems( items ).iterator();
-										while ( iterator.hasNext() )
-										{
-											final IAEItemStack o = iterator.next();
-											if( o.getDefinition().isItemEqual( request.getDefinition() ) && o.isCraftable() )
-											{
-												out = o;
-												break;
-											}
-											iterator.remove();
-										}
-									}
 								}
 
 								if( out != null )
@@ -274,14 +258,14 @@ public class PacketJEIRecipe extends AppEngPacket
 								else
 								{
 									currentItem = ad.simulateSimilarRemove(recipe[x][y].getCount(), this.recipe[x][y],FuzzyMode.IGNORE_ALL, null );
-									if( currentItem.isEmpty() )
-									{
-										currentItem = this.recipe[x][y].copy();
-									}
 								}
 							}
 						}
 					}
+					if( currentItem.isEmpty() && this.recipe[x] != null)
+					{
+						currentItem = this.recipe[x][0].copy();
+					}
 				}
 				ItemHandlerUtil.setStackInSlot( craftMatrix, x, currentItem );
 			}

src/main/java/appeng/me/cache/TickManagerCache.java

@@ -19,9 +19,9 @@
 package appeng.me.cache;
 
 
-import java.util.HashMap;
-import java.util.PriorityQueue;
+import java.util.*;
 
+import appeng.parts.automation.PartLevelEmitter;
 import com.google.common.base.Preconditions;
 
 import net.minecraft.crash.CrashReport;
@@ -46,6 +46,7 @@ public class TickManagerCache implements ITickManager
 	private final HashMap<IGridNode, TickTracker> alertable = new HashMap<>();
 	private final HashMap<IGridNode, TickTracker> sleeping = new HashMap<>();
 	private final HashMap<IGridNode, TickTracker> awake = new HashMap<>();
+	private final HashMap<IGridNode, TickTracker> laterTicker = new HashMap<>();
 	private final PriorityQueue<TickTracker> upcomingTicks = new PriorityQueue<>();
 
 	private long currentTick = 0;
@@ -86,7 +87,7 @@ public class TickManagerCache implements ITickManager
 		{
 			this.currentTick++;
 
-			while( !this.upcomingTicks.isEmpty() )
+			while ( !this.upcomingTicks.isEmpty() )
 			{
 				tt = this.upcomingTicks.peek();
 
@@ -99,36 +100,50 @@ public class TickManagerCache implements ITickManager
 				this.upcomingTicks.poll();
 
 				final int diff = (int) ( this.currentTick - tt.getLastTick() );
-				final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
 
-				switch( mod )
+				if( tt.getGridTickable() instanceof PartLevelEmitter )
+				{
+					laterTicker.put( tt.getNode(), tt );
+				} else
 				{
-					case FASTER:
-						tt.setCurrentRate( tt.getCurrentRate() - 2 );
-						break;
-					case IDLE:
-						tt.setCurrentRate( tt.getRequest().maxTickRate );
-						break;
-					case SAME:
-						break;
-					case SLEEP:
-						this.sleepDevice( tt.getNode() );
-						break;
-					case SLOWER:
-						tt.setCurrentRate( tt.getCurrentRate() + 1 );
-						break;
-					case URGENT:
-						tt.setCurrentRate( 0 );
-						break;
-					default:
-						break;
-				}
 
+					final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
+
+					switch ( mod )
+					{
+						case FASTER:
+							tt.setCurrentRate( tt.getCurrentRate() - 2 );
+							break;
+						case IDLE:
+							tt.setCurrentRate( tt.getRequest().maxTickRate );
+							break;
+						case SAME:
+							break;
+						case SLEEP:
+							this.sleepDevice( tt.getNode() );
+							break;
+						case SLOWER:
+							tt.setCurrentRate( tt.getCurrentRate() + 1 );
+							break;
+						case URGENT:
+							tt.setCurrentRate( 0 );
+							break;
+						default:
+							break;
+					}
+				}
 				if( this.awake.containsKey( tt.getNode() ) )
 				{
 					this.addToQueue( tt );
 				}
 			}
+			Iterator<Map.Entry<IGridNode, TickTracker>> ltIterator = laterTicker.entrySet().iterator();
+			while ( ltIterator.hasNext() )
+			{
+				Map.Entry<IGridNode, TickTracker> tickTracker = ltIterator.next();
+				tickTracker.getValue().getGridTickable().tickingRequest( tickTracker.getKey(), 1 );
+				ltIterator.remove();
+			}
 		}
 		catch( final Throwable t )
 		{

src/main/java/appeng/parts/automation/PartLevelEmitter.java

@@ -19,9 +19,15 @@
 package appeng.parts.automation;
 
 
+import javax.annotation.Nonnull;
+
 import java.util.Collection;
 import java.util.Random;
 
+import appeng.api.networking.IGridNode;
+import appeng.api.networking.ticking.IGridTickable;
+import appeng.api.networking.ticking.TickRateModulation;
+import appeng.api.networking.ticking.TickingRequest;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
@@ -82,7 +88,7 @@ import appeng.util.Platform;
 import appeng.util.inv.InvOperation;
 
 
-public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>, ICraftingProvider
+public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>, ICraftingProvider, IGridTickable
 {
 
 	@PartModels
@@ -118,6 +124,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	private double centerX;
 	private double centerY;
 	private double centerZ;
+	private IBaseMonitor<IAEItemStack> changedMonitor;
 
 	@Reflected
 	public PartLevelEmitter( final ItemStack is )
@@ -400,7 +407,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource actionSource )
 	{
-		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor );
+		this.changedMonitor = monitor;
 	}
 
 	@Override
@@ -576,4 +583,22 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 			return this.isLevelEmitterOn() ? MODEL_ON_OFF : MODEL_OFF_OFF;
 		}
 	}
+
+	@Nonnull
+	@Override
+	public TickingRequest getTickingRequest( @Nonnull IGridNode node )
+	{
+		return new TickingRequest( 1,1,false,false );
+	}
+
+	@Nonnull
+	@Override
+	public TickRateModulation tickingRequest( @Nonnull IGridNode node, int ticksSinceLastCall )
+	{
+		if (this.changedMonitor != null)
+		{
+			this.updateReportingValue((IMEMonitor<IAEItemStack>) changedMonitor);
+		}
+		return TickRateModulation.URGENT;
+	}
 }