Initial CB1060 implementation

Author: kimoVoid

README.md

@@ -1,8 +1,8 @@
 ## Forked to support Minecraft Beta 1.7.3's McRegion map format
 Original project can be found [here](https://github.com/BlueMap-Minecraft/BlueMap)
 
-## Currently supported methods: CLI and Poseidon (Bukkit)
-Download Project Poseidon [here](https://github.com/RhysB/Project-Poseidon)
+## Currently supported methods: CLI and Bukkit (CB1060 and Poseidon)
+Make sure to use the `bukkit` build only if you're using original CB1060. If you're using [Project Poseidon](https://github.com/RhysB/Project-Poseidon), choose the `poseidon` build.
 
 ## To get the Beta look:
 

implementations/bukkit/build.gradle.kts

@@ -26,12 +26,6 @@ repositories {
 	maven {
 		setUrl("https://oss.sonatype.org/content/repositories/snapshots")
 	}
-	maven {
-		setUrl("https://repository.johnymuffin.com/repository/maven-public")
-	}
-		maven {
-		setUrl("https://repository.johnymuffin.com/repository/maven-snapshots")
-	}
 }
 
 dependencies {
@@ -41,8 +35,8 @@ dependencies {
 		exclude( group = "com.google.code.gson", module = "gson" )
 	}
 
-	shadow ("com.legacyminecraft.poseidon:poseidon-craftbukkit:1.1.8")
-	implementation ("org.bstats:bstats-bukkit:2.2.1")
+	shadow (fileTree("libs"))
+	implementation ("com.google.code.gson:gson:2.11.0")
 
 	testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2")
 	testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2")
@@ -89,6 +83,7 @@ tasks.shadowJar {
 	archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
 
 	//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it
+	relocate ("com.google.code.gson", "de.bluecolored.shadow.google.gson")
 	relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config")
 	relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt")
 	relocate ("org.spongepowered.configurate", "de.bluecolored.shadow.configurate")

implementations/bukkit/libs/craftbukkit1060.jar

@@ -51,7 +51,7 @@ public BukkitCommandSource(Plugin plugin, CommandSender delegate) {
 
     @Override
     public void sendMessage(Text text) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(BukkitPlugin.getInstance(), () -> {
+        Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(BukkitPlugin.getInstance(), () -> {
             if (delegate instanceof Player) {
                 Player player = (Player) delegate;
                 player.sendMessage(ChatColor.GRAY + text.toPlainString());

implementations/bukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommandSource.java

@@ -29,23 +29,15 @@
 import de.bluecolored.bluemap.common.serverinterface.Player;
 import de.bluecolored.bluemap.common.plugin.text.Text;
 import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
 import org.bukkit.Location;
 
 import java.io.IOException;
-import java.util.EnumMap;
-import java.util.Map;
 import java.util.UUID;
 
 public class BukkitPlayer implements Player {
 
-    private static final Map<GameMode, Gamemode> GAMEMODE_MAP = new EnumMap<>(GameMode.class);
-    static {
-        GAMEMODE_MAP.put(GameMode.SURVIVAL, Gamemode.SURVIVAL);
-        GAMEMODE_MAP.put(GameMode.CREATIVE, Gamemode.CREATIVE);
-    }
-
     private final UUID uuid;
+    private final String playerName;
     private Text name;
     private String world;
     private Vector3d position;
@@ -58,8 +50,9 @@ public class BukkitPlayer implements Player {
     private boolean vanished;
     private Gamemode gamemode;
 
-    public BukkitPlayer(UUID playerUUID) {
-        this.uuid = playerUUID;
+    public BukkitPlayer(UUID uuid, String playerName) {
+        this.uuid = uuid;
+        this.playerName = playerName;
         update();
     }
 
@@ -127,14 +120,13 @@ public Gamemode getGamemode() {
      * API access, only call on server thread!
      */
     public void update() {
-        org.bukkit.entity.Player player = Bukkit.getServer().getPlayer(uuid);
+        org.bukkit.entity.Player player = Bukkit.getServer().getPlayer(this.playerName);
         if (player == null) {
             this.online = false;
             return;
         }
 
-        this.gamemode = GAMEMODE_MAP.get(GameMode.SURVIVAL);
-        if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
+        this.gamemode = Gamemode.SURVIVAL;
 
         this.invisible = this.vanished = false; // TODO add support for vanish;
 

implementations/bukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java

@@ -0,0 +1,24 @@
+package de.bluecolored.bluemap.bukkit;
+
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerListener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import java.util.UUID;
+
+public class BukkitPlayerListener extends PlayerListener {
+
+    public void onPlayerJoin(PlayerJoinEvent evt) {
+        BukkitPlayer player = new BukkitPlayer(evt.getPlayer().getUniqueId(), evt.getPlayer().getName());
+        BukkitPlugin.getInstance().getOnlinePlayerMap().put(evt.getPlayer().getUniqueId(), player);
+        BukkitPlugin.getInstance().getOnlinePlayerList().add(player);
+    }
+
+    public void onPlayerLeave(PlayerQuitEvent evt) {
+        UUID playerUUID = evt.getPlayer().getUniqueId();
+        BukkitPlugin.getInstance().getOnlinePlayerMap().remove(playerUUID);
+        synchronized (BukkitPlugin.getInstance().getOnlinePlayerList()) {
+            BukkitPlugin.getInstance().getOnlinePlayerList().removeIf(p -> p.getUuid().equals(playerUUID));
+        }
+    }
+}

implementations/bukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayerListener.java

@@ -40,10 +40,6 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
 import org.bukkit.event.Event;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.IOException;
@@ -52,7 +48,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class BukkitPlugin extends JavaPlugin implements ServerInterface, Listener {
+public class BukkitPlugin extends JavaPlugin implements ServerInterface {
 
     private static BukkitPlugin instance;
 
@@ -100,8 +96,11 @@ public void onEnable() {
         }
 
         //register events
-        getServer().getPluginManager().registerEvents(this, this);
-        getServer().getPluginManager().registerEvents(eventForwarder, this);
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_JOIN, new BukkitPlayerListener(), Event.Priority.Monitor, this);
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_QUIT, new BukkitPlayerListener(), Event.Priority.Monitor, this);
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_JOIN, new EventForwarder(), Event.Priority.Monitor, this);
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_QUIT, new EventForwarder(), Event.Priority.Monitor, this);
+        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_CHAT, new EventForwarder(), Event.Priority.Monitor, this);
 
         //register commands
         try {
@@ -117,14 +116,11 @@ public void onEnable() {
             Logger.global.logError("Failed to register commands!", e);
         }
 
-        //tab completions
-        getServer().getPluginManager().registerEvents(commands, this);
-
         //update online-player collections
         this.onlinePlayerList.clear();
         this.onlinePlayerMap.clear();
         for (org.bukkit.entity.Player player : getServer().getOnlinePlayers()) {
-            BukkitPlayer bukkitPlayer = new BukkitPlayer(player.getUniqueId());
+            BukkitPlayer bukkitPlayer = new BukkitPlayer(player.getUniqueId(), player.getName());
             onlinePlayerMap.put(player.getUniqueId(), bukkitPlayer);
             onlinePlayerList.add(bukkitPlayer);
         }
@@ -174,7 +170,7 @@ public void unregisterAllListeners() {
     @Override
     public Collection<ServerWorld> getLoadedWorlds() {
         Collection<ServerWorld> loadedWorlds = new ArrayList<>(3);
-        for (World world : Bukkit.getWorlds()) {
+        for (World world : Bukkit.getServer().getWorlds()) {
             loadedWorlds.add(worlds.get(world));
         }
         return loadedWorlds;
@@ -186,17 +182,17 @@ public Optional<ServerWorld> getWorld(Object world) {
             return getWorld((Path) world);
 
         if (world instanceof String) {
-            var serverWorld = Bukkit.getWorld((String) world);
+            var serverWorld = Bukkit.getServer().getWorld((String) world);
             if (serverWorld != null) world = serverWorld;
         }
 
         if (world instanceof String) {
-            var serverWorld = Bukkit.getWorld(new Key((String) world).getValue());
+            var serverWorld = Bukkit.getServer().getWorld(new Key((String) world).getValue());
             if (serverWorld != null) world = serverWorld;
         }
 
         if (world instanceof UUID) {
-            var serverWorld = Bukkit.getWorld((UUID) world);
+            var serverWorld = Bukkit.getServer().getWorld((UUID) world);
             if (serverWorld != null) world = serverWorld;
         }
 
@@ -228,25 +224,17 @@ public static BukkitPlugin getInstance() {
         return instance;
     }
 
-    @EventHandler(priority = Event.Priority.Monitor, ignoreCancelled = true)
-    public void onPlayerJoin(PlayerJoinEvent evt) {
-        BukkitPlayer player = new BukkitPlayer(evt.getPlayer().getUniqueId());
-        onlinePlayerMap.put(evt.getPlayer().getUniqueId(), player);
-        onlinePlayerList.add(player);
+    @Override
+    public Collection<Player> getOnlinePlayers() {
+        return onlinePlayerMap.values();
     }
 
-    @EventHandler(priority = Event.Priority.Monitor, ignoreCancelled = true)
-    public void onPlayerLeave(PlayerQuitEvent evt) {
-        UUID playerUUID = evt.getPlayer().getUniqueId();
-        onlinePlayerMap.remove(playerUUID);
-        synchronized (onlinePlayerList) {
-            onlinePlayerList.removeIf(p -> p.getUuid().equals(playerUUID));
-        }
+    public Collection<BukkitPlayer> getOnlinePlayerList() {
+        return onlinePlayerList;
     }
 
-    @Override
-    public Collection<Player> getOnlinePlayers() {
-        return onlinePlayerMap.values();
+    public Map<UUID, Player> getOnlinePlayerMap() {
+        return onlinePlayerMap;
     }
 
     @Override

implementations/bukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java

@@ -92,7 +92,7 @@ public boolean persistWorldChanges() throws IOException {
         if (delegateWorld == null) return false;
 
         try {
-            return Bukkit.getScheduler().callSyncMethod(BukkitPlugin.getInstance(), () -> {
+            return Bukkit.getServer().getScheduler().callSyncMethod(BukkitPlugin.getInstance(), () -> {
                 delegateWorld.save();
                 return true;
             }).get();

implementations/bukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitWorld.java

@@ -26,17 +26,15 @@
 
 import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
 import de.bluecolored.bluemap.common.plugin.text.Text;
-import org.bukkit.event.Event;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerListener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-public class EventForwarder implements Listener {
+public class EventForwarder extends PlayerListener {
 
     private final Collection<ServerEventListener> listeners;
 
@@ -52,18 +50,19 @@ public synchronized void removeAllListeners() {
         listeners.clear();
     }
 
-    @EventHandler(priority = Event.Priority.Monitor, ignoreCancelled = true)
+    @Override
     public synchronized void onPlayerJoin(PlayerJoinEvent evt) {
         for (ServerEventListener listener : listeners) listener.onPlayerJoin(evt.getPlayer().getUniqueId());
     }
 
-    @EventHandler(priority = Event.Priority.Monitor, ignoreCancelled = true)
-    public synchronized void onPlayerLeave(PlayerQuitEvent evt) {
+    @Override
+    public synchronized void onPlayerQuit(PlayerQuitEvent evt) {
         for (ServerEventListener listener : listeners) listener.onPlayerJoin(evt.getPlayer().getUniqueId());
     }
 
-    @EventHandler(priority = Event.Priority.Monitor, ignoreCancelled = true)
+    @Override
     public synchronized void onPlayerChat(PlayerChatEvent evt) {
+        if (evt.isCancelled()) return;
         String message = String.format(evt.getFormat(), evt.getPlayer().getDisplayName(), evt.getMessage());
         for (ServerEventListener listener : listeners) listener.onChatMessage(Text.of(message));
     }