giant code revamp

98ping · Aug 4, 2022 · caef8ea · caef8ea
1 parent b7c4dfa
commit caef8ea
Show file tree

Hide file tree

Showing 168 changed files with 109 additions and 64 deletions.
diff --git a/.gradle/7.1/executionHistory/executionHistory.bin b/.gradle/7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.1/executionHistory/executionHistory.lock b/.gradle/7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.1/fileHashes/fileHashes.bin b/.gradle/7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.1/fileHashes/fileHashes.lock b/.gradle/7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/7.1/fileHashes/resourceHashesCache.bin b/.gradle/7.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/...ns/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.class b/...ns/build/classes/kotlin/main/ltd/matrixstudios/alchemist/models/profile/GameProfile.class
diff --git a/...classes/kotlin/main/ltd/matrixstudios/alchemist/service/expirable/PunishmentService.class b/...classes/kotlin/main/ltd/matrixstudios/alchemist/service/expirable/PunishmentService.class
diff --git a/.../classes/kotlin/main/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.class b/.../classes/kotlin/main/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.class
diff --git a/...classes/kotlin/main/ltd/matrixstudios/alchemist/service/profiles/ProfileGameService.class b/...classes/kotlin/main/ltd/matrixstudios/alchemist/service/profiles/ProfileGameService.class
diff --git a/commons/build/kotlin/commons10SNAPSHOTjar-classes.txt b/commons/build/kotlin/commons10SNAPSHOTjar-classes.txt
@@ -1 +1 @@
-C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\Alchemist.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\expirables\Expirable.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\filter\Filter.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\grant\Grantable.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\grant\types\Punishment.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\grant\types\RankGrant.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\grant\types\TagGrant.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\party\Party.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\party\PartyElevation.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\profile\GameProfile.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\ranks\Rank.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\server\UniqueServer.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\tags\Tag.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\punishments\PunishmentType.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\punishments\actor\ActorType.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\punishments\actor\DefaultActor.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\punishments\actor\executor\Executor.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\redis\RedisPacket.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\redis\RedisPacketManager.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\expirable\ExpiringService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\expirable\PunishmentService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\expirable\RankGrantService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\expirable\TagGrantService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\filter\FilterService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\party\PartyService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\profiles\ProfileGameService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\ranks\RankService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\server\UniqueServerService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\tags\TagService.class
+C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\Alchemist.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\expirables\Expirable.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\filter\Filter.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\grant\Grantable.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\grant\types\Punishment.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\grant\types\RankGrant.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\grant\types\TagGrant.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\party\Party.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\party\PartyElevation.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\profile\GameProfile$getCurrentRank$$inlined$sortedBy$1.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\profile\GameProfile.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\ranks\Rank.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\server\UniqueServer.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\models\tags\Tag.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\punishments\PunishmentType.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\punishments\actor\ActorType.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\punishments\actor\DefaultActor.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\punishments\actor\executor\Executor.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\redis\RedisPacket.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\redis\RedisPacketManager.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\expirable\ExpiringService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\expirable\PunishmentService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\expirable\RankGrantService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\expirable\TagGrantService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\filter\FilterService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\party\PartyService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\profiles\ProfileGameService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\ranks\RankService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\server\UniqueServerService.class;C:\Users\Maximus\Desktop\Matrix Development\Alchemist\commons\build\classes\kotlin\main\ltd\matrixstudios\alchemist\service\tags\TagService.class
diff --git a/commons/build/kotlin/compileKotlin/build-history.bin b/commons/build/kotlin/compileKotlin/build-history.bin
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
diff --git a/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
diff --git a/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/...ns/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-38
+46
 0
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/commons/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/commons/build/kotlin/compileKotlin/last-build.bin b/commons/build/kotlin/compileKotlin/last-build.bin
diff --git a/commons/build/libs/commons-1.0-SNAPSHOT.jar b/commons/build/libs/commons-1.0-SNAPSHOT.jar
diff --git a/commons/build/tmp/kapt3/incApCache/main/java-cache.bin b/commons/build/tmp/kapt3/incApCache/main/java-cache.bin
diff --git a/...incrementalData/main/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.class b/...incrementalData/main/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.class
diff --git a/.../tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.java b/.../tmp/kapt3/stubs/main/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.java
@@ -2,12 +2,16 @@
 
 import java.lang.System;
 
