partial implementation of oredict storage bus

missing proper GUI, text, item models, memorycard support.
logic works
This commit is contained in:
PrototypeTrousers
2022-01-03 02:33:08 -03:00
parent 13afa6908a
commit 9eef9d3840
13 changed files with 492 additions and 32 deletions
+50 -10
View File
@@ -19,13 +19,8 @@
package appeng.util.item;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
@@ -116,7 +111,7 @@ public class OreHelper
boolean sameOre( final AEItemStack aeItemStack, final IAEItemStack is )
{
final OreReference a = aeItemStack.getOre().orElse( null );
final OreReference b = aeItemStack.getOre().orElse( null );
final OreReference b = ( (AEItemStack) is ).getOre().orElse( null );
return this.sameOre( a, b );
}
@@ -160,8 +155,53 @@ public class OreHelper
}
}
return false;
} )
.orElse( false );
} ).orElse( false );
}
public Set<Integer> getMatchingOre( String allow )
{
List<String> matchingOres = new ArrayList<>();
ConcurrentMap<String, List<ItemStack>> oreKeys = oreDictCache.asMap();
oreKeys.forEach( ( s, l ) -> {
if( allow.startsWith( "*" ) && allow.endsWith( "*" ) )
{
if( s.contains( allow.substring( 1, allow.length() - 1 ) ) )
{
matchingOres.add( s );
}
}
else if( allow.startsWith( "*" ) )
{
if( s.endsWith( allow.substring( 1 ) ) )
{
matchingOres.add( s );
}
}
else if( allow.endsWith( "*" ) )
{
if( s.startsWith( allow.substring( 0, allow.length() - 1 ) ) )
{
matchingOres.add( s );
}
}
else
{
if( s.matches( allow ) )
{
matchingOres.add( s );
}
}
} );
Set<Integer> oreIDs = new HashSet<>();
for( String matchingOre : matchingOres )
{
oreIDs.add( OreDictionary.getOreID( matchingOre ) );
}
return oreIDs;
}
List<ItemStack> getCachedOres( final String oreName )
@@ -65,8 +65,8 @@ public class OreReference
return this.aeOtherOptions;
}
Collection<Integer> getOres()
{
return this.ores;
}
public Collection<Integer> getOres()
{
return this.ores;
}
}
@@ -0,0 +1,51 @@
package appeng.util.prioritylist;
import appeng.api.storage.data.IAEStack;
import appeng.util.item.AEItemStack;
import appeng.util.item.OreReference;
import java.util.ArrayList;
import java.util.Set;
public class OreDictPriorityList<T extends IAEStack<T>> implements IPartitionList<T>
{
private final Set<Integer> oreIDs;
private final String oreMatch;
public OreDictPriorityList( Set<Integer> oreIDs, String oreMatch )
{
this.oreIDs = oreIDs;
this.oreMatch = oreMatch;
}
@Override
public boolean isListed( final T input )
{
OreReference or = ( (AEItemStack) input ).getOre().orElse( null );
if( or != null )
{
for( Integer oreID : or.getOres() )
{
if( this.oreIDs.contains( oreID ) )
{
return true;
}
}
}
return false;
}
@Override
public boolean isEmpty()
{
return oreMatch.equals( "" );
}
@Override
public Iterable<T> getItems()
{
return new ArrayList<>();
}
}