Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-10-01 16:47:35 +02:00
Code Issues Projects Releases Wiki Activity

Restore a few more methods, add some documentation

Browse Source
This commit is contained in:
Dan Mulloy 2016-03-02 20:47:00 -05:00
parent 072a60516e
commit 850e3431da
2 changed files with 94 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java
View File

@ -25,9 +25,12 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
import com.comphenix.protocol.injector.BukkitUnwrapper;
import com.comphenix.protocol.reflect.FieldAccessException;
import com.comphenix.protocol.reflect.FieldUtils;
import com.comphenix.protocol.reflect.FuzzyReflection;
import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
@ -39,11 +42,23 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
private static MethodAccessor getter = null;
private static MethodAccessor setter = null;
private static Field ENTITY_DATA_FIELD = null;
private static Field ENTITY_FIELD = null;
/**
* Constructs a new Data Watcher. This is currently unsupported in 1.9 and up due to changes in data watcher structure.
* Essentially, Mojang further tied data watchers to their entities.
* @deprecated
*/
@Deprecated
public WrappedDataWatcher() {
super(MinecraftReflection.getDataWatcherClass());
}
/**
* Constructs a wrapped data watcher around an existing NMS data watcher.
* @param handle NMS data watcher
*/
public WrappedDataWatcher(Object handle) {
this();
setHandle(handle);
@ -212,11 +227,78 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
setter.invoke(handle, object, WrappedWatchableObject.getUnwrapped(value));
}
/**
* Clone the content of the current DataWatcher.
*
* @return A cloned data watcher.
*/
public WrappedDataWatcher deepClone() {
// TODO This
return null;
}
/**
* Retrieve the data watcher associated with an entity.
*
* @param entity - the entity to read from.
* @return Associated data watcher.
* @throws FieldAccessException Reflection failed.
*/
public static WrappedDataWatcher getEntityWatcher(Entity entity) throws FieldAccessException {
if (ENTITY_DATA_FIELD == null)
ENTITY_DATA_FIELD = FuzzyReflection.fromClass(MinecraftReflection.getEntityClass(), true).getFieldByType("datawatcher", MinecraftReflection.getDataWatcherClass());
BukkitUnwrapper unwrapper = new BukkitUnwrapper();
try {
Object nsmWatcher = FieldUtils.readField(ENTITY_DATA_FIELD, unwrapper.unwrapItem(entity), true);
if (nsmWatcher != null)
return new WrappedDataWatcher(nsmWatcher);
else
return null;
} catch (IllegalAccessException e) {
throw new FieldAccessException("Cannot access DataWatcher field.", e);
}
}
/**
* Retrieve the entity associated with this data watcher.
* <p>
* <b>Warning:</b> This is only supported on 1.7.2 and above.
*
* @return The entity, or NULL.
*/
public Entity getEntity() {
if (!MinecraftReflection.isUsingNetty())
throw new IllegalStateException("This method is only supported on 1.7.2 and above.");
try {
return (Entity) MinecraftReflection.getBukkitEntity(ENTITY_FIELD.get(handle));
} catch (Exception e) {
throw new RuntimeException("Unable to retrieve entity.", e);
}
}
/**
* Set the entity associated with this data watcher.
* <p>
* <b>Warning:</b> This is only supported on 1.7.2 and above.
*
* @param entity - the new entity.
*/
public void setEntity(Entity entity) {
if (!MinecraftReflection.isUsingNetty())
throw new IllegalStateException("This method is only supported on 1.7.2 and above.");
try {
ENTITY_FIELD.set(handle, BukkitUnwrapper.getInstance().unwrapItem(entity));
} catch (Exception e) {
throw new RuntimeException("Unable to set entity.", e);
}
}
@Deprecated
@SuppressWarnings("unused")
public static Integer getTypeID(Class<?> clazz) {

13
ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedWatchableObject.java
View File

@ -17,9 +17,12 @@ public class WrappedWatchableObject extends AbstractWrapper {
private WrappedWatchableObject() {
super(MinecraftReflection.getDataWatcherItemClass());
}
/**
* Constructs a wrapped watchable object around an existing NMS data watcher item.
* @param handle Data watcher item
*/
public WrappedWatchableObject(Object handle) {
this();
setHandle(handle);
@ -29,10 +32,18 @@ public class WrappedWatchableObject extends AbstractWrapper {
// ---- Getter methods
/**
* Gets the wrapped value of this data watcher item.
* @return The wrapped value
*/
public Object getValue() {
return getWrapped(getRawValue());
}
/**
* Gets the raw value of this data watcher item.
* @return Raw value
*/
public Object getRawValue() {
return modifier.readSafely(1);
}