-@kotlin.Metadata(mv = {1, 6, 0}, k = 1, d1 = {"\u00002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0005\n\u0002\u0010\u0002\n\u0000\n\u0002\u0010\u001e\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\b\u0003\b\u00c6\u0002\u0018\u00002\b\u0012\u0004\u0012\u00020\u00020\u0001B\u0007\b\u0002\u00a2\u0006\u0002\u0010\u0003J\b\u0010\u000b\u001a\u00020\fH\u0016J\u0014\u0010\r\u001a\b\u0012\u0004\u0012\u00020\u00020\u000e2\u0006\u0010\u000f\u001a\u00020\u0006J\u0012\u0010\u0010\u001a\u000e\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00020\u000e0\u0011J\u000e\u0010\u0012\u001a\u00020\f2\u0006\u0010\u0013\u001a\u00020\u0002R&\u0010\u0004\u001a\u000e\u0012\u0004\u0012\u00020\u0006\u0012\u0004\u0012\u00020\u00020\u0005X\u0086\u000e\u00a2\u0006\u000e\n\u0000\u001a\u0004\b\u0007\u0010\b\"\u0004\b\t\u0010\n\u00a8\u0006\u0014"}, d2 = {"Lltd/matrixstudios/alchemist/service/expirable/RankGrantService;", "Lltd/matrixstudios/alchemist/service/expirable/ExpiringService;", "Lltd/matrixstudios/alchemist/models/grant/types/RankGrant;", "()V", "handler", "Lio/github/nosequel/data/store/StoreType;", "Ljava/util/UUID;", "getHandler", "()Lio/github/nosequel/data/store/StoreType;", "setHandler", "(Lio/github/nosequel/data/store/StoreType;)V", "clearOutModels", "", "findByTarget", "", "target", "getValues", "Ljava/util/concurrent/CompletableFuture;", "save", "rankGrant", "commons"})
+@kotlin.Metadata(mv = {1, 6, 0}, k = 1, d1 = {"\u0000J\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0003\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0005\n\u0002\u0018\u0002\n\u0002\u0010\u001e\n\u0002\b\u0005\n\u0002\u0010\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0006\n\u0002\u0018\u0002\n\u0002\b\u0003\b\u00c6\u0002\u0018\u00002\b\u0012\u0004\u0012\u00020\u00020\u0001B\u0007\b\u0002\u00a2\u0006\u0002\u0010\u0003J\b\u0010\u0017\u001a\u00020\u0018H\u0016J\u001a\u0010\u0019\u001a\u000e\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00020\u00120\u001a2\u0006\u0010\u001b\u001a\u00020\u000bJ\u0014\u0010\u001c\u001a\b\u0012\u0004\u0012\u00020\u00020\u00122\u0006\u0010\u001d\u001a\u00020\u000bJ\u0012\u0010\u001e\u001a\u000e\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00020\u00120\u001aJ\u000e\u0010\u001f\u001a\u00020\u00182\u0006\u0010 \u001a\u00020!J\u000e\u0010\"\u001a\u00020\u00182\u0006\u0010#\u001a\u00020\u0002R\u0017\u0010\u0004\u001a\b\u0012\u0004\u0012\u00020\u00060\u0005\u00a2\u0006\b\n\u0000\u001a\u0004\b\u0007\u0010\bR&\u0010\t\u001a\u000e\u0012\u0004\u0012\u00020\u000b\u0012\u0004\u0012\u00020\u00020\nX\u0086\u000e\u00a2\u0006\u000e\n\u0000\u001a\u0004\b\f\u0010\r\"\u0004\b\u000e\u0010\u000fR,\u0010\u0010\u001a\u0014\u0012\u0004\u0012\u00020\u000b\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00020\u00120\u0011X\u0086\u000e\u00a2\u0006\u000e\n\u0000\u001a\u0004\b\u0013\u0010\u0014\"\u0004\b\u0015\u0010\u0016\u00a8\u0006$"}, d2 = {"Lltd/matrixstudios/alchemist/service/expirable/RankGrantService;", "Lltd/matrixstudios/alchemist/service/expirable/ExpiringService;", "Lltd/matrixstudios/alchemist/models/grant/types/RankGrant;", "()V", "collection", "Lcom/mongodb/client/MongoCollection;", "Lorg/bson/Document;", "getCollection", "()Lcom/mongodb/client/MongoCollection;", "handler", "Lio/github/nosequel/data/store/StoreType;", "Ljava/util/UUID;", "getHandler", "()Lio/github/nosequel/data/store/StoreType;", "setHandler", "(Lio/github/nosequel/data/store/StoreType;)V", "playerGrants", "Ljava/util/HashMap;", "", "getPlayerGrants", "()Ljava/util/HashMap;", "setPlayerGrants", "(Ljava/util/HashMap;)V", "clearOutModels", "", "findByTarget", "Ljava/util/concurrent/CompletableFuture;", "target", "getFromCache", "uuid", "getValues", "recalculatePlayer", "gameProfile", "Lltd/matrixstudios/alchemist/models/profile/GameProfile;", "save", "rankGrant", "commons"})
 public final class RankGrantService extends ltd.matrixstudios.alchemist.service.expirable.ExpiringService<ltd.matrixstudios.alchemist.models.grant.types.RankGrant> {
     @org.jetbrains.annotations.NotNull()
     public static final ltd.matrixstudios.alchemist.service.expirable.RankGrantService INSTANCE = null;
     @org.jetbrains.annotations.NotNull()
     private static io.github.nosequel.data.store.StoreType<java.util.UUID, ltd.matrixstudios.alchemist.models.grant.types.RankGrant> handler;
+    @org.jetbrains.annotations.NotNull()
+    private static final com.mongodb.client.MongoCollection<org.bson.Document> collection = null;
+    @org.jetbrains.annotations.NotNull()
+    private static java.util.HashMap<java.util.UUID, java.util.Collection<ltd.matrixstudios.alchemist.models.grant.types.RankGrant>> playerGrants;
 
     private RankGrantService() {
         super();
@@ -22,17 +26,41 @@ public final void setHandler(@org.jetbrains.annotations.NotNull()
     io.github.nosequel.data.store.StoreType<java.util.UUID, ltd.matrixstudios.alchemist.models.grant.types.RankGrant> p0) {
     }
 
+    @org.jetbrains.annotations.NotNull()
+    public final com.mongodb.client.MongoCollection<org.bson.Document> getCollection() {
+        return null;
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.HashMap<java.util.UUID, java.util.Collection<ltd.matrixstudios.alchemist.models.grant.types.RankGrant>> getPlayerGrants() {
+        return null;
+    }
+
+    public final void setPlayerGrants(@org.jetbrains.annotations.NotNull()
+    java.util.HashMap<java.util.UUID, java.util.Collection<ltd.matrixstudios.alchemist.models.grant.types.RankGrant>> p0) {
+    }
+
     @org.jetbrains.annotations.NotNull()
     public final java.util.concurrent.CompletableFuture<java.util.Collection<ltd.matrixstudios.alchemist.models.grant.types.RankGrant>> getValues() {
         return null;
     }
 
+    @org.jetbrains.annotations.NotNull()
+    public final java.util.Collection<ltd.matrixstudios.alchemist.models.grant.types.RankGrant> getFromCache(@org.jetbrains.annotations.NotNull()
+    java.util.UUID uuid) {
+        return null;
+    }
+
+    public final void recalculatePlayer(@org.jetbrains.annotations.NotNull()
+    ltd.matrixstudios.alchemist.models.profile.GameProfile gameProfile) {
+    }
+
     public final void save(@org.jetbrains.annotations.NotNull()
     ltd.matrixstudios.alchemist.models.grant.types.RankGrant rankGrant) {
     }
 
     @org.jetbrains.annotations.NotNull()
-    public final java.util.Collection<ltd.matrixstudios.alchemist.models.grant.types.RankGrant> findByTarget(@org.jetbrains.annotations.NotNull()
+    public final java.util.concurrent.CompletableFuture<java.util.Collection<ltd.matrixstudios.alchemist.models.grant.types.RankGrant>> findByTarget(@org.jetbrains.annotations.NotNull()
     java.util.UUID target) {
         return null;
     }

diff --git a/...3/stubs/main/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.kapt_metadata b/...3/stubs/main/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.kapt_metadata
diff --git a/commons/src/main/kotlin/ltd/matrixstudios/alchemist/models/profile/GameProfile.kt b/commons/src/main/kotlin/ltd/matrixstudios/alchemist/models/profile/GameProfile.kt
@@ -144,12 +144,18 @@ data class GameProfile(
     fun getCurrentRank(): Rank? {
         var currentGrant: Rank? = RankService.findFirstAvailableDefaultRank()
 
-        RankGrantService.findByTarget(uuid).forEach { grant ->
-            if (grant.expirable.isActive() && grant.getGrantable()!!.weight > currentGrant!!.weight) {
-                currentGrant = grant.getGrantable()
-            }
+        val filteredRank = RankGrantService.getFromCache(uuid).filter {
+            it.expirable.isActive()
+        }.sortedBy { it.getGrantable()!!.weight }.reversed().firstOrNull()
+
+        if (filteredRank == null
+            ||
+            filteredRank.getGrantable()!!.weight < currentGrant!!.weight
+        )
+        {
+            return currentGrant
         }
 
-        return currentGrant
+        return filteredRank.getGrantable()
     }
 }
diff --git a/commons/src/main/kotlin/ltd/matrixstudios/alchemist/service/expirable/PunishmentService.kt b/commons/src/main/kotlin/ltd/matrixstudios/alchemist/service/expirable/PunishmentService.kt
@@ -29,15 +29,6 @@ object PunishmentService : ExpiringService<Punishment>() {
     }
 
 
-    override fun clearOutModels() {
-        getValues().forEach {
-            if (!it.expirable.isActive() && it.removedBy == null) {
-                it.removedBy = UUID.fromString("00000000-0000-0000-0000-000000000000")
-                it.removedReason = "Expired"
-
-                save(it)
-            }
-        }
-    }
+    override fun clearOutModels() { }
 
 }
diff --git a/commons/src/main/kotlin/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.kt b/commons/src/main/kotlin/ltd/matrixstudios/alchemist/service/expirable/RankGrantService.kt
@@ -1,44 +1,56 @@
 package ltd.matrixstudios.alchemist.service.expirable
 
-import com.mongodb.client.model.Filters
 import io.github.nosequel.data.DataStoreType
 import ltd.matrixstudios.alchemist.Alchemist
-import ltd.matrixstudios.alchemist.models.grant.types.Punishment
 import ltd.matrixstudios.alchemist.models.grant.types.RankGrant
 import ltd.matrixstudios.alchemist.models.profile.GameProfile
-import ltd.matrixstudios.alchemist.models.ranks.Rank
-import ltd.matrixstudios.alchemist.punishments.PunishmentType
-import ltd.matrixstudios.alchemist.punishments.actor.ActorType
-import ltd.matrixstudios.alchemist.redis.RedisPacketManager
+import org.bson.Document
 import java.util.*
 import java.util.concurrent.CompletableFuture
 
 object RankGrantService : ExpiringService<RankGrant>() {
 
     var handler = Alchemist.dataHandler.createStoreType<UUID, RankGrant>(DataStoreType.MONGO)
 
+    val collection = Alchemist.MongoConnectionPool.getCollection("rankgrant") //need this here because honey doesnt have a way to get raw collection
+
+    var playerGrants = hashMapOf<UUID, Collection<RankGrant>>()
 
     fun getValues() : CompletableFuture<Collection<RankGrant>> {
         return handler.retrieveAllAsync()
     }
 
+    fun getFromCache(uuid: UUID): Collection<RankGrant> {
+        return playerGrants.getOrDefault(uuid, findByTarget(uuid).get())
+    }
+
+    fun recalculatePlayer(gameProfile: GameProfile) {
+        findByTarget(gameProfile.uuid).thenApply { playerGrants[gameProfile.uuid] = it }
+    }
+
+
     fun save(rankGrant: RankGrant) {
         handler.storeAsync(rankGrant.uuid, rankGrant)
     }
 
-    fun findByTarget(target: UUID) : Collection<RankGrant> {
-        return getValues().get().filter { it.target == target }
-    }
+    fun findByTarget(target: UUID) : CompletableFuture<Collection<RankGrant>> {
+        return CompletableFuture.supplyAsync {
+            val sorted = collection.find(Document("target", target.toString()))
+
+            val toReturn = mutableListOf<RankGrant>()
 
+            for (rawDoc in sorted)
+            {
+                val json = rawDoc.toJson()
 
-    override fun clearOutModels() {
-        getValues().get().forEach {
-            if (!it.expirable.isActive() && it.removedBy == null) {
-                it.removedBy = UUID.fromString("00000000-0000-0000-0000-000000000000")
-                it.removedReason = "Expired"
+                val gson = Alchemist.gson.fromJson(json, RankGrant::class.java)
 
-                save(it)
+                toReturn.add(gson)
             }
+
+            return@supplyAsync toReturn
         }
     }
+
+    override fun clearOutModels() { }
 }