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/recipes/AEItemResolver.java
+2 -2
View File
@@ -19,6 +19,7 @@
package appeng.recipes;
import appeng.api.AEApi;
import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IItems;
import appeng.api.definitions.IParts;
@@ -27,7 +28,6 @@ import appeng.api.recipes.ResolverResult;
import appeng.api.recipes.ResolverResultSet;
import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.items.materials.ItemMaterial;
import appeng.items.materials.MaterialType;
@@ -45,7 +45,7 @@ public class AEItemResolver implements ISubItemResolver
if( nameSpace.equals( AppEng.MOD_ID ) )
{
final IDefinitions definitions = Api.INSTANCE.definitions();
final IDefinitions definitions = AEApi.instance().definitions();
final IItems items = definitions.items();
final IParts parts = definitions.parts();
src/main/java/appeng/recipes/game/DisassembleRecipe.java
+5 -5
View File
@@ -19,12 +19,12 @@
package appeng.recipes.game;
import appeng.api.AEApi;
import appeng.api.definitions.*;
import appeng.api.storage.IMEInventory;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.core.Api;
import appeng.core.AppEng;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.IInventory;
@@ -59,7 +59,7 @@ public final class DisassembleRecipe extends SpecialRecipe
{
super( id );
final IDefinitions definitions = Api.INSTANCE.definitions();
final IDefinitions definitions = AEApi.instance().definitions();
final IBlocks blocks = definitions.blocks();
final IItems items = definitions.items();
final IMaterials mats = definitions.materials();
@@ -109,15 +109,15 @@ public final class DisassembleRecipe extends SpecialRecipe
{
ItemStack storageCellStack = maybeCellOutput.get();
// make sure the storage cell stackInSlot empty...
final IMEInventory<IAEItemStack> cellInv = Api.INSTANCE
final IMEInventory<IAEItemStack> cellInv = AEApi.instance()
.registries()
.cell()
.getCellInventory( stackInSlot, null,
Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) );
AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
if( cellInv != null )
{
final IItemList<IAEItemStack> list = cellInv
.getAvailableItems( Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ).createList() );
.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() );
if( !list.isEmpty() )
{
return ItemStack.EMPTY;
src/main/java/appeng/recipes/game/FacadeRecipe.java
+2 -2
View File
@@ -19,9 +19,9 @@
package appeng.recipes.game;
import appeng.api.AEApi;
import appeng.api.definitions.IComparableDefinition;
import appeng.api.definitions.IDefinitions;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.items.parts.ItemFacade;
import net.minecraft.inventory.CraftingInventory;
@@ -47,7 +47,7 @@ public final class FacadeRecipe extends SpecialRecipe
{
super( id );
this.facade = facade;
final IDefinitions definitions = Api.INSTANCE.definitions();
final IDefinitions definitions = AEApi.instance().definitions();
this.anchor = definitions.parts().cableAnchor();
}
src/main/java/appeng/recipes/handlers/GrinderHandler.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class GrinderHandler implements IAERecipeFactory
turns = JSONUtils.getInt( json, "turns" );
}
final IGrinderRegistry reg = Api.INSTANCE.registries().grinder();
final IGrinderRegistry reg = AEApi.instance().registries().grinder();
for( int i = 0; i < input.length; ++i )
{
final IGrinderRecipeBuilder builder = reg.builder();
src/main/java/appeng/recipes/handlers/InscriberHandler.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class InscriberHandler implements IAERecipeFactory
bottom = CraftingHelper.getIngredient( JSONUtils.getJsonObject( ingredients, "bottom" ), ctx ).getMatchingStacks();
}
final IInscriberRegistry reg = Api.INSTANCE.registries().inscriber();
final IInscriberRegistry reg = AEApi.instance().registries().inscriber();
for( int i = 0; i < top.length; ++i )
{
for( int j = 0; j < bottom.length; ++j )
src/main/java/appeng/recipes/ingredients/PartIngredientSerializer.java
+2 -2
View File
@@ -19,10 +19,10 @@
package appeng.recipes.ingredients;
import appeng.api.AEApi;
import appeng.api.recipes.ResolverResult;
import appeng.api.recipes.ResolverResultSet;
import appeng.core.AELog;
import appeng.core.Api;
import appeng.core.AppEng;
import com.google.gson.JsonObject;
import net.minecraft.item.Item;
@@ -66,7 +66,7 @@ public class PartIngredientSerializer implements IIngredientSerializer<PartIngre
private PartIngredient getPart( String partName )
{
final Object result = Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, partName );
final Object result = AEApi.instance().registries().recipes().resolveItem( AppEng.MOD_ID, partName );
if( result instanceof ResolverResultSet )
{