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/commands/Commands.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt74
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt32
5 files changed, 60 insertions, 54 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 22f7e2d28..a0a6e60d4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -550,7 +550,7 @@ object Commands {
) { HoppityEggLocations.toggleDebug() }
registerCommand(
"shresetmineshaftpitystats",
- "Resets the mineshaft pity display stats"
+ "Resets the mineshaft pity display stats",
) { MineshaftPityDisplay.fullResetCounter() }
}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
index 8fe946833..1ff5a5d1d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt
@@ -39,11 +39,11 @@ object MiningAPI {
private val dwarvenBaseCampPattern by group.pattern("area.basecamp", "Dwarven Base Camp")
private val coldReset by group.pattern(
"cold.reset",
- "§6The warmth of the campfire reduced your §r§b❄ Cold §r§6to §r§a0§r§6!|§c ☠ §r§7You froze to death§r§7."
+ "§6The warmth of the campfire reduced your §r§b❄ Cold §r§6to §r§a0§r§6!|§c ☠ §r§7You froze to death§r§7.",
)
private val coldResetDeath by group.pattern(
"cold.deathreset",
- "§c ☠ §r§7§r§.(?<name>.+)§r§7 (?<reason>.+)"
+ "§c ☠ §r§7§r§.(?<name>.+)§r§7 (?<reason>.+)",
)
data class MinedBlock(val ore: OreBlock, var position: LorenzVec, var confirmed: Boolean, val time: SimpleTimeMark)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
index 9e47a5a45..6bff0262e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/OreType.kt
@@ -10,182 +10,182 @@ enum class OreType(
val oreName: String,
private val internalNameString: String,
val oreBlocks: List<OreBlock>,
- val internalName: NEUInternalName = internalNameString.asInternalName()
+ val internalName: NEUInternalName = internalNameString.asInternalName(),
) {
MITHRIL(
"Mithril",
"MITHRIL_ORE",
- listOf(OreBlock.LOW_TIER_MITHRIL, OreBlock.MID_TIER_MITHRIL, OreBlock.HIGH_TIER_MITHRIL)
+ listOf(OreBlock.LOW_TIER_MITHRIL, OreBlock.MID_TIER_MITHRIL, OreBlock.HIGH_TIER_MITHRIL),
),
TITANIUM(
"Titanium",
"TITANIUM_ORE",
- listOf(OreBlock.TITANIUM)
+ listOf(OreBlock.TITANIUM),
),
COBBLESTONE(
"Cobblestone",
"COBBLESTONE",
- listOf(OreBlock.STONE, OreBlock.COBBLESTONE)
+ listOf(OreBlock.STONE, OreBlock.COBBLESTONE),
),
COAL(
"Coal",
"COAL",
- listOf(OreBlock.COAL_ORE)
+ listOf(OreBlock.COAL_ORE),
),
IRON(
"Iron",
"IRON_INGOT",
- listOf(OreBlock.IRON_ORE)
+ listOf(OreBlock.IRON_ORE),
),
GOLD(
"Gold",
"GOLD_INGOT",
- listOf(OreBlock.GOLD_ORE, OreBlock.DWARVEN_GOLD)
+ listOf(OreBlock.GOLD_ORE, OreBlock.DWARVEN_GOLD),
),
LAPIS(
"Lapis Lazuli",
"INK_SACK-4",
- listOf(OreBlock.LAPIS_ORE)
+ listOf(OreBlock.LAPIS_ORE),
),
REDSTONE(
"Redstone",
"REDSTONE",
- listOf(OreBlock.REDSTONE_ORE, OreBlock.DWARVEN_REDSTONE)
+ listOf(OreBlock.REDSTONE_ORE, OreBlock.DWARVEN_REDSTONE),
),
EMERALD(
"Emerald",
"EMERALD",
- listOf(OreBlock.EMERALD_ORE, OreBlock.DWARVEN_EMERALD)
+ listOf(OreBlock.EMERALD_ORE, OreBlock.DWARVEN_EMERALD),
),
DIAMOND(
"Diamond",
"DIAMOND",
- listOf(OreBlock.DIAMOND_ORE, OreBlock.DWARVEN_DIAMOND)
+ listOf(OreBlock.DIAMOND_ORE, OreBlock.DWARVEN_DIAMOND),
),
NETHERRACK(
"Netherrack",
"NETHERRACK",
- listOf(OreBlock.NETHERRACK)
+ listOf(OreBlock.NETHERRACK),
),
QUARTZ(
"Nether Quartz",
"QUARTZ",
- listOf(OreBlock.QUARTZ_ORE)
+ listOf(OreBlock.QUARTZ_ORE),
),
GLOWSTONE(
"Glowstone",
"GLOWSTONE_DUST",
- listOf(OreBlock.GLOWSTONE)
+ listOf(OreBlock.GLOWSTONE),
),
MYCELIUM(
"Mycelium",
"MYCEL",
- listOf(OreBlock.MYCELIUM)
+ listOf(OreBlock.MYCELIUM),
),
RED_SAND(
"Red Sand",
"SAND-1",
- listOf(OreBlock.RED_SAND)
+ listOf(OreBlock.RED_SAND),
),
SULPHUR(
"Sulphur",
"SULPHUR_ORE",
- listOf(OreBlock.SULPHUR)
+ listOf(OreBlock.SULPHUR),
),
GRAVEL(
"Gravel",
"GRAVEL",
- listOf(OreBlock.GRAVEL)
+ listOf(OreBlock.GRAVEL),
),
END_STONE(
"End Stone",
"ENDER_STONE",
- listOf(OreBlock.END_STONE)
+ listOf(OreBlock.END_STONE),
),
OBSIDIAN(
"Obsidian",
"OBSIDIAN",
- listOf(OreBlock.OBSIDIAN)
+ listOf(OreBlock.OBSIDIAN),
),
HARD_STONE(
"Hard Stone",
"HARD_STONE",
- listOf(OreBlock.HARD_STONE_HOLLOWS, OreBlock.HARD_STONE_GLACIAL)
+ listOf(OreBlock.HARD_STONE_HOLLOWS, OreBlock.HARD_STONE_GLACIAL),
),
RUBY(
"Ruby",
"ROUGH_RUBY_GEM",
- listOf(OreBlock.RUBY)
+ listOf(OreBlock.RUBY),
),
AMBER(
"Amber",
"ROUGH_AMBER_GEM",
- listOf(OreBlock.AMBER)
+ listOf(OreBlock.AMBER),
),
AMETHYST(
"Amethyst",
"ROUGH_AMETHYST_GEM",
- listOf(OreBlock.AMETHYST)
+ listOf(OreBlock.AMETHYST),
),
JADE(
"Jade",
"ROUGH_JADE_GEM",
- listOf(OreBlock.JADE)
+ listOf(OreBlock.JADE),
),
SAPPHIRE(
"Sapphire",
"ROUGH_SAPPHIRE_GEM",
- listOf(OreBlock.SAPPHIRE)
+ listOf(OreBlock.SAPPHIRE),
),
TOPAZ(
"Topaz",
"ROUGH_TOPAZ_GEM",
- listOf(OreBlock.TOPAZ)
+ listOf(OreBlock.TOPAZ),
),
JASPER(
"Jasper",
"ROUGH_JASPER_GEM",
- listOf(OreBlock.JASPER)
+ listOf(OreBlock.JASPER),
),
OPAL(
"Opal",
"ROUGH_OPAL_GEM",
- listOf(OreBlock.OPAL)
+ listOf(OreBlock.OPAL),
),
AQUAMARINE(
"Aquamarine",
"ROUGH_AQUAMARINE_GEM",
- listOf(OreBlock.AQUAMARINE)
+ listOf(OreBlock.AQUAMARINE),
),
CITRINE(
"Citrine",
"ROUGH_CITRINE_GEM",
- listOf(OreBlock.CITRINE)
+ listOf(OreBlock.CITRINE),
),
ONYX(
"Onyx",
"ROUGH_ONYX_GEM",
- listOf(OreBlock.ONYX)
+ listOf(OreBlock.ONYX),
),
PERIDOT(
"Peridot",
"ROUGH_PERIDOT_GEM",
- listOf(OreBlock.PERIDOT)
+ listOf(OreBlock.PERIDOT),
),
UMBER(
"Umber",
"UMBER",
- listOf(OreBlock.LOW_TIER_UMBER, OreBlock.HIGH_TIER_UMBER)
+ listOf(OreBlock.LOW_TIER_UMBER, OreBlock.HIGH_TIER_UMBER),
),
TUNGSTEN(
"Tungsten",
"TUNGSTEN",
- listOf(OreBlock.LOW_TIER_TUNGSTEN, OreBlock.HIGH_TIER_TUNGSTEN)
+ listOf(OreBlock.LOW_TIER_TUNGSTEN, OreBlock.HIGH_TIER_TUNGSTEN),
),
GLACITE(
"Glacite",
"GLACITE",
- listOf(OreBlock.GLACITE)
+ listOf(OreBlock.GLACITE),
),
;
@@ -200,7 +200,7 @@ enum class OreType(
return this.equalsOneOf(
RUBY, AMBER, AMETHYST, JADE,
SAPPHIRE, TOPAZ, JASPER, OPAL,
- AQUAMARINE, CITRINE, ONYX, PERIDOT
+ AQUAMARINE, CITRINE, ONYX, PERIDOT,
)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
index ce1b5eea7..466a632fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt
@@ -522,7 +522,7 @@ object SkyHanniDebugsAndTests {
OreBlock.getByStateOrNull(pos.getBlockStateAt())?.let { ore ->
config.debugOrePos.renderString(
"Looking at: ${ore.name} (${pos.toCleanString()})",
- posLabel = "OreBlock"
+ posLabel = "OreBlock",
)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
index d540daffe..80aa131b2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CollectionUtils.kt
@@ -309,9 +309,11 @@ object CollectionUtils {
addString("§a[$display]")
} else {
addString("§e[")
- add(Renderable.link("§e$display") {
- onChange(entry)
- })
+ add(
+ Renderable.link("§e$display") {
+ onChange(entry)
+ },
+ )
addString("§e]")
}
addString(" ")
@@ -331,16 +333,20 @@ object CollectionUtils {
ChatUtils.lastButtonClicked = System.currentTimeMillis()
}
}
- add(Renderable.horizontalContainer(buildList {
- addString(prefix)
- addString("§a[")
- if (tips.isEmpty()) {
- add(Renderable.link("§e$getName", false, onClick))
- } else {
- add(Renderable.clickAndHover("§e$getName", tips, false, onClick))
- }
- addString("§a]")
- }))
+ add(
+ Renderable.horizontalContainer(
+ buildList {
+ addString(prefix)
+ addString("§a[")
+ if (tips.isEmpty()) {
+ add(Renderable.link("§e$getName", false, onClick))
+ } else {
+ add(Renderable.clickAndHover("§e$getName", tips, false, onClick))
+ }
+ addString("§a]")
+ },
+ ),
+ )
}
fun Collection<Collection<Renderable>>.tableStretchXPadding(xSpace: Int): Int {