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

Revert using internal API

Browse Source
This commit is contained in:
yueh
2020-06-07 17:21:20 +02:00
parent 7715f605eb
commit 23b6e195ac
148 changed files with 472 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/crafting/MECraftingInventory.java
+16 -17
View File
@@ -28,7 +28,6 @@ import appeng.api.storage.IStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.core.Api;
import appeng.util.inv.ItemListIgnoreCrafting;
@@ -51,7 +50,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
public MECraftingInventory()
{
this.localCache = new ItemListIgnoreCrafting<>( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() );
this.localCache = new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() );
this.extractedCache = null;
this.injectedCache = null;
this.missingCache = null;
@@ -71,7 +70,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( this.logMissing )
{
this.missingCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.missingCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
@@ -80,7 +79,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( this.logExtracted )
{
this.extractedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.extractedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
@@ -89,7 +88,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( this.logInjections )
{
this.injectedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.injectedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
@@ -97,7 +96,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
}
this.localCache = this.target
.getAvailableItems( new ItemListIgnoreCrafting<>( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() ) );
.getAvailableItems( new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) );
this.par = parent;
}
@@ -111,7 +110,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( logMissing )
{
this.missingCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.missingCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
@@ -120,7 +119,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( logExtracted )
{
this.extractedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.extractedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
@@ -129,14 +128,14 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( logInjections )
{
this.injectedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.injectedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
this.injectedCache = null;
}
this.localCache = new ItemListIgnoreCrafting<>( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() );
this.localCache = new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() );
for( final IAEItemStack is : target.getStorageList() )
{
this.localCache.add( target.extractItems( is, Actionable.SIMULATE, src ) );
@@ -154,7 +153,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( logMissing )
{
this.missingCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.missingCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
@@ -163,7 +162,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( logExtracted )
{
this.extractedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.extractedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
@@ -172,14 +171,14 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
if( logInjections )
{
this.injectedCache = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
this.injectedCache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
}
else
{
this.injectedCache = null;
}
this.localCache = target.getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() );
this.localCache = target.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() );
this.par = null;
}
@@ -260,7 +259,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
@Override
public IStorageChannel getChannel()
{
return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class );
return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
}
public IItemList<IAEItemStack> getItemList()
@@ -270,8 +269,8 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
public boolean commit( final IActionSource src )
{
final IItemList<IAEItemStack> added = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
final IItemList<IAEItemStack> pulled = Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList();
final IItemList<IAEItemStack> added = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
final IItemList<IAEItemStack> pulled = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
boolean failed = false;
if( this.logInjections )