Started work on border transfer. Hotfix for counties.

noahhusby · Aug 6, 2020 · 1e3bb6e · 1e3bb6e
1 parent 012125d
commit 1e3bb6e
Show file tree

Hide file tree

Showing 44 changed files with 34,516 additions and 94 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
diff --git a/Sledgehammer [Bungeecord]/dependency-reduced-pom.xml b/Sledgehammer [Bungeecord]/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.noahhusby</groupId>
   <artifactId>Sledgehammer</artifactId>
-  <version>0.1-bungeecord</version>
+  <version>0.2.2-bungeecord</version>
   <build>
     <plugins>
       <plugin>

diff --git a/Sledgehammer [Bungeecord]/pom.xml b/Sledgehammer [Bungeecord]/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.noahhusby</groupId>
     <artifactId>Sledgehammer</artifactId>
-    <version>0.1-bungeecord</version>
+    <version>0.2.2-bungeecord</version>
     <repositories>
         <repository>
             <id>bungeecord-repo</id>

diff --git a/Sledgehammer [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/Constants.java b/Sledgehammer [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/Constants.java
@@ -0,0 +1,7 @@
+package com.noahhusby.sledgehammer;
+
+public class Constants {
+    public static final String PLUGINID   = "sledgehammer";
+    public static final String VERSION = "0.2.2";
+    public static final double SCALE = 7318261.522857145;
+}
diff --git a/Sledgehammer [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/Sledgehammer.java b/Sledgehammer [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/Sledgehammer.java
@@ -3,15 +3,19 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.noahhusby.sledgehammer.commands.CsTpllCommand;
+import com.noahhusby.sledgehammer.commands.SledgehammerCommand;
 import com.noahhusby.sledgehammer.commands.TpllCommand;
 import com.noahhusby.sledgehammer.commands.WarpCommand;
 import com.noahhusby.sledgehammer.datasets.OpenStreetMaps;
 import com.noahhusby.sledgehammer.handlers.CommunicationHandler;
+import com.noahhusby.sledgehammer.handlers.PlayerLocationHandler;
 import com.noahhusby.sledgehammer.handlers.WarpHandler;
 import com.noahhusby.sledgehammer.util.Warp;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.config.Configuration;
@@ -24,6 +28,7 @@
 
 import java.io.*;
 import java.nio.file.Files;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 
@@ -50,17 +55,33 @@ public void onEnable() {
             ProxyServer.getInstance().getPluginManager().registerCommand(this, new CsTpllCommand());
         }
 
+        ProxyServer.getInstance().getPluginManager().registerCommand(this, new SledgehammerCommand());
+
         ProxyServer.getInstance().registerChannel("sledgehammer:channel");
         ProxyServer.getInstance().getPluginManager().registerListener(this, this);
 
         OpenStreetMaps.getInstance();
+
+        getProxy().getScheduler().schedule(this, () -> {
+
+        }, 10,  TimeUnit.SECONDS);
     }
 
     @EventHandler
     public void onMessage(PluginMessageEvent e) {
         CommunicationHandler.onIncomingMessage(e);
     }
 
+    @EventHandler
+    public void onPlayerJoin(PostLoginEvent e) {
+        PlayerLocationHandler.getInstance().onPlayerJoin(e.getPlayer());
+    }
+
+    @EventHandler
+    public void onPlayerLeave(PlayerDisconnectEvent e) {
+        PlayerLocationHandler.getInstance().onPlayerQuit(e.getPlayer());
+    }
+
 
     private void initConfig() {
         createConfig();

diff --git a/...r [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/commands/SledgehammerCommand.java b/...r [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/commands/SledgehammerCommand.java
@@ -0,0 +1,16 @@
+package com.noahhusby.sledgehammer.commands;
+
+import com.noahhusby.sledgehammer.util.ChatHelper;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.plugin.Command;
+
+public class SledgehammerCommand extends Command {
+    public SledgehammerCommand() {
+        super("sledgehammer");
+    }
+
+    @Override
+    public void execute(CommandSender commandSender, String[] strings) {
+        ChatHelper.getInstance().infoMessage(commandSender);
+    }
+}
diff --git a/...hammer [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/datasets/OpenStreetMaps.java b/...hammer [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/datasets/OpenStreetMaps.java
@@ -1,6 +1,7 @@
 package com.noahhusby.sledgehammer.datasets;
 
 
+import com.noahhusby.sledgehammer.Constants;
 import com.noahhusby.sledgehammer.Sledgehammer;
 import com.noahhusby.sledgehammer.util.Location;
 import com.noahhusby.sledgehammer.util.ProxyUtil;
@@ -50,9 +51,17 @@ public ServerInfo getServerFromLocation(double lon, double lat) {
                                 }
                                 break;
                             case "county":
-                                if(location.county.equals(regionData[1].trim()) &&
-                                location.state.equals(regionData[2].trim())) {
-                                    return ProxyUtil.getServerFromName(server);
+                                if(regionData.length==4) {
+                                    if(location.county.equals(regionData[1].trim()) &&
+                                    location.state.equals(regionData[2].trim()) &&
+                                    location.country.equals(regionData[3].trim())) {
+                                        return ProxyUtil.getServerFromName(server);
+                                    }
+                                } else {
+                                    if(location.county.equals(regionData[1].trim()) &&
+                                            location.state.equals(regionData[2].trim())) {
+                                        return ProxyUtil.getServerFromName(server);
+                                    }
                                 }
                                 break;
                             case "state":
@@ -82,7 +91,7 @@ private Location getLocation(double lon, double lat) {
 
             URL url = new URL(fullRequest);
             HttpURLConnection con = (HttpURLConnection)url.openConnection();
-            con.setRequestProperty("User-Agent", "sledgehammer/1.0");
+            con.setRequestProperty("User-Agent", Constants.PLUGINID+"/"+Constants.VERSION);
             con.setRequestProperty("Accept", "application/json");
 
             try(BufferedReader br = new BufferedReader(

diff --git a/... [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/handlers/CommunicationHandler.java b/... [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/handlers/CommunicationHandler.java
@@ -39,9 +39,11 @@ public static void onIncomingMessage(PluginMessageEvent e) {
             if(args.length < 3) return;
             if(!args[1].equals(Sledgehammer.configuration.getString("authentication-key"))) return;
             switch (args[4]) {
-                case "WARP_LOC":
+                case "POS":
                     WarpHandler.getInstance().incomingLocationResponse(args[3], new Point(args[5].replaceAll("[^\\d-]", ""),
                             args[6].replaceAll("[^\\d-]", ""), args[7].replaceAll("[^\\d-]", "")));
+                    PlayerLocationHandler.getInstance().updateLocation(args[3], new Point(args[5].replaceAll("[^\\d-]", ""),
+                            args[6].replaceAll("[^\\d-]", ""), args[7].replaceAll("[^\\d-]", "")));
                     break;
             }
         } catch (Exception ex) {

diff --git a/...[Bungeecord]/src/main/java/com/noahhusby/sledgehammer/handlers/PlayerLocationHandler.java b/...[Bungeecord]/src/main/java/com/noahhusby/sledgehammer/handlers/PlayerLocationHandler.java
@@ -0,0 +1,48 @@
+package com.noahhusby.sledgehammer.handlers;
+
+import com.google.common.collect.Maps;
+import com.noahhusby.sledgehammer.Constants;
+import com.noahhusby.sledgehammer.Sledgehammer;
+import com.noahhusby.sledgehammer.projection.GeographicProjection;
+import com.noahhusby.sledgehammer.projection.ModifiedAirocean;
+import com.noahhusby.sledgehammer.projection.ScaleProjection;
+import com.noahhusby.sledgehammer.util.Point;
+import com.noahhusby.sledgehammer.util.ProxyUtil;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.Map;
+
+public class PlayerLocationHandler {
+    private static PlayerLocationHandler mInstance = null;
+
+    public static PlayerLocationHandler getInstance() {
+        if(mInstance == null) mInstance = new PlayerLocationHandler();
+        return mInstance;
+    }
+
+    Map<ProxiedPlayer, Point> playerLocations = Maps.newHashMap();
+    Map<ProxiedPlayer, Integer> playerRecall = Maps.newHashMap();
+
+    private PlayerLocationHandler() {}
+
+    public void onPlayerJoin(ProxiedPlayer player) {
+        playerLocations.remove(player);
+    }
+
+    public void onPlayerQuit(ProxiedPlayer player) {
+        playerLocations.remove(player);
+    }
+
+    public void updateLocation(String sender, Point point) {
+        if(false) {
+            //if(!ProxyUtil.isServerRegional(ProxyUtil.getServerFromPlayerName(sender))) return;
+            GeographicProjection projection = new ModifiedAirocean();
+            GeographicProjection uprightProj = GeographicProjection.orientProjection(projection, GeographicProjection.Orientation.upright);
+            ScaleProjection scaleProj = new ScaleProjection(uprightProj, Constants.SCALE, Constants.SCALE);
+
+            double proj[] = scaleProj.toGeo(Double.parseDouble(point.x), Double.parseDouble(point.z));
+            Sledgehammer.logger.info("Location: "+proj[0]+", "+proj[1]);
+        }
+    }
+
+}
diff --git a/Sledgehammer [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/handlers/WarpHandler.java b/Sledgehammer [Bungeecord]/src/main/java/com/noahhusby/sledgehammer/handlers/WarpHandler.java
@@ -39,7 +39,7 @@ public Warp getWarp(String w) {
     public void requestNewWarp(String warp, CommandSender sender) {
         requestedWarps.put(sender.getName(), warp);
         CommunicationHandler.executeRequest(ProxyServer.getInstance().getPlayer(sender.getName()).getServer().getInfo(),
-                sender.getName(), "WARP_LOC");
+                sender.getName(), "POS");
     }
 
     public void removeWarp(String w, CommandSender sender) {