Skip to content

Allow energy cables to be quickly replaced while holding wrench in of… #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarkVen0m wants to merge 2 commits into
base: 1.21.x
Choose a base branch
from
Open

Allow energy cables to be quickly replaced while holding wrench in of… #846

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a60b5a0
Allow energy cables to be quickly replaced while holding wrench in of…
DarkVen0m Aug 24, 2024
d30beca
Formatting fixes
DarkVen0m Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/main/java/aztech/modern_industrialization/pipes/impl/PipeItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,20 @@
*/
package aztech.modern_industrialization.pipes.impl;

import aztech.modern_industrialization.MITags;
import aztech.modern_industrialization.pipes.MIPipes;
import aztech.modern_industrialization.pipes.api.PipeNetworkData;
import aztech.modern_industrialization.pipes.api.PipeNetworkNode;
import aztech.modern_industrialization.pipes.api.PipeNetworkType;
import aztech.modern_industrialization.pipes.electricity.ElectricityNetworkData;
import aztech.modern_industrialization.pipes.electricity.ElectricityNetworkNode;
import aztech.modern_industrialization.pipes.fluid.FluidNetworkData;
import aztech.modern_industrialization.pipes.item.ItemNetworkData;
import java.util.HashSet;
import net.minecraft.core.BlockPos;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
Expand Down Expand Up @@ -128,6 +133,34 @@ private boolean tryPlaceAt(UseOnContext context, BlockPos pos) {
// If there is a block entity we try to add the pipe.
BlockEntity be = world.getBlockEntity(pos);
if (be instanceof PipeBlockEntity pipeBe) {
var player = context.getPlayer();
if (player != null && player.getOffhandItem().is(MITags.WRENCHES) && isCable()) {
if (!world.isClientSide()) {
var cablesToRemove = new HashSet<PipeNetworkType>();
// save cables which we need to remove
for (PipeNetworkNode pipe : pipeBe.getNodes()) {
var isCablePipe = pipe instanceof ElectricityNetworkNode;
if (!isCablePipe)
continue;
cablesToRemove.add(pipe.getType());
}
// remove all energy cables
for (PipeNetworkType type : cablesToRemove) {
pipeBe.removePipeAndDropContainedItems(type);
world.addFreshEntity(
new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(MIPipes.INSTANCE.getPipeItem(type))));
}
world.blockUpdated(pos, Blocks.AIR);
if (pipeBe.canAddPipe(type)) {
if (!world.isClientSide()) {
pipeBe.addPipe(type, defaultData.clone());
return true;
}
return false;
}
}
return true;
}
if (pipeBe.canAddPipe(type)) {
if (!world.isClientSide()) {
pipeBe.addPipe(type, defaultData.clone());
Expand Down