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/spatial/CachedPlane.java
+5 -5
View File
@@ -59,7 +59,7 @@ public class CachedPlane
private final List<TileEntity> tiles = new ArrayList<>();
private final List<NextTickListEntry> ticks = new ArrayList<>();
private final World world;
private final IMovableRegistry reg = Api.INSTANCE.registries().movable();
private final IMovableRegistry reg = AEApi.instance().registries().movable();
private final List<WorldCoord> updates = new ArrayList<>();
private int verticalBits;
private final BlockState matrixBlockState;
@@ -67,7 +67,7 @@ public class CachedPlane
public CachedPlane( final World w, final int minX, final int minY, final int minZ, final int maxX, final int maxY, final int maxZ )
{
Block matrixFrameBlock = Api.INSTANCE.definitions().blocks().matrixFrame().maybeBlock().orElse( null );
Block matrixFrameBlock = AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().orElse( null );
if( matrixFrameBlock != null )
{
this.matrixBlockState = matrixFrameBlock.getDefaultState();
@@ -115,7 +115,7 @@ public class CachedPlane
}
}
final IMovableRegistry mr = Api.INSTANCE.registries().movable();
final IMovableRegistry mr = AEApi.instance().registries().movable();
for( int cx = 0; cx < this.cx_size; cx++ )
{
@@ -203,13 +203,13 @@ public class CachedPlane
private IMovableHandler getHandler( final TileEntity te )
{
final IMovableRegistry mr = Api.INSTANCE.registries().movable();
final IMovableRegistry mr = AEApi.instance().registries().movable();
return mr.getHandler( te );
}
void swap( final CachedPlane dst )
{
final IMovableRegistry mr = Api.INSTANCE.registries().movable();
final IMovableRegistry mr = AEApi.instance().registries().movable();
if( dst.x_size == this.x_size && dst.y_size == this.y_size && dst.z_size == this.z_size )
{
src/main/java/appeng/spatial/StorageChunkProvider.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class StorageChunkProvider extends ChunkGeneratorOverworld
biomes[k] = biomeId;
}
Api.INSTANCE.definitions().blocks().matrixFrame().maybeBlock().ifPresent( block -> this.fillChunk( chunk, block.getDefaultState() ) );
AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().ifPresent( block -> this.fillChunk( chunk, block.getDefaultState() ) );
chunk.setModified( false );
src/main/java/appeng/spatial/StorageHelper.java
+1 -2
View File
@@ -22,7 +22,6 @@ package appeng.spatial;
import java.util.ArrayList;
import java.util.List;
import appeng.core.Api;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
@@ -163,7 +162,7 @@ public class StorageHelper
public void swapRegions( final World srcWorld, final int srcX, final int srcY, final int srcZ, final World dstWorld, final int dstX, final int dstY, final int dstZ, final int scaleX, final int scaleY, final int scaleZ )
{
Api.INSTANCE
AEApi.instance()
.definitions()
.blocks()
.matrixFrame()