16552051255

Committed 27 Jul 2025 01:58PM UTC coverage: 53.206% (+8.0%) from 45.161%

Build # 16552051255

Build Type

push

github

Committed by

rubensworks

Commit Message

Resolve minor TODOs

Run Details

2888 of 8740 branches covered (33.04%)

Branch coverage included in aggregate %.

17341 of 29280 relevant lines covered (59.22%)

3.08 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

13.64

/src/main/java/org/cyclops/integrateddynamics/block/BlockDryingBasin.java

package org.cyclops.integrateddynamics.block;

import com.mojang.serialization.MapCodec;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.Containers;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.BaseEntityBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.neoforged.neoforge.fluids.FluidActionResult;
import net.neoforged.neoforge.fluids.FluidUtil;
import net.neoforged.neoforge.fluids.capability.IFluidHandler;
import org.cyclops.cyclopscore.block.BlockWithEntityGui;
import org.cyclops.cyclopscore.fluid.SingleUseTank;
import org.cyclops.cyclopscore.helper.IModHelpers;
import org.cyclops.integrateddynamics.RegistryEntries;
import org.cyclops.integrateddynamics.blockentity.BlockEntityDryingBasin;

import javax.annotation.Nullable;

/**
 * A block for drying stuff.
 * @author rubensworks
 */
public class BlockDryingBasin extends BlockWithEntityGui {

    public static final MapCodec<BlockDryingBasin> CODEC = simpleCodec(BlockDryingBasin::new);
    private static final VoxelShape SHAPE_RAYTRACE = box(2.0D, 4.0D, 2.0D, 14.0D, 16.0D, 14.0D);
    private static final VoxelShape SHAPE = Shapes.join(Shapes.block(), Shapes.or(
            box(0.0D, 0.0D, 4.0D, 16.0D, 3.0D, 12.0D),
            new VoxelShape[]{
                    box(4.0D, 0.0D, 0.0D, 12.0D, 3.0D, 16.0D),
                    box(2.0D, 0.0D, 2.0D, 14.0D, 3.0D, 14.0D),
                    SHAPE_RAYTRACE
            }), BooleanOp.ONLY_FIRST);

    public BlockDryingBasin(Properties properties) {
        super(properties, BlockEntityDryingBasin::new);
    }

    @Override
    protected MapCodec<? extends BaseEntityBlock> codec() {
        return CODEC;
    }

    @Override
    @Nullable
    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
        return createTickerHelper(blockEntityType, RegistryEntries.BLOCK_ENTITY_DRYING_BASIN.get(), level.isClientSide ? new BlockEntityDryingBasin.TickerClient() : new BlockEntityDryingBasin.TickerServer());
    }

    @Override
    public InteractionResult useWithoutItem(BlockState blockState, Level world, BlockPos blockPos, Player player,
                                             BlockHitResult rayTraceResult) {
        return IModHelpers.get().getBlockEntityHelpers().get(world, blockPos, BlockEntityDryingBasin.class)
                .map(tile -> {
                    ItemStack itemStack = player.getInventory().getSelectedItem();
                    IFluidHandler itemFluidHandler = FluidUtil.getFluidHandler(itemStack).orElse(null);
                    SingleUseTank tank = tile.getTank();
                    ItemStack tileStack = tile.getInventory().getItem(0);

                    if (itemStack.isEmpty() && !tileStack.isEmpty()) {
                        player.getInventory().setItem(player.getInventory().getSelectedSlot(), tileStack);
                        tile.getInventory().setItem(0, ItemStack.EMPTY);
                        tile.sendUpdate();
                        return InteractionResult.SUCCESS;
                    } else if(player.getInventory().add(tileStack)){
                        tile.getInventory().setItem(0, ItemStack.EMPTY);
                        tile.sendUpdate();
                        return InteractionResult.SUCCESS;
                    } else if (itemFluidHandler != null && !tank.isFull()
                            && !itemFluidHandler.drain(Integer.MAX_VALUE, IFluidHandler.FluidAction.SIMULATE).isEmpty()) {
                        FluidActionResult fluidAction = FluidUtil.tryEmptyContainer(itemStack, tank, Integer.MAX_VALUE, player, true);
                        if (fluidAction.isSuccess()) {
                            ItemStack newItemStack = fluidAction.getResult();
                            IModHelpers.get().getInventoryHelpers().tryReAddToStack(player, itemStack, newItemStack, player.getUsedItemHand());
                            tile.sendUpdate();
                        }
                        return InteractionResult.SUCCESS;
                    } else if (itemFluidHandler != null && !tank.isEmpty() &&
                            itemFluidHandler.fill(tank.getFluid(), IFluidHandler.FluidAction.SIMULATE) > 0) {
                        FluidActionResult fluidAction = FluidUtil.tryFillContainer(itemStack, tank, Integer.MAX_VALUE, player, true);
                        if (fluidAction.isSuccess()) {
                            ItemStack newItemStack = fluidAction.getResult();
                            IModHelpers.get().getInventoryHelpers().tryReAddToStack(player, itemStack, newItemStack, player.getUsedItemHand());
                        }
                        return InteractionResult.SUCCESS;
                    } else if (!itemStack.isEmpty() && tileStack.isEmpty()) {
                        tile.getInventory().setItem(0, itemStack.split(1));
                        if(itemStack.getCount() <= 0) player.getInventory().setItem(player.getInventory().getSelectedSlot(), ItemStack.EMPTY);
                        tile.sendUpdate();
                        return InteractionResult.SUCCESS;
                    }
                    return InteractionResult.PASS;
                })
                .orElse(InteractionResult.PASS);
    }

    @SuppressWarnings("deprecation")
    @Override
    public boolean hasAnalogOutputSignal(BlockState blockState) {
        return true;
    }

    @SuppressWarnings("deprecation")
    @Override
    public int getAnalogOutputSignal(BlockState blockState, Level world, BlockPos blockPos) {
        return IModHelpers.get().getBlockEntityHelpers().get(world, blockPos, BlockEntityDryingBasin.class)
                .map(tile -> tile.getInventory().getItem(0) != null ? 15 : 0)
                .orElse(0);
    }

    @Override
    public VoxelShape getShape(BlockState blockState, BlockGetter world, BlockPos blockPos, CollisionContext selectionContext) {
        return SHAPE;
    }

    @Override
    public VoxelShape getInteractionShape(BlockState blockState, BlockGetter world, BlockPos blockPos) {
        return SHAPE_RAYTRACE;
    }

    @Override
    protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) {
        super.affectNeighborsAfterRemoval(state, level, pos, movedByPiston);
        Containers.updateNeighboursAfterDestroy(state, level, pos);
    }
}

