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

fully port to kutil 1.14

Browse Source
This commit is contained in:
Bixilon 2022-08-27 21:52:31 +02:00
parent 5d0e3f1a16
commit bd3062a669
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,12 +13,12 @@
package de.bixilon.minosoft.protocol
import de.bixilon.kutil.base64.Base64Util.fromBase64
import de.bixilon.kutil.base64.Base64Util.toBase64
import de.bixilon.kutil.json.JsonObject
import de.bixilon.kutil.primitive.LongUtil.toLong
import de.bixilon.minosoft.protocol.protocol.encryption.CryptManager
import de.bixilon.minosoft.protocol.protocol.encryption.CryptManager.encodeNetwork
import de.bixilon.minosoft.util.KUtil.fromBase64
import de.bixilon.minosoft.util.YggdrasilUtil
import java.nio.charset.StandardCharsets
import java.security.PublicKey

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

@ -105,7 +105,7 @@ class PlayInByteBuffer : InByteBuffer {
return readParticleData(type)
}
@Deprecated("Should be makde with factories")
@Deprecated("Should be made with factories")
fun readParticleData(type: ParticleType): ParticleData {
// ToDo: Replace with dynamic particle type calling
if (this.versionId < V_17W45A) {

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

@ -12,9 +12,9 @@
*/
package de.bixilon.minosoft.protocol.protocol.encryption
import de.bixilon.kutil.base64.Base64Util.fromBase64
import de.bixilon.minosoft.data.registries.versions.Version
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
import de.bixilon.minosoft.util.KUtil.fromBase64
import java.nio.charset.StandardCharsets
import java.security.*
import java.security.spec.PKCS8EncodedKeySpec

6
src/main/java/de/bixilon/minosoft/util/KUtil.kt
View File

@ -18,7 +18,6 @@ import de.bixilon.jiibles.TableStyles
import de.bixilon.kotlinglm.vec2.Vec2t
import de.bixilon.kotlinglm.vec3.Vec3t
import de.bixilon.kotlinglm.vec4.Vec4t
import de.bixilon.kutil.base64.Base64Util
import de.bixilon.kutil.cast.CastUtil.unsafeCast
import de.bixilon.kutil.collections.CollectionUtil.synchronizedListOf
import de.bixilon.kutil.collections.CollectionUtil.synchronizedMapOf
@ -295,9 +294,4 @@ object KUtil {
Platform.exit()
}
}
@Deprecated("KUtil 1.14")
fun String.fromBase64(): ByteArray {
return Base64Util.DECODER.decode(this)
}
}

2
src/main/java/de/bixilon/minosoft/util/account/minecraft/MinecraftPrivateKey.kt
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.util.account.minecraft
import com.fasterxml.jackson.annotation.JsonIgnore
import com.fasterxml.jackson.annotation.JsonProperty
import de.bixilon.minosoft.util.KUtil.fromBase64
import de.bixilon.kutil.base64.Base64Util.fromBase64
import de.bixilon.minosoft.util.YggdrasilUtil
import de.bixilon.minosoft.util.account.minecraft.key.MinecraftKeyPair
import java.nio.charset.StandardCharsets