Skip to content

fix #7382: Chain Conveyor travel doesn't work with Wrench in offhand #8172

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
wants to merge 1 commit into
base: mc1.20.1/dev
Choose a base branch
from
Open

fix #7382: Chain Conveyor travel doesn't work with Wrench in offhand #8172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions ...a/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ public static void clientTick() {
}

Minecraft mc = Minecraft.getInstance();
ItemStack mainHandItem = mc.player.getMainHandItem();
boolean isWrench = AllItemTags.CHAIN_RIDEABLE.matches(mainHandItem);
boolean isWrench = mc.player.isHolding(AllItemTags.CHAIN_RIDEABLE::matches);
boolean dismantling = isWrench && mc.player.isShiftKeyDown();
double range = mc.player.getAttribute(ForgeMod.BLOCK_REACH.get())
.getValue() + 1;
Expand Down Expand Up @@ -114,9 +113,9 @@ public static void clientTick() {

private static boolean isActive() {
Minecraft mc = Minecraft.getInstance();
ItemStack mainHandItem = mc.player.getMainHandItem();
return AllItemTags.CHAIN_RIDEABLE.matches(mainHandItem) || AllBlocks.PACKAGE_FROGPORT.isIn(mainHandItem)
|| PackageItem.isPackage(mainHandItem);
return mc.player.isHolding(AllItemTags.CHAIN_RIDEABLE::matches)
|| mc.player.isHolding(s->AllBlocks.PACKAGE_FROGPORT.isIn(s))
|| mc.player.isHolding(PackageItem::isPackage);
}

public static boolean onUse() {
Expand All @@ -125,30 +124,33 @@ public static boolean onUse() {

Minecraft mc = Minecraft.getInstance();
ItemStack mainHandItem = mc.player.getMainHandItem();
ItemStack offHandItem = mc.player.getOffhandItem();
if (mc.player.isHolding(AllItemTags.CHAIN_RIDEABLE::matches)) {
ItemStack usedItem = AllItemTags.CHAIN_RIDEABLE.matches(mainHandItem) ? mainHandItem : offHandItem;

if (AllItemTags.CHAIN_RIDEABLE.matches(mainHandItem)) {
if (!mc.player.isShiftKeyDown()) {
ChainConveyorRidingHandler.embark(selectedLift, selectedChainPosition, selectedConnection);
return true;
}

AllPackets.getChannel()
.sendToServer(new ChainConveyorConnectionPacket(selectedLift, selectedLift.offset(selectedConnection),
mainHandItem, false));
usedItem, false));
return true;
}

if (AllBlocks.PACKAGE_FROGPORT.isIn(mainHandItem)) {
if (mc.player.isHolding(s->AllBlocks.PACKAGE_FROGPORT.isIn(s))) {
PackagePortTargetSelectionHandler.exactPositionOfTarget = selectedBakedPosition;
PackagePortTargetSelectionHandler.activePackageTarget =
new PackagePortTarget.ChainConveyorFrogportTarget(selectedLift, selectedChainPosition, selectedConnection);
return true;
}

if (PackageItem.isPackage(mainHandItem)) {
if (mc.player.isHolding(PackageItem::isPackage)) {
ItemStack usedItem = PackageItem.isPackage(mainHandItem) ? mainHandItem : offHandItem;
AllPackets.getChannel()
.sendToServer(new ChainPackageInteractionPacket(selectedLift, selectedConnection, selectedChainPosition,
mainHandItem));
usedItem));
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRidingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static void clientTick() {
Minecraft mc = Minecraft.getInstance();
if (mc.isPaused())
return;
if (!AllItemTags.CHAIN_RIDEABLE.matches(mc.player.getMainHandItem())) {
if (!mc.player.isHolding(AllItemTags.CHAIN_RIDEABLE::matches)) {
stopRiding();
return;
}
Expand Down
24 changes: 16 additions & 8 deletions ...ava/com/simibubi/create/content/kinetics/chainConveyor/ChainPackageInteractionPacket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,13 @@ protected void applySettings(ServerPlayer player, ChainConveyorBlockEntity be) {
if (best == null)
return;

if (player.getMainHandItem()
.isEmpty())
player.setItemInHand(InteractionHand.MAIN_HAND, best.item.copy());
if (player.isHolding(stack -> stack.isEmpty())) {
if (player.getMainHandItem().isEmpty()) {
player.setItemInHand(InteractionHand.MAIN_HAND, best.item.copy());
} else {
player.setItemInHand(InteractionHand.OFF_HAND, best.item.copy());
}
}
else
player.getInventory()
.placeItemBackInInventory(best.item.copy());
Expand All @@ -95,11 +99,15 @@ protected void applySettings(ServerPlayer player, ChainConveyorBlockEntity be) {
return;

if (!player.isCreative()) {
player.getMainHandItem()
.shrink(1);
if (player.getMainHandItem()
.isEmpty())
player.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY);
player.getMainHandItem().shrink(1);
player.getOffhandItem().shrink(1);
if (player.isHolding(stack -> stack.isEmpty())) {
if (player.getMainHandItem().isEmpty()) {
player.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY);
} else {
player.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY);
}
}
}

if (selectedConnection.equals(BlockPos.ZERO))
Expand Down
Loading