MinecraftMods/LibZontreck
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Produce a test build to attempt to fix database not being properly set

Browse source
This commit is contained in:
zontreck 2024-04-30 15:13:01 -07:00
parent 58a732782d
commit bd15d1f244
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -53,7 +53,7 @@ mod_name=Zontreck's Library Mod
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=GPLv3 mod_license=GPLv3
# The mod version. See https://semver.org/ # The mod version. See https://semver.org/
mod_version=1201.13.043024.0404 mod_version=1201.13.043024.1512
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources. # This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

6
src/main/java/dev/zontreck/libzontreck/config/sections/DatabaseSection.java
View file

@ -16,13 +16,11 @@ public class DatabaseSection
public String user = "root"; public String user = "root";
public String password = ""; public String password = "";
public String host = "localhost:3306"; // IP:port public String host = "localhost:3306"; // IP:port
public String database = "savedBlocks"; public String database = "";
public int version; public int version;
public static final int VERSION = 1; public static final int VERSION = 1;
private boolean migrated=false;
public static DatabaseSection deserialize(CompoundTag tag) public static DatabaseSection deserialize(CompoundTag tag)
{ {
DatabaseSection ret = new DatabaseSection(); DatabaseSection ret = new DatabaseSection();
@ -42,6 +40,8 @@ public class DatabaseSection
ret.database = tag.getString(TAG_DATABASE); ret.database = tag.getString(TAG_DATABASE);
} }
ret.version = VERSION;
return ret; return ret;
} }

14
src/main/java/dev/zontreck/libzontreck/memory/world/DatabaseWrapper.java
View file

@ -33,6 +33,9 @@ public class DatabaseWrapper {
public static void start() { public static void start() {
instance = new DatabaseWrapper(); instance = new DatabaseWrapper();
try { try {
LibZontreck.LOGGER.info("Connecting to database...");
LibZontreck.LOGGER.info("jdbc:db ://" + ServerConfig.database.user + "@" + ServerConfig.database.host + "/" + ServerConfig.database.database);
instance.connect(ServerConfig.database.host, ServerConfig.database.user, ServerConfig.database.password, ServerConfig.database.database); instance.connect(ServerConfig.database.host, ServerConfig.database.user, ServerConfig.database.password, ServerConfig.database.database);
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@ -40,6 +43,17 @@ public class DatabaseWrapper {
} }
public void connect(String url, String username, String password, String database) throws SQLException { public void connect(String url, String username, String password, String database) throws SQLException {
if(database.isBlank())
{
ServerConfig.init();
if(ServerConfig.database.database.isBlank())
{
throw new SQLException("Failed to connect to database");
} else {
start();
return;
}
}
try { try {
// Try MariaDB JDBC driver // Try MariaDB JDBC driver
Class.forName("org.mariadb.jdbc.Driver"); Class.forName("org.mariadb.jdbc.Driver");