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

Added ME Fluid Interface (#3564)

Browse Source 
* Fixed fluid storage bus json recipe
* Added part version and recipes
* Added rudimentary gui
This commit is contained in:
fscan
2018-06-27 20:04:30 +02:00
committed by yueh
parent 046a27bf4c
commit c2d18ce013
31 changed files with 2200 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/api/definitions/ApiBlocks.java
+13
View File
@@ -126,6 +126,8 @@ import appeng.decorative.solid.BlockQuartzPillar;
import appeng.decorative.solid.BlockSkyStone;
import appeng.decorative.solid.BlockSkyStone.SkystoneType;
import appeng.decorative.stair.BlockStairCommon;
import appeng.fluids.block.BlockFluidInterface;
import appeng.fluids.tile.TileFluidInterface;
import appeng.hooks.DispenserBehaviorTinyTNT;
import appeng.tile.crafting.TileCraftingMonitorTile;
import appeng.tile.crafting.TileCraftingStorageTile;
@@ -197,6 +199,7 @@ public final class ApiBlocks implements IBlocks
private final ITileDefinition drive;
private final ITileDefinition chest;
private final ITileDefinition iface;
private final ITileDefinition fluidIface;
private final ITileDefinition cellWorkbench;
private final ITileDefinition iOPort;
private final ITileDefinition condenser;
@@ -390,6 +393,10 @@ public final class ApiBlocks implements IBlocks
.features( AEFeature.INTERFACE )
.tileEntity( new TileEntityDefinition( TileInterface.class ) )
.build();
this.fluidIface = registry.block( "fluid_interface", BlockFluidInterface::new )
.features( AEFeature.FLUID_INTERFACE )
.tileEntity( new TileEntityDefinition( TileFluidInterface.class ) )
.build();
this.cellWorkbench = registry.block( "cell_workbench", BlockCellWorkbench::new )
.features( AEFeature.STORAGE_CELLS )
.tileEntity( new TileEntityDefinition( TileCellWorkbench.class ) )
@@ -893,6 +900,12 @@ public final class ApiBlocks implements IBlocks
return this.iface;
}
@Override
public ITileDefinition fluidIface()
{
return this.fluidIface;
}
@Override
public ITileDefinition cellWorkbench()
{
src/main/java/appeng/core/api/definitions/ApiParts.java
+10 -2
View File
@@ -55,6 +55,7 @@ public final class ApiParts implements IParts
private final IItemDefinition importBus;
private final IItemDefinition exportBus;
private final IItemDefinition iface;
private final IItemDefinition fluidIface;
private final IItemDefinition levelEmitter;
private final IItemDefinition annihilationPlane;
private final IItemDefinition identityAnnihilationPlane;
@@ -111,10 +112,11 @@ public final class ApiParts implements IParts
this.importBus = new DamagedItemDefinition( "part.bus.import", itemPart.createPart( PartType.IMPORT_BUS ) );
this.exportBus = new DamagedItemDefinition( "part.bus.export", itemPart.createPart( PartType.EXPORT_BUS ) );
this.iface = new DamagedItemDefinition( "part.interface", itemPart.createPart( PartType.INTERFACE ) );
this.fluidIface = new DamagedItemDefinition( "part.fluid_interface", itemPart.createPart( PartType.FLUID_INTERFACE ) );
this.levelEmitter = new DamagedItemDefinition( "part.level_emitter", itemPart.createPart( PartType.LEVEL_EMITTER ) );
this.annihilationPlane = new DamagedItemDefinition( "part.plane.annihilation", itemPart.createPart( PartType.ANNIHILATION_PLANE ) );
this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity",
itemPart.createPart( PartType.IDENTITY_ANNIHILATION_PLANE ) );
this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart
.createPart( PartType.IDENTITY_ANNIHILATION_PLANE ) );
this.formationPlane = new DamagedItemDefinition( "part.plane.formation", itemPart.createPart( PartType.FORMATION_PLANE ) );
this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemPart.createPart( PartType.P2P_TUNNEL_ME ) );
this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemPart.createPart( PartType.P2P_TUNNEL_REDSTONE ) );
@@ -255,6 +257,12 @@ public final class ApiParts implements IParts
return this.iface;
}
@Override
public IItemDefinition fluidIface()
{
return this.fluidIface;
}
@Override
public IItemDefinition levelEmitter()
{