sorceress
/
EasyAuth
1
0
Fork 1
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Support /reload

This commit is contained in:
samo_lego 2020-08-23 22:02:55 +02:00
parent 2de71f924f
commit a5bd437227
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/samo_lego/simpleauth/SimpleAuth.java
View File

@ -51,9 +51,10 @@ public class SimpleAuth implements DedicatedServerModInitializer {
private static final Timer TIMER = new Timer(); private static final Timer TIMER = new Timer();
// HashMap of players that are not authenticated /**
// Rather than storing all the authenticated players, we just store ones that are not authenticated * HashMap of non-authenticated players.
// It stores some data as well, e.g. login tries and user password * Stores their data as {@link org.samo_lego.simpleauth.storage.PlayerCache PlayerCache} object
*/
public static HashMap<String, PlayerCache> deauthenticatedUsers = new HashMap<>(); public static HashMap<String, PlayerCache> deauthenticatedUsers = new HashMap<>();
/** /**
@ -120,18 +121,22 @@ public class SimpleAuth implements DedicatedServerModInitializer {
// From Fabric API // From Fabric API
AttackBlockCallback.EVENT.register((playerEntity, world, hand, blockPos, direction) -> AuthEventHandler.onAttackBlock(playerEntity)); AttackBlockCallback.EVENT.register((playerEntity, world, hand, blockPos, direction) -> AuthEventHandler.onAttackBlock(playerEntity));
UseBlockCallback.EVENT.register((player, world, hand, blockHitResult) -> AuthEventHandler.onUseBlock(player)); UseBlockCallback.EVENT.register((player, world, hand, blockHitResult) -> AuthEventHandler.onUseBlock(player));
UseItemCallback.EVENT.register((player, world, hand) -> AuthEventHandler.onUseItem(player)); UseItemCallback.EVENT.register((player, world, hand) -> AuthEventHandler.onUseItem(player));
AttackEntityCallback.EVENT.register((player, world, hand, entity, entityHitResult) -> AuthEventHandler.onAttackEntity(player)); AttackEntityCallback.EVENT.register((player, world, hand, entity, entityHitResult) -> AuthEventHandler.onAttackEntity(player));
UseEntityCallback.EVENT.register((player, world, hand, entity, entityHitResult) -> AuthEventHandler.onUseEntity(player)); UseEntityCallback.EVENT.register((player, world, hand, entity, entityHitResult) -> AuthEventHandler.onUseEntity(player));
ServerLifecycleEvents.SERVER_STOPPED.register(minecraftServer -> this.onStopServer()); ServerLifecycleEvents.START_DATA_PACK_RELOAD.register((server, serverResourceManager) -> AuthCommand.reloadConfig(null));
ServerLifecycleEvents.SERVER_STOPPED.register(this::onStopServer);
} }
private void onStopServer() { /**
* Called on server stop.
*/
private void onStopServer(MinecraftServer server) {
logInfo("Shutting down SimpleAuth."); logInfo("Shutting down SimpleAuth.");
WriteBatch batch = DB.getLevelDBStore().createWriteBatch(); WriteBatch batch = DB.getLevelDBStore().createWriteBatch();
// Writing coords of de-authenticated players to database // Writing coordinates of de-authenticated players to database
deauthenticatedUsers.forEach((uuid, playerCache) -> { deauthenticatedUsers.forEach((uuid, playerCache) -> {
JsonObject data = new JsonObject(); JsonObject data = new JsonObject();
data.addProperty("password", playerCache.password); data.addProperty("password", playerCache.password);

5
src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java
View File

@ -30,7 +30,7 @@ public class AuthCommand {
dispatcher.register(literal("auth") dispatcher.register(literal("auth")
.requires(source -> source.hasPermissionLevel(4)) .requires(source -> source.hasPermissionLevel(4))
.then(literal("reload") .then(literal("reload")
.executes( ctx -> reloadConfig(ctx.getSource())) .executes( ctx -> reloadConfig(ctx.getSource().getEntity()))
) )
.then(literal("setGlobalPassword") .then(literal("setGlobalPassword")
.then(argument("password", word()) .then(argument("password", word())
@ -96,8 +96,7 @@ public class AuthCommand {
} }
// Reloading the config // Reloading the config
private static int reloadConfig(ServerCommandSource source) { public static int reloadConfig(Entity sender) {
Entity sender = source.getEntity();
config = AuthConfig.load(new File("./mods/SimpleAuth/config.json")); config = AuthConfig.load(new File("./mods/SimpleAuth/config.json"));
if(sender != null) if(sender != null)