+ Added the bit where things that are tracked are actually registered, you know
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
package dataStructures;
|
package dataStructures;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import core.DatabaseManager;
|
||||||
import core.DatabaseTrackedObject;
|
import core.DatabaseTrackedObject;
|
||||||
import utils.AdminControl;
|
import utils.AdminControl;
|
||||||
|
|
||||||
@@ -27,6 +29,12 @@ public class KittyGuild extends DatabaseTrackedObject
|
|||||||
|
|
||||||
private String commandIndicator;
|
private String commandIndicator;
|
||||||
|
|
||||||
|
private void RegisterTrackedObjects()
|
||||||
|
{
|
||||||
|
DatabaseManager.instance.Register(roleList);
|
||||||
|
DatabaseManager.instance.Register(beans);
|
||||||
|
}
|
||||||
|
|
||||||
// Default content for a guild
|
// Default content for a guild
|
||||||
public KittyGuild(String uniqueID, AdminControl adminControl, ArrayList <String> emoji)
|
public KittyGuild(String uniqueID, AdminControl adminControl, ArrayList <String> emoji)
|
||||||
{
|
{
|
||||||
@@ -34,6 +42,7 @@ public class KittyGuild extends DatabaseTrackedObject
|
|||||||
this.uniqueID = uniqueID;
|
this.uniqueID = uniqueID;
|
||||||
roleList = new KittyTrackedVector(roleListName, uniqueID);
|
roleList = new KittyTrackedVector(roleListName, uniqueID);
|
||||||
beans = new KittyTrackedLong(beansName, uniqueID);
|
beans = new KittyTrackedLong(beansName, uniqueID);
|
||||||
|
RegisterTrackedObjects();
|
||||||
|
|
||||||
control = adminControl;
|
control = adminControl;
|
||||||
this.contentRating = KittyRating.Safe;
|
this.contentRating = KittyRating.Safe;
|
||||||
@@ -49,6 +58,7 @@ public class KittyGuild extends DatabaseTrackedObject
|
|||||||
this.uniqueID = uniqueID;
|
this.uniqueID = uniqueID;
|
||||||
roleList = new KittyTrackedVector(roleListName, uniqueID);
|
roleList = new KittyTrackedVector(roleListName, uniqueID);
|
||||||
beans = new KittyTrackedLong(beansName, uniqueID);
|
beans = new KittyTrackedLong(beansName, uniqueID);
|
||||||
|
RegisterTrackedObjects();
|
||||||
|
|
||||||
SetCommandIndicator(commandIndicator);
|
SetCommandIndicator(commandIndicator);
|
||||||
this.contentRating = contentRating;
|
this.contentRating = contentRating;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package dataStructures;
|
package dataStructures;
|
||||||
|
|
||||||
|
import core.DatabaseManager;
|
||||||
import core.DatabaseTrackedObject;
|
import core.DatabaseTrackedObject;
|
||||||
import utils.GlobalLog;
|
import utils.GlobalLog;
|
||||||
import utils.LogFilter;
|
import utils.LogFilter;
|
||||||
@@ -12,6 +13,7 @@ import utils.LogFilter;
|
|||||||
// public SomeConstructor(...)
|
// public SomeConstructor(...)
|
||||||
// {
|
// {
|
||||||
// myValue = new KittyTrackedLong("friendlyName", this.UniqueID);
|
// myValue = new KittyTrackedLong("friendlyName", this.UniqueID);
|
||||||
|
// DatabaseManager.instance.Register(myValue);
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
public class KittyTrackedLong extends DatabaseTrackedObject
|
public class KittyTrackedLong extends DatabaseTrackedObject
|
||||||
@@ -32,7 +34,6 @@ public class KittyTrackedLong extends DatabaseTrackedObject
|
|||||||
{
|
{
|
||||||
tracked += toAdd;
|
tracked += toAdd;
|
||||||
MarkDirty();
|
MarkDirty();
|
||||||
System.out.println("DIRTY");
|
|
||||||
return tracked;
|
return tracked;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +41,6 @@ public class KittyTrackedLong extends DatabaseTrackedObject
|
|||||||
{
|
{
|
||||||
tracked -= toSubtract;
|
tracked -= toSubtract;
|
||||||
MarkDirty();
|
MarkDirty();
|
||||||
System.out.println("DIRTY");
|
|
||||||
return tracked;
|
return tracked;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,7 +74,7 @@ public class KittyTrackedLong extends DatabaseTrackedObject
|
|||||||
catch(Exception e)
|
catch(Exception e)
|
||||||
{
|
{
|
||||||
tracked = 0;
|
tracked = 0;
|
||||||
GlobalLog.Error(LogFilter.Core, "Failed to deserialize long with database ID " + databaseID);
|
GlobalLog.Error(LogFilter.Core, "Falling back to default of 0 due to failure to deserialize long with database ID " + databaseID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user