Run IntelliJ IDEA code formatter

This commit is contained in:
KingRainbow44
2023-03-31 17:19:26 -04:00
parent 5bf5fb07a2
commit 15e2f3ca34
917 changed files with 30030 additions and 22446 deletions

View File

@@ -1,25 +1,25 @@
package emu.grasscutter.game.tower;
import java.util.Map;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Transient;
@Entity
public class TowerData{
/**
* the floor players chose
*/
int currentFloorId;
int currentLevel;
@Transient
int currentLevelId;
/**
* floorId - Record
*/
Map<Integer, TowerLevelRecord> recordMap;
@Transient
int entryScene;
}
package emu.grasscutter.game.tower;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Transient;
import java.util.Map;
@Entity
public class TowerData {
/**
* the floor players chose
*/
int currentFloorId;
int currentLevel;
@Transient
int currentLevelId;
/**
* floorId - Record
*/
Map<Integer, TowerLevelRecord> recordMap;
@Transient
int entryScene;
}

View File

@@ -18,7 +18,17 @@ public class TowerLevelRecord {
private int floorStarRewardProgress;
public TowerLevelRecord setLevelStars(int levelId, int stars){
public TowerLevelRecord() {
}
public TowerLevelRecord(int floorId) {
this.floorId = floorId;
this.passedLevelMap = new HashMap<>();
this.floorStarRewardProgress = 0;
}
public TowerLevelRecord setLevelStars(int levelId, int stars) {
passedLevelMap.put(levelId, stars);
return this;
}
@@ -27,16 +37,6 @@ public class TowerLevelRecord {
return passedLevelMap.values().stream().mapToInt(Integer::intValue).sum();
}
public TowerLevelRecord(){
}
public TowerLevelRecord(int floorId){
this.floorId = floorId;
this.passedLevelMap = new HashMap<>();
this.floorStarRewardProgress = 0;
}
public int getFloorId() {
return floorId;
}

View File

@@ -14,6 +14,8 @@ import java.util.Map;
public class TowerManager extends BasePlayerManager {
private static final List<DungeonSettleListener> towerDungeonSettleListener = List.of(new TowerDungeonSettleListener());
public TowerManager(Player player) {
super(player);
}
@@ -36,11 +38,10 @@ public class TowerManager extends BasePlayerManager {
public int getCurrentLevel() {
return getTowerData().currentLevel + 1;
}
private static final List<DungeonSettleListener> towerDungeonSettleListener = List.of(new TowerDungeonSettleListener());
public Map<Integer, TowerLevelRecord> getRecordMap() {
Map<Integer, TowerLevelRecord> recordMap = getTowerData().recordMap;
if (recordMap == null || recordMap.size()==0) {
if (recordMap == null || recordMap.size() == 0) {
recordMap = new HashMap<>();
recordMap.put(1001, new TowerLevelRecord(1001));
getTowerData().recordMap = recordMap;
@@ -53,10 +54,10 @@ public class TowerManager extends BasePlayerManager {
getTowerData().currentFloorId = floorData.getFloorId();
getTowerData().currentLevel = 0;
getTowerData().currentLevelId = GameData.getTowerLevelDataMap().values().stream()
.filter(x -> x.getLevelGroupId() == floorData.getLevelGroupId() && x.getLevelIndex() == 1)
.findFirst()
.map(TowerLevelData::getId)
.orElse(0);
.filter(x -> x.getLevelGroupId() == floorData.getLevelGroupId() && x.getLevelIndex() == 1)
.findFirst()
.map(TowerLevelData::getId)
.orElse(0);
if (getTowerData().entryScene == 0) {
getTowerData().entryScene = player.getSceneId();
@@ -75,7 +76,7 @@ public class TowerManager extends BasePlayerManager {
// use team user choose
player.getTeamManager().useTemporaryTeam(0);
player.getServer().getDungeonSystem().handoffDungeon(player, dungeonId,
towerDungeonSettleListener);
towerDungeonSettleListener);
// make sure user can exit dungeon correctly
player.getScene().setPrevScene(getTowerData().entryScene);
@@ -91,15 +92,16 @@ public class TowerManager extends BasePlayerManager {
public void notifyCurLevelRecordChange() {
player.getSession().send(new PacketTowerCurLevelRecordChangeNotify(getTowerData().currentFloorId, getCurrentLevel()));
}
public void notifyCurLevelRecordChangeWhenDone(int stars) {
Map<Integer, TowerLevelRecord> recordMap = getRecordMap();
int currentFloorId = getTowerData().currentFloorId;
if (!recordMap.containsKey(currentFloorId)) {
recordMap.put(currentFloorId,
new TowerLevelRecord(currentFloorId).setLevelStars(getCurrentLevelId(),stars));
}else {
new TowerLevelRecord(currentFloorId).setLevelStars(getCurrentLevelId(), stars));
} else {
recordMap.put(currentFloorId,
recordMap.get(currentFloorId).setLevelStars(getCurrentLevelId(),stars));
recordMap.get(currentFloorId).setLevelStars(getCurrentLevelId(), stars));
}
getTowerData().currentLevel++;
@@ -109,16 +111,19 @@ public class TowerManager extends BasePlayerManager {
var nextFloorId = this.getNextFloorId();
recordMap.computeIfAbsent(nextFloorId, TowerLevelRecord::new);
player.getSession().send(new PacketTowerCurLevelRecordChangeNotify(nextFloorId, 1));
}else {
} else {
player.getSession().send(new PacketTowerCurLevelRecordChangeNotify(currentFloorId, getCurrentLevel()));
}
}
public boolean hasNextLevel() {
return getTowerData().currentLevel < 3;
}
public int getNextFloorId() {
return player.getServer().getTowerSystem().getNextFloorId(getTowerData().currentFloorId);
}
public boolean hasNextFloor() {
return player.getServer().getTowerSystem().getNextFloorId(getTowerData().currentFloorId) > 0;
}
@@ -133,7 +138,7 @@ public class TowerManager extends BasePlayerManager {
return false;
}
return recordMap.get(player.getServer().getTowerSystem().getLastEntranceFloor())
.getStarCount() >= 6;
.getStarCount() >= 6;
}
public void mirrorTeamSetUp(int teamId) {

View File

@@ -12,13 +12,13 @@ import java.util.List;
public class TowerSystem extends BaseGameSystem {
private TowerScheduleConfig towerScheduleConfig;
public TowerSystem(GameServer server) {
super(server);
this.load();
}
private TowerScheduleConfig towerScheduleConfig;
public synchronized void load() {
try {
towerScheduleConfig = DataLoader.loadClass("TowerSchedule.json", TowerScheduleConfig.class);
@@ -35,7 +35,7 @@ public class TowerSystem extends BaseGameSystem {
var data = GameData.getTowerScheduleDataMap().get(towerScheduleConfig.getScheduleId());
if (data == null) {
Grasscutter.getLogger().error("Could not get current tower schedule data by schedule id {}, please check your resource files",
towerScheduleConfig.getScheduleId());
towerScheduleConfig.getScheduleId());
}
return data;
@@ -57,13 +57,13 @@ public class TowerSystem extends BaseGameSystem {
var nextId = 0;
// find in entrance floors first
for (int i=0;i<entranceFloors.size()-1;i++) {
for (int i = 0; i < entranceFloors.size() - 1; i++) {
if (floorId == entranceFloors.get(i)) {
nextId = entranceFloors.get(i+1);
nextId = entranceFloors.get(i + 1);
}
}
if (floorId == entranceFloors.get(entranceFloors.size()-1)) {
if (floorId == entranceFloors.get(entranceFloors.size() - 1)) {
nextId = scheduleFloors.get(0);
}
@@ -72,11 +72,12 @@ public class TowerSystem extends BaseGameSystem {
}
// find in schedule floors
for (int i=0; i < scheduleFloors.size() - 1; i++) {
for (int i = 0; i < scheduleFloors.size() - 1; i++) {
if (floorId == scheduleFloors.get(i)) {
nextId = scheduleFloors.get(i + 1);
}
}return nextId;
}
return nextId;
}
public Integer getLastEntranceFloor() {