icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source
This commit is contained in:
gnembon committed 2020-12-20 19:27:04 -04:00
2 parents 32d0ba9694 2f6141f44b
commit 941b7d4836
9 files changed
+71 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
+15 -1
View File
@@ -1,9 +1,9 @@
package carpet.mixins;
import carpet.CarpetSettings;
import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket;
import net.minecraft.network.packet.c2s.play.CraftRequestC2SPacket;
import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket;
import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
@@ -40,6 +40,7 @@ import static carpet.script.CarpetEventServer.Event.PLAYER_STARTS_SPRINTING;
import static carpet.script.CarpetEventServer.Event.PLAYER_STOPS_SNEAKING;
import static carpet.script.CarpetEventServer.Event.PLAYER_STOPS_SPRINTING;
import static carpet.script.CarpetEventServer.Event.PLAYER_SWAPS_HANDS;
import static carpet.script.CarpetEventServer.Event.PLAYER_SWINGS_HAND;
import static carpet.script.CarpetEventServer.Event.PLAYER_SWITCHES_SLOT;
import static carpet.script.CarpetEventServer.Event.PLAYER_USES_ITEM;
import static carpet.script.CarpetEventServer.Event.PLAYER_WAKES_UP;
@@ -266,4 +267,17 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin
PLAYER_SWITCHES_SLOT.onSlotSwitch(player, player.getInventory().selectedSlot, packet.getSelectedSlot());
}
}
@Inject(method = "onHandSwing", at = @At(
value = "INVOKE", target =
"Lnet/minecraft/server/network/ServerPlayerEntity;updateLastActionTime()V",
shift = At.Shift.BEFORE)
)
private void onSwing(HandSwingC2SPacket packet, CallbackInfo ci)
{
if (PLAYER_SWINGS_HAND.isNeeded() && !player.handSwinging)
{
PLAYER_SWINGS_HAND.onHandAction(player, packet.getHand());
}
}
}