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

remove some todos

Browse Source
This commit is contained in:
Bixilon 2022-09-16 15:38:44 +02:00
parent d4779f0f89
commit 908e67b415
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/bixilon/minosoft/config/profile/profiles/connection/ConnectionProfile.kt
View File

@ -58,6 +58,11 @@ class ConnectionProfile(
var autoRespawn by delegate(false) var autoRespawn by delegate(false)
/**
* If set, the client will respond with "vanilla" as brand and not "minosoft"
*/
var fakeBrand by delegate(false)
override fun toString(): String { override fun toString(): String {
return ConnectionProfileManager.getName(this) return ConnectionProfileManager.getName(this)
} }

8
src/main/java/de/bixilon/minosoft/protocol/network/connection/play/plugin/DefaultPluginHandler.kt
View File

@ -16,9 +16,11 @@ package de.bixilon.minosoft.protocol.network.connection.play.plugin
import de.bixilon.minosoft.data.registries.DefaultRegistries import de.bixilon.minosoft.data.registries.DefaultRegistries
import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.modding.channels.DefaultPluginChannels import de.bixilon.minosoft.modding.channels.DefaultPluginChannels
import de.bixilon.minosoft.protocol.ProtocolUtil.encodeNetwork
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.packets.c2s.play.PluginC2SP import de.bixilon.minosoft.protocol.packets.c2s.play.PluginC2SP
import de.bixilon.minosoft.protocol.protocol.PlayOutByteBuffer import de.bixilon.minosoft.protocol.protocol.PlayOutByteBuffer
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
object DefaultPluginHandler { object DefaultPluginHandler {
@ -31,13 +33,13 @@ object DefaultPluginHandler {
connection.pluginManager[brandChannel] = { connection.pluginManager[brandChannel] = {
connection.serverInfo.brand = it.readString() connection.serverInfo.brand = it.readString()
sendBrand(brandChannel, connection) // ToDo: Option to set brand sendBrand(brandChannel, connection, if (connection.profiles.connection.fakeBrand) ProtocolDefinition.VANILLA_BRAND else ProtocolDefinition.MINOSOFT_BRAND)
} }
} }
private fun sendBrand(channel: ResourceLocation, connection: PlayConnection, brand: String = "vanilla") { private fun sendBrand(channel: ResourceLocation, connection: PlayConnection, brand: String) {
val buffer = PlayOutByteBuffer(connection) val buffer = PlayOutByteBuffer(connection)
buffer.writeString(brand) // ToDo: Remove length prefix buffer.writeByteArray(brand.encodeNetwork())
connection.sendPacket(PluginC2SP(channel, buffer)) connection.sendPacket(PluginC2SP(channel, buffer))
} }
} }

1
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/PongS2CP.kt
View File

@ -37,7 +37,6 @@ class PongS2CP(buffer: InByteBuffer) : StatusS2CPacket {
} }
val latency = TimeUtil.nanos - pingQuery.nanos val latency = TimeUtil.nanos - pingQuery.nanos
connection.network.disconnect() connection.network.disconnect()
// ToDo: Log.info(String.format("Server is running on version %s (versionId=%d, protocolId=%d), reconnecting...", connection.getVersion().getVersionName(), connection.getVersion().getVersionId(), connection.getVersion().getProtocolId()));
val pongEvent = StatusPongReceiveEvent(connection, EventInitiators.SERVER, pingId, latency) val pongEvent = StatusPongReceiveEvent(connection, EventInitiators.SERVER, pingId, latency)
connection.lastPongEvent = pongEvent connection.lastPongEvent = pongEvent
connection.fireEvent(pongEvent) connection.fireEvent(pongEvent)

2
src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt
View File

@ -401,7 +401,7 @@ open class InByteBuffer {
} }
val type = NBTTagTypes[readUnsignedByte()] val type = NBTTagTypes[readUnsignedByte()]
if (type === NBTTagTypes.COMPOUND) { if (type === NBTTagTypes.COMPOUND) {
var name = readString(readUnsignedShort()) // ToDo var name = readString(readUnsignedShort()) // ToDo: Should this name be ignored?
} }
return readNBTTag(type) return readNBTTag(type)
} }

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

@ -100,4 +100,7 @@ public final class ProtocolDefinition {
} }
LAN_SERVER_BROADCAST_INET_ADDRESS = inetAddress; LAN_SERVER_BROADCAST_INET_ADDRESS = inetAddress;
} }
public static final String VANILLA_BRAND = "vanilla";
public static final String MINOSOFT_BRAND = "minosoft";
} }

2
src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt
View File

@ -54,7 +54,6 @@ object ChunkUtil {
private fun readLegacyChunkWithAddBitSet(buffer: PlayInByteBuffer, dimension: DimensionProperties, sectionBitMask: BitSet, addBitMask: BitSet, isFullChunk: Boolean, containsSkyLight: Boolean): ChunkData { private fun readLegacyChunkWithAddBitSet(buffer: PlayInByteBuffer, dimension: DimensionProperties, sectionBitMask: BitSet, addBitMask: BitSet, isFullChunk: Boolean, containsSkyLight: Boolean): ChunkData {
val chunkData = ChunkData() val chunkData = ChunkData()
// ToDo chunkData.lightAccessor = DummyLightAccessor
val totalBytes = ProtocolDefinition.BLOCKS_PER_SECTION * sectionBitMask.cardinality() val totalBytes = ProtocolDefinition.BLOCKS_PER_SECTION * sectionBitMask.cardinality()
val halfBytes = totalBytes / 2 val halfBytes = totalBytes / 2
@ -122,7 +121,6 @@ object ChunkUtil {
return readLegacyChunkWithAddBitSet(buffer, dimension, sectionBitMask, addBitMask!!, isFullChunk, containsSkyLight) return readLegacyChunkWithAddBitSet(buffer, dimension, sectionBitMask, addBitMask!!, isFullChunk, containsSkyLight)
} }
val chunkData = ChunkData() val chunkData = ChunkData()
// ToDo: chunkData.lightAccessor = DummyLightAccessor
val totalEntries: Int = ProtocolDefinition.BLOCKS_PER_SECTION * sectionBitMask.cardinality() val totalEntries: Int = ProtocolDefinition.BLOCKS_PER_SECTION * sectionBitMask.cardinality()
val totalHalfEntries = totalEntries / 2 val totalHalfEntries = totalEntries / 2