Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	.gradle/7.0/executionHistory/executionHistory.bin
#	.gradle/7.0/executionHistory/executionHistory.lock
#	.gradle/7.0/fileHashes/fileHashes.bin
#	.gradle/7.0/fileHashes/fileHashes.lock
#	.gradle/7.0/javaCompile/classAnalysis.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/checksums/checksums.lock
This commit is contained in:
retrooper committed 2021-05-25 22:39:16 +02:00
commit 5324aab746
10 files changed
+99 -1

No files matched your search

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -43,7 +43,7 @@ public class WrappedPacketInArmAnimation extends WrappedPacket {
//Optimize to do nothing on legacy versions. The protocol of the legacy versions only support one hand, the main hand.
if (version.isNewerThan(ServerVersion.v_1_8_8)) {
Enum<?> enumConst = EnumUtil.valueOf(NMSUtils.enumHandClass, hand.name());
write(NMSUtils.enumHandClass, 0, enumConst);
writeEnumConstant(0, enumConst);
}
}
}
@@ -0,0 +1,56 @@
package io.github.retrooper.packetevents.packetwrappers.play.out.bedit;
import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
import io.github.retrooper.packetevents.utils.enums.EnumUtil;
import io.github.retrooper.packetevents.utils.nms.NMSUtils;
import io.github.retrooper.packetevents.utils.player.Hand;
import io.github.retrooper.packetevents.utils.server.ServerVersion;
import org.bukkit.inventory.ItemStack;
import java.util.Optional;
/**
* @author Tecnio
* @see <a href="https://wiki.vg/Protocol#Edit_Book"</a>
*/
public class WrappedPacketInBEdit extends WrappedPacket {
public WrappedPacketInBEdit(final NMSPacket packet) {
super(packet);
}
public ItemStack getItemStack() {
return readItemStack(0);
}
public void setItemStack(final ItemStack itemStack) {
writeItemStack(0, itemStack);
}
public boolean isSigning() {
return readBoolean(0);
}
public void setSigning(final boolean signing) {
writeBoolean(0, signing);
}
@SupportedVersions(ranges = {ServerVersion.v_1_13, ServerVersion.v_1_16_5})
public Optional<Hand> getHand() {
if (version.isNewerThanOrEquals(ServerVersion.v_1_13)) {
final Enum<?> enumConst = readEnumConstant(0, NMSUtils.enumHandClass);
return Optional.of(Hand.valueOf(enumConst.name()));
}
return Optional.empty();
}
@SupportedVersions(ranges = {ServerVersion.v_1_13, ServerVersion.v_1_16_5})
public void setHand(final Hand hand) {
if (version.isNewerThanOrEquals(ServerVersion.v_1_13)) {
final Enum<?> enumConst = EnumUtil.valueOf(NMSUtils.enumHandClass, hand.name());
writeEnumConstant(0, enumConst);
}
}
}
@@ -0,0 +1,42 @@
package io.github.retrooper.packetevents.packetwrappers.play.out.jigsawgenerate;
import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
import io.github.retrooper.packetevents.utils.vector.Vector3i;
/**
* Sent when Generate is pressed on the Jigsaw Block interface.
*
* @author Tecnio
* @see <a href="https://wiki.vg/Protocol#Generate_Structure"</a>
*/
public class WrappedPacketInJigsawGenerate extends WrappedPacket {
public WrappedPacketInJigsawGenerate(final NMSPacket packet) {
super(packet);
}
public Vector3i getBlockPosition() {
return readBlockPosition(0);
}
public void setBlockPosition(final Vector3i blockPosition) {
writeBlockPosition(0, blockPosition);
}
public int getLevels() {
return readInt(0);
}
public void setLevels(final int levels) {
writeInt(0, levels);
}
public boolean isKeepingJigsaws() {
return readBoolean(0);
}
public void setKeepingJigsaws(final boolean keepingJigsaws) {
writeBoolean(0, keepingJigsaws);
}
}