Skip to content
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

Fixed FactoryPanelBlock.java. Feature LogisticallyLinkedBlockItem.java #7814

Open
wants to merge 3 commits into
base: mc1.21.1/dev
Choose a base branch
from
Open

Fixed FactoryPanelBlock.java. Feature LogisticallyLinkedBlockItem.java #7814

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
936ac37
Fixed FactoryPanelBlock.java
ForgeStove Mar 7, 2025
6a9a6f0
Allow player to clear the link when Shift + Right-click
ForgeStove Mar 8, 2025
d4e7f05
fix server issue
ForgeStove Mar 8, 2025
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
2 changes: 0 additions & 2 deletions src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,6 @@ public int getDirectSignal(BlockState pBlockState, BlockGetter pBlockAccess, Blo

@Override
public boolean canBeReplaced(BlockState pState, BlockPlaceContext pUseContext) {
if (pUseContext.isSecondaryUseActive())
return false;
if (!AllBlocks.FACTORY_GAUGE.isIn(pUseContext.getItemInHand()))
return false;
Vec3 location = pUseContext.getClickLocation();
Expand Down
17 changes: 17 additions & 0 deletions .../java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedBlockItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
import java.util.List;
import java.util.UUID;

import net.minecraft.client.Minecraft;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.phys.HitResult.Type;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -67,6 +72,18 @@ public void appendHoverText(@NotNull ItemStack stack, @NotNull TooltipContext to
.addTo(tooltipComponents);
}

public InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand usedHand) {
ItemStack itemstack = player.getItemInHand(usedHand);
Minecraft mc = Minecraft.getInstance();
if (!itemstack.getComponents().has(DataComponents.BLOCK_ENTITY_DATA))
return InteractionResultHolder.fail(itemstack);
if (player.isShiftKeyDown() && (mc.hitResult == null || mc.hitResult.getType() == Type.MISS)) {
itemstack.remove(DataComponents.BLOCK_ENTITY_DATA);
return InteractionResultHolder.success(itemstack);
}
return InteractionResultHolder.pass(itemstack);
}

@Override
public @NotNull InteractionResult useOn(UseOnContext pContext) {
ItemStack stack = pContext.getItemInHand();
Expand Down