Fix REntity Metadata

SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java

@@ -21,6 +21,10 @@ package de.steamwar.core;
 
 import net.minecraft.network.chat.IChatMutableComponent;
 import net.minecraft.network.chat.contents.LiteralContents;
+import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
+import net.minecraft.network.syncher.DataWatcher;
+
+import java.util.ArrayList;
 
 public class ChatWrapper19 implements ChatWrapper {
 
@@ -28,4 +32,14 @@ public class ChatWrapper19 implements ChatWrapper {
     public Object stringToChatComponent(String text) {
         return IChatMutableComponent.a(new LiteralContents(text));
     }
+
+    @Override
+    public Object getDataWatcherPacket(int entityId, Object... dataWatcherKeyValues) {
+        ArrayList<DataWatcher.b<?>> nativeWatchers = new ArrayList<>(1);
+        for(int i = 0; i < dataWatcherKeyValues.length; i+=2) {
+            nativeWatchers.add((DataWatcher.b<?>) BountifulWrapper.impl.getDataWatcherItem(dataWatcherKeyValues[i], dataWatcherKeyValues[i+1]));
+        }
+
+        return new PacketPlayOutEntityMetadata(entityId, nativeWatchers);
+    }
 }

SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java

@@ -21,6 +21,9 @@ package de.steamwar.core;
 
 import com.comphenix.tinyprotocol.Reflection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ChatWrapper8 implements ChatWrapper {
 
     private static final Reflection.ConstructorInvoker chatComponentConstructor = Reflection.getConstructor(Reflection.getClass("{nms.network.chat}.ChatComponentText"), String.class);
@@ -28,4 +31,20 @@ public class ChatWrapper8 implements ChatWrapper {
     public Object stringToChatComponent(String text) {
         return chatComponentConstructor.invoke(text);
     }
+
+    private static final Reflection.FieldAccessor<Integer> metadataEntity = Reflection.getField(metadataPacket, int.class, 0);
+    private static final Reflection.FieldAccessor<List> metadataMetadata = Reflection.getField(metadataPacket, List.class, 0);
+    @Override
+    public Object getDataWatcherPacket(int entityId, Object... dataWatcherKeyValues) {
+        Object packet = Reflection.newInstance(metadataPacket);
+        metadataEntity.set(packet, entityId);
+
+        ArrayList<Object> nativeWatchers = new ArrayList<>(1);
+        for(int i = 0; i < dataWatcherKeyValues.length; i+=2) {
+            nativeWatchers.add(BountifulWrapper.impl.getDataWatcherItem(dataWatcherKeyValues[i], dataWatcherKeyValues[i+1]));
+        }
+        metadataMetadata.set(packet, nativeWatchers);
+
+        return packet;
+    }
 }

SpigotCore_Main/src/com/comphenix/tinyprotocol/Reflection.java

@@ -63,7 +63,6 @@ public final class Reflection {
 		 * @param value - the new value of the field.
 		 */
 		void set(Object target, Object value);
-		void setInt(Object target, int value);
 
 		/**
 		 * Determine if the given object has this field.
@@ -163,15 +162,6 @@ public final class Reflection {
 						}
 					}
 
-					@Override
-					public void setInt(Object target, int value) {
-						try {
-							field.setInt(target, value);
-						} catch (IllegalAccessException e) {
-							throw new IllegalArgumentException("Cannot access reflection.", e);
-						}
-					}
-
 					@Override
 					public boolean hasField(Object target) {
 						// target instanceof DeclaringClass

SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java

@@ -19,8 +19,14 @@
 
 package de.steamwar.core;
 
+import com.comphenix.tinyprotocol.Reflection;
+
 public interface ChatWrapper {
     ChatWrapper impl = VersionDependent.getVersionImpl(Core.getInstance());
 
+    Class<?> metadataPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutEntityMetadata");
+
     Object stringToChatComponent(String text);
+
+    Object getDataWatcherPacket(int entityId, Object... dataWatcherKeyValues);
 }

SpigotCore_Main/src/de/steamwar/entity/REntity.java

@@ -20,10 +20,7 @@
 package de.steamwar.entity;
 
 import com.comphenix.tinyprotocol.Reflection;
-import de.steamwar.core.BountifulWrapper;
+import de.steamwar.core.*;
-import de.steamwar.core.Core;
-import de.steamwar.core.FlatteningWrapper;
-import de.steamwar.core.ProtocolWrapper;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import lombok.Getter;
@@ -349,21 +346,8 @@ public class REntity {
         return status;
     }
 
-    private static final Class<?> metadataPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutEntityMetadata");
-    private static final Reflection.FieldAccessor<Integer> metadataEntity = Reflection.getField(metadataPacket, int.class, 0);
-    private static final Reflection.FieldAccessor<List> metadataMetadata = Reflection.getField(metadataPacket, List.class, 0);
-
     protected Object getDataWatcherPacket(Object... dataWatcherKeyValues) {
-        Object packet = Reflection.newInstance(metadataPacket);
+        return ChatWrapper.impl.getDataWatcherPacket(entityId, dataWatcherKeyValues);
-        metadataEntity.setInt(packet, entityId);
-
-        ArrayList<Object> nativeWatchers = new ArrayList<>(1);
-        for(int i = 0; i < dataWatcherKeyValues.length; i+=2) {
-            nativeWatchers.add(BountifulWrapper.impl.getDataWatcherItem(dataWatcherKeyValues[i], dataWatcherKeyValues[i+1]));
-        }
-        metadataMetadata.set(packet, nativeWatchers);
-
-        return packet;
     }
 
     private static final Class<?> teleportPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutEntityTeleport");