summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data/model
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-07-06 08:08:52 +0200
committerGitHub <noreply@github.com>2024-07-06 08:08:52 +0200
commit7b3ed85d171c156f895fdbaeff4d18572fc0f18e (patch)
tree0bbfeca0a796bdd6494548f9f161edbc7fb6b700 /src/main/java/at/hannibal2/skyhanni/data/model
parent34ba8c5fb8304e7b568822f8d3f675a0f133c6da (diff)
downloadskyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.tar.gz
skyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.tar.bz2
skyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.zip
Backend: Fixed typos everywhere (#2175)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data/model')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt32
3 files changed, 20 insertions, 19 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
index 76c97e662..ab5d1ca2d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt
@@ -60,7 +60,7 @@ value class Graph(
{ reader ->
reader.beginObject()
val list = mutableListOf<GraphNode>()
- val neigbourMap = mutableMapOf<GraphNode, List<Pair<Int, Double>>>()
+ val neighbourMap = mutableMapOf<GraphNode, List<Pair<Int, Double>>>()
while (reader.hasNext()) {
val id = reader.nextName().toInt()
reader.beginObject()
@@ -93,10 +93,10 @@ value class Graph(
}
val node = GraphNode(id, position!!, name)
list.add(node)
- neigbourMap[node] = neighbors
+ neighbourMap[node] = neighbors
reader.endObject()
}
- neigbourMap.forEach { (node, edge) ->
+ neighbourMap.forEach { (node, edge) ->
node.neighbours = edge.associate { (id, distance) ->
list.first { it.id == id } to distance
}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
index 161ec76f5..6fd65778e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
@@ -10,6 +10,7 @@ enum class SkyblockStat(val icon: String) {
DEFENSE("§a❈"),
STRENGTH("§c❁"),
INTELLIGENCE("§b✎"),
+
CRIT_DAMAGE("§9☠"),
CRIT_CHANCE("§9☣"),
FEROCITY("§c⫽"),
diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
index 22ac4982b..f1a5001ad 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt
@@ -75,23 +75,23 @@ class TextInput {
}
return
}
- val tcarriage = carriage
+ val carriage = carriage
if (Keyboard.KEY_LEFT.isKeyClicked()) {
- carriage = tcarriage?.moveCarriageLeft() ?: (textBox.length - 1)
+ this.carriage = carriage?.moveCarriageLeft() ?: (textBox.length - 1)
return
}
if (Keyboard.KEY_RIGHT.isKeyClicked()) {
- carriage = when {
- tcarriage == null -> null
- (tcarriage >= textBox.length - 1) -> null
- else -> moveCarriageRight(tcarriage)
+ this.carriage = when {
+ carriage == null -> null
+ (carriage >= textBox.length - 1) -> null
+ else -> moveCarriageRight(carriage)
}
return
}
if (Keyboard.KEY_DELETE.isKeyClicked()) { // Does not work for some reason
- if (tcarriage != null) {
- textBox.removeRange(tcarriage, tcarriage + 1)
+ if (carriage != null) {
+ textBox.removeRange(carriage, carriage + 1)
} else {
textBox.dropLast(1)
}
@@ -103,27 +103,27 @@ class TextInput {
val char = Keyboard.getEventCharacter()
textBox = when (char) {
Char(0) -> return
- '\b' -> if (tcarriage != null) {
- if (tcarriage == 0) {
+ '\b' -> if (carriage != null) {
+ if (carriage == 0) {
textBox.substring(1)
} else {
- carriage = tcarriage.minus(1)
- textBox.removeRange(tcarriage - 1, tcarriage)
+ this.carriage = carriage.minus(1)
+ textBox.removeRange(carriage - 1, carriage)
}
} else {
textBox.dropLast(1)
}
- else -> if (tcarriage != null) {
- carriage = tcarriage + 1
- textBox.insert(tcarriage, char)
+ else -> if (carriage != null) {
+ this.carriage = carriage + 1
+ textBox.insert(carriage, char)
} else {
textBox + char
}
}
}
- private fun moveCarriageRight(tcarriage: Int) = tcarriage + 1
+ private fun moveCarriageRight(carriage: Int) = carriage + 1
private fun Int.moveCarriageLeft(): Int = when {
this > 0 -> this - 1