aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/test/command
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2022-09-07 05:09:48 +0200
committerGitHub <noreply@github.com>2022-09-07 05:09:48 +0200
commitcfeac0b6a71c592b61c53fad192eb22bb24b0f54 (patch)
tree2d4cbf11b8f5b93b6d907404399ffcd8ae08e763 /src/main/java/at/hannibal2/skyhanni/test/command
parent5b76d78b62420bfa5c9cca3cb3ebc50a12e812b7 (diff)
downloadskyhanni-cfeac0b6a71c592b61c53fad192eb22bb24b0f54.tar.gz
skyhanni-cfeac0b6a71c592b61c53fad192eb22bb24b0f54.tar.bz2
skyhanni-cfeac0b6a71c592b61c53fad192eb22bb24b0f54.zip
0.7 (#2)
* code cleanup * Option to hide the Skyblock Level from the chat messages, Option to change the way the Skyblock Level gets displayed in the chat * change version to 0.6.1 * add highlight the voidling extremist in pink color * add highlight corrupted mobs in purple color * fixed highlight corrupted mobs in purple color in the private island * another minor fix for highlight corrupted mobs in purple color * created EntityHealthUpdateEvent and fixing CorruptedMobHighlight * using EntityHealthUpdateEvent everywhere * added marking a player with yellow color * highlight slayer miniboss in blue color * /copyentities now shows health correctly for every entity * infer fix * fixing bazaar message filter * changelog * hides the death messages of other players, except for players who are close to the player. * hiding tip messages * highlight deathmites in dungeon in red color * code cleanup * code cleanup * hide tnt laying around in dungeon * fix infer * remove debug * Added hide Blessings laying around in dungeon. Added hide Revive Stones laying around in dungeon. * Hide Premium Flesh laying around in dungeon. * edited LorenzTest * Added dungeon copilot and separate filter for hiding dungeon key and door messages. * Added hide Journal Entry pages laying around in dungeon. * Added hide Skeleton Skulls laying around in dungeon. * credits * Added highlight Skeleton Skulls when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull) * Added highlight Skeleton Skulls when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull) * fix wording * clarification * small fixes * Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying) * better/more readability for CopyNearbyEntitiesCommand * make version 0.7
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/test/command')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt116
1 files changed, 78 insertions, 38 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt
index 291000c77..1467f2b85 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyEntitiesCommand.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.test.command
import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
+import at.hannibal2.skyhanni.utils.ItemUtils.name
import at.hannibal2.skyhanni.utils.LocationUtils
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
@@ -10,8 +11,10 @@ import at.hannibal2.skyhanni.utils.toLorenzVec
import net.minecraft.client.Minecraft
import net.minecraft.entity.EntityLivingBase
import net.minecraft.entity.item.EntityArmorStand
+import net.minecraft.entity.item.EntityItem
import net.minecraft.entity.monster.EntityEnderman
import net.minecraft.entity.monster.EntityMagmaCube
+import net.minecraft.item.ItemStack
object CopyNearbyEntitiesCommand {
@@ -33,18 +36,19 @@ object CopyNearbyEntitiesCommand {
val vec = position.toLorenzVec()
val distance = start.distance(vec)
if (distance < searchRadius) {
- resultList.add("found entity: '" + entity.name + "'")
+ val simpleName = entity.javaClass.simpleName
+ resultList.add("entity: $simpleName")
val displayName = entity.displayName
+ resultList.add("name: '" + entity.name + "'")
resultList.add("displayName: '${displayName.formattedText}'")
- val simpleName = entity.javaClass.simpleName
- resultList.add("simpleName: $simpleName")
- resultList.add("vec: $vec")
- resultList.add("distance: $distance")
+ resultList.add("location data:")
+ resultList.add("- vec: $vec")
+ resultList.add("- distance: $distance")
val rotationYaw = entity.rotationYaw
val rotationPitch = entity.rotationPitch
- resultList.add("rotationYaw: $rotationYaw")
- resultList.add("rotationPitch: $rotationPitch")
+ resultList.add("- rotationYaw: $rotationYaw")
+ resultList.add("- rotationPitch: $rotationPitch")
val riddenByEntity = entity.riddenByEntity
resultList.add("riddenByEntity: $riddenByEntity")
@@ -52,46 +56,66 @@ object CopyNearbyEntitiesCommand {
resultList.add("ridingEntity: $ridingEntity")
- if (entity is EntityArmorStand) {
- resultList.add("armor stand data:")
- val headRotation = entity.headRotation.toLorenzVec()
- val bodyRotation = entity.bodyRotation.toLorenzVec()
- resultList.add("headRotation: $headRotation")
- resultList.add("bodyRotation: $bodyRotation")
-
- for ((id, stack) in entity.inventory.withIndex()) {
- resultList.add("id $id = $stack")
- if (stack != null) {
- val skullTexture = stack.getSkullTexture()
- if (skullTexture != null) {
- resultList.add("skullTexture: $skullTexture")
- }
- val cleanName = stack.cleanName()
- val type = stack.javaClass.name
- resultList.add("cleanName: $cleanName")
- resultList.add("type: $type")
+ when (entity) {
+ is EntityArmorStand -> {
+ resultList.add("EntityArmorStand:")
+ val headRotation = entity.headRotation.toLorenzVec()
+ val bodyRotation = entity.bodyRotation.toLorenzVec()
+ resultList.add("- headRotation: $headRotation")
+ resultList.add("- bodyRotation: $bodyRotation")
+ resultList.add("- inventory:")
+ for ((id, stack) in entity.inventory.withIndex()) {
+ resultList.add("- id $id ($stack)")
+ printItemStackData(stack, resultList)
}
}
- } else if (entity is EntityEnderman) {
- val enderman = entity as EntityEnderman
- val heldItem = enderman.heldItem
- resultList.add("enderman heldItem: $heldItem")
- } else {
- if (entity is EntityLivingBase) {
- val baseMaxHealth = entity.baseMaxHealth
- val health = entity.health.toInt()
- resultList.add("baseMaxHealth: $baseMaxHealth")
- resultList.add("health: $health")
+
+ is EntityEnderman -> {
+ resultList.add("EntityEnderman:")
+ val heldBlockState = entity.heldBlockState
+ resultList.add("- heldBlockState: $heldBlockState")
+ if (heldBlockState != null) {
+ val block = heldBlockState.block
+ resultList.add("- block: $block")
+ }
}
- if (entity is EntityMagmaCube) {
+
+ is EntityMagmaCube -> {
+ resultList.add("EntityMagmaCube:")
val squishFactor = entity.squishFactor
val slimeSize = entity.slimeSize
- resultList.add("factor: $squishFactor")
- resultList.add("slimeSize: $slimeSize")
+ resultList.add("- factor: $squishFactor")
+ resultList.add("- slimeSize: $slimeSize")
+ }
+
+ is EntityItem -> {
+ resultList.add("EntityItem:")
+ val stack = entity.entityItem
+ val stackName = stack.name
+ val stackDisplayName = stack.displayName
+ val cleanName = stack.cleanName()
+ val itemEnchanted = stack.isItemEnchanted
+ val itemDamage = stack.itemDamage
+ val stackSize = stack.stackSize
+ val maxStackSize = stack.maxStackSize
+ resultList.add("- name: '$stackName'")
+ resultList.add("- stackDisplayName: '$stackDisplayName'")
+ resultList.add("- cleanName: '$cleanName'")
+ resultList.add("- itemEnchanted: '$itemEnchanted'")
+ resultList.add("- itemDamage: '$itemDamage'")
+ resultList.add("- stackSize: '$stackSize'")
+ resultList.add("- maxStackSize: '$maxStackSize'")
}
}
+ if (entity is EntityLivingBase) {
+ resultList.add("EntityLivingBase:")
+ val baseMaxHealth = entity.baseMaxHealth.toInt()
+ val health = entity.health.toInt()
+ resultList.add("- baseMaxHealth: $baseMaxHealth")
+ resultList.add("- health: $health")
+ }
resultList.add("")
resultList.add("")
counter++
@@ -106,4 +130,20 @@ object CopyNearbyEntitiesCommand {
LorenzUtils.chat("§e[SkyHanni] No entities found in a search radius of $searchRadius!")
}
}
+
+ private fun printItemStackData(stack: ItemStack?, resultList: MutableList<String>) {
+ if (stack != null) {
+ val skullTexture = stack.getSkullTexture()
+ if (skullTexture != null) {
+ resultList.add("- skullTexture:")
+ resultList.add("- $skullTexture")
+ }
+ val cleanName = stack.cleanName()
+ val stackName = stack.name
+ val type = stack.javaClass.name
+ resultList.add("- name: '$stackName'")
+ resultList.add("- cleanName: '$cleanName'")
+ resultList.add("- type: $type")
+ }
+ }
} \ No newline at end of file