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/tile/misc/CondenserItemInventory.java
+1 -2
View File
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
import appeng.core.Api;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
@@ -105,7 +104,7 @@ class CondenserItemInventory implements IMEMonitor<IAEItemStack>, ITickingMonito
@Override
public IStorageChannel<IAEItemStack> getChannel()
{
return Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class );
return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
}
@Override
src/main/java/appeng/tile/misc/TileCharger.java
+7 -7
View File
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import appeng.core.Api;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketBuffer;
@@ -32,6 +31,7 @@ import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.PowerUnits;
@@ -129,7 +129,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
final ItemStack myItem = this.inv.getStackInSlot( 0 );
if( this.getInternalCurrentPower() > POWER_THRESHOLD )
{
final IMaterials materials = Api.INSTANCE.definitions().materials();
final IMaterials materials = AEApi.instance().definitions().materials();
if( materials.certusQuartzCrystal().isSameAs( myItem ) )
{
@@ -179,7 +179,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
{
ItemStack held = player.inventory.getCurrentItem();
if( Api.INSTANCE.definitions().materials().certusQuartzCrystal().isSameAs( held ) || Platform.isChargeable( held ) )
if( AEApi.instance().definitions().materials().certusQuartzCrystal().isSameAs( held ) || Platform.isChargeable( held ) )
{
held = player.inventory.decrStackSize( player.inventory.currentItem, 1 );
this.inv.setStackInSlot( 0, held );
@@ -213,7 +213,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
if( !myItem.isEmpty() )
{
final IMaterials materials = Api.INSTANCE.definitions().materials();
final IMaterials materials = AEApi.instance().definitions().materials();
if( Platform.isChargeable( myItem ) )
{
@@ -221,7 +221,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
if( ps.getAEMaxPower( myItem ) > ps.getAECurrentPower( myItem ) )
{
final double chargeRate = Api.INSTANCE.registries().charger().getChargeRate( myItem.getItem() );
final double chargeRate = AEApi.instance().registries().charger().getChargeRate( myItem.getItem() );
double extractedAmount = this.extractAEPower( chargeRate, Actionable.MODULATE, PowerMultiplier.CONFIG );
@@ -292,7 +292,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
@Override
public boolean allowInsert( IItemHandler inv, final int i, final ItemStack itemstack )
{
final IItemDefinition cert = Api.INSTANCE.definitions().materials().certusQuartzCrystal();
final IItemDefinition cert = AEApi.instance().definitions().materials().certusQuartzCrystal();
return Platform.isChargeable( itemstack ) || cert.isSameAs( itemstack );
}
@@ -311,7 +311,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
}
}
return Api.INSTANCE.definitions().materials().certusQuartzCrystalCharged().isSameAs( extractedItem );
return AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs( extractedItem );
}
}
}
src/main/java/appeng/tile/misc/TileCondenser.java
+3 -4
View File
@@ -22,7 +22,6 @@ package appeng.tile.misc;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import appeng.core.Api;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -167,7 +166,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
private ItemStack getOutput()
{
final IMaterials materials = Api.INSTANCE.definitions().materials();
final IMaterials materials = AEApi.instance().definitions().materials();
switch( (CondenserOutput) this.cm.getSetting( Settings.CONDENSER_OUTPUT ) )
{
@@ -325,7 +324,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
public int fill(FluidStack resource, FluidAction action) {
if( action == FluidAction.EXECUTE )
{
final IStorageChannel<IAEFluidStack> chan = Api.INSTANCE.storage().getStorageChannel( IFluidStorageChannel.class );
final IStorageChannel<IAEFluidStack> chan = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class );
TileCondenser.this.addPower( ( resource == null ? 0.0 : (double) resource.getAmount() ) / chan.transferFactor() );
}
@@ -392,7 +391,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
@Override
public <T extends IAEStack<T>> IMEMonitor<T> getInventory( IStorageChannel<T> channel )
{
if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) )
if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
{
return (IMEMonitor<T>) this.itemInventory;
}
src/main/java/appeng/tile/misc/TileInscriber.java
+7 -7
View File
@@ -26,7 +26,6 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import appeng.core.Api;
import com.google.common.collect.Lists;
import net.minecraft.item.ItemStack;
@@ -39,6 +38,7 @@ import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.Upgrades;
@@ -110,7 +110,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
this.getProxy().setIdlePowerUsage( 0 );
this.settings = new ConfigManager( this );
final ITileDefinition inscriberDefinition = Api.INSTANCE.definitions().blocks().inscriber();
final ITileDefinition inscriberDefinition = AEApi.instance().definitions().blocks().inscriber();
this.upgrades = new DefinitionUpgradeInventory( inscriberDefinition, this, this.getUpgradeSlots() );
this.sideItemHandler.setMaxStackSize( 1, 64 );
@@ -306,7 +306,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
return null;
}
final IComparableDefinition namePress = Api.INSTANCE.definitions().materials().namePress();
final IComparableDefinition namePress = AEApi.instance().definitions().materials().namePress();
final boolean isNameA = namePress.isSameAs( plateA );
final boolean isNameB = namePress.isSameAs( plateB );
@@ -319,7 +319,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
return this.makeNamePressRecipe( input, plateB, plateA );
}
for( final IInscriberRecipe recipe : Api.INSTANCE.registries().inscriber().getRecipes() )
for( final IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() )
{
final boolean matchA = ( plateA.isEmpty() && !recipe.getTopOptional().isPresent() ) || ( Platform.itemComparisons()
@@ -559,7 +559,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
final List<ItemStack> inputs = Lists.newArrayList( startingItem );
final InscriberProcessType type = InscriberProcessType.INSCRIBE;
final IInscriberRecipeBuilder builder = Api.INSTANCE.registries().inscriber().builder();
final IInscriberRecipeBuilder builder = AEApi.instance().registries().inscriber().builder();
builder.withInputs( inputs ).withOutput( renamedItem ).withProcessType( type );
if( !plateA.isEmpty() )
@@ -609,11 +609,11 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
if( inv == TileInscriber.this.topItemHandler || inv == TileInscriber.this.bottomItemHandler )
{
if( Api.INSTANCE.definitions().materials().namePress().isSameAs( stack ) )
if( AEApi.instance().definitions().materials().namePress().isSameAs( stack ) )
{
return true;
}
for( final ItemStack optionals : Api.INSTANCE.registries().inscriber().getOptionals() )
for( final ItemStack optionals : AEApi.instance().registries().inscriber().getOptionals() )
{
if( Platform.itemComparisons().isSameItem( stack, optionals ) )
{
src/main/java/appeng/tile/misc/TileInterface.java
+2 -2
View File
@@ -26,7 +26,6 @@ import java.util.List;
import javax.annotation.Nullable;
import appeng.container.implementations.ContainerInterface;
import appeng.core.Api;
import com.google.common.collect.ImmutableSet;
import net.minecraft.inventory.CraftingInventory;
@@ -43,6 +42,7 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.Upgrades;
import appeng.api.networking.IGridNode;
@@ -359,7 +359,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
@Override
public ItemStack getItemStackRepresentation()
{
return Api.INSTANCE.definitions().blocks().iface().maybeStack( 1 ).orElse( ItemStack.EMPTY );
return AEApi.instance().definitions().blocks().iface().maybeStack( 1 ).orElse( ItemStack.EMPTY );
}
@Override
src/main/java/appeng/tile/misc/TileSecurityStation.java
+3 -3
View File
@@ -24,7 +24,6 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import appeng.core.Api;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -38,6 +37,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.SecurityPermissions;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
@@ -278,7 +278,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
@Override
public <T extends IAEStack<T>> IMEMonitor<T> getInventory( IStorageChannel<T> channel )
{
if( channel == Api.INSTANCE.storage().getStorageChannel( IItemStorageChannel.class ) )
if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
{
return (IMEMonitor<T>) this.securityMonitor;
}
@@ -318,7 +318,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
@Override
public void readPermissions( final Map<Integer, EnumSet<SecurityPermissions>> playerPerms )
{
final IPlayerRegistry pr = Api.INSTANCE.registries().players();
final IPlayerRegistry pr = AEApi.instance().registries().players();
// read permissions
for( final IAEItemStack ais : this.inventory.getStoredItems() )