.

Author: InventivetalentDev

API/pom.xml

@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.inventivetalent</groupId>
             <artifactId>reflectionhelper</artifactId>
-            <version>1.17.0-SNAPSHOT</version>
+            <version>1.17.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.inventivetalent</groupId>

API/src/org/inventivetalent/packetlistener/channel/ChannelAbstract.java

@@ -4,12 +4,11 @@
 import org.bukkit.entity.Player;
 import org.inventivetalent.packetlistener.Cancellable;
 import org.inventivetalent.packetlistener.IPacketListener;
+import org.inventivetalent.reflection.accessor.FieldAccessor;
 import org.inventivetalent.reflection.resolver.FieldResolver;
 import org.inventivetalent.reflection.resolver.MethodResolver;
 import org.inventivetalent.reflection.resolver.minecraft.NMSClassResolver;
-import org.inventivetalent.reflection.util.AccessUtil;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
@@ -33,10 +32,10 @@ public abstract class ChannelAbstract {
     protected static final FieldResolver minecraftServerFieldResolver = new FieldResolver(MinecraftServer);
     protected static final FieldResolver serverConnectionFieldResolver = new FieldResolver(ServerConnection);
 
-    static final Field networkManager = playerConnectionFieldResolver.resolveSilent("networkManager");
-    static final Field playerConnection = entityPlayerFieldResolver.resolveSilent("playerConnection");
-    static final Field serverConnection = minecraftServerFieldResolver.resolveByFirstTypeSilent(ServerConnection);
-    static final Field connectionList = serverConnectionFieldResolver.resolveByLastTypeSilent(List.class);
+    static final FieldAccessor networkManager = playerConnectionFieldResolver.resolveAccessor("networkManager");
+    static final FieldAccessor playerConnection = entityPlayerFieldResolver.resolveAccessor("playerConnection");
+    static final FieldAccessor serverConnection = minecraftServerFieldResolver.resolveByFirstTypeAccessor(ServerConnection);
+    static final FieldAccessor connectionList = serverConnectionFieldResolver.resolveByLastTypeAccessor(List.class);
 
     protected static final MethodResolver craftServerFieldResolver = new MethodResolver(Bukkit.getServer().getClass());
 
@@ -69,7 +68,7 @@ public void addServerChannel() {
             if (!currentList.isEmpty()) {
                 // Try to check if our list is already set
                 try {
-                    Field superListField = AccessUtil.setAccessible(currentList.getClass().getSuperclass().getDeclaredField("list"));
+                    FieldAccessor superListField = new FieldAccessor(currentList.getClass().getSuperclass().getDeclaredField("list"));
                     Object list = superListField.get(currentList);
                     if (IListenerList.class.isAssignableFrom(list.getClass())) { return; }
                 } catch (Exception e) {

API/src/org/inventivetalent/packetlistener/channel/INCChannel.java

@@ -6,15 +6,15 @@
 import org.bukkit.entity.Player;
 import org.inventivetalent.packetlistener.Cancellable;
 import org.inventivetalent.packetlistener.IPacketListener;
+import org.inventivetalent.reflection.accessor.FieldAccessor;
 import org.inventivetalent.reflection.minecraft.Minecraft;
 
-import java.lang.reflect.Field;
 import java.net.SocketAddress;
 import java.util.ArrayList;
 
 public class INCChannel extends ChannelAbstract {
 
-	private static final Field channelField = networkManagerFieldResolver.resolveByFirstTypeSilent(io.netty.channel.Channel.class);
+	private static final FieldAccessor channelField = networkManagerFieldResolver.resolveByFirstTypeAccessor(io.netty.channel.Channel.class);
 
 	public INCChannel(IPacketListener iPacketListener) {
 		super(iPacketListener);

API/src/org/inventivetalent/packetlistener/handler/PacketAbstract.java

@@ -40,11 +40,7 @@ public PacketAbstract(Object packet, Cancellable cancellable, ChannelWrapper cha
 	 * @param value Value to be assigned to the field
 	 */
 	public void setPacketValue(String field, Object value) {
-		try {
-			fieldResolver.resolve(field).set(getPacket(), value);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
+		fieldResolver.resolveAccessor(field).set(getPacket(), value);
 	}
 
 	/**
@@ -55,7 +51,7 @@ public void setPacketValue(String field, Object value) {
 	 */
 	public void setPacketValueSilent(String field, Object value) {
 		try {
-			fieldResolver.resolve(field).set(getPacket(), value);
+			setPacketValue(field, value);
 		} catch (Exception e) {
 		}
 	}
@@ -68,7 +64,7 @@ public void setPacketValueSilent(String field, Object value) {
 	 */
 	public void setPacketValue(int index, Object value) {
 		try {
-			fieldResolver.resolveIndex(index).set(getPacket(), value);
+			fieldResolver.resolveIndexAccessor(index).set(getPacket(), value);
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
@@ -82,7 +78,7 @@ public void setPacketValue(int index, Object value) {
 	 */
 	public void setPacketValueSilent(int index, Object value) {
 		try {
-			fieldResolver.resolveIndex(index).set(getPacket(), value);
+			setPacketValue(index, value);
 		} catch (Exception e) {
 		}
 	}
@@ -94,11 +90,7 @@ public void setPacketValueSilent(int index, Object value) {
 	 * @return current value of the field
 	 */
 	public Object getPacketValue(String field) {
-		try {
-			return fieldResolver.resolve(field).get(getPacket());
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
+		return fieldResolver.resolveAccessor(field).get(getPacket());
 	}
 
 	/**
@@ -109,7 +101,7 @@ public Object getPacketValue(String field) {
 	 */
 	public Object getPacketValueSilent(String field) {
 		try {
-			return fieldResolver.resolve(field).get(getPacket());
+			return getPacketValue(field);
 		} catch (Exception e) {
 		}
 		return null;
@@ -122,11 +114,7 @@ public Object getPacketValueSilent(String field) {
 	 * @return value of the field
 	 */
 	public Object getPacketValue(int index) {
-		try {
-			return fieldResolver.resolveIndex(index).get(getPacket());
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
+		return fieldResolver.resolveIndexAccessor(index).get(getPacket());
 	}
 
 	/**
@@ -137,7 +125,7 @@ public Object getPacketValue(int index) {
 	 */
 	public Object getPacketValueSilent(int index) {
 		try {
-			return fieldResolver.resolveIndex(index).get(getPacket());
+			return getPacketValue(index);
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}