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

move ChunkUtil and LightUtil to network

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-23 22:18:07 +01:00
parent c6ccd9b4bc
commit e2f30887ff
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
12 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt
View File

@ -42,7 +42,7 @@ internal object MinosoftSIT {
RunConfiguration.VERBOSE_LOGGING = true
RunConfiguration.APPLICATION_NAME = "Minosoft it"
val isCi = (System.getenv("GITHUB_ACTIONS") ?: System.getenv("TRAVIS") ?: System.getenv("CIRCLECI") ?: System.getenv("GITLAB_CI")) != null
val isCi = (System.getenv("GITHUB_ACTIONS") ?: System.getenv("TRAVIS") ?: System.getenv("CIRCLECI") ?: System.getenv("GITLAB_CI")) != null // TODO: kutil 1.25 Environment.isInCI()
if (isCi) {
RunConfiguration::HOME_DIRECTORY.forceSet(Path.of("./it"))
}

2
src/main/java/de/bixilon/minosoft/data/world/chunk/manager/ChunkTicker.kt
View File

@ -16,7 +16,7 @@ package de.bixilon.minosoft.data.world.chunk.manager
import de.bixilon.kotlinglm.vec2.Vec2i
import de.bixilon.kutil.collections.iterator.async.ConcurrentIterator
import de.bixilon.kutil.concurrent.pool.ThreadPool
import de.bixilon.minosoft.util.chunk.ChunkUtil.isInViewDistance
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil.isInViewDistance
import java.util.*
class ChunkTicker(val manager: ChunkManager) {

2
src/main/java/de/bixilon/minosoft/data/world/chunk/neighbours/ChunkNeighbours.kt
View File

@ -24,7 +24,7 @@ import de.bixilon.minosoft.data.world.chunk.chunk.Chunk
import de.bixilon.minosoft.data.world.positions.ChunkPositionUtil.chunkPosition
import de.bixilon.minosoft.data.world.positions.SectionHeight
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.inChunkPosition
import de.bixilon.minosoft.util.chunk.ChunkUtil
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil
class ChunkNeighbours(val chunk: Chunk) : Iterable<Chunk?> {
val neighbours: Array<Chunk?> = arrayOfNulls(COUNT)

2
src/main/java/de/bixilon/minosoft/gui/rendering/camera/visibility/WorldVisibilityGraph.kt
View File

@ -38,8 +38,8 @@ import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.EMPTY
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.chunkPosition
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.sectionHeight
import de.bixilon.minosoft.modding.event.listener.CallbackEventListener.Companion.listen
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil.isInViewDistance
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.util.chunk.ChunkUtil.isInViewDistance
import it.unimi.dsi.fastutil.ints.IntOpenHashSet
/**

2
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/ChunkMesher.kt
View File

@ -19,7 +19,7 @@ import de.bixilon.minosoft.gui.rendering.chunk.WorldQueueItem
import de.bixilon.minosoft.gui.rendering.chunk.mesh.ChunkMeshes
import de.bixilon.minosoft.gui.rendering.chunk.queue.meshing.tasks.MeshPrepareTask
import de.bixilon.minosoft.gui.rendering.chunk.util.ChunkRendererUtil.smallMesh
import de.bixilon.minosoft.util.chunk.ChunkUtil
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil
class ChunkMesher(
private val renderer: ChunkRenderer,

2
src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt
View File

@ -37,8 +37,8 @@ import de.bixilon.minosoft.modding.event.listener.CallbackEventListener.Companio
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnectionStates
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnectionStates.Companion.disconnected
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil.isInViewDistance
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.util.chunk.ChunkUtil.isInViewDistance
import de.bixilon.minosoft.util.collections.floats.BufferedArrayFloatList

1
src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt
View File

@ -74,6 +74,7 @@ import de.bixilon.minosoft.protocol.packets.s2c.play.block.*
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.*
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.batch.ChunkBatchDoneS2CP
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.batch.ChunkBatchStartS2CP
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light.ChunkLightS2CP
import de.bixilon.minosoft.protocol.packets.s2c.play.border.*
import de.bixilon.minosoft.protocol.packets.s2c.play.bossbar.BossbarS2CF
import de.bixilon.minosoft.protocol.packets.s2c.play.chat.*

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

@ -31,6 +31,7 @@ import de.bixilon.minosoft.gui.rendering.util.VecUtil.of
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.EMPTY
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light.ChunkLightS2CP
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_14W26A
@ -47,7 +48,6 @@ import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_21W03A
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_21W37A
import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
import de.bixilon.minosoft.util.KUtil.toResourceLocation
import de.bixilon.minosoft.util.chunk.ChunkUtil
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType

3
src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt → src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkUtil.kt
View File

@ -11,7 +11,7 @@
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.util.chunk
package de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk
import de.bixilon.kutil.cast.CastUtil.unsafeCast
import de.bixilon.minosoft.config.StaticConfiguration
@ -31,6 +31,7 @@ import de.bixilon.minosoft.data.world.container.palette.palettes.BiomePaletteFac
import de.bixilon.minosoft.data.world.container.palette.palettes.BlockStatePaletteFactory
import de.bixilon.minosoft.data.world.positions.ChunkPosition
import de.bixilon.minosoft.data.world.positions.SectionHeight
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light.LightUtil
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_14W26A
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_15W35A

1
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunksS2CP.kt
View File

@ -19,7 +19,6 @@ import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
import de.bixilon.minosoft.util.chunk.ChunkUtil
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType

4
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkLightS2CP.kt → src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/light/ChunkLightS2CP.kt
View File

@ -10,7 +10,7 @@
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk
package de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light
import de.bixilon.kotlinglm.vec2.Vec2i
@ -20,9 +20,9 @@ import de.bixilon.minosoft.protocol.network.connection.Connection
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.packets.registry.PacketExtraHandler
import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light.LightUtil.readLightPacket
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
import de.bixilon.minosoft.util.chunk.LightUtil.readLightPacket
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType

2
src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt → src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/light/LightUtil.kt
View File

@ -11,7 +11,7 @@
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.util.chunk
package de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light
import de.bixilon.minosoft.data.registries.dimension.DimensionProperties
import de.bixilon.minosoft.data.world.chunk.chunk.ChunkPrototype