Merge branch '1.18' into 'master'

1.18

See merge request bixilon/minosoft!29
This commit is contained in:
Bixilon 2021-11-30 21:44:16 +01:00
commit 413486524d
5 changed files with 12 additions and 4 deletions

View File

@ -16,6 +16,14 @@ package de.bixilon.minosoft.protocol.protocol;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class ProtocolVersions { public class ProtocolVersions {
public static final int public static final int
V_1_18 = 815,
V_1_18_RC4 = 814,
V_1_18_RC3 = 813,
V_1_18_RC2 = 812,
V_1_18_RC1 = 811,
V_1_18_PRE8 = 810,
V_1_18_PRE7 = 809,
V_1_18_PRE6 = 808,
V_1_18_PRE5 = 807, V_1_18_PRE5 = 807,
V_1_18_PRE4 = 806, V_1_18_PRE4 = 806,
V_1_18_PRE3 = 805, V_1_18_PRE3 = 805,

View File

@ -20,7 +20,7 @@ import kotlin.math.floor
import kotlin.math.ln import kotlin.math.ln
object MMath { object MMath {
private const val LN_2 = 0.69314718056 // ln(2.0) private const val LN_2 = 0.6931471805599453 // ln(2.0)
fun clamp(value: Vec2i, min: Vec2i, max: Vec2i): Vec2i { fun clamp(value: Vec2i, min: Vec2i, max: Vec2i): Vec2i {
value.x = clamp(value.x, min.x, max.x) value.x = clamp(value.x, min.x, max.x)

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long