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/block/AEBaseBlockItemChargeable.java
+2 -2
View File
@@ -19,12 +19,12 @@
package appeng.block;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.PowerUnits;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.implementations.items.IAEItemPowerStorage;
import appeng.core.Api;
import appeng.core.localization.GuiText;
import net.minecraft.block.Block;
import net.minecraft.client.util.ITooltipFlag;
@@ -134,7 +134,7 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte
private double getMaxEnergyCapacity()
{
final Block blockID = Block.getBlockFromItem( this );
final IBlockDefinition energyCell = Api.INSTANCE.definitions().blocks().energyCell();
final IBlockDefinition energyCell = AEApi.instance().definitions().blocks().energyCell();
return energyCell.maybeBlock().map( block ->
{
src/main/java/appeng/block/crafting/ItemCraftingStorage.java
+2 -2
View File
@@ -19,12 +19,12 @@
package appeng.block.crafting;
import appeng.core.Api;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import appeng.block.AEBaseBlockItem;
import appeng.core.AEConfig;
import appeng.api.AEApi;
import appeng.api.features.AEFeature;
@@ -38,7 +38,7 @@ public class ItemCraftingStorage extends AEBaseBlockItem
@Override
public ItemStack getContainerItem( final ItemStack itemStack )
{
return Api.INSTANCE.definitions().blocks().craftingUnit().maybeStack( 1 ).orElse( ItemStack.EMPTY );
return AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 ).orElse( ItemStack.EMPTY );
}
@Override
src/main/java/appeng/block/misc/BlockCharger.java
+2 -2
View File
@@ -24,7 +24,6 @@ import java.util.function.Function;
import javax.annotation.Nullable;
import appeng.core.Api;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.math.BlockRayTraceResult;
@@ -50,6 +49,7 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.AEApi;
import appeng.api.util.AEAxisAlignedBB;
import appeng.block.AEBaseTileBlock;
import appeng.client.render.renderable.ItemRenderable;
@@ -115,7 +115,7 @@ public class BlockCharger extends AEBaseTileBlock<TileCharger>
{
final TileCharger tc = (TileCharger) tile;
if( Api.INSTANCE.definitions().materials().certusQuartzCrystalCharged().isSameAs( tc.getInternalInventory().getStackInSlot( 0 ) ) )
if( AEApi.instance().definitions().materials().certusQuartzCrystalCharged().isSameAs( tc.getInternalInventory().getStackInSlot( 0 ) ) )
{
final double xOff = 0.0;
final double yOff = 0.0;
src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
+2 -2
View File
@@ -2,8 +2,8 @@
package appeng.block.qnb;
import appeng.api.AEApi;
import appeng.client.render.cablebus.CubeBuilder;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.tile.qnb.TileQuantumBridge;
import com.google.common.collect.ImmutableList;
@@ -63,7 +63,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel
this.coveredCableTexture = bakedTextureGetter.apply( TEXTURE_COVERED_CABLE );
this.lightTexture = bakedTextureGetter.apply( TEXTURE_RING_LIGHT );
this.lightCornerTexture = bakedTextureGetter.apply( TEXTURE_RING_LIGHT_CORNER );
this.linkBlock = Api.INSTANCE.definitions().blocks().quantumLink().maybeBlock().orElse( null );
this.linkBlock = AEApi.instance().definitions().blocks().quantumLink().maybeBlock().orElse( null );
}
@Override