Some randomness improvements

Author: Malfrador

build.gradle.kts

@@ -21,7 +21,7 @@ java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
-val papyrusVersion = "1.21.7-R0.1-SNAPSHOT"
+val papyrusVersion = "1.21.8-R0.1-SNAPSHOT"
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
 
 dependencies {

src/main/java/de/erethon/aether/combat/SpellCastEntry.java

@@ -2,6 +2,8 @@
 
 import de.erethon.aether.Aether;
 import de.erethon.spellbook.api.SpellData;
+import de.erethon.spellbook.api.SpellLibrary;
+import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 
 public class SpellCastEntry {
@@ -10,7 +12,7 @@ public class SpellCastEntry {
     private SpellData spell;
     private double chance;
 
-    //private SpellLibrary library = Bukkit.getServer().getSpellbookAPI().getLibrary();
+    private final SpellLibrary library = Bukkit.getServer().getSpellbookAPI().getLibrary();
 
 
     public boolean canCast() {
@@ -23,7 +25,7 @@ public SpellData getSpell() {
 
     public void load(String loadingID, ConfigurationSection section) {
         name = section.getName();
-        spell = null; //library.getSpellByID(section.getName());
+        spell = library.getSpellByID(section.getName());
         if (spell == null) {
             Aether.addException(loadingID, "Spell not found: " + section.getName(), "Check if the Spellbook spell exists and is loaded", null);
             Aether.log("Spell not found: " + section.getName());

src/main/java/de/erethon/aether/creature/AetherBaseMob.java

@@ -115,10 +115,11 @@ public AetherBaseMob(NPCData data, World world) {
     public AetherBaseMob(NPCData data, World world, Integer overrideLevel) {
         super((EntityType<? extends Monster>) data.getDisplayType(), ((CraftWorld) world).getHandle());
         this.data = data;
+        this.displayType = data.getDisplayType();
 
         if (data.hasLevels()) {
             mobLevel = Objects.requireNonNullElseGet(overrideLevel, data::selectRandomLevel);
-            levelInfo = data.getLevelInfoForLevel(mobLevel);
+            levelInfo = data.getCompositeLevelInfoForLevel(mobLevel);
             Aether.log("Spawned " + data.getID() + " at level " + mobLevel);
         }
 
@@ -573,13 +574,14 @@ public void readAdditionalSaveData(ValueInput input) {
             remove(RemovalReason.DISCARDED);
             return;
         }
+        this.displayType = data.getDisplayType();
         Optional<Integer> papyrusVersion = input.getInt("papyrus-entity-version");
         version = papyrusVersion.orElse(0);
 
         Optional<Integer> savedLevel = input.getInt("aether-mob-level");
         if (savedLevel.isPresent()) {
             mobLevel = savedLevel.get();
-            levelInfo = data.getLevelInfoForLevel(mobLevel);
+            levelInfo = data.getCompositeLevelInfoForLevel(mobLevel);
             Aether.log("Loaded " + data.getID() + " at level " + mobLevel);
         }
 

src/main/java/de/erethon/aether/creature/CreatureManager.java

@@ -74,8 +74,9 @@ public void loadSub(File file) {
             }
             if (f.isDirectory()) {
                 loadSub(f);
+                continue;
             }
-            loadNPCFile(file);
+            loadNPCFile(f);
         }
     }
 

src/main/java/de/erethon/aether/creature/NPCData.java

@@ -795,6 +795,64 @@ public MobLevelInfo getLevelInfoForLevel(int level) {
         return bestLevel != -1 ? levelInfo.get(bestLevel) : null;
     }
 
+    /**
+     * Gets composite level info for a mob level, finding the best available configuration
+     * for each attribute individually. If a specific attribute isn't configured at the
+     * exact level, it falls back to the highest configured level below it.
+     */
+    public MobLevelInfo getCompositeLevelInfoForLevel(int level) {
+        if (levelInfo.isEmpty()) {
+            return null;
+        }
+
+        // Always build composite attribute bonuses by finding best level for each attribute
+        // This ensures attributes "fall through" from lower levels when not defined at higher levels
+        Map<org.bukkit.attribute.Attribute, MobAttributeRange> compositeAttributes = new HashMap<>();
+
+        // Collect all unique attributes across all levels
+        Set<org.bukkit.attribute.Attribute> allAttributes = new HashSet<>();
+        for (MobLevelInfo info : levelInfo.values()) {
+            allAttributes.addAll(info.baseAttributeBonus().keySet());
+        }
+
+        // For each attribute, find the best available level
+        for (org.bukkit.attribute.Attribute attribute : allAttributes) {
+            int bestLevelForAttribute = -1;
+
+            for (int configuredLevel : levelInfo.keySet()) {
+                MobLevelInfo info = levelInfo.get(configuredLevel);
+                // Only consider levels at or below the target level that have this specific attribute
+                if (configuredLevel <= level &&
+                    info.baseAttributeBonus().containsKey(attribute) &&
+                    configuredLevel > bestLevelForAttribute) {
+                    bestLevelForAttribute = configuredLevel;
+                }
+            }
+
+            if (bestLevelForAttribute != -1) {
+                MobLevelInfo bestInfo = levelInfo.get(bestLevelForAttribute);
+                compositeAttributes.put(attribute, bestInfo.baseAttributeBonus().get(attribute));
+                Aether.log("Using level " + bestLevelForAttribute + " configuration for attribute " +
+                          attribute.getKey() + " on mob level " + level);
+            }
+        }
+
+        // For loot, use the highest configured level at or below the target level
+        MobLevelLoot compositeLoot = null;
+        int bestLootLevel = -1;
+        for (int configuredLevel : levelInfo.keySet()) {
+            if (configuredLevel <= level && configuredLevel > bestLootLevel) {
+                MobLevelInfo info = levelInfo.get(configuredLevel);
+                if (info.loot() != null) {
+                    bestLootLevel = configuredLevel;
+                    compositeLoot = info.loot();
+                }
+            }
+        }
+
+        return new MobLevelInfo(level, compositeAttributes, compositeLoot);
+    }
+
     @Override
     public String toString() {
         return "NPCData{" +