Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-20 10:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Javalin to 5.5.0 & Fix project warnings

Browse Source
This commit is contained in:
KingRainbow44
2023-05-13 16:40:15 -04:00
parent 5755aa4e6c
commit 9322c288ac
12 changed files with 71 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/emu/grasscutter/game/avatar/Avatar.java
View File

@@ -1,15 +1,14 @@
package emu.grasscutter.game.avatar;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import dev.morphia.annotations.*;
import emu.grasscutter.GameConstants;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.OpenConfigEntry;
import emu.grasscutter.data.binout.OpenConfigEntry.SkillPointModifier;
import emu.grasscutter.data.common.FightPropData;
import emu.grasscutter.data.excels.*;
import emu.grasscutter.data.excels.EquipAffixData;
import emu.grasscutter.data.excels.ItemData.WeaponProperty;
import emu.grasscutter.data.excels.ProudSkillData;
import emu.grasscutter.data.excels.avatar.AvatarData;
import emu.grasscutter.data.excels.avatar.AvatarSkillData;
import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
@@ -41,16 +40,19 @@ import emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.TrialAvatarInfo;
import emu.grasscutter.server.packet.send.*;
import emu.grasscutter.utils.ProtoHelper;
import it.unimi.dsi.fastutil.ints.*;
import java.util.*;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import lombok.val;
import org.bson.types.ObjectId;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.*;
import java.util.stream.Stream;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
@Entity(value = "avatars", useDiscriminator = false)
public class Avatar {
@Transient @Getter private final Int2ObjectMap<GameItem> equips;
@@ -316,7 +318,7 @@ public class Avatar {
var candSkillDepotId = candSkillDepotIdsList.get(candSkillDepotIndex);
// Sanity checks for skill depots
val skillDepot = GameData.getAvatarSkillDepotDataMap().get(candSkillDepotId);
val skillDepot = GameData.getAvatarSkillDepotDataMap().get((int) candSkillDepotId);
if (skillDepot == null || skillDepot.getId() == skillDepotId) {
return false;
}

1
src/main/java/emu/grasscutter/game/drop/DropInfo.java
View File

@@ -2,6 +2,7 @@ package emu.grasscutter.game.drop;
import java.util.List;
@SuppressWarnings("deprecation")
public class DropInfo {
private int monsterId;
private List<DropData> dropDataList;

1
src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
View File

@@ -19,6 +19,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import java.util.List;
@SuppressWarnings("deprecation")
public class DropSystemLegacy extends BaseGameSystem {
private final Int2ObjectMap<List<DropData>> dropData;

9
src/main/java/emu/grasscutter/game/managers/blossom/BlossomActivity.java
View File

@@ -107,9 +107,12 @@ public final class BlossomActivity {
}
generatedCount += willSpawn;
for (int i = 0; i < willSpawn; i++) {
var monsterData = GameData.getMonsterDataMap().get(candidateMonsters.poll());
int level = scene.getEntityLevel(1, worldLevelOverride);
EntityMonster entity = new EntityMonster(scene, monsterData, pos.nearby2d(4f), level);
var entry = candidateMonsters.poll();
if (entry == null) continue;
var monsterData = GameData.getMonsterDataMap().get((int) entry);
var level = scene.getEntityLevel(1, worldLevelOverride);
var entity = new EntityMonster(scene, monsterData, pos.nearby2d(4f), level);
scene.addEntity(entity);
newMonsters.add(entity);
}