More compile things
This commit is contained in:
@@ -24,15 +24,30 @@
|
||||
package appeng.api.config;
|
||||
|
||||
|
||||
import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
|
||||
|
||||
|
||||
public enum Actionable
|
||||
{
|
||||
/**
|
||||
* Perform the intended action.
|
||||
*/
|
||||
MODULATE,
|
||||
MODULATE( FluidAction.EXECUTE ),
|
||||
|
||||
/**
|
||||
* Pretend to perform the action.
|
||||
*/
|
||||
SIMULATE
|
||||
SIMULATE( FluidAction.SIMULATE );
|
||||
|
||||
private final FluidAction fluidAction;
|
||||
|
||||
Actionable( FluidAction fluidAction )
|
||||
{
|
||||
this.fluidAction = fluidAction;
|
||||
}
|
||||
|
||||
public FluidAction getFluidAction()
|
||||
{
|
||||
return fluidAction;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ import java.util.EnumSet;
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.world.IWorld;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import appeng.api.IAppEngApi;
|
||||
@@ -91,7 +92,7 @@ public interface IGridNode
|
||||
* @return the world the node is located in
|
||||
*/
|
||||
@Nonnull
|
||||
World getWorld();
|
||||
IWorld getWorld();
|
||||
|
||||
/**
|
||||
* @return a set of the connected sides, INTERNAL represents an invisible connection
|
||||
@@ -169,4 +170,4 @@ public interface IGridNode
|
||||
* @param playerID new player id
|
||||
*/
|
||||
void setPlayerID( int playerID );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package appeng.api.parts;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@@ -11,5 +12,5 @@ import net.minecraft.client.renderer.model.BakedQuad;
|
||||
|
||||
public interface IPartBakedModel
|
||||
{
|
||||
List<BakedQuad> getPartQuads( @Nullable Long partFlags, long rand );
|
||||
List<BakedQuad> getPartQuads( @Nullable Long partFlags, Random rand );
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ package appeng.api.parts;
|
||||
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
@@ -46,7 +46,8 @@ public interface IPartHelper
|
||||
*
|
||||
* @return true if placing was successful
|
||||
*/
|
||||
ActionResult<?> placeBus( ItemStack is, BlockPos pos, Direction side, PlayerEntity player, Hand hand, World world );
|
||||
//TODO, this should probably take ItemStack + ItemUseContext
|
||||
ActionResultType placeBus( ItemStack is, BlockPos pos, Direction side, PlayerEntity player, Hand hand, World world );
|
||||
|
||||
/**
|
||||
* @return the render mode
|
||||
|
||||
Reference in New Issue
Block a user