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

Lots of compile fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-04 03:02:48 +02:00
parent 6eb2a9504a
commit 237463dd94
241 changed files with 3438 additions and 3474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java
+10 -10
View File
@@ -41,7 +41,7 @@ import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.core.Api;
import appeng.core.sync.GuiBridge;
import appeng.fluids.util.AEFluidInventory;
import appeng.fluids.util.IAEFluidInventory;
import appeng.fluids.util.IAEFluidTank;
@@ -120,7 +120,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
final BlockPos pos = te.getPos().offset( side.getFacing() );
final BlockState state = w.getBlockState( pos );
if( this.canReplace( w, state, state.getBlock(), pos ) )
if( this.canReplace( w, state, pos ) )
{
if( type == Actionable.MODULATE )
{
@@ -141,9 +141,9 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
return input;
}
private boolean canReplace( World w, BlockState state, Block block, BlockPos pos )
private boolean canReplace( World w, BlockState state, BlockPos pos )
{
return block.isReplaceable( w, pos ) && !( block instanceof IFluidBlock ) && !( block instanceof BlockLiquid ) && !state.getMaterial().isLiquid();
return state.getMaterial().isReplaceable() && w.getFluidState(pos).isEmpty() && !state.getMaterial().isLiquid();
}
@Override
@@ -188,7 +188,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
{
if( Platform.isServer() )
{
Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_FLUID_FORMATION_PLANE );
// FIXME Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_FLUID_FORMATION_PLANE );
}
return true;
@@ -229,9 +229,9 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
return Api.INSTANCE.definitions().parts().fluidFormationnPlane().maybeStack( 1 ).orElse( ItemStack.EMPTY );
}
@Override
public GuiBridge getGuiBridge()
{
return GuiBridge.GUI_FLUID_FORMATION_PLANE;
}
// FIXME @Override
// FIXME public GuiBridge getGuiBridge()
// FIXME {
// FIXME return GuiBridge.GUI_FLUID_FORMATION_PLANE;
// FIXME }
}