From 36cddf8abb8368dd0bfc2b7dff15a5bf110871dc Mon Sep 17 00:00:00 2001 From: Collin Date: Mon, 16 Oct 2023 12:54:04 -0400 Subject: [PATCH] add WM 3.0.0 support --- build.gradle.kts | 6 +++--- src/main/java/com/cjcrafter/armormechanics/ArmorSet.kt | 4 ++-- .../java/com/cjcrafter/armormechanics/commands/Command.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9f530bf..a8306e9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -60,9 +60,9 @@ repositories { dependencies { compileOnly("org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT") - implementation("io.lumine:Mythic-Dist:5.0.1-SNAPSHOT") - compileOnly("me.deecaad:mechanicscore:2.5.0-SNAPSHOT2") - compileOnly("me.deecaad:weaponmechanics:2.7.0-SNAPSHOT2") + compileOnly("io.lumine:Mythic-Dist:5.0.1-SNAPSHOT") + compileOnly("me.deecaad:mechanicscore:3.0.0") + compileOnly("me.deecaad:weaponmechanics:3.0.0") implementation("org.bstats:bstats-bukkit:3.0.1") implementation("me.cjcrafter:mechanicsautodownload:1.1.2") } diff --git a/src/main/java/com/cjcrafter/armormechanics/ArmorSet.kt b/src/main/java/com/cjcrafter/armormechanics/ArmorSet.kt index aa06594..c156d7d 100644 --- a/src/main/java/com/cjcrafter/armormechanics/ArmorSet.kt +++ b/src/main/java/com/cjcrafter/armormechanics/ArmorSet.kt @@ -31,7 +31,7 @@ class ArmorSet : Serializer { val options: Set = ArmorMechanics.INSTANCE.armors.keys var allNull = true for (i in temp.indices) { - val key = temp[i] + val key = temp[i]!! // The title is allowed to be null, since a user may want to have a // set of armor that doesn't include, for example, a helmet. @@ -63,7 +63,7 @@ class ArmorSet : Serializer { ) } - val bonus = data.of("Bonus_Effects").assertExists().serialize(BonusEffect::class.java) + val bonus = data.of("Bonus_Effects").assertExists().serialize(BonusEffect::class.java)!! ArmorMechanics.INSTANCE.effects[data.key] = bonus val set = ArmorSet(bonus, temp[0], temp[1], temp[2], temp[3]) ArmorMechanics.INSTANCE.sets[data.key] = set diff --git a/src/main/java/com/cjcrafter/armormechanics/commands/Command.kt b/src/main/java/com/cjcrafter/armormechanics/commands/Command.kt index d8cce85..4bc78e2 100644 --- a/src/main/java/com/cjcrafter/armormechanics/commands/Command.kt +++ b/src/main/java/com/cjcrafter/armormechanics/commands/Command.kt @@ -155,7 +155,7 @@ object Command { command.register() } - fun give(sender: CommandSender, entities: List, title: String?, data: Map) { + fun give(sender: CommandSender, entities: List, title: String, data: Map) { // Since we want to ignore spelling/capitalization errors, we should // make sure the given 'title' matches to an actual armor-title.