AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 11:24:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

network: 1.19-pre2

Browse Source
This commit is contained in:
Bixilon 2022-05-23 20:22:36 +02:00
parent b93f5b3b48
commit dec79e4176
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
6 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/chat/CommandC2SP.kt
View File

@ -38,7 +38,7 @@ class CommandC2SP(
buffer.writeString(argument)
buffer.writeByteArray(signature)
}
if (buffer.versionId >= ProtocolVersions.V_19_PRE_1) {
if (buffer.versionId >= ProtocolVersions.V_1_19_PRE_1) {
buffer.writeBoolean(signedPreview)
}
}

8
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/InitializeS2CP.kt
View File

@ -16,6 +16,9 @@ import de.bixilon.kutil.json.JsonObject
import de.bixilon.kutil.json.JsonUtil.asJsonObject
import de.bixilon.minosoft.data.Difficulties
import de.bixilon.minosoft.data.abilities.Gamemodes
import de.bixilon.minosoft.data.entities.GlobalPosition
import de.bixilon.minosoft.data.entities.data.types.GlobalPositionEntityDataType
import de.bixilon.minosoft.data.registries.DefaultRegistries
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.registries.dimension.DimensionProperties
import de.bixilon.minosoft.data.registries.other.game.event.handlers.gamemode.GamemodeChangeEvent
@ -62,6 +65,8 @@ class InitializeS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
private set
var registries: JsonObject? = null
private set
var lastDeathPosition: GlobalPosition? = null
private set
init {
entityId = buffer.readInt()
@ -135,6 +140,9 @@ class InitializeS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
if (buffer.versionId >= ProtocolVersions.V_19W36A) {
isEnableRespawnScreen = buffer.readBoolean()
}
if (buffer.versionId >= ProtocolVersions.V_1_19_PRE_2) {
lastDeathPosition = buffer.readPlayOptional { GlobalPositionEntityDataType.read(this) }
}
}
}

7
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/RespawnS2CP.kt
View File

@ -15,6 +15,8 @@ package de.bixilon.minosoft.protocol.packets.s2c.play
import de.bixilon.kutil.json.JsonUtil.asJsonObject
import de.bixilon.minosoft.data.Difficulties
import de.bixilon.minosoft.data.abilities.Gamemodes
import de.bixilon.minosoft.data.entities.GlobalPosition
import de.bixilon.minosoft.data.entities.data.types.GlobalPositionEntityDataType
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.registries.dimension.DimensionProperties
import de.bixilon.minosoft.modding.event.events.RespawnEvent
@ -47,6 +49,8 @@ class RespawnS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
private set
var world: ResourceLocation? = null
private set
var lastDeathPosition: GlobalPosition? = null
private set
init {
dimension = when {
@ -87,6 +91,9 @@ class RespawnS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
if (buffer.versionId >= ProtocolVersions.V_20W18A) {
copyMetaData = buffer.readBoolean()
}
if (buffer.versionId >= ProtocolVersions.V_1_19_PRE_2) {
lastDeathPosition = buffer.readPlayOptional { GlobalPositionEntityDataType.read(this) }
}
}
override fun handle(connection: PlayConnection) {

3
src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersions.kt
View File

@ -14,7 +14,8 @@ package de.bixilon.minosoft.protocol.protocol
@Suppress("UNUSED")
object ProtocolVersions {
const val V_19_PRE_1 = 841
const val V_1_19_PRE_2 = 842
const val V_1_19_PRE_1 = 841
const val V_22W19A = 840
const val V_22W18A = 839
const val V_22W17A = 838

2
src/main/resources/assets/minosoft/mapping/assets_properties.json
View File

File diff suppressed because one or more lines are too long

5
src/main/resources/assets/minosoft/mapping/versions.json
View File

@ -1,4 +1,9 @@
{
"842": {
"name": "1.19-pre2",
"protocol_id": 1073741910,
"packets": 841
},
"841": {
"name": "1.19-pre1",
"protocol_id": 1073741909,