Deduplication (#35)

* refactor: reduce revision-specific models into a single module * refactor: cleanup warnings * refactor: reduce multi-module transcribers into a single module * refactor: directly depend on transcribers instead of loading as plugin * refactor: directly depend on transcribers instead of loading as plugin * refactor: rename base transcriber to text transcriber * feat: set last-modified date on transcribed .txt files based on .bin * fix: indexer error cases * refactor: modify state via a specialized class during transcribing
blurite · Nov 2, 2024 · d8e5849 · d8e5849
1 parent 89b5c51
commit d8e5849
Show file tree

Hide file tree

Showing 1,226 changed files with 1,802 additions and 83,364 deletions.
diff --git a/gui/proxy-tool/src/main/kotlin/net/rsprox/gui/components/LaunchBar.kt b/gui/proxy-tool/src/main/kotlin/net/rsprox/gui/components/LaunchBar.kt
@@ -109,7 +109,7 @@ public class LaunchBar(
                 renderer = SessionTypeCellRenderer()
                 selectedIndex = App.service.getSelectedClient()
             }
-        launchModeDropdown.addActionListener { e ->
+        launchModeDropdown.addActionListener {
             App.service.setSelectedClient(launchModeDropdown.selectedIndex)
         }
 

diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
@@ -11,8 +11,10 @@ dependencies {
     implementation(rootProject.libs.rsprot.buffer)
     implementation(rootProject.libs.rsprot.compression)
     implementation(rootProject.libs.rsprot.protocol)
+    implementation(rootProject.libs.rsprot.crypto)
     implementation(platform(rootProject.libs.log4j.bom))
     implementation(rootProject.libs.bundles.log4j)
+    implementation(projects.cache.cacheApi)
 }
 
 private val pluginsPath: Path = Path(System.getProperty("user.home"), ".rsprox", "plugins")

diff --git a/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/common/OldSchoolZoneProt.kt b/protocol/osrs-223/src/main/kotlin/net/rsprox/protocol/common/OldSchoolZoneProt.kt
diff --git a/...dec/misc/user/UpdatePlayerModelDecoder.kt → ...c/misc/user/UpdatePlayerModelV1Decoder.kt b/...dec/misc/user/UpdatePlayerModelDecoder.kt → ...c/misc/user/UpdatePlayerModelV1Decoder.kt
@@ -5,17 +5,17 @@ import net.rsprot.protocol.ClientProt
 import net.rsprot.protocol.metadata.Consistent
 import net.rsprox.protocol.ProxyMessageDecoder
 import net.rsprox.protocol.game.incoming.decoder.prot.GameClientProt
-import net.rsprox.protocol.game.incoming.model.misc.user.UpdatePlayerModel
+import net.rsprox.protocol.game.incoming.model.misc.user.UpdatePlayerModelV1
 import net.rsprox.protocol.session.Session
 
 @Consistent
-public class UpdatePlayerModelDecoder : ProxyMessageDecoder<UpdatePlayerModel> {
+public class UpdatePlayerModelV1Decoder : ProxyMessageDecoder<UpdatePlayerModelV1> {
     override val prot: ClientProt = GameClientProt.UPDATE_PLAYER_MODEL
 
     override fun decode(
         buffer: JagByteBuf,
         session: Session,
-    ): UpdatePlayerModel {
+    ): UpdatePlayerModelV1 {
         val bodyType = buffer.g1()
         val identKit = ByteArray(7)
         for (i in identKit.indices) {
@@ -25,7 +25,7 @@ public class UpdatePlayerModelDecoder : ProxyMessageDecoder<UpdatePlayerModel> {
         for (i in colours.indices) {
             colours[i] = buffer.g1().toByte()
         }
-        return UpdatePlayerModel(
+        return UpdatePlayerModelV1(
             bodyType,
             identKit,
             colours,

diff --git a/...n/kotlin/net/rsprox/protocol/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt b/...n/kotlin/net/rsprox/protocol/game/incoming/decoder/prot/ClientMessageDecoderRepository.kt
@@ -56,7 +56,7 @@ import net.rsprox.protocol.game.incoming.decoder.codec.misc.user.OculusLeaveDeco
 import net.rsprox.protocol.game.incoming.decoder.codec.misc.user.SendSnapshotDecoder
 import net.rsprox.protocol.game.incoming.decoder.codec.misc.user.SetChatFilterSettingsDecoder
 import net.rsprox.protocol.game.incoming.decoder.codec.misc.user.TeleportDecoder
-import net.rsprox.protocol.game.incoming.decoder.codec.misc.user.UpdatePlayerModelDecoder
+import net.rsprox.protocol.game.incoming.decoder.codec.misc.user.UpdatePlayerModelV1Decoder
 import net.rsprox.protocol.game.incoming.decoder.codec.npcs.OpNpc1Decoder
 import net.rsprox.protocol.game.incoming.decoder.codec.npcs.OpNpc2Decoder
 import net.rsprox.protocol.game.incoming.decoder.codec.npcs.OpNpc3Decoder
@@ -191,7 +191,7 @@ public object ClientMessageDecoderRepository {
                 bind(SendSnapshotDecoder())
                 bind(HiscoreRequestDecoder())
                 bind(IfCrmViewClickDecoder())
-                bind(UpdatePlayerModelDecoder())
+                bind(UpdatePlayerModelV1Decoder())
 
                 bind(ConnectionTelemetryDecoder())
                 bind(SendPingReplyDecoder())

diff --git a/...col/osrs-223/src/main/kotlin/net/rsprox/protocol/game/incoming/model/buttons/If1Button.kt b/...col/osrs-223/src/main/kotlin/net/rsprox/protocol/game/incoming/model/buttons/If1Button.kt
diff --git a/...col/osrs-223/src/main/kotlin/net/rsprox/protocol/game/incoming/model/buttons/If3Button.kt b/...col/osrs-223/src/main/kotlin/net/rsprox/protocol/game/incoming/model/buttons/If3Button.kt
diff --git a/...col/osrs-223/src/main/kotlin/net/rsprox/protocol/game/incoming/model/buttons/IfButtonD.kt b/...col/osrs-223/src/main/kotlin/net/rsprox/protocol/game/incoming/model/buttons/IfButtonD.kt