From b7013e82739ed7a9d28eef21fe0ec11496dffd0e Mon Sep 17 00:00:00 2001 From: Lorenz Date: Sat, 3 Sep 2022 21:41:29 +0200 Subject: added option to mark the own summoning mobs in green --- .../skyhanni/features/SummoningMobManager.kt | 40 ++++++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/SummoningMobManager.kt index 5b31248d7..877db7e6a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/SummoningMobManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/SummoningMobManager.kt @@ -2,12 +2,9 @@ package at.hannibal2.skyhanni.features import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.utils.LocationUtils -import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.* import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth -import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings -import at.hannibal2.skyhanni.utils.getLorenzVec import net.minecraft.client.Minecraft import net.minecraft.entity.EntityLiving import net.minecraft.entity.EntityLivingBase @@ -18,11 +15,40 @@ import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.gameevent.TickEvent +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable +import java.awt.Color import java.util.regex.Pattern class SummoningMobManager { - private val summoningMobs = mutableMapOf() + companion object { + + @JvmStatic + fun setColorMultiplier( + entity: T, + lightBrightness: Float, + partialTickTime: Float, + cir: CallbackInfoReturnable, + ) { + if (SkyHanniMod.feature.abilities.summoningMobColored) { + if (entity is EntityLiving && entity in summoningMobs.keys) { + cir.returnValue = LorenzColor.GREEN.toColor().withAlpha(127) + } + } + } + + @JvmStatic + fun replaceHurtTime(entity: EntityLivingBase): Int { + return if (SkyHanniMod.feature.abilities.summoningMobColored + && entity in summoningMobs.keys + ) 0 else entity.hurtTime + } + + fun Color.withAlpha(alpha: Int): Int = (alpha.coerceIn(0, 255) shl 24) or (this.rgb and 0x00ffffff) + + private val summoningMobs = mutableMapOf() + } + private val summoningMobNametags = mutableListOf() private var summoningsSpawned = 0 private var searchArmorStands = false @@ -95,7 +121,7 @@ class SummoningMobManager { it is EntityLiving && it !in summoningMobs.keys && it.getLorenzVec().distance(playerLocation) < 3 } .forEach { - if (it.ticksExisted == 0) { + if (it.ticksExisted < 2) { summoningMobs[it as EntityLiving] = SummoningMob(System.currentTimeMillis(), name = "Mob") updateData() if (summoningMobs.size == summoningsSpawned) { @@ -117,7 +143,7 @@ class SummoningMobManager { val name = summoningMob.name if (currentHealth == 0) { summoningMobs.remove(entityLiving) - LorenzUtils.chat("§e[SkyHanni] your Summoning Mob just §cdied!") + LorenzUtils.chat("§e[SkyHanni] Your Summoning Mob just §cdied!") continue } -- cgit