-
-
Notifications
You must be signed in to change notification settings - Fork 837
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix left click on air being ignored and right click on block being ha…
…ndled twice
- Loading branch information
Showing
12 changed files
with
459 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...t-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorServerPlayerGameMode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * WorldEdit, a Minecraft world manipulation toolkit | ||
| * Copyright (C) sk89q <http://www.sk89q.com> | ||
| * Copyright (C) WorldEdit team and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.sk89q.worldedit.fabric.mixin; | ||
|
|
||
| import net.minecraft.server.level.ServerPlayerGameMode; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.gen.Accessor; | ||
|
|
||
| @Mixin(ServerPlayerGameMode.class) | ||
| public interface AccessorServerPlayerGameMode { | ||
|
|
||
| @Accessor("isDestroyingBlock") | ||
| boolean isDestroyingBlock(); | ||
| } |
63 changes: 63 additions & 0 deletions
63
...ric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerGamePacketListenerImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * WorldEdit, a Minecraft world manipulation toolkit | ||
| * Copyright (C) sk89q <http://www.sk89q.com> | ||
| * Copyright (C) WorldEdit team and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.sk89q.worldedit.fabric.mixin; | ||
|
|
||
| import com.sk89q.worldedit.fabric.FabricWorldEdit; | ||
| import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket; | ||
| import net.minecraft.network.protocol.game.ServerboundSwingPacket; | ||
| import net.minecraft.server.level.ServerPlayer; | ||
| import net.minecraft.server.network.ServerGamePacketListenerImpl; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Mixin(ServerGamePacketListenerImpl.class) | ||
| public class MixinServerGamePacketListenerImpl { | ||
| @Shadow | ||
| public ServerPlayer player; | ||
|
|
||
| private int ignoreSwingPackets; | ||
|
|
||
| @Inject(method = "handleAnimate", at = @At("HEAD")) | ||
| private void onAnimate(ServerboundSwingPacket packet, CallbackInfo ci) { | ||
| if (!((AccessorServerPlayerGameMode) this.player.gameMode).isDestroyingBlock()) { | ||
| if (this.ignoreSwingPackets > 0) { | ||
| this.ignoreSwingPackets--; | ||
| } else if (FabricWorldEdit.inst != null) { | ||
| FabricWorldEdit.inst.onLeftClickAir(this.player, packet.getHand()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Inject(method = "handlePlayerAction", at = @At("HEAD")) | ||
| private void onAction(ServerboundPlayerActionPacket packet, CallbackInfo ci) { | ||
| switch (packet.getAction()) { | ||
| case DROP_ITEM: | ||
| case DROP_ALL_ITEMS: | ||
| case START_DESTROY_BLOCK: | ||
| this.ignoreSwingPackets++; | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.