feat: updated java version to 17

feat: updated kotlin version to 2.1.0
feat: reimplemented enchantment tiers into enchantment groups, migrating their configuration from being hard-coded to toml-based
feat: implemented automated enchantment files discovery
fix: removed perks enchantment group
chore: updated package dependencies
chore: bumped the version to 2.0.2

Author: onerdna

android/app/build.gradle

@@ -10,12 +10,12 @@ android {
     ndkVersion = "27.0.12077973"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {

android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version '8.9.1' apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include("app")

assets/enchantments/medium.toml

@@ -1,4 +1,8 @@
-tier = "medium"
+[group]
+id = "medium"
+displayName = "Medium"
+color = "0xFFE6521F"
+order = 1
 
 [shockingStrike]
 name = "Shocking Strike"

assets/enchantments/mythical.toml

@@ -1,4 +1,9 @@
-tier = "mythical"
+[group]
+id = "mythical"
+displayName = "Mythical"
+color = "0xFF441752"
+order = 2
+hasAspect = false
 
 [stone_fetters]
 name = "Stone Fetters"

assets/enchantments/perk.toml

@@ -1,4 +1,8 @@
-tier = "simple"
+[group]
+id = "simple"
+displayName = "Simple"
+color = "0xFF254D70"
+order = 0
 
 [critical_protection]
 name = "Critical Protection"

assets/enchantments/simple.toml

@@ -23,82 +23,55 @@ import 'package:stalker/logic/equipment_type.dart';
 import 'package:toml/toml.dart';
 import 'package:xml/xml.dart';
 
-enum EnchantmentTier { simple, medium, mythical, perk }
-
-extension EnchantmentTierExtension on EnchantmentTier {
-  int get color {
-    switch (this) {
-      case EnchantmentTier.simple:
-        return 0xFF254D70;
-      case EnchantmentTier.medium:
-        return 0xFFE6521F;
-      case EnchantmentTier.mythical:
-        return 0xFF441752;
-      case EnchantmentTier.perk:
-        return 0xFFB45253;
-    }
-  }
+class EnchantmentGroup {
+  final String id;
+  final String displayName;
+  final int color;
+  final int order;
+  final bool hasAspect;
 
-  String get recipeDeliveryName {
-    switch (this) {
-      case EnchantmentTier.simple:
-        return "Simple";
-      case EnchantmentTier.medium:
-        return "Medium";
-      case EnchantmentTier.mythical:
-        return "Mythical"; // either Mythical or Mythic, not tested
-      case EnchantmentTier.perk:
-        return "";
-    }
-  }
+  EnchantmentGroup(this.id, this.displayName, this.color, this.order, this.hasAspect);
 
-  static EnchantmentTier? tierFromRecipeName(String recipeDeliveryName) {
-    return EnchantmentTier.values
-        .where((c) => c.recipeDeliveryName == recipeDeliveryName)
-        .firstOrNull;
+  factory EnchantmentGroup.fromToml(Map<String, dynamic> tomlMap) {
+    return EnchantmentGroup(tomlMap["id"], tomlMap["displayName"],
+        int.parse(tomlMap["color"]), tomlMap["order"], tomlMap["hasAspect"] ?? true);
   }
 }
 
 class Enchantment {
   final String name;
   final String id;
   final String? description;
-  final EnchantmentTier tier;
   final Map<EquipmentType, String> ids;
+  final EnchantmentGroup group;
 
-  const Enchantment(this.name, this.id, this.description, this.tier, this.ids);
+  const Enchantment(this.name, this.id, this.description, this.ids, this.group);
 
   factory Enchantment.fromToml(
-      MapEntry<String, dynamic> entry, EnchantmentTier tier) {
-    if (tier == EnchantmentTier.mythical || tier == EnchantmentTier.perk) {
+      MapEntry<String, dynamic> entry, EnchantmentGroup group) {
+    if (entry.value.containsKey("id")) {
       final id = entry.value["id"] as String;
       return Enchantment(
-        entry.value["name"] as String,
-        entry.key,
-        entry.value["description"] as String?,
-        tier,
-        {
-          EquipmentType.weapon: id,
-          EquipmentType.ranged: id,
-          EquipmentType.magic: id,
-          EquipmentType.armor: id,
-          EquipmentType.helm: id,
-        },
-      );
+          entry.value["name"] as String,
+          entry.key,
+          entry.value["description"] as String?,
+          {
+            EquipmentType.weapon: id,
+            EquipmentType.ranged: id,
+            EquipmentType.magic: id,
+            EquipmentType.armor: id,
+            EquipmentType.helm: id,
+          },
+          group);
     } else {
       final equipmentIdsRaw =
           entry.value["equipment_ids"] as Map<String, dynamic>;
       final equipmentIds = equipmentIdsRaw.map(
         (k, v) => MapEntry(EquipmentType.values.byName(k), v as String),
       );
 
-      return Enchantment(
-        entry.value["name"] as String,
-        entry.key,
-        entry.value["description"] as String?,
-        tier,
-        equipmentIds,
-      );
+      return Enchantment(entry.value["name"] as String, entry.key,
+          entry.value["description"] as String?, equipmentIds, group);
     }
   }
 
@@ -107,9 +80,11 @@ class Enchantment {
 
 class EnchantmentsManager {
   static List<Enchantment> enchantments = [];
+  static List<EnchantmentGroup> groups = [];
 
   static Future<void> loadFromFiles() async {
     enchantments.clear();
+    groups.clear();
     final manifestContent = await rootBundle.loadString('AssetManifest.json');
     final Map<String, dynamic> manifestMap = json.decode(manifestContent);
 
@@ -118,13 +93,14 @@ class EnchantmentsManager {
         .toList()) {
       final tomlString = await rootBundle.loadString(file);
       final tomlMap = TomlDocument.parse(tomlString).toMap();
-      final tier = EnchantmentTier.values.byName(tomlMap["tier"]);
-      tomlMap.remove("tier");
+      final group = EnchantmentGroup.fromToml(tomlMap["group"]);
+      tomlMap.remove("group");
+      groups.add(group);
       enchantments.addAll(tomlMap.entries.map((e) {
-        final id = e.key;
         final data = e.value as Map<String, dynamic>;
-        return Enchantment.fromToml(MapEntry(id, data), tier);
+        return Enchantment.fromToml(MapEntry(e.key, data), group);
       }));
+      groups.sort((a, b) => a.order.compareTo(b.order));
     }
   }
 

lib/logic/enchantment.dart

@@ -40,9 +40,18 @@ class UpgradeDelivery {
   }
 }
 
+enum RecipeEnchantmentTier {
+  simple("Simple"),
+  medium("Medium"),
+  mythical("Mythical");
+
+  final String name;
+  const RecipeEnchantmentTier(this.name);
+}
+
 class RecipeDelivery {
   DateTime time = DateTime.fromMillisecondsSinceEpoch(0);
-  late EnchantmentTier tier;
+  late RecipeEnchantmentTier tier;
   int itemLevel = 0;
   int playerLevel = 0;
 
@@ -52,7 +61,7 @@ class RecipeDelivery {
     time = DateTime.fromMillisecondsSinceEpoch(int.parse(deliveryTime) * 1000);
     this.itemLevel = int.parse(itemLevel);
     this.playerLevel = int.parse(playerLevel);
-    this.tier = EnchantmentTierExtension.tierFromRecipeName(tier)!;
+    this.tier = RecipeEnchantmentTier.values.firstWhere((e) => e.name == tier);
   }
 }
 
@@ -66,7 +75,7 @@ class Equipment {
   int upgrade = 0;
   UpgradeDelivery? upgradeDelivery;
   RecipeDelivery? recipeDelivery;
-  
+
   static const minLevel = 1;
   static const maxLevel = 52;
   static const minUpgrade = 0;
@@ -104,8 +113,7 @@ class Equipment {
             enchantments.map((e) => e.toXml(type))),
       if (recipeDelivery != null)
         XmlElement(XmlName("RecipeDelivery"), [
-          XmlAttribute(
-              XmlName("Name"), recipeDelivery!.tier.recipeDeliveryName),
+          XmlAttribute(XmlName("Name"), recipeDelivery!.tier.name),
           XmlAttribute(
               XmlName("ItemLevel"), recipeDelivery!.itemLevel.toString()),
           XmlAttribute(