code refactoring

This commit is contained in:
unurled 2024-03-18 22:01:16 +01:00
parent 456df87c33
commit 9105d31a02
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
9 changed files with 652 additions and 542 deletions

View file

@ -29,6 +29,7 @@ import org.jetbrains.annotations.Nullable;
public class ClientBuildManager extends Manager {
public static final String SR_PLAYERS_CLIENTBUILD = "sr.players.clientbuild.";
private final List<ClientBuild> builds = new ArrayList<>();
/** a map of players that have ClientBuild displayed */
@ -54,7 +55,7 @@ public class ClientBuildManager extends Manager {
public void saveData() {
// save client side builds to redis
DataManager dataManager = DataManager.getInstance(DataManager.class);
DataManager dataManager = Manager.getInstance(DataManager.class);
DataHandler dh = dataManager.getDataHandler();
Gson gson =
@ -69,7 +70,7 @@ public class ClientBuildManager extends Manager {
for (Entry<Player, List<String>> entry : playerBlocks.entrySet()) {
for (String name : entry.getValue()) {
// save for player
dh.set("sr.players.clientbuild." + entry.getKey().getUniqueId() + "." + name, "true");
dh.set(SR_PLAYERS_CLIENTBUILD + entry.getKey().getUniqueId() + "." + name, "true");
}
}
}
@ -78,7 +79,7 @@ public class ClientBuildManager extends Manager {
@Override
public void loadData() {
// load client side builds from redis
DataManager dataManager = DataManager.getInstance(DataManager.class);
DataManager dataManager = Manager.getInstance(DataManager.class);
DataHandler dh = dataManager.getDataHandler();
if (dh == null) {
@ -107,11 +108,10 @@ public class ClientBuildManager extends Manager {
@EventHandler
public void onPlayerJoin(@NotNull PlayerJoinEvent e) {
DataHandler dh = DataManager.getInstance(DataManager.class).getDataHandler();
DataHandler dh = Manager.getInstance(DataManager.class).getDataHandler();
Player p = e.getPlayer();
List<String> names =
new ArrayList<>(dh.getKeysAll("sr.players.clientbuild." + p.getUniqueId()));
List<String> names = new ArrayList<>(dh.getKeysAll(SR_PLAYERS_CLIENTBUILD + p.getUniqueId()));
playerBlocks.put(p, names);
@ -144,13 +144,13 @@ public class ClientBuildManager extends Manager {
// save the player's displayed builds
DataManager dataManager = DataManager.getInstance(DataManager.class);
DataManager dataManager = Manager.getInstance(DataManager.class);
DataHandler dh = dataManager.getDataHandler();
dh.remove("sr.players.clientbuild." + p.getUniqueId());
dh.remove(SR_PLAYERS_CLIENTBUILD + p.getUniqueId());
for (String name : names) {
dh.set("sr.players.clientbuild." + p.getUniqueId() + "." + name, "true");
dh.set(SR_PLAYERS_CLIENTBUILD + p.getUniqueId() + "." + name, "true");
}
playerBlocks.get(p).clear();