diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
9 files changed, 6 insertions, 54 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt index 15bf00125..23991e31c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt @@ -111,14 +111,12 @@ class CompactBingoChat { private fun onNewAreaDiscovered(message: String): Boolean { if (message == " §r§6§lNEW AREA DISCOVERED!") { newArea = 1 - println("new area $newArea $message") return false } if (message != "") { if (newArea == 1) { newArea = 2 - println("new area $newArea $message") return false } @@ -127,7 +125,6 @@ class CompactBingoChat { return true } else { newArea = 0 - println("new area $newArea $message") } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt index 0b7f14f2f..49bfb00da 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt @@ -429,7 +429,7 @@ class DamageIndicatorManager { return "" } - private fun checkBlazeSlayer(entity: EntityLiving, entityData: EntityData, health: Int, maxHealth: Int): String? { + private fun checkBlazeSlayer(entity: EntityLiving, entityData: EntityData, health: Int, maxHealth: Int): String { val shields = HellionShield.values() var found = false for (shield in shields) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/OldDamage.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/OldDamage.kt index 5cdb95aca..26c0a751a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/OldDamage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/OldDamage.kt @@ -1,4 +1,3 @@ package at.hannibal2.skyhanni.features.damageindicator -class OldDamage(val time: Long, val damage: Long, val healing: Long) { -}
\ No newline at end of file +class OldDamage(val time: Long, val damage: Long, val healing: Long)
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt index 497c25f0e..ca7ad1cc5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/EliteFarmingWeight.kt @@ -304,8 +304,8 @@ class EliteFarmingWeight { private fun specialMushroomWeight(weightPerCrop: MutableMap<CropType, Double>, totalWeight: Double): Double { val cactusWeight = weightPerCrop[CropType.CACTUS]!! val sugarCaneWeight = weightPerCrop[CropType.SUGAR_CANE]!! - val doubleBreakRatio = (cactusWeight + sugarCaneWeight) / totalWeight; - val normalRatio = (totalWeight - cactusWeight - sugarCaneWeight) / totalWeight; + val doubleBreakRatio = (cactusWeight + sugarCaneWeight) / totalWeight + val normalRatio = (totalWeight - cactusWeight - sugarCaneWeight) / totalWeight val mushroomFactor = CropType.MUSHROOM.getFactor() val mushroomCollection = CropType.MUSHROOM.getLocalCounter() diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt index fb48d73fb..4d86c7a35 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenPlotIcon.kt @@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.LorenzUtils.chat import at.hannibal2.skyhanni.utils.NEUItems -import at.hannibal2.skyhanni.utils.StringUtils.removeColor import io.github.moulberry.notenoughupdates.events.ReplaceItemEvent import io.github.moulberry.notenoughupdates.events.SlotClickEvent import io.github.moulberry.notenoughupdates.util.Utils diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideDeadEntities.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideDeadEntities.kt deleted file mode 100644 index 6bca8e97d..000000000 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideDeadEntities.kt +++ /dev/null @@ -1,38 +0,0 @@ -//package at.hannibal2.skyhanni.features.misc -// -//import at.hannibal2.skyhanni.events.CheckRenderEntityEvent -//import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent -//import at.hannibal2.skyhanni.utils.LorenzUtils -//import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -// -// -//// Skytils feature does work already. -// -//class HideDeadEntities { -// private val hiddenEntities = mutableListOf<Int>() -// -// @SubscribeEvent -// fun onEntityHealthUpdate(event: EntityHealthUpdateEvent) { -// val entityId = event.entity.entityId -// -// if (event.health <= 0) { -// if (!hiddenEntities.contains(entityId)) { -// hiddenEntities.add(entityId) -// } -// } else { -// if (hiddenEntities.contains(entityId)) { -// hiddenEntities.remove(entityId) -// LorenzUtils.debug("respawned: ${event.entity.name}") -// } -// } -// } -// -// @SubscribeEvent -// fun onCheckRender(event: CheckRenderEntityEvent<*>) { -// if (!LorenzUtils.inSkyBlock) return -// -//// if (hiddenEntities.contains(event.entity.entityId)) { -//// event.isCanceled = true -//// } -// } -//}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt index 205314dce..5c7871a1e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt @@ -35,7 +35,7 @@ object QuickModMenuSwitch { Class.forName(path) add(Mod(name, mod.description, mod.command, mod.guiPath)) continue@out - } catch (ignored_: Exception) { + } catch (_: Exception) { } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/Quest.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/Quest.kt index 230900153..e5cd68162 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/Quest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/Quest.kt @@ -9,5 +9,4 @@ abstract class Quest( val internalName: String, var state: QuestState, val displayName: String = internalName -) { -}
\ No newline at end of file +)
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt index d054ded6c..cb2c3def5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt @@ -18,7 +18,6 @@ import net.minecraftforge.fml.common.gameevent.TickEvent class SummoningSoulsName { - var tick = 0 private val texture = "ewogICJ0aW1lc3RhbXAiIDogMTYwMTQ3OTI2NjczMywKICAicHJvZmlsZUlkIiA6ICJmMzA1ZjA5NDI0NTg0ZjU" + "4YmEyYjY0ZjAyZDcyNDYyYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJqcm9ja2EzMyIsCiAgInNpZ25hdH" + @@ -34,11 +33,8 @@ class SummoningSoulsName { fun onTick(event: TickEvent.ClientTickEvent) { if (!isEnabled()) return - tick++ //TODO use packets instead of this - if (tick % 1 == 0) { check() - } } private fun check() { |