aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Misc.java4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/CopyNearbyEntitiesCommand.kt145
5 files changed, 87 insertions, 81 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
index 3b1199ea6..0f9d735a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -50,7 +50,7 @@ public class Misc {
"\u00a7bSpider Slayer (not implemented)",
"\u00a7bWolf Slayer (not implemented)",
"\u00a7bVoidgloom Seraph",
- "\u00a7bBlaze Slayer (not implemented)",
+ "\u00a7bBlaze Slayer (only tier 1 yet)",
"\u00a7bHeadless Horseman (bugged)",
"\u00a7bDungeon Floor 1",
"\u00a7bDungeon Floor 2",
@@ -63,7 +63,7 @@ public class Misc {
)
@ConfigAccordionId(id = 1)
//TODO only show currently working and tested features
- public List<Integer> damageIndicatorBossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 8));
+ public List<Integer> damageIndicatorBossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 8, 9));
@Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
index 411e5b14d..cf2271eb9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
@@ -72,7 +72,7 @@ public class Commands {
"copyentities",
new SimpleCommand.ProcessCommandRunnable() {
public void processCommand(ICommandSender sender, String[] args) {
- CopyNearbyEntitiesCommand.Companion.testCommand(args);
+ CopyNearbyEntitiesCommand.INSTANCE.command(args);
}
}
)
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
index 078669b95..c8bea30df 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
@@ -222,9 +222,7 @@ class BossFinder {
if (entity is EntityEnderman) {
if (entity.hasNameTagWith(3, "§c☠ §bVoidgloom Seraph ")) {
-
-
- when (maxHealth.toInt()) {
+ when (maxHealth) {
300_000, 600_000 -> {
return EntityResult(bossType = BossType.SLAYER_ENDERMAN_1)
}
@@ -299,6 +297,15 @@ class BossFinder {
}
}
}
+ if (entity is EntityBlaze) {
+ if (entity.hasNameTagWith(2, "§c☠ §bInferno Demonlord ")) {
+ when (maxHealth) {
+ 2_500_000, 5_000_000 -> {
+ return EntityResult(bossType = BossType.SLAYER_BLAZE_1)
+ }
+ }
+ }
+ }
}
return null
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
index f43d990a6..00e920a0e 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
@@ -29,7 +29,7 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName
SLAYER_ENDERMAN_3("§cVoidgloom Seraph 3", 8),
SLAYER_ENDERMAN_4("§4Voidgloom Seraph 4", 8),
- BLAZE_SLAYER("Blaze Slayer", 9, "Blaze"),
+ SLAYER_BLAZE_1("§aInferno Demonlord 1", 9),
HUB_HEADLESS_HORSEMAN("§6Headless Horseman", 10),
@@ -58,4 +58,6 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName
* f7 blood room giants
*
*/
+
+ //TODO diana mythological creatures
} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/test/CopyNearbyEntitiesCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/CopyNearbyEntitiesCommand.kt
index 164e22755..262d5892e 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/CopyNearbyEntitiesCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/CopyNearbyEntitiesCommand.kt
@@ -12,96 +12,93 @@ import net.minecraft.entity.EntityLivingBase
import net.minecraft.entity.item.EntityArmorStand
import net.minecraft.entity.monster.EntityMagmaCube
-class CopyNearbyEntitiesCommand {
+object CopyNearbyEntitiesCommand {
- companion object {
-
- fun testCommand(args: Array<String>) {
- var searchRadius = 10
- if (args.size == 1) {
- searchRadius = args[0].toInt()
- }
-
- val minecraft = Minecraft.getMinecraft()
- val start = LocationUtils.playerLocation()
- val world = minecraft.theWorld
+ fun command(args: Array<String>) {
+ var searchRadius = 10
+ if (args.size == 1) {
+ searchRadius = args[0].toInt()
+ }
- val resultList = mutableListOf<String>()
- var counter = 0
+ val minecraft = Minecraft.getMinecraft()
+ val start = LocationUtils.playerLocation()
+ val world = minecraft.theWorld
- for (entity in world.loadedEntityList) {
- val position = entity.position
- val vec = position.toLorenzVec()
- val distance = start.distance(vec)
- if (distance < searchRadius) {
- resultList.add("found entity: '" + entity.name + "'")
- val displayName = entity.displayName
- resultList.add("displayName: '${displayName.formattedText}'")
- val simpleName = entity.javaClass.simpleName
- resultList.add("simpleName: $simpleName")
- resultList.add("vec: $vec")
- resultList.add("distance: $distance")
+ val resultList = mutableListOf<String>()
+ var counter = 0
- val rotationYaw = entity.rotationYaw
- val rotationPitch = entity.rotationPitch
- resultList.add("rotationYaw: $rotationYaw")
- resultList.add("rotationPitch: $rotationPitch")
+ for (entity in world.loadedEntityList) {
+ val position = entity.position
+ val vec = position.toLorenzVec()
+ val distance = start.distance(vec)
+ if (distance < searchRadius) {
+ resultList.add("found entity: '" + entity.name + "'")
+ val displayName = entity.displayName
+ resultList.add("displayName: '${displayName.formattedText}'")
+ val simpleName = entity.javaClass.simpleName
+ resultList.add("simpleName: $simpleName")
+ resultList.add("vec: $vec")
+ resultList.add("distance: $distance")
- val riddenByEntity = entity.riddenByEntity
- resultList.add("riddenByEntity: $riddenByEntity")
- val ridingEntity = entity.ridingEntity
- resultList.add("ridingEntity: $ridingEntity")
+ val rotationYaw = entity.rotationYaw
+ val rotationPitch = entity.rotationPitch
+ resultList.add("rotationYaw: $rotationYaw")
+ resultList.add("rotationPitch: $rotationPitch")
+ val riddenByEntity = entity.riddenByEntity
+ resultList.add("riddenByEntity: $riddenByEntity")
+ val ridingEntity = entity.ridingEntity
+ 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")
+ 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")
}
- }
- } else {
- if (entity is EntityLivingBase) {
- val baseMaxHealth = entity.baseMaxHealth
- val health = entity.health.toInt()
- resultList.add("baseMaxHealth: $baseMaxHealth")
- resultList.add("health: $health")
- }
- if (entity is EntityMagmaCube) {
- val squishFactor = entity.squishFactor
- val slimeSize = entity.slimeSize
- resultList.add("factor: $squishFactor")
- resultList.add("slimeSize: $slimeSize")
+ val cleanName = stack.cleanName()
+ val type = stack.javaClass.name
+ resultList.add("cleanName: $cleanName")
+ resultList.add("type: $type")
}
}
- resultList.add("")
- resultList.add("")
- counter++
+ } else {
+ if (entity is EntityLivingBase) {
+ val baseMaxHealth = entity.baseMaxHealth
+ val health = entity.health.toInt()
+ resultList.add("baseMaxHealth: $baseMaxHealth")
+ resultList.add("health: $health")
+ }
+ if (entity is EntityMagmaCube) {
+ val squishFactor = entity.squishFactor
+ val slimeSize = entity.slimeSize
+ resultList.add("factor: $squishFactor")
+ resultList.add("slimeSize: $slimeSize")
+
+ }
}
+ resultList.add("")
+ resultList.add("")
+ counter++
}
+ }
- if (counter != 0) {
- val string = resultList.joinToString("\n")
- Utils.copyToClipboard(string)
- LorenzUtils.chat("§e$counter entities copied into the clipboard!")
- } else {
- LorenzUtils.chat("§eNo entities found in a search radius of $searchRadius!")
- }
+ if (counter != 0) {
+ val string = resultList.joinToString("\n")
+ Utils.copyToClipboard(string)
+ LorenzUtils.chat("§e$counter entities copied into the clipboard!")
+ } else {
+ LorenzUtils.chat("§eNo entities found in a search radius of $searchRadius!")
}
}
} \ No newline at end of file
generated by cgit (git 2.46.0) at 2024-11-24 07:59:06 +0000