fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored AEStacks & ItemList (#4406)

Browse Source 
Removed custom VarInt/VarLong solution.
Moved itemstack and fluidstack serialisation to their own NBT tag to avoid interference.
Removed now useless NBT sorting
Added NullItemList
This commit is contained in:
yueh
2020-06-11 20:20:16 +02:00
committed by GitHub
parent c45a15e13b
commit d449ee47c4
10 changed files with 616 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/item/ItemList.java
+106 -88
View File
@@ -1,6 +1,6 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
* Copyright (c) 2013 - 2020, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -21,41 +21,24 @@ package appeng.util.item;
import java.util.Collection;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.NavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.Map;
import java.util.NoSuchElementException;
import net.minecraft.item.Item;
import appeng.api.config.FuzzyMode;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.util.item.AESharedItemStack.Bounds;
public final class ItemList implements IItemList<IAEItemStack>
{
private final NavigableMap<AESharedItemStack, IAEItemStack> records = new ConcurrentSkipListMap<>();
private final static IItemList<IAEItemStack> NULL_ITEMLIST = new NullItemList();
@Override
public void add( final IAEItemStack option )
{
if( option == null )
{
return;
}
final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
if( st != null )
{
st.add( option );
return;
}
final IAEItemStack opt = option.copy();
this.putItemRecord( opt );
}
private final Map<Item, IItemList<IAEItemStack>> records = new IdentityHashMap<>();
@Override
public IAEItemStack findPrecise( final IAEItemStack itemStack )
@@ -65,7 +48,7 @@ public final class ItemList implements IItemList<IAEItemStack>
return null;
}
return this.records.get( ( (AEItemStack) itemStack ).getSharedStack() );
return this.getRecord( itemStack.getItem() ).findPrecise( itemStack );
}
@Override
@@ -76,9 +59,7 @@ public final class ItemList implements IItemList<IAEItemStack>
return Collections.emptyList();
}
final AEItemStack ais = (AEItemStack) filter;
return this.findFuzzyDamage( ais, fuzzy, false );
return this.getRecord( filter.getItem() ).findFuzzy( filter, fuzzy );
}
@Override
@@ -88,76 +69,47 @@ public final class ItemList implements IItemList<IAEItemStack>
}
@Override
public void addStorage( final IAEItemStack option )
public void add( final IAEItemStack itemStack )
{
if( option == null )
if( itemStack == null )
{
return;
}
final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
if( st != null )
{
st.incStackSize( option.getStackSize() );
return;
}
final IAEItemStack opt = option.copy();
this.putItemRecord( opt );
}
/*
* public void clean() { Iterator<StackType> i = iterator(); while (i.hasNext()) { StackType AEI =
* i.next(); if ( !AEI.isMeaningful() ) i.remove(); } }
*/
@Override
public void addCrafting( final IAEItemStack option )
{
if( option == null )
{
return;
}
final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
if( st != null )
{
st.setCraftable( true );
return;
}
final IAEItemStack opt = option.copy();
opt.setStackSize( 0 );
opt.setCraftable( true );
this.putItemRecord( opt );
this.getOrCreateRecord( itemStack.getItem() ).add( itemStack );
}
@Override
public void addRequestable( final IAEItemStack option )
public void addStorage( final IAEItemStack itemStack )
{
if( option == null )
if( itemStack == null )
{
return;
}
final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
this.getOrCreateRecord( itemStack.getItem() ).addStorage( itemStack );
}
if( st != null )
@Override
public void addCrafting( final IAEItemStack itemStack )
{
if( itemStack == null )
{
st.setCountRequestable( st.getCountRequestable() + option.getCountRequestable() );
return;
}
final IAEItemStack opt = option.copy();
opt.setStackSize( 0 );
opt.setCraftable( false );
opt.setCountRequestable( option.getCountRequestable() );
this.getOrCreateRecord( itemStack.getItem() ).addCrafting( itemStack );
}
this.putItemRecord( opt );
@Override
public void addRequestable( final IAEItemStack itemStack )
{
if( itemStack == null )
{
return;
}
this.getOrCreateRecord( itemStack.getItem() ).addRequestable( itemStack );
}
@Override
@@ -174,13 +126,19 @@ public final class ItemList implements IItemList<IAEItemStack>
@Override
public int size()
{
return this.records.size();
int size = 0;
for( IItemList<IAEItemStack> entry : records.values() )
{
size += entry.size();
}
return size;
}
@Override
public Iterator<IAEItemStack> iterator()
{
return new MeaningfulItemIterator<>( this.records.values().iterator() );
return new ChainedIterator( this.records.values().iterator() );
}
@Override
@@ -192,16 +150,76 @@ public final class ItemList implements IItemList<IAEItemStack>
}
}
private IAEItemStack putItemRecord( final IAEItemStack itemStack )
private IItemList<IAEItemStack> getRecord( Item item )
{
return this.records.put( ( (AEItemStack) itemStack ).getSharedStack(), itemStack );
return this.records.getOrDefault( item, NULL_ITEMLIST );
}
private Collection<IAEItemStack> findFuzzyDamage( final IAEItemStack filter, final FuzzyMode fuzzy, final boolean ignoreMeta )
private IItemList<IAEItemStack> getOrCreateRecord( Item item )
{
final AEItemStack itemStack = (AEItemStack) filter;
final Bounds bounds = itemStack.getSharedStack().getBounds( fuzzy, ignoreMeta );
return this.records.computeIfAbsent( item, this::makeRecordMap );
}
private IItemList<IAEItemStack> makeRecordMap( Item item )
{
if( item.isDamageable() )
{
return new FuzzyItemList();
}
else
{
return new StrictItemList();
}
}
private class ChainedIterator implements Iterator<IAEItemStack>
{
private final Iterator<IItemList<IAEItemStack>> parent;
private Iterator<IAEItemStack> next;
public ChainedIterator( Iterator<IItemList<IAEItemStack>> iterator )
{
this.parent = iterator;
if( this.parent.hasNext() )
{
this.next = this.parent.next().iterator();
}
}
@Override
public boolean hasNext()
{
while( this.next != null )
{
if( this.next.hasNext() )
{
return true;
}
if( this.parent.hasNext() )
{
this.next = this.parent.next().iterator();
}
else
{
this.next = null;
}
}
return false;
}
@Override
public IAEItemStack next()
{
if( this.next == null )
{
throw new NoSuchElementException();
}
return this.next.next();
}
return this.records.subMap( bounds.lower(), true, bounds.upper(), true ).descendingMap().values();
}
}