1.4.0 rc1
This commit is contained in:
Tyler Murphy
parent
a812bde64c
commit
ec2bf9d35d
3 changed files with 0 additions and 289 deletions
|
|
@ -21,9 +21,6 @@ package net.tylermurphy.hideAndSeek.util;
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
|
||||||
import net.tylermurphy.hideAndSeek.Main;
|
|
||||||
import net.tylermurphy.hideAndSeek.util.protocollib.WrapperPlayServerNamedSoundEffect;
|
|
||||||
import org.bukkit.Sound;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import com.comphenix.protocol.PacketType;
|
import com.comphenix.protocol.PacketType;
|
||||||
|
|
@ -31,7 +28,6 @@ import com.comphenix.protocol.ProtocolLibrary;
|
||||||
import com.comphenix.protocol.ProtocolManager;
|
import com.comphenix.protocol.ProtocolManager;
|
||||||
import com.comphenix.protocol.events.PacketContainer;
|
import com.comphenix.protocol.events.PacketContainer;
|
||||||
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
|
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
|
||||||
import com.comphenix.protocol.wrappers.EnumWrappers.SoundCategory;
|
|
||||||
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
|
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
|
||||||
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
|
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
|
||||||
|
|
||||||
|
|
@ -39,18 +35,6 @@ public class Packet {
|
||||||
|
|
||||||
private static final ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
|
private static final ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
|
||||||
|
|
||||||
public static void playSound(Player player, Sound sound, float volume, float pitch) {
|
|
||||||
WrapperPlayServerNamedSoundEffect packet = new WrapperPlayServerNamedSoundEffect();
|
|
||||||
packet.setSoundCategory(SoundCategory.MASTER);
|
|
||||||
packet.setSoundEffect(sound);
|
|
||||||
packet.setEffectPositionX((int)(player.getLocation().getX() * 8.0));
|
|
||||||
packet.setEffectPositionY((int)(player.getLocation().getY() * 8.0));
|
|
||||||
packet.setEffectPositionZ((int)(player.getLocation().getZ() * 8.0));
|
|
||||||
packet.setPitch(pitch);
|
|
||||||
packet.setVolume(volume);
|
|
||||||
packet.sendPacket(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setGlow(Player player, Player target, boolean glowing) {
|
public static void setGlow(Player player, Player target, boolean glowing) {
|
||||||
PacketContainer packet = protocolManager.createPacket(PacketType.Play.Server.ENTITY_METADATA);
|
PacketContainer packet = protocolManager.createPacket(PacketType.Play.Server.ENTITY_METADATA);
|
||||||
packet.getIntegers().write(0, target.getEntityId());
|
packet.getIntegers().write(0, target.getEntityId());
|
||||||
|
|
|
||||||
|
|
@ -1,115 +0,0 @@
|
||||||
/**
|
|
||||||
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
|
|
||||||
* Copyright (C) dmulloy2 <http://dmulloy2.net>
|
|
||||||
* Copyright (C) Kristian S. Strangeland
|
|
||||||
*
|
|
||||||
* 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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.tylermurphy.hideAndSeek.util.protocollib;
|
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import com.comphenix.protocol.PacketType;
|
|
||||||
import com.comphenix.protocol.ProtocolLibrary;
|
|
||||||
import com.comphenix.protocol.events.PacketContainer;
|
|
||||||
import com.google.common.base.Objects;
|
|
||||||
|
|
||||||
public abstract class AbstractPacket {
|
|
||||||
// The packet we will be modifying
|
|
||||||
protected PacketContainer handle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs a new strongly typed wrapper for the given packet.
|
|
||||||
*
|
|
||||||
* @param handle - handle to the raw packet data.
|
|
||||||
* @param type - the packet type.
|
|
||||||
*/
|
|
||||||
protected AbstractPacket(PacketContainer handle, PacketType type) {
|
|
||||||
// Make sure we're given a valid packet
|
|
||||||
if (handle == null)
|
|
||||||
throw new IllegalArgumentException("Packet handle cannot be NULL.");
|
|
||||||
if (!Objects.equal(handle.getType(), type))
|
|
||||||
throw new IllegalArgumentException(handle.getHandle()
|
|
||||||
+ " is not a packet of type " + type);
|
|
||||||
|
|
||||||
this.handle = handle;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve a handle to the raw packet data.
|
|
||||||
*
|
|
||||||
* @return Raw packet data.
|
|
||||||
*/
|
|
||||||
public PacketContainer getHandle() {
|
|
||||||
return handle;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send the current packet to the given receiver.
|
|
||||||
*
|
|
||||||
* @param receiver - the receiver.
|
|
||||||
* @throws RuntimeException If the packet cannot be sent.
|
|
||||||
*/
|
|
||||||
public void sendPacket(Player receiver) {
|
|
||||||
try {
|
|
||||||
ProtocolLibrary.getProtocolManager().sendServerPacket(receiver,
|
|
||||||
getHandle());
|
|
||||||
} catch (InvocationTargetException e) {
|
|
||||||
throw new RuntimeException("Cannot send packet.", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send the current packet to all online players.
|
|
||||||
*/
|
|
||||||
public void broadcastPacket() {
|
|
||||||
ProtocolLibrary.getProtocolManager().broadcastServerPacket(getHandle());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Simulate receiving the current packet from the given sender.
|
|
||||||
*
|
|
||||||
* @param sender - the sender.
|
|
||||||
* @throws RuntimeException If the packet cannot be received.
|
|
||||||
* @deprecated Misspelled. recieve to receive
|
|
||||||
* @see #receivePacket(Player)
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public void recievePacket(Player sender) {
|
|
||||||
try {
|
|
||||||
ProtocolLibrary.getProtocolManager().recieveClientPacket(sender,
|
|
||||||
getHandle());
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException("Cannot recieve packet.", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Simulate receiving the current packet from the given sender.
|
|
||||||
*
|
|
||||||
* @param sender - the sender.
|
|
||||||
* @throws RuntimeException if the packet cannot be received.
|
|
||||||
*/
|
|
||||||
public void receivePacket(Player sender) {
|
|
||||||
try {
|
|
||||||
ProtocolLibrary.getProtocolManager().recieveClientPacket(sender,
|
|
||||||
getHandle());
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException("Cannot receive packet.", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,158 +0,0 @@
|
||||||
/**
|
|
||||||
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
|
|
||||||
* Copyright (C) dmulloy2 <http://dmulloy2.net>
|
|
||||||
* Copyright (C) Kristian S. Strangeland
|
|
||||||
*
|
|
||||||
* 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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.tylermurphy.hideAndSeek.util.protocollib;
|
|
||||||
|
|
||||||
import org.bukkit.Sound;
|
|
||||||
|
|
||||||
import com.comphenix.protocol.PacketType;
|
|
||||||
import com.comphenix.protocol.events.PacketContainer;
|
|
||||||
import com.comphenix.protocol.wrappers.EnumWrappers.SoundCategory;
|
|
||||||
|
|
||||||
public class WrapperPlayServerNamedSoundEffect extends AbstractPacket {
|
|
||||||
public static final PacketType TYPE =
|
|
||||||
PacketType.Play.Server.NAMED_SOUND_EFFECT;
|
|
||||||
|
|
||||||
public WrapperPlayServerNamedSoundEffect() {
|
|
||||||
super(new PacketContainer(TYPE), TYPE);
|
|
||||||
handle.getModifier().writeDefaults();
|
|
||||||
}
|
|
||||||
|
|
||||||
public WrapperPlayServerNamedSoundEffect(PacketContainer packet) {
|
|
||||||
super(packet, TYPE);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Sound getSoundEffect() {
|
|
||||||
return handle.getSoundEffects().read(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSoundEffect(Sound value) {
|
|
||||||
handle.getSoundEffects().write(0, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public SoundCategory getSoundCategory() {
|
|
||||||
return handle.getSoundCategories().read(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSoundCategory(SoundCategory value) {
|
|
||||||
handle.getSoundCategories().write(0, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve Effect position X.
|
|
||||||
* <p>
|
|
||||||
* Notes: effect X multiplied by 8
|
|
||||||
*
|
|
||||||
* @return The current Effect position X
|
|
||||||
*/
|
|
||||||
public int getEffectPositionX() {
|
|
||||||
return handle.getIntegers().read(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set Effect position X.
|
|
||||||
*
|
|
||||||
* @param value - new value.
|
|
||||||
*/
|
|
||||||
public void setEffectPositionX(int value) {
|
|
||||||
handle.getIntegers().write(0, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve Effect position Y.
|
|
||||||
* <p>
|
|
||||||
* Notes: effect Y multiplied by 8
|
|
||||||
*
|
|
||||||
* @return The current Effect position Y
|
|
||||||
*/
|
|
||||||
public int getEffectPositionY() {
|
|
||||||
return handle.getIntegers().read(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set Effect position Y.
|
|
||||||
*
|
|
||||||
* @param value - new value.
|
|
||||||
*/
|
|
||||||
public void setEffectPositionY(int value) {
|
|
||||||
handle.getIntegers().write(1, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve Effect position Z.
|
|
||||||
* <p>
|
|
||||||
* Notes: effect Z multiplied by 8
|
|
||||||
*
|
|
||||||
* @return The current Effect position Z
|
|
||||||
*/
|
|
||||||
public int getEffectPositionZ() {
|
|
||||||
return handle.getIntegers().read(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set Effect position Z.
|
|
||||||
*
|
|
||||||
* @param value - new value.
|
|
||||||
*/
|
|
||||||
public void setEffectPositionZ(int value) {
|
|
||||||
handle.getIntegers().write(2, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve Volume.
|
|
||||||
* <p>
|
|
||||||
* Notes: 1 is 100%, can be more
|
|
||||||
*
|
|
||||||
* @return The current Volume
|
|
||||||
*/
|
|
||||||
public float getVolume() {
|
|
||||||
return handle.getFloat().read(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set Volume.
|
|
||||||
*
|
|
||||||
* @param value - new value.
|
|
||||||
*/
|
|
||||||
public void setVolume(float value) {
|
|
||||||
handle.getFloat().write(0, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve Pitch.
|
|
||||||
* <p>
|
|
||||||
* Notes: 63 is 100%, can be more
|
|
||||||
*
|
|
||||||
* @return The current Pitch
|
|
||||||
*/
|
|
||||||
public float getPitch() {
|
|
||||||
return handle.getFloat().read(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set Pitch.
|
|
||||||
*
|
|
||||||
* @param value - new value.
|
|
||||||
*/
|
|
||||||
public void setPitch(float value) {
|
|
||||||
handle.getFloat().write(1, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue