Improve fluid propagation, still some issues

This commit is contained in:
modmuss50 2016-05-12 18:41:51 +01:00
parent 934cc76089
commit 9ecd52436b

View file

@ -30,21 +30,20 @@ import net.minecraftforge.common.property.Properties;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import reborncore.common.util.ChatUtils;
import reborncore.common.misc.Functions;
import reborncore.common.misc.vecmath.Vecs3dCube;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.StringUtils;
import reborncore.common.util.Tank;
import reborncore.common.util.WorldUtils;
import techreborn.parts.TechRebornParts;
import reborncore.common.util.StringUtils;
import java.util.*;
/**
* Created by modmuss50 on 09/05/2016.
*/
public class MultipartFluidPipe extends Multipart implements INormallyOccludingPart, ISlottedPart, ITickable
{
public class MultipartFluidPipe extends Multipart implements INormallyOccludingPart, ISlottedPart, ITickable {
public static final IUnlistedProperty<Boolean> UP = Properties.toUnlisted(PropertyBool.create("up"));
public static final IUnlistedProperty<Boolean> DOWN = Properties.toUnlisted(PropertyBool.create("down"));
@ -62,51 +61,42 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
EnumFluidPipeTypes currentType = EnumFluidPipeTypes.EMPTY;
Tank tank = new Tank("MultipartFluidPipe", 1000, null);
public MultipartFluidPipe()
{
public MultipartFluidPipe() {
connectedSides = new HashMap<>();
refreshBounding();
}
public static MultipartFluidPipe getPartFromWorld(World world, BlockPos pos, EnumFacing side)
{
if (world == null || pos == null)
{
public static MultipartFluidPipe getPartFromWorld(World world, BlockPos pos, EnumFacing side) {
if (world == null || pos == null) {
return null;
}
IMultipartContainer container = MultipartHelper.getPartContainer(world, pos);
if (side != null && container != null)
{
if (side != null && container != null) {
ISlottedPart slottedPart = container.getPartInSlot(PartSlot.getFaceSlot(side));
if (slottedPart instanceof IMicroblock.IFaceMicroblock && !((IMicroblock.IFaceMicroblock) slottedPart)
.isFaceHollow())
{
.isFaceHollow()) {
return null;
}
}
if (container == null)
{
if (container == null) {
return null;
}
ISlottedPart part = container.getPartInSlot(PartSlot.CENTER);
if (part instanceof MultipartFluidPipe)
{
if (part instanceof MultipartFluidPipe) {
return (MultipartFluidPipe) part;
}
return null;
}
public void refreshBounding()
{
public void refreshBounding() {
float centerFirst = center - offset;
double w = (thickness / 16) - 0.5;
boundingBoxes[6] = new Vecs3dCube(centerFirst - w, centerFirst - w, centerFirst - w, centerFirst + w,
centerFirst + w, centerFirst + w);
int i = 0;
for (EnumFacing dir : EnumFacing.VALUES)
{
for (EnumFacing dir : EnumFacing.VALUES) {
double xMin1 = (dir.getFrontOffsetX() < 0 ?
0.0 :
(dir.getFrontOffsetX() == 0 ? centerFirst - w : centerFirst + w));
@ -133,27 +123,24 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
}
}
@Override public void addCollisionBoxes(AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
{
@Override
public void addCollisionBoxes(AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity) {
for (EnumFacing dir : EnumFacing.VALUES)
{
for (EnumFacing dir : EnumFacing.VALUES) {
if (connectedSides.containsKey(dir) && mask
.intersectsWith(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
}
if (mask.intersectsWith(boundingBoxes[6].toAABB()))
{
if (mask.intersectsWith(boundingBoxes[6].toAABB())) {
list.add(boundingBoxes[6].toAABB());
}
super.addCollisionBoxes(mask, list, collidingEntity);
}
@Override public void addSelectionBoxes(List<AxisAlignedBB> list)
{
@Override
public void addSelectionBoxes(List<AxisAlignedBB> list) {
for (EnumFacing dir : EnumFacing.VALUES)
{
for (EnumFacing dir : EnumFacing.VALUES) {
if (connectedSides.containsKey(dir))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
}
@ -161,74 +148,62 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
super.addSelectionBoxes(list);
}
@Override public void onRemoved()
{
@Override
public void onRemoved() {
super.onRemoved();
for (EnumFacing dir : EnumFacing.VALUES)
{
for (EnumFacing dir : EnumFacing.VALUES) {
MultipartFluidPipe multipart = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (multipart != null)
{
if (multipart != null) {
multipart.nearByChange();
}
}
}
@Override public void addOcclusionBoxes(List<AxisAlignedBB> list)
{
for (EnumFacing dir : EnumFacing.VALUES)
{
@Override
public void addOcclusionBoxes(List<AxisAlignedBB> list) {
for (EnumFacing dir : EnumFacing.VALUES) {
if (connectedSides.containsKey(dir))
list.add(boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB());
}
list.add(boundingBoxes[6].toAABB());
}
@Override public void onNeighborBlockChange(Block block)
{
@Override
public void onNeighborBlockChange(Block block) {
super.onNeighborBlockChange(block);
nearByChange();
}
public void nearByChange()
{
public void nearByChange() {
checkConnectedSides();
for (EnumFacing direction : EnumFacing.VALUES)
{
for (EnumFacing direction : EnumFacing.VALUES) {
BlockPos blockPos = getPos().offset(direction);
WorldUtils.updateBlock(getWorld(), blockPos);
MultipartFluidPipe part = getPartFromWorld(getWorld(), blockPos, direction);
if (part != null)
{
if (part != null) {
part.checkConnectedSides();
}
}
}
@Override public void onAdded()
{
@Override
public void onAdded() {
nearByChange();
}
public boolean shouldConnectTo(EnumFacing dir)
{
if (dir != null)
{
if (internalShouldConnectTo(dir))
{
public boolean shouldConnectTo(EnumFacing dir) {
if (dir != null) {
if (internalShouldConnectTo(dir)) {
MultipartFluidPipe multipartFluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (multipartFluidPipe != null && multipartFluidPipe.internalShouldConnectTo(dir.getOpposite()))
{
if (multipartFluidPipe != null && multipartFluidPipe.internalShouldConnectTo(dir.getOpposite())) {
return true;
}
} else
{
} else {
TileEntity tile = getNeighbourTile(dir);
if (tile instanceof IFluidHandler && (currentType == EnumFluidPipeTypes.EXTRACT
|| currentType == EnumFluidPipeTypes.INSERT))
{
|| currentType == EnumFluidPipeTypes.INSERT)) {
return true;
}
}
@ -236,20 +211,16 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
return false;
}
public boolean internalShouldConnectTo(EnumFacing dir)
{
public boolean internalShouldConnectTo(EnumFacing dir) {
ISlottedPart part = getContainer().getPartInSlot(PartSlot.getFaceSlot(dir));
if (part instanceof IMicroblock.IFaceMicroblock)
{
if (!((IMicroblock.IFaceMicroblock) part).isFaceHollow())
{
if (part instanceof IMicroblock.IFaceMicroblock) {
if (!((IMicroblock.IFaceMicroblock) part).isFaceHollow()) {
return false;
}
}
if (!OcclusionHelper.occlusionTest(getContainer().getParts(), p -> p == this,
boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB()))
{
boundingBoxes[Functions.getIntDirFromDirection(dir)].toAABB())) {
return false;
}
@ -258,37 +229,32 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
return multipartFluidPipe != null;
}
public TileEntity getNeighbourTile(EnumFacing side)
{
public TileEntity getNeighbourTile(EnumFacing side) {
return side != null ? getWorld().getTileEntity(getPos().offset(side)) : null;
}
public void checkConnectedSides()
{
public void checkConnectedSides() {
refreshBounding();
connectedSides = new HashMap<>();
for (EnumFacing dir : EnumFacing.values())
{
for (EnumFacing dir : EnumFacing.values()) {
int d = Functions.getIntDirFromDirection(dir);
if (getWorld() == null)
{
if (getWorld() == null) {
return;
}
TileEntity te = getNeighbourTile(dir);
if (shouldConnectTo(dir))
{
if (shouldConnectTo(dir)) {
connectedSides.put(dir, te.getPos());
}
}
}
@Override public EnumSet<PartSlot> getSlotMask()
{
@Override
public EnumSet<PartSlot> getSlotMask() {
return EnumSet.of(PartSlot.CENTER);
}
@Override public IBlockState getExtendedState(IBlockState state)
{
@Override
public IBlockState getExtendedState(IBlockState state) {
IExtendedBlockState extendedBlockState = (IExtendedBlockState) state;
return extendedBlockState.withProperty(DOWN, shouldConnectTo(EnumFacing.DOWN))
.withProperty(UP, shouldConnectTo(EnumFacing.UP)).withProperty(NORTH, shouldConnectTo(EnumFacing.NORTH))
@ -297,87 +263,76 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
.withProperty(EAST, shouldConnectTo(EnumFacing.EAST)).withProperty(TYPE, currentType);
}
@Override public BlockStateContainer createBlockState()
{
@Override
public BlockStateContainer createBlockState() {
return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[]{TYPE},
new IUnlistedProperty[]{DOWN, UP, NORTH, SOUTH, WEST, EAST});
}
@Override public float getHardness(PartMOP hit)
{
@Override
public float getHardness(PartMOP hit) {
return 0.5F;
}
public Material getMaterial()
{
public Material getMaterial() {
return Material.CLOTH;
}
@Override public List<ItemStack> getDrops()
{
@Override
public List<ItemStack> getDrops() {
List<ItemStack> list = new ArrayList<>();
list.add(new ItemStack(TechRebornParts.fluidPipe, 1, 0));
return list;
}
@Override public ResourceLocation getModelPath()
{
@Override
public ResourceLocation getModelPath() {
return new ResourceLocation("techreborn:fluidpipe");
}
@Override public boolean canRenderInLayer(BlockRenderLayer layer)
{
@Override
public boolean canRenderInLayer(BlockRenderLayer layer) {
return layer == BlockRenderLayer.CUTOUT;
}
@Override public void update()
{
if (!getWorld().isRemote)
{
for (EnumFacing dir : EnumFacing.VALUES)
{
@Override
public void update() {
if (!getWorld().isRemote) {
for (EnumFacing dir : EnumFacing.VALUES) {
//if (connectedSides.containsKey(dir)) {
MultipartFluidPipe fluidPipe = getPartFromWorld(getWorld(), getPos().offset(dir), dir);
if (fluidPipe != null)
{
if (!tank.isEmpty())
{
if (fluidPipe != null) {
if (!tank.isEmpty()) {
if (fluidPipe.tank.isEmpty() || fluidPipe.tank.getFluid().getFluid() == tank.getFluid()
.getFluid())
{
int wantedAmount = fluidPipe.tank.getCapacity();
if (!fluidPipe.tank.isEmpty())
{
wantedAmount = fluidPipe.tank.getCapacity() - fluidPipe.tank.getFluidAmount();
.getFluid()) {
if(fluidPipe.tank.getFluidAmount() < tank.getFluidAmount()){
int freeSpace = fluidPipe.tank.getCapacity();
if (!fluidPipe.tank.isEmpty()) {
freeSpace = fluidPipe.tank.getCapacity() - fluidPipe.tank.getFluidAmount();
}
int amountToDischarge = Math.min(Math.min(mbt, tank.getFluidAmount()), wantedAmount);
int difference = tank.getFluidAmount() - freeSpace;
int amountToChange = difference /2;
fluidPipe.tank.setFluid(tank.getFluid());
fluidPipe.tank.setFluidAmount(fluidPipe.tank.getFluidAmount() + amountToDischarge);
tank.setFluidAmount(tank.getFluidAmount() - amountToDischarge);
fluidPipe.tank.setFluidAmount(fluidPipe.tank.getFluidAmount() + amountToChange);
tank.setFluidAmount(tank.getFluidAmount() - amountToChange);
}
}
}
}
// }
TileEntity tileEntity = getNeighbourTile(dir);
if (tileEntity != null)
{
if (tileEntity instanceof IFluidHandler)
{
if (tileEntity != null) {
if (tileEntity instanceof IFluidHandler) {
IFluidHandler handler = (IFluidHandler) tileEntity;
if (currentType == EnumFluidPipeTypes.EXTRACT)
{
if (!tank.isFull())
{
if (currentType == EnumFluidPipeTypes.EXTRACT) {
if (!tank.isFull()) {
FluidTankInfo[] fluidTankInfos = handler.getTankInfo(dir.getOpposite());
if (fluidTankInfos.length != 0)
{
if (fluidTankInfos.length != 0) {
FluidTankInfo info = fluidTankInfos[0];
if (info != null & info.fluid != null)
{
if (tank.isEmpty() || info.fluid.getFluid() == tank.getFluid().getFluid())
{
if (handler.canDrain(dir.getOpposite(), info.fluid.getFluid()))
{
if (info != null & info.fluid != null) {
if (tank.isEmpty() || info.fluid.getFluid() == tank.getFluid().getFluid()) {
if (handler.canDrain(dir.getOpposite(), info.fluid.getFluid())) {
int amountToMove = Math
.min(mbt, tank.getCapacity() - tank.getFluidAmount());
int fluidAmount = tank.getFluidAmount();
@ -391,21 +346,16 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
}
}
}
} else if (currentType == EnumFluidPipeTypes.INSERT)
{
if (!tank.isEmpty())
{
} else if (currentType == EnumFluidPipeTypes.INSERT) {
if (!tank.isEmpty()) {
FluidTankInfo[] fluidTankInfos = handler.getTankInfo(dir.getOpposite());
if (fluidTankInfos.length != 0)
{
if (fluidTankInfos.length != 0) {
FluidTankInfo info = fluidTankInfos[0];
if (info.fluid == null || info.fluid.getFluid() == null
|| info.fluid.getFluid() == tank.getFluid().getFluid() && handler
.canFill(dir.getOpposite(), tank.getFluid().getFluid()))
{
.canFill(dir.getOpposite(), tank.getFluid().getFluid())) {
int infoSpace = info.capacity;
if (info.fluid != null)
{
if (info.fluid != null) {
infoSpace = info.capacity - info.fluid.amount;
}
int amountToMove = Math.min(mbt, infoSpace);
@ -421,27 +371,23 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
}
}
@Override public boolean onActivated(EntityPlayer player, EnumHand hand, ItemStack heldItem, PartMOP hit)
{
@Override
public boolean onActivated(EntityPlayer player, EnumHand hand, ItemStack heldItem, PartMOP hit) {
//TODO make only wrench able to change mode, shift-click with wrench picks up pipe, and click with empty hand displays current mode in chat (doesn't change it)
//TODO sync this to the client, and also when part is loaded
//if (!getWorld().isRemote) {
if (currentType == EnumFluidPipeTypes.EMPTY)
{
if (currentType == EnumFluidPipeTypes.EMPTY) {
currentType = EnumFluidPipeTypes.EXTRACT;
} else if (currentType == EnumFluidPipeTypes.EXTRACT)
{
} else if (currentType == EnumFluidPipeTypes.EXTRACT) {
currentType = EnumFluidPipeTypes.INSERT;
} else if (currentType == EnumFluidPipeTypes.INSERT)
{
} else if (currentType == EnumFluidPipeTypes.INSERT) {
currentType = EnumFluidPipeTypes.EMPTY;
}
// }
if (getWorld().isRemote)
{
ChatUtils.sendNoSpamClient(new TextComponetValue(
if (getWorld().isRemote) {
ChatUtils.sendNoSpamClient(new TextComponentString(
ChatFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " " +
currentType.colour + StringUtils.toFirstCapital(currentType.getName())));
}
@ -450,36 +396,24 @@ public class MultipartFluidPipe extends Multipart implements INormallyOccludingP
return true;
}
@Override public void writeToNBT(NBTTagCompound tag)
{
@Override
public void writeToNBT(NBTTagCompound tag) {
super.writeToNBT(tag);
tank.writeToNBT(tag);
tag.setString("mode", currentType.getName());
}
@Override public void readFromNBT(NBTTagCompound tag)
{
@Override
public void readFromNBT(NBTTagCompound tag) {
super.readFromNBT(tag);
tank.readFromNBT(tag);
String mode = tag.getString("mode");
if (mode.equals(EnumFluidPipeTypes.EMPTY))
{
if (mode.equals(EnumFluidPipeTypes.EMPTY)) {
currentType = EnumFluidPipeTypes.EMPTY;
} else if (mode.equals(EnumFluidPipeTypes.INSERT))
{
} else if (mode.equals(EnumFluidPipeTypes.INSERT)) {
currentType = EnumFluidPipeTypes.INSERT;
} else if (mode.equals(EnumFluidPipeTypes.EXTRACT))
{
} else if (mode.equals(EnumFluidPipeTypes.EXTRACT)) {
currentType = EnumFluidPipeTypes.EXTRACT;
}
}
public class TextComponetValue extends TextComponentString
{
public TextComponetValue(String msg)
{
super(msg);
}
}
}