Remove references to old DH files and allow sub-dim matching to work with the database

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java

@@ -88,7 +88,7 @@ public class FullDataFileHandler implements IFullDataSourceProvider
 		
 		try
 		{
-			this.fullDataRepo = new FullDataRepo("jdbc:sqlite", this.saveDir.getPath() + "/dhData.sqlite");
+			this.fullDataRepo = new FullDataRepo("jdbc:sqlite", this.saveDir.getPath() + "/" + AbstractSaveStructure.DATABASE_NAME);
 		}
 		catch (SQLException e)
 		{

core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java

@@ -82,7 +82,7 @@ public class RenderSourceFileHandler implements IRenderSourceProvider
 		
 		try
 		{
-			this.renderDataRepo = new RenderDataRepo("jdbc:sqlite", this.saveDir.getPath() + "/dhData.sqlite");
+			this.renderDataRepo = new RenderDataRepo("jdbc:sqlite", this.saveDir.getPath() + "/" + AbstractSaveStructure.DATABASE_NAME);
 		}
 		catch (SQLException e)
 		{

core/src/main/java/com/seibel/distanthorizons/core/file/structure/AbstractSaveStructure.java

@@ -32,8 +32,7 @@ import java.io.File;
  */
 public abstract class AbstractSaveStructure implements AutoCloseable
 {
-	public static final String RENDER_CACHE_FOLDER_NAME = "renderCache";
-	public static final String DATA_FOLDER_NAME = "data";
+	public static final String DATABASE_NAME = "DistantHorizons.sqlite";
 	
 	protected static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	

core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java

@@ -177,7 +177,7 @@ public class ClientOnlySaveStructure extends AbstractSaveStructure
 			return null;
 		}
 		
-		return new File(levelFolder, RENDER_CACHE_FOLDER_NAME);
+		return levelFolder;
 	}
 	
 	@Override
@@ -189,7 +189,7 @@ public class ClientOnlySaveStructure extends AbstractSaveStructure
 			return null;
 		}
 		
-		return new File(levelFolder, DATA_FOLDER_NAME);
+		return levelFolder;
 	}
 	
 	
@@ -225,9 +225,8 @@ public class ClientOnlySaveStructure extends AbstractSaveStructure
 						boolean isValidDhLevelFolder = false;
 						for (File dataFolder : dataFolders)
 						{
-							// a valid level folder needs to have DH specific folders in it
-							if (dataFolder.getName().equalsIgnoreCase(RENDER_CACHE_FOLDER_NAME)
-								|| dataFolder.getName().equalsIgnoreCase(DATA_FOLDER_NAME))
+							// look for the DH database file
+							if (dataFolder.getName().equalsIgnoreCase(AbstractSaveStructure.DATABASE_NAME))
 							{
 								isValidDhLevelFolder = true;
 								break;

core/src/main/java/com/seibel/distanthorizons/core/file/structure/LocalSaveStructure.java

@@ -31,8 +31,6 @@ import java.io.File;
  */
 public class LocalSaveStructure extends AbstractSaveStructure
 {
-	public static final String SERVER_FOLDER_NAME = "Distant_Horizons";
-	
 	private File debugPath = new File("");
 	
 	
@@ -49,24 +47,24 @@ public class LocalSaveStructure extends AbstractSaveStructure
 	public File getLevelFolder(ILevelWrapper wrapper)
 	{
 		IServerLevelWrapper serverSide = (IServerLevelWrapper) wrapper;
-		this.debugPath = new File(serverSide.getSaveFolder(), "Distant_Horizons");
-		return new File(serverSide.getSaveFolder(), "Distant_Horizons");
+		this.debugPath = serverSide.getSaveFolder();
+		return serverSide.getSaveFolder();
 	}
 	
 	@Override
 	public File getRenderCacheFolder(ILevelWrapper level)
 	{
 		IServerLevelWrapper serverSide = (IServerLevelWrapper) level;
-		this.debugPath = new File(serverSide.getSaveFolder(), "Distant_Horizons");
-		return new File(serverSide.getSaveFolder(), "Distant_Horizons");
+		this.debugPath = serverSide.getSaveFolder();
+		return serverSide.getSaveFolder();
 	}
 	
 	@Override
 	public File getFullDataFolder(ILevelWrapper level)
 	{
 		IServerLevelWrapper serverLevelWrapper = (IServerLevelWrapper) level;
-		this.debugPath = new File(serverLevelWrapper.getSaveFolder(), SERVER_FOLDER_NAME);
-		return new File(serverLevelWrapper.getSaveFolder(), SERVER_FOLDER_NAME);
+		this.debugPath = serverLevelWrapper.getSaveFolder();
+		return serverLevelWrapper.getSaveFolder();
 	}
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimensionLevelMatcher.java

@@ -218,15 +218,8 @@ public class SubDimensionLevelMatcher implements AutoCloseable
 			LOGGER.info("Testing level folder: [" + LodUtil.shortenString(testLevelFolder.getName(), 8) + "]");
 			try
 			{
-				// get the sub dim level folder
-				File fullDataFolder = new File(testLevelFolder, AbstractSaveStructure.DATA_FOLDER_NAME);
-				if (!fullDataFolder.exists())
-				{
-					continue;
-				}
-				
 				// get the data source to compare against
-				IDhLevel tempLevel = new DhClientLevel(new ClientOnlySaveStructure(), this.currentClientLevel, fullDataFolder, false);
+				IDhLevel tempLevel = new DhClientLevel(new ClientOnlySaveStructure(), this.currentClientLevel, testLevelFolder, false);
 				IFullDataSource testFullDataSource = tempLevel.getFileHandler().readAsync(new DhSectionPos(this.playerData.playerBlockPos)).join();
 				if (testFullDataSource == null)
 				{