From 00c1f1d1d06c5da0f2cc8ae0de3acae94c0317f6 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Fri, 22 Apr 2022 14:02:40 +0200 Subject: [PATCH] replace some todos with broken --- .../minosoft/data/direction/Directions.kt | 3 ++- .../models/baked/block/BakedBlockStateModel.kt | 3 ++- src/main/java/de/bixilon/minosoft/util/Broken.kt | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 src/main/java/de/bixilon/minosoft/util/Broken.kt diff --git a/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt b/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt index 59aac5fea..d839f33de 100644 --- a/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt +++ b/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt @@ -28,6 +28,7 @@ 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( @@ -82,7 +83,7 @@ enum class Directions( SOUTH -> WEST WEST -> NORTH EAST -> SOUTH - else -> TODO() + else -> Broken("Rotation: $this") } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/block/BakedBlockStateModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/block/BakedBlockStateModel.kt index 0003e98ea..a5338a8cf 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/block/BakedBlockStateModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/block/BakedBlockStateModel.kt @@ -23,6 +23,7 @@ import de.bixilon.minosoft.gui.rendering.util.VecUtil import de.bixilon.minosoft.gui.rendering.util.VecUtil.getWorldOffset import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.toVec3 import de.bixilon.minosoft.gui.rendering.world.mesh.WorldMesh +import de.bixilon.minosoft.gui.rendering.world.preparer.cull.SolidCullSectionPreparer import java.util.* class BakedBlockStateModel( @@ -58,7 +59,7 @@ class BakedBlockStateModel( continue } tint = tints?.getOrNull(face.tintIndex) ?: -1 - currentLight = (face.cullFace?.let { light[it.ordinal] } ?: light[6]).toInt() + currentLight = (face.cullFace?.let { light[it.ordinal] } ?: light[SolidCullSectionPreparer.SELF_LIGHT_INDEX]).toInt() face.singleRender(positionArray, mesh, currentLight, ambientLight, tint) if (!rendered) { rendered = true diff --git a/src/main/java/de/bixilon/minosoft/util/Broken.kt b/src/main/java/de/bixilon/minosoft/util/Broken.kt new file mode 100644 index 000000000..941e8763e --- /dev/null +++ b/src/main/java/de/bixilon/minosoft/util/Broken.kt @@ -0,0 +1,16 @@ +/* + * 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 . + * + * 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")