Merge branch 'modular' of https://github.com/MylesIsCool/ViaVersion into modular

common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java

@@ -95,7 +95,6 @@ public class PipelineUtil {
         boolean mark = false;
         for (String s : pipeline.names()) {
             if (mark) {
-                System.out.println("Context before: " + s);
                 return pipeline.context(pipeline.get(s));
             }
             if (s.equalsIgnoreCase(name))

pom.xml

@@ -111,7 +111,8 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>19.0</version>
+            <version>17.0</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

sponge/src/main/java/us/myles/ViaVersion/sponge/listeners/protocol1_9to1_8/HandItemCache.java

@@ -0,0 +1,78 @@
+package us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8;
+
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.item.inventory.ItemStack;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class HandItemCache implements Runnable {
+    public static boolean CACHE = false;
+    private static ConcurrentHashMap<UUID, Item> handCache = new ConcurrentHashMap<>();
+    private static Field GET_DAMAGE;
+    private static Method GET_ID;
+
+    public static Item getHandItem(UUID player) {
+        if (!handCache.containsKey(player))
+            return null;
+        return handCache.get(player);
+    }
+
+    @Override
+    public void run() {
+        List<UUID> players = new ArrayList<>(handCache.keySet());
+
+        for (Player p : Sponge.getServer().getOnlinePlayers()) {
+            handCache.put(p.getUniqueId(), convert(p.getItemInHand().orElse(null)));
+            players.remove(p.getUniqueId());
+        }
+        // Remove offline players
+        for (UUID uuid : players) {
+            handCache.remove(uuid);
+        }
+    }
+
+    public static Item convert(ItemStack itemInHand) {
+        if (itemInHand == null) return new Item((short) 0, (byte) 0, (short) 0, null);
+        if (GET_DAMAGE == null) {
+            try {
+                GET_DAMAGE = itemInHand.getClass().getDeclaredField("field_77991_e");
+                GET_DAMAGE.setAccessible(true);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+        if (GET_ID == null) {
+            try {
+                GET_ID = Class.forName("net.minecraft.item.Item").getDeclaredMethod("func_150891_b", Class.forName("net.minecraft.item.Item"));
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        int id = 0;
+        try {
+            id = (int) GET_ID.invoke(null, itemInHand.getItem());
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        int damage = 0;
+        try {
+            damage = (int) GET_DAMAGE.get(itemInHand);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return new Item((short) id, (byte) itemInHand.getQuantity(), (short) damage, null);
+    }
+}
+

sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaLoader.java

@@ -4,15 +4,16 @@ import lombok.AllArgsConstructor;
 import org.spongepowered.api.Sponge;
 import us.myles.ViaVersion.SpongePlugin;
 import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.minecraft.item.Item;
 import us.myles.ViaVersion.api.platform.ViaPlatformLoader;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.BulkChunkTranslatorProvider;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.HandItemProvider;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider;
 import us.myles.ViaVersion.sponge.listeners.ClientLeaveListener;
 import us.myles.ViaVersion.sponge.listeners.UpdateListener;
-import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.ArmorListener;
+import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.*;
-import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.BlockListener;
-import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.CommandBlockListener;
-import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.DeathListener;
 import us.myles.ViaVersion.sponge.providers.SpongeViaBulkChunkTranslator;
 import us.myles.ViaVersion.sponge.providers.SpongeViaMovementTransmitter;
 
@@ -24,49 +25,31 @@ public class SpongeViaLoader implements ViaPlatformLoader {
     public void load() {
         // Update Listener
         Sponge.getEventManager().registerListeners(plugin, new UpdateListener());
-//
         /* Base Protocol */
         Sponge.getEventManager().registerListeners(plugin, new ClientLeaveListener());
-//        /* 1.9 client to 1.8 server */
+        /* 1.9 client to 1.8 server */
-//
         new ArmorListener(plugin).register();
         new CommandBlockListener(plugin).register();
         new DeathListener(plugin).register();
         new BlockListener(plugin).register();
 
-//        if (plugin.getConf().isItemCache()) {
+        if (plugin.getConf().isItemCache()) {
-//            new HandItemCache().runTaskTimerAsynchronously(plugin, 2L, 2L); // Updates player's items :)
+            Via.getPlatform().runRepeatingSync(new HandItemCache(), 2L); // Updates player's items :)
-//            HandItemCache.CACHE = true;
+            HandItemCache.CACHE = true;
-//        }
+        }
-//
+
-//        /* Providers */
+        /* Providers */
         Via.getManager().getProviders().use(BulkChunkTranslatorProvider.class, new SpongeViaBulkChunkTranslator());
         Via.getManager().getProviders().use(MovementTransmitterProvider.class, new SpongeViaMovementTransmitter());
-//        Via.getManager().getProviders().use(HandItemProvider.class, new HandItemProvider() {
+        Via.getManager().getProviders().use(HandItemProvider.class, new HandItemProvider() {
-//            @Override
+            @Override
-//            public Item getHandItem(final UserConnection info) {
+            public Item getHandItem(final UserConnection info) {
-//                if (HandItemCache.CACHE) {
+                if (HandItemCache.CACHE) {
-//                    return HandItemCache.getHandItem(info.get(ProtocolInfo.class).getUuid());
+                    return HandItemCache.getHandItem(info.get(ProtocolInfo.class).getUuid());
-//                } else {
+                } else {
-//                    try {
+                    return super.getHandItem(info); // TODO: On API Docs write about this
-//                        return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<Item>() {
+                }
-//                            @Override
+            }
-//                            public Item call() throws Exception {
+        });
-//                                UUID playerUUID = info.get(ProtocolInfo.class).getUuid();
-//                                if (Bukkit.getPlayer(playerUUID) != null) {
-//                                    return HandItemCache.convert(Bukkit.getPlayer(playerUUID).getItemInHand());
-//                                }
-//                                return null;
-//                            }
-//                        }).get(10, TimeUnit.SECONDS);
-//                    } catch (Exception e) {
-//                        System.out.println("Error fetching hand item: " + e.getClass().getName());
-//                        if (Via.getManager().isDebug())
-//                            e.printStackTrace();
-//                        return null;
-//                    }
-//                }
-//            }
-//        });
     }
 }