DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 64 Pull Requests Packages Releases Wiki Activity

Fix registry packets

Browse Source
This commit is contained in:
DBotThePony 2024-08-31 14:34:38 +07:00
parent e2115397fe
commit aac28a4704
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchManager.kt
View File

@ -134,7 +134,7 @@ object AndroidResearchManager : SimpleJsonResourceReloadListener(GsonBuilder().s
}
context.enqueueWork {
minecraft.player?.matteryPlayer?.reloadResearch(MINECRAFT_SERVER.registryAccess())
context.player().matteryPlayer.reloadResearch(context.player().registryAccess())
}
}

13
src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt
View File

@ -101,6 +101,7 @@ import ru.dbotthepony.mc.otm.core.writeComponent
import ru.dbotthepony.mc.otm.core.writeItemType
import ru.dbotthepony.mc.otm.matter.MatterManager.Finder
import ru.dbotthepony.mc.otm.milliTime
import ru.dbotthepony.mc.otm.onceServer
import ru.dbotthepony.mc.otm.registry.MDeferredRegister
import ru.dbotthepony.mc.otm.registry.RegistryDelegate
import ru.dbotthepony.mc.otm.secondTime
@ -1771,8 +1772,16 @@ object MatterManager {
LOGGER.debug("Encoding matter registry packets took ${time.millis}ms, (${totalSize} bytes total, $compressedSize bytes compressed)")
for (chunk in chunks) {
distributor.invoke(chunk)
/**
* Delay sending by one server tick;
* this way client is guaranteed to be in "PLAY" state, with local player present.
* This hack is required because we manually compressing and splitting packet between multiple payloads,
* hence it is impossible to "read" parsed data from network directly, using provided RegistryFriendlyByteBuf.
*/
onceServer {
for (chunk in chunks) {
distributor.invoke(chunk)
}
}
}