summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/nether
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-03-29 13:10:21 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-03-29 13:10:21 +0200
commit00834cd15e9154018f9e1bb113355a119f1e9a80 (patch)
tree541abf49835f42cbee47f9a1cf273f7abdb91944 /src/main/java/at/hannibal2/skyhanni/features/nether
parentab471dbbfd660831e7998a1da596d562a2090677 (diff)
downloadskyhanni-00834cd15e9154018f9e1bb113355a119f1e9a80.tar.gz
skyhanni-00834cd15e9154018f9e1bb113355a119f1e9a80.tar.bz2
skyhanni-00834cd15e9154018f9e1bb113355a119f1e9a80.zip
added addAsSingletonList
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/nether')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt8
4 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
index 2b79bbd42..ef9541d9f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.features.nether.reputationhelper.dailykuudra.DailyK
import at.hannibal2.skyhanni.features.nether.reputationhelper.dailyquest.DailyQuestHelper
import at.hannibal2.skyhanni.features.nether.reputationhelper.miniboss.DailyMiniBossHelper
import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
import at.hannibal2.skyhanni.utils.LorenzVec
import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
import at.hannibal2.skyhanni.utils.TabListData
@@ -15,7 +16,6 @@ import com.google.gson.JsonObject
import net.minecraftforge.fml.common.eventhandler.EventPriority
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.TickEvent
-import java.util.*
class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) {
@@ -79,7 +79,7 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) {
//TODO test
if (factionType == FactionType.NONE) return
- newList.add(Collections.singletonList("Reputation Helper:"))
+ newList.addAsSingletonList("Reputation Helper:")
questHelper.render(newList)
miniBossHelper.render(newList)
if (factionType == FactionType.MAGE) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt
index ce30ed3db..e8d69aa38 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt
@@ -8,12 +8,12 @@ import at.hannibal2.skyhanni.features.nether.reputationhelper.CrimsonIsleReputat
import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
import at.hannibal2.skyhanni.utils.LorenzColor
import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
import at.hannibal2.skyhanni.utils.LorenzVec
import at.hannibal2.skyhanni.utils.NEUItems
import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
import net.minecraftforge.client.event.RenderWorldLastEvent
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.*
import java.util.regex.Pattern
class DailyKuudraBossHelper(private val reputationHelper: CrimsonIsleReputationHelper) {
@@ -67,15 +67,15 @@ class DailyKuudraBossHelper(private val reputationHelper: CrimsonIsleReputationH
fun render(display: MutableList<List<Any>>) {
val done = kuudraTiers.count { it.doneToday }
- display.add(Collections.singletonList(""))
- display.add(Collections.singletonList("§7Daily Kuudra (§e$done§8/§e3 killed§7)"))
+ display.addAsSingletonList("")
+ display.addAsSingletonList("§7Daily Kuudra (§e$done§8/§e3 killed§7)")
if (done != 2) {
for (tier in kuudraTiers) {
val result = if (tier.doneToday) "§7Done" else "§bTodo"
val displayName = tier.getDisplayName()
val displayItem = tier.displayItem
if (displayItem == null) {
- display.add(Collections.singletonList(" $displayName: $result"))
+ display.addAsSingletonList(" $displayName: $result")
} else {
val lineList = mutableListOf<Any>()
lineList.add(" ")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
index 611330339..a6d06366a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
@@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.utils.*
import at.hannibal2.skyhanni.utils.InventoryUtils.getInventoryName
import at.hannibal2.skyhanni.utils.ItemUtils.getLore
import at.hannibal2.skyhanni.utils.ItemUtils.name
+import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
import at.hannibal2.skyhanni.utils.RenderUtils.highlight
import net.minecraft.client.gui.inventory.GuiChest
@@ -20,7 +21,6 @@ import net.minecraft.inventory.ContainerChest
import net.minecraftforge.client.event.RenderWorldLastEvent
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.TickEvent
-import java.util.*
class DailyQuestHelper(val reputationHelper: CrimsonIsleReputationHelper) {
@@ -223,8 +223,8 @@ class DailyQuestHelper(val reputationHelper: CrimsonIsleReputationHelper) {
fun render(display: MutableList<List<Any>>) {
val done = quests.count { it.state == QuestState.COLLECTED }
- display.add(Collections.singletonList(""))
- display.add(Collections.singletonList("§7Daily Quests (§e$done§8/§e5 collected§7)"))
+ display.addAsSingletonList("")
+ display.addAsSingletonList("§7Daily Quests (§e$done§8/§e5 collected§7)")
if (done != 5) {
quests.mapTo(display) { renderQuest(it) }
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt
index 0eaa0be66..2e0673746 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt
@@ -11,11 +11,11 @@ import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
import at.hannibal2.skyhanni.utils.LocationUtils
import at.hannibal2.skyhanni.utils.LorenzColor
import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
import at.hannibal2.skyhanni.utils.NEUItems
import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
import net.minecraftforge.client.event.RenderWorldLastEvent
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.*
import java.util.regex.Pattern
class DailyMiniBossHelper(private val reputationHelper: CrimsonIsleReputationHelper) {
@@ -75,15 +75,15 @@ class DailyMiniBossHelper(private val reputationHelper: CrimsonIsleReputationHel
fun render(display: MutableList<List<Any>>) {
val done = miniBosses.count { it.doneToday }
- display.add(Collections.singletonList(""))
- display.add(Collections.singletonList("§7Daily Bosses (§e$done§8/§e5 killed§7)"))
+ display.addAsSingletonList("")
+ display.addAsSingletonList("§7Daily Bosses (§e$done§8/§e5 killed§7)")
if (done != 5) {
for (miniBoss in miniBosses) {
val result = if (miniBoss.doneToday) "§aDone" else "§bTodo"
val displayName = miniBoss.displayName
val displayItem = miniBoss.displayItem
if (displayItem == null) {
- display.add(Collections.singletonList(" $displayName: $result"))
+ display.addAsSingletonList(" $displayName: $result")
} else {
val lineList = mutableListOf<Any>()
lineList.add(" ")