Move FakeServer to 1.8 provider (#4395)

Moving this removes the need to needlessly update the FakeServer class with new methods when upstream changes it.

Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -72,7 +72,7 @@ import java.util.regex.Pattern;
 
 import static com.earth2me.essentials.I18n.tl;
 
-public class EssentialsPlayerListener implements Listener {
+public class EssentialsPlayerListener implements Listener, FakeAccessor {
     private static final Logger LOGGER = Logger.getLogger("Essentials");
     private final transient IEssentials ess;
 
@@ -1001,4 +1001,9 @@ public class EssentialsPlayerListener implements Listener {
                 && (ess.getSettings().isCommandOverridden(label) || (ess.getAlternativeCommandsHandler().getAlternative(label) == null));
         }
     }
+
+    @Override
+    public void getUser(Player player) {
+        ess.getUser(player);
+    }
 }

providers/1_8Provider/src/main/java/com/earth2me/essentials/FakeAccessor.java

@@ -0,0 +1,13 @@
+package com.earth2me.essentials;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+/**
+ * Utility method to bridge certain features between our test suite and the base module.
+ */
+public interface FakeAccessor {
+    void onPlayerJoin(PlayerJoinEvent event);
+
+    void getUser(Player player);
+}

providers/1_8Provider/src/main/java/com/earth2me/essentials/FakeServer.java

@@ -3,33 +3,25 @@ package com.earth2me.essentials;
 import org.bukkit.BanList;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
-import org.bukkit.Keyed;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Server;
-import org.bukkit.Statistic;
-import org.bukkit.StructureType;
-import org.bukkit.Tag;
 import org.bukkit.UnsafeValues;
 import org.bukkit.Warning.WarningState;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldCreator;
 import org.bukkit.advancement.Advancement;
-import org.bukkit.block.data.BlockData;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarFlag;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
-import org.bukkit.boss.KeyedBossBar;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.conversations.Conversation;
 import org.bukkit.conversations.ConversationAbandonedEvent;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventPriority;
@@ -44,7 +36,6 @@ import org.bukkit.inventory.ItemFactory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.Merchant;
 import org.bukkit.inventory.Recipe;
-import org.bukkit.loot.LootTable;
 import org.bukkit.map.MapView;
 import org.bukkit.permissions.Permissible;
 import org.bukkit.permissions.Permission;
@@ -78,10 +69,9 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
-import java.util.function.Consumer;
 import java.util.logging.Logger;
 
-@SuppressWarnings({"NullableProblems", "ConstantConditions"})
+@SuppressWarnings({"NullableProblems"})
 public final class FakeServer implements Server {
     private final List<World> worlds = new ArrayList<>();
     private final PluginManager pluginManager = new FakePluginManager();
@@ -128,6 +118,16 @@ public final class FakeServer implements Server {
         return "127.0.0.1";
     }
 
+    @Override
+    public String getServerName() {
+        return getName();
+    }
+
+    @Override
+    public String getServerId() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public int broadcastMessage(final String string) {
         int i = 0;
@@ -232,6 +232,11 @@ public final class FakeServer implements Server {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
 
+            @Override
+            public void cancelAllTasks() {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+
             @Override
             public boolean isCurrentlyRunning(final int i) {
                 throw new UnsupportedOperationException("Not supported yet.");
@@ -257,11 +262,6 @@ public final class FakeServer implements Server {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
 
-            @Override
-            public void runTask(final Plugin plugin, final Consumer<BukkitTask> task) throws IllegalArgumentException {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
             @Override
             public BukkitTask runTask(final Plugin plugin, final BukkitRunnable bukkitRunnable) throws IllegalArgumentException {
                 return null;
@@ -273,11 +273,6 @@ public final class FakeServer implements Server {
                 return null;
             }
 
-            @Override
-            public void runTaskAsynchronously(final Plugin plugin, final Consumer<BukkitTask> task) throws IllegalArgumentException {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
             @Override
             public BukkitTask runTaskAsynchronously(final Plugin plugin, final BukkitRunnable bukkitRunnable) throws IllegalArgumentException {
                 return null;
@@ -288,11 +283,6 @@ public final class FakeServer implements Server {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
 
-            @Override
-            public void runTaskLater(final Plugin plugin, final Consumer<BukkitTask> task, final long delay) throws IllegalArgumentException {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
             @Override
             public BukkitTask runTaskLater(final Plugin plugin, final BukkitRunnable bukkitRunnable, final long l) throws IllegalArgumentException {
                 return null;
@@ -304,11 +294,6 @@ public final class FakeServer implements Server {
                 return null;
             }
 
-            @Override
-            public void runTaskLaterAsynchronously(final Plugin plugin, final Consumer<BukkitTask> task, final long delay) throws IllegalArgumentException {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
             @Override
             public BukkitTask runTaskLaterAsynchronously(final Plugin plugin, final BukkitRunnable bukkitRunnable, final long l) throws IllegalArgumentException {
                 return null;
@@ -319,11 +304,6 @@ public final class FakeServer implements Server {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
 
-            @Override
-            public void runTaskTimer(final Plugin plugin, final Consumer<BukkitTask> task, final long delay, final long period) throws IllegalArgumentException {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
             @Override
             public BukkitTask runTaskTimer(final Plugin plugin, final BukkitRunnable bukkitRunnable, final long l, final long l1) throws IllegalArgumentException {
                 return null;
@@ -334,11 +314,6 @@ public final class FakeServer implements Server {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
 
-            @Override
-            public void runTaskTimerAsynchronously(final Plugin plugin, final Consumer<BukkitTask> task, final long delay, final long period) throws IllegalArgumentException {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
             @Override
             public BukkitTask runTaskTimerAsynchronously(final Plugin plugin, final BukkitRunnable bukkitRunnable, final long l, final long l1) throws IllegalArgumentException {
                 return null;
@@ -442,6 +417,11 @@ public final class FakeServer implements Server {
         return null;
     }
 
+    @Override
+    public MapView getMap(short id) {
+        return null;
+    }
+
     @Override
     public void reload() {
     }
@@ -540,16 +520,6 @@ public final class FakeServer implements Server {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public ItemStack createExplorerMap(final World world, final Location location, final StructureType structureType) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public ItemStack createExplorerMap(final World world, final Location location, final StructureType structureType, final int radius, final boolean findUnexplored) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     public boolean getAllowFlight() {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -560,16 +530,6 @@ public final class FakeServer implements Server {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public boolean isWhitelistEnforced() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void setWhitelistEnforced(boolean value) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     public Set<org.bukkit.OfflinePlayer> getWhitelistedPlayers() {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -684,96 +644,6 @@ public final class FakeServer implements Server {
                 }
                 throw new UnsupportedOperationException("Not supported yet.");
             }
-
-            @Override
-            public void incrementStatistic(final Statistic statistic) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void decrementStatistic(final Statistic statistic) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public int getStatistic(final Statistic statistic) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void incrementStatistic(final Statistic statistic, final int amount) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void decrementStatistic(final Statistic statistic, final int amount) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void setStatistic(final Statistic statistic, final int newValue) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void incrementStatistic(final Statistic statistic, final Material material) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void decrementStatistic(final Statistic statistic, final Material material) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public int getStatistic(final Statistic statistic, final Material material) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void incrementStatistic(final Statistic statistic, final Material material, final int amount) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void decrementStatistic(final Statistic statistic, final Material material, final int amount) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void setStatistic(final Statistic statistic, final Material material, final int newValue) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void incrementStatistic(final Statistic statistic, final EntityType entityType) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void decrementStatistic(final Statistic statistic, final EntityType entityType) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public int getStatistic(final Statistic statistic, final EntityType entityType) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void incrementStatistic(final Statistic statistic, final EntityType entityType, final int amount) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void decrementStatistic(final Statistic statistic, final EntityType entityType, final int amount) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public void setStatistic(final Statistic statistic, final EntityType entityType, final int newValue) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
         };
     }
 
@@ -822,12 +692,10 @@ public final class FakeServer implements Server {
                 }
             }
 
-            @Override
             public void sendMessage(final UUID uuid, final String message) {
                 sendMessage(message);
             }
 
-            @Override
             public void sendMessage(final UUID uuid, final String[] messages) {
                 sendMessage(messages);
             }
@@ -842,11 +710,6 @@ public final class FakeServer implements Server {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
 
-            @Override
-            public Spigot spigot() {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
             @Override
             public boolean isPermissionSet(final String name) {
                 throw new UnsupportedOperationException("Not supported yet.");
@@ -941,12 +804,6 @@ public final class FakeServer implements Server {
             public void sendRawMessage(final String message) {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
-
-            @Override
-            public void sendRawMessage(final UUID uuid, final String s) {
-
-            }
-
         };
     }
 
@@ -1000,31 +857,11 @@ public final class FakeServer implements Server {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public int getTicksPerWaterSpawns() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public int getTicksPerWaterAmbientSpawns() {
-        return 0;
-    }
-
-    @Override
-    public int getTicksPerAmbientSpawns() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     public List<Recipe> getRecipesFor(final ItemStack is) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public Recipe getRecipe(final NamespacedKey namespacedKey) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     public Iterator<Recipe> recipeIterator() {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -1040,11 +877,6 @@ public final class FakeServer implements Server {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public boolean removeRecipe(final NamespacedKey key) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     public HelpMap getHelpMap() {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -1100,11 +932,6 @@ public final class FakeServer implements Server {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public int getWaterAmbientSpawnLimit() {
-        return 0;
-    }
-
     @Override
     public boolean isPrimaryThread() {
         return true; // Can be set to true or false, just needs to return for AFK status test to pass.
@@ -1175,37 +1002,12 @@ public final class FakeServer implements Server {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public KeyedBossBar createBossBar(final NamespacedKey key, final String title, final BarColor color, final BarStyle style, final BarFlag... flags) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Iterator<KeyedBossBar> getBossBars() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public KeyedBossBar getBossBar(final NamespacedKey key) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public boolean removeBossBar(final NamespacedKey key) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     @SuppressWarnings("deprecation")
     public UnsafeValues getUnsafe() {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public Spigot spigot() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     public BanList getBanList(final BanList.Type arg0) {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -1257,45 +1059,6 @@ public final class FakeServer implements Server {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public BlockData createBlockData(final Material material) {
-        return null;
-    }
-
-    @Override
-    public BlockData createBlockData(final Material material, final Consumer<BlockData> consumer) {
-        return null;
-    }
-
-    @Override
-    public BlockData createBlockData(final String data) throws IllegalArgumentException {
-        return null;
-    }
-
-    @Override
-    public BlockData createBlockData(final Material material, final String data) throws IllegalArgumentException {
-        return null;
-    }
-
-    @Override
-    public <T extends Keyed> Tag<T> getTag(final String s, final NamespacedKey namespacedKey, final Class<T> aClass) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    public <T extends Keyed> Iterable<Tag<T>> getTags(final String registry, final Class<T> clazz) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public LootTable getLootTable(final NamespacedKey arg0) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public List<Entity> selectEntities(final CommandSender sender, final String selector) throws IllegalArgumentException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     static class FakePluginManager implements PluginManager {
         final ArrayList<RegisteredListener> listeners = new ArrayList<>();
 
@@ -1349,13 +1112,12 @@ public final class FakeServer implements Server {
             Logger.getLogger("Minecraft").info("Called event " + event.getEventName());
             if (event instanceof PlayerJoinEvent) {
                 for (final RegisteredListener listener : listeners) {
-                    if (listener.getListener() instanceof EssentialsPlayerListener) {
+                    if (listener.getListener() instanceof FakeAccessor) {
                         final PlayerJoinEvent jEvent = (PlayerJoinEvent) event;
-                        final EssentialsPlayerListener epl = (EssentialsPlayerListener) listener.getListener();
+                        final FakeAccessor epl = (FakeAccessor) listener.getListener();
                         epl.onPlayerJoin(jEvent);
-                        final Essentials ess = (Essentials) listener.getPlugin();
+                        Logger.getLogger("Essentials").info("Sending join event to Essentials");
-                        ess.getLogger().info("Sending join event to Essentials");
+                        epl.getUser(jEvent.getPlayer());
-                        ess.getUser(jEvent.getPlayer());
                     }
                 }
             }
@@ -1456,9 +1218,4 @@ public final class FakeServer implements Server {
             throw new UnsupportedOperationException("Not supported yet.");
         }
     }
-
-    @Override
-    public int getMaxWorldSize() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
 }