Inserts a new column in the portal position table

src/main/java/org/sgrewritten/stargate/api/GateAPI.java

@@ -113,7 +113,7 @@ public interface GateAPI {
      * @param location <p> The location of the position </p>
      * @param type     <p> The type of position </p>
      */
-    void addPortalPosition(Location location, PositionType type);
+    void addPortalPosition(Location location, PositionType type, String pluginName);
 
     /**
      * Add a position specific to this Gate

src/main/java/org/sgrewritten/stargate/api/MaterialHandlerResolver.java

@@ -81,7 +81,7 @@ public void registerPlacement(Location location, List<RealPortal> portals, Mater
             for(BlockHandlerInterface blockHandlerInterface : blockHandlerMap.get(material)){
                 if(portal.hasFlag(blockHandlerInterface.getFlag()) && blockHandlerInterface.registerPlacedBlock(location,player,portal)){
                     BlockVector relativeVector = portal.getGate().getRelativeVector(location).toBlockVector();
-                    PortalPosition portalPosition = new PortalPosition(blockHandlerInterface.getInterfaceType(),relativeVector);
+                    PortalPosition portalPosition = new PortalPosition(blockHandlerInterface.getInterfaceType(),relativeVector,blockHandlerInterface.getPlugin().getName());
                     portal.getGate().addPortalPosition(portalPosition);
                     blockBlockHandlerMap.put(new BlockLocation(location),blockHandlerInterface);
                     registry.registerLocation(GateStructureType.CONTROL_BLOCK,new BlockLocation(location),portal);

src/main/java/org/sgrewritten/stargate/database/SQLQueryGenerator.java

@@ -338,15 +338,17 @@ public PreparedStatement generateAddPortalFlagRelationStatement(Connection conne
      */
     public PreparedStatement generateRemoveFlagsStatement(Connection connection,
                                                           StorageType portalType, Portal portal) throws SQLException {
-        PreparedStatement removeFlagsStatement;
+        String stringStatement;
         if (portalType == StorageType.LOCAL) {
-            removeFlagsStatement = prepareQuery(connection, getQuery(SQLQuery.DELETE_PORTAL_FLAG_RELATIONS));
+            stringStatement = getQuery(SQLQuery.DELETE_PORTAL_FLAG_RELATIONS);
         } else {
-            removeFlagsStatement = prepareQuery(connection, getQuery(SQLQuery.DELETE_INTER_PORTAL_FLAG_RELATIONS));
+            stringStatement = getQuery(SQLQuery.DELETE_INTER_PORTAL_FLAG_RELATIONS);
+        }
+        try(PreparedStatement removeFlagsStatement = prepareQuery(connection, stringStatement)) {
+            removeFlagsStatement.setString(1, portal.getName());
+            removeFlagsStatement.setString(2, portal.getNetwork().getId());
+            return removeFlagsStatement;
         }
-        removeFlagsStatement.setString(1, portal.getName());
-        removeFlagsStatement.setString(2, portal.getNetwork().getId());
-        return removeFlagsStatement;
     }
 
     /**
@@ -361,16 +363,19 @@ public PreparedStatement generateRemoveFlagsStatement(Connection connection,
      */
     public PreparedStatement generateRemoveFlagStatement(Connection connection,
                                                          StorageType portalType, Portal portal, Character flagChar) throws SQLException {
-        PreparedStatement removeFlagsStatement;
+        String stringStatement;
         if (portalType == StorageType.LOCAL) {
-            removeFlagsStatement = prepareQuery(connection, getQuery(SQLQuery.DELETE_PORTAL_FLAG_RELATION));
+            stringStatement = getQuery(SQLQuery.DELETE_PORTAL_FLAG_RELATION);
         } else {
-            removeFlagsStatement = prepareQuery(connection, getQuery(SQLQuery.DELETE_INTER_PORTAL_FLAG_RELATION));
+            stringStatement = getQuery(SQLQuery.DELETE_INTER_PORTAL_FLAG_RELATION);
+        }
+
+        try(PreparedStatement removeFlagsStatement = prepareQuery(connection, stringStatement) ) {
+            removeFlagsStatement.setString(1, portal.getName());
+            removeFlagsStatement.setString(2, portal.getNetwork().getName());
+            removeFlagsStatement.setString(3, String.valueOf(flagChar));
+            return removeFlagsStatement;
         }
-        removeFlagsStatement.setString(1, portal.getName());
-        removeFlagsStatement.setString(2, portal.getNetwork().getName());
-        removeFlagsStatement.setString(3, String.valueOf(flagChar));
-        return removeFlagsStatement;
     }
 
     /**

src/main/java/org/sgrewritten/stargate/gate/Gate.java

@@ -360,7 +360,7 @@ private void calculatePortalPositions(boolean alwaysOn) {
             if (registeredControls.contains(buttonVector)) {
                 continue;
             }
-            portalPositions.add(new PortalPosition(PositionType.BUTTON, buttonVector));
+            portalPositions.add(new PortalPosition(PositionType.BUTTON, buttonVector, "Stargate"));
             break;
         }
 
@@ -382,9 +382,9 @@ private List<BlockVector> getExistingControlPositions(boolean alwaysOn) {
             }
 
             if (Tag.WALL_SIGNS.isTagged(material)) {
-                portalPositions.add(new PortalPosition(PositionType.SIGN, blockVector));
+                portalPositions.add(new PortalPosition(PositionType.SIGN, blockVector, "Stargate"));
             } else if (!alwaysOn && ButtonHelper.isButton(material)) {
-                portalPositions.add(new PortalPosition(PositionType.BUTTON, blockVector));
+                portalPositions.add(new PortalPosition(PositionType.BUTTON, blockVector, "Stargate"));
             }
             foundVectors.add(blockVector);
         }
@@ -450,10 +450,10 @@ public Location getTopLeft() {
     }
 
     @Override
-    public void addPortalPosition(Location location, PositionType type) {
+    public void addPortalPosition(Location location, PositionType type, String pluginName) {
         BlockVector relativeBlockVector = this.getRelativeVector(location).toBlockVector();
         Stargate.log(Level.FINEST, String.format("Adding portal position %s with relative position %s", type.toString(), relativeBlockVector));
-        this.addPortalPosition(relativeBlockVector, type);
+        this.addPortalPosition(relativeBlockVector, type, pluginName);
     }
 
     @Override
@@ -480,8 +480,8 @@ public void addPortalPosition(PortalPosition portalPosition) {
      * @param relativeBlockVector <p> The relative position in format space</p>
      * @param type                <p> The type of position </p>
      */
-    public void addPortalPosition(BlockVector relativeBlockVector, PositionType type) {
-        PortalPosition pos = new PortalPosition(type, relativeBlockVector);
+    public void addPortalPosition(BlockVector relativeBlockVector, PositionType type, String pluginName) {
+        PortalPosition pos = new PortalPosition(type, relativeBlockVector, pluginName);
         this.portalPositions.add(pos);
     }
 

src/main/java/org/sgrewritten/stargate/migration/SQLDatabaseMigrator.java

@@ -1,6 +1,7 @@
 package org.sgrewritten.stargate.migration;
 
 import org.jetbrains.annotations.NotNull;
+import org.sgrewritten.stargate.Stargate;
 import org.sgrewritten.stargate.config.TableNameConfiguration;
 import org.sgrewritten.stargate.database.SQLDatabaseAPI;
 import org.sgrewritten.stargate.database.SQLQuery;
@@ -15,6 +16,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Objects;
+import java.util.logging.Level;
 
 public class SQLDatabaseMigrator {
 
@@ -44,12 +46,12 @@ private void run(StorageType type, Connection connection) throws SQLException, I
         String path = sqlFilesPath + "/" + type.toString().toLowerCase();
         int count = 0;
         while (true) {
-            boolean fallible = false;
+            boolean failAble = false;
             try {
                 InputStream stream = FileHelper.getInputStreamForInternalFile(path + "/step" + count + ".sql");
                 if (stream == null) {
-                    fallible = true;
-                    stream = FileHelper.getInputStreamForInternalFile(path + "/fallibleStep" + count + ".sql");
+                    failAble = true;
+                    stream = FileHelper.getInputStreamForInternalFile(path + "/failAbleStep" + count + ".sql");
                 }
                 if (stream == null) {
                     break;
@@ -62,7 +64,7 @@ private void run(StorageType type, Connection connection) throws SQLException, I
                 }
                 count++;
             } catch (SQLException | IOException e) {
-                if (!fallible) {
+                if (!failAble) {
                     throw e;
                 }
             }

src/main/java/org/sgrewritten/stargate/network/portal/PortalPosition.java

@@ -17,16 +17,19 @@ public class PortalPosition {
 
     private final PositionType positionType;
     private final BlockVector positionLocation;
+    private final String pluginName;
 
     /**
      * Instantiates a new portal position
      *
      * @param positionType     <p>The type of this portal position</p>
      * @param positionLocation <p>The location of this portal position</p>
+     * @param pluginName <p> The name of the plugin this position relates to</p>
      */
-    public PortalPosition(@NotNull PositionType positionType, @NotNull BlockVector positionLocation) {
+    public PortalPosition(@NotNull PositionType positionType, @NotNull BlockVector positionLocation, @NotNull String pluginName) {
         this.positionType = Objects.requireNonNull(positionType);
         this.positionLocation = Objects.requireNonNull(positionLocation);
+        this.pluginName = Objects.requireNonNull(pluginName);
     }
 
     /**
@@ -68,6 +71,9 @@ public void setMetaData(RealPortal portal, String data) {
         }
     }
 
+    public String getPluginName() {
+        return this.pluginName;
+    }
     @Override
     public boolean equals(Object other) {
         if (!(other instanceof PortalPosition otherPortalPosition)) {
@@ -80,4 +86,5 @@ public boolean equals(Object other) {
     public String toString() {
         return String.format("{x=%d,y=%d,z=%d,%s}", positionLocation.getBlockX(), positionLocation.getBlockY(), positionLocation.getBlockZ(), positionType);
     }
+
 }

src/main/java/org/sgrewritten/stargate/util/LegacyPortalStorageLoader.java

@@ -116,11 +116,11 @@ private static Portal readPortal(String line, World world, StargateAPI stargateA
         Location buttonLocation = LegacyDataHandler.loadLocation(world, portalProperties[2]);
         if (signLocation != null) {
             Stargate.log(Level.FINEST, "signLocation=" + signLocation);
-            gate.addPortalPosition(signLocation, PositionType.SIGN);
+            gate.addPortalPosition(signLocation, PositionType.SIGN, "Stargate");
         }
         if (buttonLocation != null && !portalData.flags().contains(PortalFlag.ALWAYS_ON)) {
             Stargate.log(Level.FINEST, "buttonLocation=" + buttonLocation);
-            gate.addPortalPosition(buttonLocation, PositionType.BUTTON);
+            gate.addPortalPosition(buttonLocation, PositionType.BUTTON, "Stargate");
         }
 
         Portal portal = PortalCreationHelper.createPortal(network, portalData, gate, stargateAPI);

src/main/java/org/sgrewritten/stargate/util/database/PortalStorageHelper.java

@@ -69,7 +69,8 @@ public static PortalPosition loadPortalPosition(ResultSet resultSet) throws Numb
         int zCoordinate = -Integer.parseInt(resultSet.getString("zCoordinate"));
         BlockVector positionVector = new BlockVector(xCoordinate, yCoordinate, zCoordinate);
         PositionType positionType = PositionType.valueOf(resultSet.getString("positionName"));
-        return new PortalPosition(positionType, positionVector);
+        String pluginName = resultSet.getString("pluginName");
+        return new PortalPosition(positionType, positionVector, pluginName);
     }
 
 
@@ -80,6 +81,8 @@ public static void addPortalPosition(PreparedStatement addPositionStatement, Rea
         addPositionStatement.setString(4, String.valueOf(portalPosition.getPositionLocation().getBlockY()));
         addPositionStatement.setString(5, String.valueOf(-portalPosition.getPositionLocation().getBlockZ()));
         addPositionStatement.setString(6, portalPosition.getPositionType().name());
+        addPositionStatement.setString(7, "");
+        addPositionStatement.setString(8, portalPosition.getPluginName());
         addPositionStatement.execute();
     }
 

src/main/resources/database/sqlite-queries/CREATE_TABLE_INTER_PORTAL_POSITION.sql

@@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS {InterPortalPosition}
    zCoordinate INTEGER NOT NULL,
    positionType INTEGER NOT NULL,
    metaData TEXT,
+   pluginName VARCHAR(255) DEFAULT "Stargate",
    PRIMARY KEY
    (
       portalName,

src/main/resources/database/sqlite-queries/CREATE_TABLE_PORTAL_POSITION.sql

@@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS {PortalPosition}
    zCoordinate INTEGER NOT NULL,
    positionType INTEGER NOT NULL,
    metaData TEXT,
+   pluginName VARCHAR(255) DEFAULT "Stargate",
    PRIMARY KEY
    (
       portalName,

src/main/resources/database/sqlite-queries/INSERT_INTER_PORTAL_POSITION.sql

@@ -5,7 +5,9 @@ INSERT INTO {InterPortalPosition}
    xCoordinate,
    yCoordinate,
    zCoordinate,
-   positionType
+   positionType,
+   metaData,
+   pluginName
 )
 VALUES
 (
@@ -14,7 +16,8 @@ VALUES
    ?,
    ?,
    ?,
-
+   ?,
+   ?,
    (
       SELECT
          {PositionType}.id

src/main/resources/database/sqlite-queries/INSERT_PORTAL_POSITION.sql

@@ -5,7 +5,9 @@ INSERT INTO {PortalPosition}
    xCoordinate,
    yCoordinate,
    zCoordinate,
-   positionType
+   positionType,
+   metaData,
+   pluginName
 )
 VALUES
 (
@@ -14,7 +16,8 @@ VALUES
    ?,
    ?,
    ?,
-
+   ?,
+   ?,
    (
       SELECT
          {PositionType}.id

src/main/resources/migration/database/alpha-1_0_0_14/inter_server/step3.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {InterPortalPosition}
+    ADD pluginName VARCHAR(255) default "Stargate";

src/main/resources/migration/database/alpha-1_0_0_14/local/step3.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {PortalPosition}
+    ADD pluginName VARCHAR(255) default "Stargate";