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

bump kotlin to 1.7, bump javafx

Browse Source
This commit is contained in:
Bixilon 2022-06-15 17:54:18 +02:00
parent 453bde5d93
commit ef3b07c8e1
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
11 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -298,8 +298,8 @@
<exec.mainClass>de.bixilon.minosoft.Minosoft</exec.mainClass>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
<javafx.version>19-ea+7</javafx.version>
<kotlin.version>1.6.21</kotlin.version>
<javafx.version>19-ea+8</javafx.version>
<kotlin.version>1.7.0</kotlin.version>
<lwjgl.version>3.3.1</lwjgl.version>
<ikonli.version>12.3.1</ikonli.version>
<netty.version>4.1.77.Final</netty.version>

2
src/main/java/de/bixilon/minosoft/data/direction/Directions.kt
View File

@ -21,6 +21,7 @@ import de.bixilon.kotlinglm.vec3.Vec3i
import de.bixilon.kotlinglm.vec3.swizzle.*
import de.bixilon.kutil.enums.EnumUtil
import de.bixilon.kutil.enums.ValuesEnum
import de.bixilon.kutil.exception.Broken
import de.bixilon.minosoft.data.Axes
import de.bixilon.minosoft.data.registries.blocks.BlockState
import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer
@ -28,7 +29,6 @@ import de.bixilon.minosoft.data.text.ChatColors
import de.bixilon.minosoft.data.world.ChunkSection
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.get
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.util.Broken
import kotlin.math.abs
enum class Directions(

2
src/main/java/de/bixilon/minosoft/data/registries/registries/registry/BlockStateRegistry.kt
View File

@ -13,12 +13,12 @@
package de.bixilon.minosoft.data.registries.registries.registry
import de.bixilon.kutil.exception.Broken
import de.bixilon.kutil.json.JsonObject
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.registries.blocks.BlockState
import de.bixilon.minosoft.data.registries.registries.Registries
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.util.Broken
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
class BlockStateRegistry(var flattened: Boolean) : AbstractRegistry<BlockState?> {

2
src/main/java/de/bixilon/minosoft/data/registries/registries/registry/ResourceLocationRegistry.kt
View File

@ -13,11 +13,11 @@
package de.bixilon.minosoft.data.registries.registries.registry
import de.bixilon.kutil.exception.Broken
import de.bixilon.kutil.json.JsonObject
import de.bixilon.kutil.primitive.IntUtil.toInt
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.registries.registries.Registries
import de.bixilon.minosoft.util.Broken
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap

41
src/main/java/de/bixilon/minosoft/data/world/container/BlockSectionDataProvider.kt
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.data.world.container
import de.bixilon.kutil.exception.Broken
import de.bixilon.minosoft.data.Axes
import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.registries.blocks.BlockState
@ -264,27 +265,31 @@ class BlockSectionDataProvider(
}
when (first) {
Directions.DOWN -> when (second) {
Directions.UP -> return 0
Directions.NORTH -> return 1
Directions.SOUTH -> return 2
Directions.WEST -> return 3
Directions.EAST -> return 4
Directions.DOWN -> return when (second) {
Directions.UP -> 0
Directions.NORTH -> 1
Directions.SOUTH -> 2
Directions.WEST -> 3
Directions.EAST -> 4
else -> Broken()
}
Directions.UP -> when (second) {
Directions.NORTH -> return 5
Directions.SOUTH -> return 6
Directions.WEST -> return 7
Directions.EAST -> return 8
Directions.UP -> return when (second) {
Directions.NORTH -> 5
Directions.SOUTH -> 6
Directions.WEST -> 7
Directions.EAST -> 8
else -> Broken()
}
Directions.NORTH -> when (second) {
Directions.SOUTH -> return 9
Directions.WEST -> return 10
Directions.EAST -> return 11
Directions.NORTH -> return when (second) {
Directions.SOUTH -> 9
Directions.WEST -> 10
Directions.EAST -> 11
else -> Broken()
}
Directions.SOUTH -> when (second) {
Directions.WEST -> return 12
Directions.EAST -> return 13
Directions.SOUTH -> return when (second) {
Directions.WEST -> 12
Directions.EAST -> 13
else -> Broken()
}
else -> return 14 // WEST->EAST
}

1
src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt
View File

@ -160,6 +160,7 @@ class ItemElement(
KeyCodes.KEY_8 -> container.invokeAction(SlotSwapContainerAction(slotId, SlotSwapContainerAction.SwapTargets.HOTBAR_8))
KeyCodes.KEY_9 -> container.invokeAction(SlotSwapContainerAction(slotId, SlotSwapContainerAction.SwapTargets.HOTBAR_9))
KeyCodes.KEY_F -> container.invokeAction(SlotSwapContainerAction(slotId, SlotSwapContainerAction.SwapTargets.OFFHAND))
else -> Unit
}
return true

1
src/main/java/de/bixilon/minosoft/gui/rendering/input/interaction/BreakInteractionHandler.kt
View File

@ -273,6 +273,7 @@ class BreakInteractionHandler(
}
legacyAcknowledgedBreakStarts.remove(it.blockPosition)
}
else -> Unit
}
})

2
src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/WeightedBakedModel.kt
View File

@ -14,6 +14,7 @@
package de.bixilon.minosoft.gui.rendering.models.baked
import de.bixilon.kotlinglm.vec3.Vec3i
import de.bixilon.kutil.exception.Broken
import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.registries.blocks.BlockState
import de.bixilon.minosoft.gui.rendering.models.baked.block.BakedBlockModel
@ -21,7 +22,6 @@ import de.bixilon.minosoft.gui.rendering.models.properties.AbstractFacePropertie
import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture
import de.bixilon.minosoft.gui.rendering.util.VecUtil
import de.bixilon.minosoft.gui.rendering.world.mesh.WorldMesh
import de.bixilon.minosoft.util.Broken
import java.util.*
import kotlin.math.abs

2
src/main/java/de/bixilon/minosoft/gui/rendering/world/entities/renderer/sign/SignBlockEntityRenderer.kt
View File

@ -18,6 +18,7 @@ import de.bixilon.kotlinglm.vec2.Vec2i
import de.bixilon.kotlinglm.vec3.Vec3
import de.bixilon.kotlinglm.vec3.Vec3i
import de.bixilon.kutil.cast.CastUtil.nullCast
import de.bixilon.kutil.exception.Broken
import de.bixilon.kutil.primitive.IntUtil.toInt
import de.bixilon.minosoft.data.Axes
import de.bixilon.minosoft.data.direction.Directions
@ -36,7 +37,6 @@ import de.bixilon.minosoft.gui.rendering.world.entities.OnlyMeshedBlockEntityRen
import de.bixilon.minosoft.gui.rendering.world.mesh.SingleWorldMesh
import de.bixilon.minosoft.gui.rendering.world.mesh.WorldMesh
import de.bixilon.minosoft.gui.rendering.world.preparer.cull.SolidCullSectionPreparer
import de.bixilon.minosoft.util.Broken
import java.util.*
class SignBlockEntityRenderer(

2
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/CommandsS2CP.kt
View File

@ -14,6 +14,7 @@ package de.bixilon.minosoft.protocol.packets.s2c.play
import de.bixilon.kutil.cast.CastUtil.nullCast
import de.bixilon.kutil.cast.CastUtil.unsafeCast
import de.bixilon.kutil.exception.Broken
import de.bixilon.minosoft.commands.nodes.CommandNode
import de.bixilon.minosoft.commands.nodes.RootNode
import de.bixilon.minosoft.commands.nodes.builder.CommandNodeBuilder
@ -21,7 +22,6 @@ import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.packets.factory.LoadPacket
import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer
import de.bixilon.minosoft.util.Broken
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType

16
src/main/java/de/bixilon/minosoft/util/Broken.kt
View File

@ -1,16 +0,0 @@
/*
* Minosoft
* Copyright (C) 2020-2022 Moritz Zwerger
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.util
fun Broken(reason: String = ""): Nothing = throw IllegalStateException("Something is broken: $reason")