1	package org.cyclops.integrateddynamics.block;
2
3	import com.mojang.serialization.MapCodec;
4	import net.minecraft.core.BlockPos;
5	import net.minecraft.server.level.ServerLevel;
6	import net.minecraft.world.Containers;
7	import net.minecraft.world.InteractionResult;
8	import net.minecraft.world.entity.player.Player;
9	import net.minecraft.world.item.ItemStack;
10	import net.minecraft.world.level.BlockGetter;
11	import net.minecraft.world.level.Level;
12	import net.minecraft.world.level.block.BaseEntityBlock;
13	import net.minecraft.world.level.block.entity.BlockEntity;
14	import net.minecraft.world.level.block.entity.BlockEntityTicker;
15	import net.minecraft.world.level.block.entity.BlockEntityType;
16	import net.minecraft.world.level.block.state.BlockState;
17	import net.minecraft.world.phys.BlockHitResult;
18	import net.minecraft.world.phys.shapes.BooleanOp;
19	import net.minecraft.world.phys.shapes.CollisionContext;
20	import net.minecraft.world.phys.shapes.Shapes;
21	import net.minecraft.world.phys.shapes.VoxelShape;
22	import net.neoforged.neoforge.fluids.FluidActionResult;
23	import net.neoforged.neoforge.fluids.FluidUtil;
24	import net.neoforged.neoforge.fluids.capability.IFluidHandler;
25	import org.cyclops.cyclopscore.block.BlockWithEntityGui;
26	import org.cyclops.cyclopscore.fluid.SingleUseTank;
27	import org.cyclops.cyclopscore.helper.IModHelpers;
28	import org.cyclops.integrateddynamics.RegistryEntries;
29	import org.cyclops.integrateddynamics.blockentity.BlockEntityDryingBasin;
30
31	import javax.annotation.Nullable;
32
33	/**
34	* A block for drying stuff.
35	* @author rubensworks
36	*/
37	public class BlockDryingBasin extends BlockWithEntityGui {
38
39	public static final MapCodec<BlockDryingBasin> CODEC = simpleCodec(BlockDryingBasin::new);	3✔
40	private static final VoxelShape SHAPE_RAYTRACE = box(2.0D, 4.0D, 2.0D, 14.0D, 16.0D, 14.0D);	8✔
41	private static final VoxelShape SHAPE = Shapes.join(Shapes.block(), Shapes.or(	12✔
42	box(0.0D, 0.0D, 4.0D, 16.0D, 3.0D, 12.0D),	11✔
43	new VoxelShape[]{
44	box(4.0D, 0.0D, 0.0D, 12.0D, 3.0D, 16.0D),	10✔
45	box(2.0D, 0.0D, 2.0D, 14.0D, 3.0D, 14.0D),	6✔
46	SHAPE_RAYTRACE
47	}), BooleanOp.ONLY_FIRST);
48
49	public BlockDryingBasin(Properties properties) {
50	super(properties, BlockEntityDryingBasin::new);	4✔
51	}	1✔
52
53	@Override
54	protected MapCodec<? extends BaseEntityBlock> codec() {
55	return CODEC;	×
56	}
57
58	@Override
59	@Nullable
60	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
61	return createTickerHelper(blockEntityType, RegistryEntries.BLOCK_ENTITY_DRYING_BASIN.get(), level.isClientSide ? new BlockEntityDryingBasin.TickerClient() : new BlockEntityDryingBasin.TickerServer());	12!
62	}
63
64	@Override
65	public InteractionResult useWithoutItem(BlockState blockState, Level world, BlockPos blockPos, Player player,
66	BlockHitResult rayTraceResult) {
67	return IModHelpers.get().getBlockEntityHelpers().get(world, blockPos, BlockEntityDryingBasin.class)	×
68	.map(tile -> {	×
69	ItemStack itemStack = player.getInventory().getSelectedItem();	×
70	IFluidHandler itemFluidHandler = FluidUtil.getFluidHandler(itemStack).orElse(null);	×
71	SingleUseTank tank = tile.getTank();	×
72	ItemStack tileStack = tile.getInventory().getItem(0);	×
73
74	if (itemStack.isEmpty() && !tileStack.isEmpty()) {	×
75	player.getInventory().setItem(player.getInventory().getSelectedSlot(), tileStack);	×
76	tile.getInventory().setItem(0, ItemStack.EMPTY);	×
77	tile.sendUpdate();	×
78	return InteractionResult.SUCCESS;	×
79	} else if(player.getInventory().add(tileStack)){	×
80	tile.getInventory().setItem(0, ItemStack.EMPTY);	×
81	tile.sendUpdate();	×
82	return InteractionResult.SUCCESS;	×
83	} else if (itemFluidHandler != null && !tank.isFull()	×
84	&& !itemFluidHandler.drain(Integer.MAX_VALUE, IFluidHandler.FluidAction.SIMULATE).isEmpty()) {	×
85	FluidActionResult fluidAction = FluidUtil.tryEmptyContainer(itemStack, tank, Integer.MAX_VALUE, player, true);	×
86	if (fluidAction.isSuccess()) {	×
87	ItemStack newItemStack = fluidAction.getResult();	×
88	IModHelpers.get().getInventoryHelpers().tryReAddToStack(player, itemStack, newItemStack, player.getUsedItemHand());	×
89	tile.sendUpdate();	×
90	}
91	return InteractionResult.SUCCESS;	×
92	} else if (itemFluidHandler != null && !tank.isEmpty() &&	×
93	itemFluidHandler.fill(tank.getFluid(), IFluidHandler.FluidAction.SIMULATE) > 0) {	×
94	FluidActionResult fluidAction = FluidUtil.tryFillContainer(itemStack, tank, Integer.MAX_VALUE, player, true);	×
95	if (fluidAction.isSuccess()) {	×
96	ItemStack newItemStack = fluidAction.getResult();	×
97	IModHelpers.get().getInventoryHelpers().tryReAddToStack(player, itemStack, newItemStack, player.getUsedItemHand());	×
98	}
99	return InteractionResult.SUCCESS;	×
100	} else if (!itemStack.isEmpty() && tileStack.isEmpty()) {	×
101	tile.getInventory().setItem(0, itemStack.split(1));	×
102	if(itemStack.getCount() <= 0) player.getInventory().setItem(player.getInventory().getSelectedSlot(), ItemStack.EMPTY);	×
103	tile.sendUpdate();	×
104	return InteractionResult.SUCCESS;	×
105	}
106	return InteractionResult.PASS;	×
107	})
108	.orElse(InteractionResult.PASS);	×
109	}
110
111	@SuppressWarnings("deprecation")
112	@Override
113	public boolean hasAnalogOutputSignal(BlockState blockState) {
114	return true;	2✔
115	}
116
117	@SuppressWarnings("deprecation")
118	@Override
119	public int getAnalogOutputSignal(BlockState blockState, Level world, BlockPos blockPos) {
120	return IModHelpers.get().getBlockEntityHelpers().get(world, blockPos, BlockEntityDryingBasin.class)	×
121	.map(tile -> tile.getInventory().getItem(0) != null ? 15 : 0)	×
122	.orElse(0);	×
123	}
124
125	@Override
126	public VoxelShape getShape(BlockState blockState, BlockGetter world, BlockPos blockPos, CollisionContext selectionContext) {
127	return SHAPE;	2✔
128	}
129
130	@Override
131	public VoxelShape getInteractionShape(BlockState blockState, BlockGetter world, BlockPos blockPos) {
132	return SHAPE_RAYTRACE;	×
133	}
134
135	@Override
136	protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) {
137	super.affectNeighborsAfterRemoval(state, level, pos, movedByPiston);	×
138	Containers.updateNeighboursAfterDestroy(state, level, pos);	×
139	}	×
140	}

CyclopsMC / IntegratedDynamics / 16552051255

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous