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

Removed AEApi

Browse Source 
Moved all internal access to the internal `Api` class using a new static
getter.
This commit is contained in:
yueh
2020-07-11 19:40:34 +02:00
parent d18eabe1fc
commit 0d43ca15be
168 changed files with 757 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/game/DisassembleRecipe.java
+5 -5
View File
@@ -33,7 +33,6 @@ import net.minecraft.item.crafting.SpecialRecipeSerializer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.definitions.IBlocks;
import appeng.api.definitions.IDefinitions;
import appeng.api.definitions.IItemDefinition;
@@ -43,6 +42,7 @@ 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;
public final class DisassembleRecipe extends SpecialRecipe {
@@ -61,7 +61,7 @@ public final class DisassembleRecipe extends SpecialRecipe {
public DisassembleRecipe(ResourceLocation id) {
super(id);
final IDefinitions definitions = AEApi.instance().definitions();
final IDefinitions definitions = Api.instance().definitions();
final IBlocks blocks = definitions.blocks();
final IItems items = definitions.items();
final IMaterials mats = definitions.materials();
@@ -105,11 +105,11 @@ public final class DisassembleRecipe extends SpecialRecipe {
if (maybeCellOutput.isPresent()) {
ItemStack storageCellStack = maybeCellOutput.get();
// make sure the storage cell stackInSlot empty...
final IMEInventory<IAEItemStack> cellInv = AEApi.instance().registries().cell().getCellInventory(
stackInSlot, null, AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
final IMEInventory<IAEItemStack> cellInv = Api.instance().registries().cell().getCellInventory(
stackInSlot, null, Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
if (cellInv != null) {
final IItemList<IAEItemStack> list = cellInv.getAvailableItems(
AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList());
Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList());
if (!list.isEmpty()) {
return ItemStack.EMPTY;
}
src/main/java/appeng/recipes/game/FacadeRecipe.java
+2 -2
View File
@@ -29,9 +29,9 @@ import net.minecraft.item.crafting.SpecialRecipeSerializer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
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.FacadeItem;
@@ -44,7 +44,7 @@ public final class FacadeRecipe extends SpecialRecipe {
public FacadeRecipe(ResourceLocation id, FacadeItem facade) {
super(id);
this.facade = facade;
final IDefinitions definitions = AEApi.instance().definitions();
final IDefinitions definitions = Api.instance().definitions();
this.anchor = definitions.parts().cableAnchor();
}