removed global maps and global dual maps

src/main/java/me/km/scheduler/SnuviScheduler.java

@@ -54,7 +54,6 @@ public class SnuviScheduler implements ISnuviScheduler {
     }
 
     private void tick(int ticks) {
-        System.out.println("Ticking scheduler");
         Iterator<SnuviTask> iter = tasks.iterator();
         long endTime = System.currentTimeMillis() + 25;
         while(iter.hasNext()) {
@@ -72,7 +71,6 @@ public class SnuviScheduler implements ISnuviScheduler {
                 iter.remove();
             }
         }
-        System.out.println("Finished ticking scheduler");
     }
 
     public void scheduleAsyncTask(Runnable r) {

src/main/java/me/km/snuviscript/DummyScriptBank.java

@@ -13,47 +13,4 @@ public class DummyScriptBank implements IScriptBank {
     public Object getVar(String var, int playerId, Object error) {
         return error;
     }
-
-    @Override
-    public Object getVar(String var, int playerId) {
-        return null;
-    }
-
-    @Override
-    public void addMapElement(String map, String key, String value) {
-    }
-
-    @Override
-    public void removeMapElement(String map, String key) {
-    }
-
-    @Override
-    public void removeMap(String map) {
-    }
-
-    @Override
-    public Object getMapValue(String map, String key) {
-        return null;
-    }
-
-    @Override
-    public void addDualMapElement(String map, String key, String key2, String value) {
-    }
-
-    @Override
-    public void removeDualMapElement(String map, String key) {
-    }
-
-    @Override
-    public void removeDualMap(String map) {
-    }
-
-    @Override
-    public void removeDualMapElement(String map, String key, String key2) {
-    }
-
-    @Override
-    public Object getDualMapValue(String map, String key, String key2) {
-        return null;
-    }
 }

src/main/java/me/km/snuviscript/IScriptBank.java

@@ -7,23 +7,7 @@ public interface IScriptBank {
 
     public Object getVar(String var, int playerId, Object error) throws Exception;
 
-    public Object getVar(String var, int playerId) throws Exception;
-
-    public void addMapElement(String map, String key, String value) throws Exception;
-
-    public void removeMapElement(String map, String key) throws Exception;
-
-    public void removeMap(String map) throws Exception;
-
-    public Object getMapValue(String map, String key) throws Exception;
-
-    public void addDualMapElement(String map, String key, String key2, String value) throws Exception;
-
-    public void removeDualMapElement(String map, String key) throws Exception;
-
-    public void removeDualMap(String map) throws Exception;
-
-    public void removeDualMapElement(String map, String key, String key2) throws Exception;
-
-    public Object getDualMapValue(String map, String key, String key2) throws Exception;
+    public default Object getVar(String var, int playerId) throws Exception {
+        return getVar(var, playerId, null);
+    }
 }

src/main/java/me/km/snuviscript/ScriptBank.java

@@ -9,8 +9,6 @@ import me.km.playerbank.PlayerManager;
 public class ScriptBank implements IScriptBank {
     private final DataBank databank;
     private final PreparedStatement getVar;
-    private final PreparedStatement getMapValue;
-    private final PreparedStatement getDualMapValue;
 
     public ScriptBank(DataBank databank, PlayerManager manager) {
         this.databank = databank;
@@ -22,26 +20,7 @@ public class ScriptBank implements IScriptBank {
                 + "UNIQUE INDEX (player_id,var), "
                 + "FOREIGN KEY (player_id) REFERENCES minecraft.players(id) ON DELETE RESTRICT);");
 
-        databank.execute("CREATE TABLE IF NOT EXISTS scriptmaps ("
-                + "id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, "
-                + "map VARCHAR(255) NOT NULL, "
-                + "keyname VARCHAR(255) NOT NULL, "
-                + "value VARCHAR(255) NOT NULL, "
-                + "INDEX (map), "
-                + "UNIQUE INDEX (map,keyname));");
-
-        databank.execute("CREATE TABLE IF NOT EXISTS scriptdualmaps ("
-                + "id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, "
-                + "map VARCHAR(255) NOT NULL, "
-                + "keyname VARCHAR(255) NOT NULL, "
-                + "seckeyname VARCHAR(255) NOT NULL, "
-                + "value VARCHAR(255) NOT NULL, "
-                + "INDEX (map), "
-                + "UNIQUE INDEX (map,keyname,seckeyname));");
-
         getVar = databank.prepareStatement("SELECT value from scriptdata WHERE player_id = ? and var = ?;");
-        getMapValue = databank.prepareStatement("SELECT value from scriptmaps WHERE map = ? AND keyname = ?;");
-        getDualMapValue = databank.prepareStatement("SELECT value from scriptdualmaps WHERE map = ? AND keyname = ? AND seckeyname = ?;");
     }
 
     @Override
@@ -82,103 +61,4 @@ public class ScriptBank implements IScriptBank {
     public Object getVar(String var, int playerId) throws Exception {
         return getVar(var, playerId, null);
     }
-
-    @Override
-    public void addMapElement(String map, String key, String value) throws Exception {
-        try(PreparedStatement addMapElement = databank.prepareStatement(
-                "INSERT INTO scriptmaps (map,keyname,value) SELECT ?, ?, ? ON DUPLICATE KEY UPDATE value=?;")) {
-            addMapElement.setString(1, map);
-            addMapElement.setString(2, key);
-            addMapElement.setString(3, value);
-            addMapElement.setString(4, value);
-            addMapElement.executeUpdate();
-        }
-    }
-
-    @Override
-    public void removeMapElement(String map, String key) throws Exception {
-        try(PreparedStatement removeMapElement = databank.prepareStatement(
-                "DELETE FROM scriptmaps WHERE map = ? AND keyname = ?;")) {
-            removeMapElement.setString(1, map);
-            removeMapElement.setString(2, key);
-            removeMapElement.executeUpdate();
-        }
-    }
-
-    @Override
-    public void removeMap(String map) throws Exception {
-        try(PreparedStatement removeMap = databank.prepareStatement(
-                "DELETE FROM scriptmaps WHERE map = ?;")) {
-            removeMap.setString(1, map);
-            removeMap.executeUpdate();
-        }
-    }
-
-    @Override
-    public Object getMapValue(String map, String key) throws Exception {
-        getMapValue.setString(1, map);
-        getMapValue.setString(2, key);
-        try(ResultSet rs = getMapValue.executeQuery()) {
-            if(rs.next()) {
-                return SnuviUtils.convert(rs.getString(1));
-            }
-            return null;
-        }
-    }
-
-    @Override
-    public void addDualMapElement(String map, String key, String key2, String value) throws Exception {
-        try(PreparedStatement addDualMapElement = databank.prepareStatement(
-                "INSERT INTO scriptdualmaps (map,keyname,seckeyname,value) SELECT ?, ?, ?, ? ON DUPLICATE KEY UPDATE value=?;")) {
-            addDualMapElement.setString(1, map);
-            addDualMapElement.setString(2, key);
-            addDualMapElement.setString(3, key2);
-            addDualMapElement.setString(4, value);
-            addDualMapElement.setString(5, value);
-            addDualMapElement.executeUpdate();
-        }
-    }
-
-    @Override
-    public void removeDualMapElement(String map, String key) throws Exception {
-        try(PreparedStatement removeDualMapElement = databank.prepareStatement(
-                "DELETE FROM scriptdualmaps WHERE map = ? AND keyname = ?;")) {
-            removeDualMapElement.setString(1, map);
-            removeDualMapElement.setString(2, key);
-            removeDualMapElement.executeUpdate();
-        }
-    }
-
-    @Override
-    public void removeDualMap(String map) throws Exception {
-        try(PreparedStatement removeDualMap = databank.prepareStatement(
-                "DELETE FROM scriptdualmaps WHERE map = ?;")) {
-            removeDualMap.setString(1, map);
-            removeDualMap.executeUpdate();
-        }
-    }
-
-    @Override
-    public void removeDualMapElement(String map, String key, String key2) throws Exception {
-        try(PreparedStatement removeDualMapElement2 = databank.prepareStatement(
-                "DELETE FROM scriptdualmaps WHERE map = ? AND keyname = ? AND seckeyname = ?;")) {
-            removeDualMapElement2.setString(1, map);
-            removeDualMapElement2.setString(2, key);
-            removeDualMapElement2.setString(3, key2);
-            removeDualMapElement2.executeUpdate();
-        }
-    }
-
-    @Override
-    public Object getDualMapValue(String map, String key, String key2) throws Exception {
-        getDualMapValue.setString(1, map);
-        getDualMapValue.setString(2, key);
-        getDualMapValue.setString(3, key2);
-        try(ResultSet rs = getDualMapValue.executeQuery()) {
-            if(rs.next()) {
-                return SnuviUtils.convert(rs.getString(1));
-            }
-            return null;
-        }
-    }
 }

src/main/java/me/km/snuviscript/commands/DeprecatedCommands.java

@@ -14,8 +14,8 @@ import static me.km.snuviscript.commands.CommandUtils.getId;
 import net.minecraft.server.MinecraftServer;
 
 public class DeprecatedCommands {
-    public static void registerFunctions(ScriptManager sm, Scripts scripts, Permissions perms, SnuviScheduler scheduler, 
-            MinecraftServer server, IPlayerBank playerBank, CustomEventCaller cec, IScriptBank scriptBank, 
+    public static void registerFunctions(ScriptManager sm, Scripts scripts, Permissions perms, SnuviScheduler scheduler,
+            MinecraftServer server, IPlayerBank playerBank, CustomEventCaller cec, IScriptBank scriptBank,
             DataBank dataBank, WorldPlotMap plots, ModCommandManager commands) {
         sm.registerFunction("getglobalvar", (sc, in) -> {
             Object o = in[0].get(sc);
@@ -54,117 +54,5 @@ public class DeprecatedCommands {
             });
         });
         sm.registerAlias("delglobalvar", "dgv");
-        sm.registerConsumer("gmap.removeall", (sc, in) -> {
-            final String map = in[0].getString(sc);
-            scheduler.scheduleAsyncTask(() -> {
-                try {
-                    scriptBank.removeMap(map);
-                } catch(Exception ex) {
-                    scheduler.scheduleTask(() -> {
-                        sc.getScriptManager().getLogger().print("Worker error", ex, null, sc.getName(), sc, null);
-                    });
-                }
-            });
-        });
-        sm.registerConsumer("gmap.add", (sc, in) -> {
-            final String map = in[0].getString(sc);
-            final String key = in[1].getString(sc);
-            final String value = in[2].getString(sc);
-            scheduler.scheduleAsyncTask(() -> {
-                try {
-                    scriptBank.addMapElement(map, key, value);
-                } catch(Exception ex) {
-                    scheduler.scheduleTask(() -> {
-                        sc.getScriptManager().getLogger().print("Worker error", ex, null, sc.getName(), sc, null);
-                    });
-                }
-            });
-        });
-        sm.registerConsumer("gmap.remove", (sc, in) -> {
-            final String map = in[0].getString(sc);
-            final String key = in[1].getString(sc);
-            scheduler.scheduleAsyncTask(() -> {
-                try {
-                    scriptBank.removeMapElement(map, key);
-                } catch(Exception ex) {
-                    scheduler.scheduleTask(() -> {
-                        sc.getScriptManager().getLogger().print("Worker error", ex, null, sc.getName(), sc, null);
-                    });
-                }
-            });
-        });
-        sm.registerFunction("gmap.get", (sc, in) -> scriptBank.getMapValue(in[0].getString(sc), in[1].getString(sc)));
-        sm.registerFunction("gmap.getordefault", (sc, in) -> {
-            Object o = scriptBank.getMapValue(in[0].getString(sc), in[1].getString(sc));
-            if(o == null) {
-                return in[2].get(sc);
-            }
-            return o;
-        });
-        sm.registerConsumer("gdmap.removeall", (sc, in) -> {
-            if(in.length >= 2) {
-                final String map = in[0].getString(sc);
-                final String key = in[1].getString(sc);
-                scheduler.scheduleAsyncTask(() -> {
-                    try {
-                        scriptBank.removeDualMapElement(map, key);
-                    } catch(Exception ex) {
-                        scheduler.scheduleTask(() -> {
-                            sc.getScriptManager().getLogger().print("Worker error", ex, null, sc.getName(), sc, null);
-                        });
-                    }
-                });
-            } else {
-                final String map = in[0].getString(sc);
-                scheduler.scheduleAsyncTask(() -> {
-                    try {
-                        scriptBank.removeDualMap(map);
-                    } catch(Exception ex) {
-                        scheduler.scheduleTask(() -> {
-                            sc.getScriptManager().getLogger().print("Worker error", ex, null, sc.getName(), sc, null);
-                        });
-                    }
-                });
-            }
-        });
-        sm.registerConsumer("gdmap.add", (sc, in) -> {
-            final String map = in[0].getString(sc);
-            final String key1 = in[1].getString(sc);
-            final String key2 = in[2].getString(sc);
-            final String value = in[3].getString(sc);
-            scheduler.scheduleAsyncTask(() -> {
-                try {
-                    scriptBank.addDualMapElement(map, key1, key2, value);
-                } catch(Exception ex) {
-                    scheduler.scheduleTask(() -> {
-                        sc.getScriptManager().getLogger().print("Worker error", ex, null, sc.getName(), sc, null);
-                    });
-                }
-            });
-        });
-        sm.registerConsumer("gdmap.remove", (sc, in) -> {
-            final String map = in[0].getString(sc);
-            final String key1 = in[1].getString(sc);
-            final String key2 = in[2].getString(sc);
-            scheduler.scheduleAsyncTask(() -> {
-                try {
-                    scriptBank.removeDualMapElement(map, key1, key2);
-                } catch(Exception ex) {
-                    scheduler.scheduleTask(() -> {
-                        sc.getScriptManager().getLogger().print("Worker error", ex, null, sc.getName(), sc, null);
-                    });
-                }
-            });
-        });
-        sm.registerFunction("gdmap.get", (sc, in) -> {
-            return scriptBank.getDualMapValue(in[0].getString(sc), in[1].getString(sc), in[2].getString(sc));
-        });
-        sm.registerFunction("gdmap.getordefault", (sc, in) -> {
-            Object o = scriptBank.getDualMapValue(in[0].getString(sc), in[1].getString(sc), in[2].getString(sc));
-            if(o == null) {
-                return in[3].get(sc);
-            }
-            return o;
-        });
     }
 }