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

Again... try to fix null config sections

Browse source
This commit is contained in:
zontreck 2024-04-23 22:53:07 -07:00
parent 09426dc0b4
commit f039eb2abf
3 changed files with 17 additions and 40 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.042324.2239 mod_version=1201.13.042324.2250
# 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

2
src/main/java/dev/zontreck/libzontreck/config/ServerConfig.java
View file

@ -20,6 +20,8 @@ public class ServerConfig
var config = SNbtIo.loadSnbt(BASE); var config = SNbtIo.loadSnbt(BASE);
database = DatabaseSection.deserialize(config.getCompound(DatabaseSection.TAG_NAME)); database = DatabaseSection.deserialize(config.getCompound(DatabaseSection.TAG_NAME));
commit();
} else { } else {
database = new DatabaseSection(); database = new DatabaseSection();

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

@ -25,49 +25,24 @@ public class DatabaseSection
public static DatabaseSection deserialize(CompoundTag tag) public static DatabaseSection deserialize(CompoundTag tag)
{ {
int ver = tag.getInt(TAG_VERSION); DatabaseSection ret = new DatabaseSection();
DatabaseSection section = new DatabaseSection(); ret.version = tag.getInt(TAG_VERSION);
section.doMigrations(ver, tag);
if(ret.version == 0)
return section;
}
public void doMigrations(int ver, CompoundTag tag)
{
switch (ver)
{ {
case 0: ret.version = VERSION;
{ return ret;
ver++;
user = tag.getString(TAG_USER);
password = tag.getString(TAG_PASSWORD);
host = tag.getString(TAG_HOST);
database = tag.getString(TAG_DATABASE);
version = ver;
migrated=true;
break;
}
default:{
user = tag.getString(TAG_USER);
password = tag.getString(TAG_PASSWORD);
host = tag.getString(TAG_HOST);
database = tag.getString(TAG_DATABASE);
version = ver;
if(migrated)
{
ServerConfig.commit();
migrated=false;
return;
}
break;
}
} }
doMigrations(ver, tag); if(ret.version >= 1)
{
ret.user = tag.getString(TAG_USER);
ret.password = tag.getString(TAG_PASSWORD);
ret.host = tag.getString(TAG_HOST);
ret.database = tag.getString(TAG_DATABASE);
}
return ret;
} }
public DatabaseSection(){ public DatabaseSection(){