Chunk: Implement getAllEntities{ofType}, move light level methods to …

…World
ChatTriggers · Jun 24, 2023 · 4f343ef · 4f343ef
1 parent d423ea7
commit 4f343ef
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 64 deletions.
diff --git a/src/main/kotlin/com/chattriggers/ctjs/minecraft/wrappers/World.kt b/src/main/kotlin/com/chattriggers/ctjs/minecraft/wrappers/World.kt
@@ -19,8 +19,8 @@ import net.minecraft.block.BlockState
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.particle.ParticleEffect
 import net.minecraft.particle.ParticleType
-import net.minecraft.particle.ParticleTypes
 import net.minecraft.registry.Registries
+import net.minecraft.world.LightType
 
 object World : CTWrapper<ClientWorld?> {
     override val mcValue get() = UMinecraft.getMinecraft().world
@@ -95,6 +95,46 @@ object World : CTWrapper<ClientWorld?> {
         return toMC()!!.getBlockState(pos.toMC())
     }
 
+    /**
+     * Gets the skylight level at the given position. This is the value seen in the debug (F3) menu
+     *
+     * @param x the x coordinate
+     * @param y the y coordinate
+     * @param z the z coordinate
+     * @return the skylight level at the location
+     */
+    fun getSkyLightLevel(x: Int, y: Int, z: Int): Int = getSkyLightLevel(BlockPos(x, y, z))
+
+    /**
+     * Gets the skylight level at the given position. This is the value seen in the debug (F3) menu
+     *
+     * @param pos The block position
+     * @return the skylight level at the location
+     */
+    fun getSkyLightLevel(pos: BlockPos): Int {
+        return toMC()?.getLightLevel(LightType.SKY, pos.toMC()) ?: 0
+    }
+
+    /**
+     * Gets the block light level at the given position. This is the value seen in the debug (F3) menu
+     *
+     * @param x the x coordinate
+     * @param y the y coordinate
+     * @param z the z coordinate
+     * @return the block light level at the location
+     */
+    fun getBlockLightLevel(x: Int, y: Int, z: Int): Int = getBlockLightLevel(BlockPos(x, y, z))
+
+    /**
+     * Gets the block light level at the given position. This is the value seen in the debug (F3) menu
+     *
+     * @param pos The block position
+     * @return the block light level at the location
+     */
+    fun getBlockLightLevel(pos: BlockPos): Int {
+        return toMC()?.getLightLevel(LightType.BLOCK, pos.toMC()) ?: 0
+    }
+
     /**
      * Gets all of the players in the world, and returns their wrapped versions.
      *

diff --git a/src/main/kotlin/com/chattriggers/ctjs/minecraft/wrappers/world/Chunk.kt b/src/main/kotlin/com/chattriggers/ctjs/minecraft/wrappers/world/Chunk.kt
@@ -1,13 +1,12 @@
 package com.chattriggers.ctjs.minecraft.wrappers.world
 
 import com.chattriggers.ctjs.minecraft.wrappers.CTWrapper
+import com.chattriggers.ctjs.minecraft.wrappers.World
 import com.chattriggers.ctjs.mixins.ChunkAccessor
-import com.chattriggers.ctjs.utils.MCChunk
-import com.chattriggers.ctjs.utils.asMixin
-import gg.essential.universal.UMinecraft
 import com.chattriggers.ctjs.minecraft.wrappers.entity.BlockEntity
-import net.minecraft.util.math.BlockPos
-import net.minecraft.world.LightType
+import com.chattriggers.ctjs.minecraft.wrappers.entity.Entity
+import com.chattriggers.ctjs.utils.*
+import net.minecraft.util.math.Box
 
 // TODO: Add more methods here?
 class Chunk(override val mcValue: MCChunk) : CTWrapper<MCChunk> {
@@ -36,73 +35,46 @@ class Chunk(override val mcValue: MCChunk) : CTWrapper<MCChunk> {
     fun getMinBlockZ() = getZ() * 16
 
     /**
-     * Gets the skylight level at the given position. This is the value seen in the debug (F3) menu
+     * Gets every entity in this chunk
      *
-     * @param x the x coordinate
-     * @param y the y coordinate
-     * @param z the z coordinate
-     * @return the skylight level at the location
+     * @return the entity list
      */
-    // TODO: Move this method somewhere else
-    fun getSkyLightLevel(x: Int, y: Int, z: Int): Int {
-        return UMinecraft.getMinecraft().world?.getLightLevel(LightType.SKY, BlockPos(x, y, z)) ?: 0
-    }
+    fun getAllEntities(): List<Entity> = getAllEntitiesOfType(MCEntity::class.java)
 
     /**
-     * Gets the block light level at the given position. This is the value seen in the debug (F3) menu
+     * Gets every entity in this chunk of a certain class
      *
-     * @param x the x coordinate
-     * @param y the y coordinate
-     * @param z the z coordinate
-     * @return the block light level at the location
+     * @param clazz the class to filter for (Use `Java.type().class` to get this)
+     * @return the entity list
      */
-    // TODO: Move this method somewhere else
-    fun getBlockLightLevel(x: Int, y: Int, z: Int): Int {
-        return UMinecraft.getMinecraft().world?.getLightLevel(LightType.BLOCK, BlockPos(x, y, z)) ?: 0
-    }
+    fun getAllEntitiesOfType(clazz: Class<MCEntity>): List<Entity> {
+        val box = Box(
+            MCBlockPos(getMinBlockX(), mcValue.bottomY, getMinBlockZ())
+        ).stretch(16.0, mcValue.topY.toDouble(), 16.0)
 
-    // TODO:
-    // /**
-    //  * Gets every entity in this chunk
-    //  *
-    //  * @return the entity list
-    //  */
-    // fun getAllEntities(): List<Entity> {
-    //     return chunk.entityLists.toList().flatten().map(::Entity)
-    // }
-    //
-    // /**
-    //  * Gets every entity in this chunk of a certain class
-    //  *
-    //  * @param clazz the class to filter for (Use `Java.type().class` to get this)
-    //  * @return the entity list
-    //  */
-    // fun getAllEntitiesOfType(clazz: Class<*>): List<Entity> {
-    //     return getAllEntities().filter {
-    //         clazz.isInstance(it.entity)
-    //     }
-    // }
+        return World.toMC()?.getEntitiesByClass(clazz, box) { true }?.map(Entity::fromMC) ?: listOf()
+    }
 
     // TODO(breaking): Rename to getAllBlockEntities
-     /**
-      * Gets every block entity in this chunk
-      *
-      * @return the block entity list
-      */
-     fun getAllBlockEntities(): List<BlockEntity> {
-         return mcValue.asMixin<ChunkAccessor>().blockEntities.values.map(::BlockEntity)
-     }
+    /**
+     * Gets every block entity in this chunk
+     *
+     * @return the block entity list
+     */
+    fun getAllBlockEntities(): List<BlockEntity> {
+        return mcValue.asMixin<ChunkAccessor>().blockEntities.values.map(::BlockEntity)
+    }
 
     // TODO(breaking): Rename to getAllBlockEntitiesOfType
-     /**
-      * Gets every block entity in this chunk of a certain class
-      *
-      * @param clazz the class to filter for (Use `Java.type().class` to get this)
-      * @return the block entity list
-      */
-     fun getAllBlockEntitiesOfType(clazz: Class<*>): List<BlockEntity> {
-         return getAllBlockEntities().filter {
-             clazz.isInstance(it.toMC())
-         }
-     }
+    /**
+     * Gets every block entity in this chunk of a certain class
+     *
+     * @param clazz the class to filter for (Use `Java.type().class` to get this)
+     * @return the block entity list
+     */
+    fun getAllBlockEntitiesOfType(clazz: Class<*>): List<BlockEntity> {
+        return getAllBlockEntities().filter {
+            clazz.isInstance(it.toMC())
+        }
+    }
 }