tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixed crafting watchers not having the right type

Browse source
This commit is contained in:
thatsIch 2014-09-28 22:45:57 +02:00
parent f1ffbf08a2
commit 56757bd828
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/appeng/crafting/CraftingWatcher.java
View file

@ -49,17 +49,17 @@ public class CraftingWatcher implements ICraftingWatcher
}
CraftingGridCache gsc;
ICraftingWatcherHost myObject;
ICraftingWatcherHost host;
HashSet<IAEStack> myInterests = new HashSet<IAEStack>();
public CraftingWatcher(CraftingGridCache cache, ICraftingWatcherHost host) {
gsc = cache;
myObject = host;
this.host = host;
}
public ICraftingWatcherHost getHost()
{
return myObject;
return host;
}
@Override

4
src/main/java/appeng/me/cache/CraftingGridCache.java vendored
View file

@ -83,8 +83,8 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
HashMap<String, CraftingLinkNexus> links = new HashMap<String, CraftingLinkNexus>();
boolean updateList = false;
final private SetMultimap<IAEStack, Collection<IAEStack>> interests = HashMultimap.create();
final public GenericInterestManager<Collection<IAEStack>> interestManager = new GenericInterestManager<Collection<IAEStack>>( interests );
final private SetMultimap<IAEStack, CraftingWatcher> interests = HashMultimap.create();
final public GenericInterestManager<CraftingWatcher> interestManager = new GenericInterestManager<CraftingWatcher>( interests );
class ActiveCpuIterator implements Iterator<ICraftingCPU>
{

8
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
View file

@ -1,11 +1,7 @@
package appeng.me.cluster.implementations;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.Set;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
@ -290,9 +286,11 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
if ( sg.interestManager.containsKey( diff ) )
{
Set<CraftingWatcher> list = sg.interestManager.get( diff );
if ( !list.isEmpty() )
{
for (CraftingWatcher iw : list)
iw.getHost().onRequestChange( sg, diff );
}
}