Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-02-07 18:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run spotlessApply

Browse Source 
also set line endings to native, no more line conflict errors!
This commit is contained in:
KingRainbow44
2023-05-02 14:00:00 +01:00
parent 4f1136ce2d
commit d32f6982be
1426 changed files with 1307544 additions and 1212706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/emu/grasscutter/data/GameData.java
View File

@@ -297,12 +297,11 @@ public final class GameData {
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<QuestData> questDataMap =
new Int2ObjectOpenHashMap<>();
private static final Int2ObjectMap<QuestData> questDataMap = new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<QuestGlobalVarData> questGlobalVarDataMap =
new Int2ObjectOpenHashMap<>();
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<ReliquaryAffixData> reliquaryAffixDataMap =
@@ -324,12 +323,11 @@ public final class GameData {
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<SceneData> sceneDataMap =
new Int2ObjectLinkedOpenHashMap<>();
private static final Int2ObjectMap<SceneData> sceneDataMap = new Int2ObjectLinkedOpenHashMap<>();
@Getter
private static final Int2ObjectMap<TalkConfigData> talkConfigDataMap =
new Int2ObjectOpenHashMap<>();
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<TowerFloorData> towerFloorDataMap =

16
src/main/java/emu/grasscutter/data/ResourceLoader.java
View File

@@ -490,14 +490,16 @@ public final class ResourceLoader {
private static void loadQuests() {
try (var files = Files.list(getResourcePath("BinOutput/Quest/"))) {
files.forEach(path -> {
try {
val mainQuest = JsonUtils.loadToClass(path, MainQuestData.class);
GameData.getMainQuestDataMap().put(mainQuest.getId(), mainQuest);
files.forEach(
path -> {
try {
val mainQuest = JsonUtils.loadToClass(path, MainQuestData.class);
GameData.getMainQuestDataMap().put(mainQuest.getId(), mainQuest);
mainQuest.onLoad(); // Load the quest data.
} catch (IOException ignored) { }
});
mainQuest.onLoad(); // Load the quest data.
} catch (IOException ignored) {
}
});
} catch (IOException e) {
Grasscutter.getLogger().error("Quest data missing");
return;

21
src/main/java/emu/grasscutter/data/binout/MainQuestData.java
View File

@@ -3,12 +3,10 @@ package emu.grasscutter.data.binout;
import dev.morphia.annotations.Entity;
import emu.grasscutter.data.GameData;
import emu.grasscutter.game.quest.enums.QuestType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import lombok.Data;
public class MainQuestData {
@@ -61,19 +59,20 @@ public class MainQuestData {
if (this.talks == null) this.talks = new ArrayList<>();
if (this.subQuests == null) this.subQuests = new SubQuestData[0];
this.talks = this.talks.stream()
.filter(Objects::nonNull).toList();
this.talks = this.talks.stream().filter(Objects::nonNull).toList();
// Apply talk data to the quest talk map.
this.talks.forEach(talkData -> GameData.getQuestTalkMap().put(
talkData.getId(), this.getId()));
this.talks.forEach(talkData -> GameData.getQuestTalkMap().put(talkData.getId(), this.getId()));
// Apply additional sub-quest data to sub-quests.
Arrays.stream(this.subQuests).forEach(quest -> {
var questData = GameData.getQuestDataMap().get(quest.getSubId());
if (questData != null) questData.applyFrom(quest);
});
Arrays.stream(this.subQuests)
.forEach(
quest -> {
var questData = GameData.getQuestDataMap().get(quest.getSubId());
if (questData != null) questData.applyFrom(quest);
});
}
@Data public static class SubQuestData {
@Data
public static class SubQuestData {
private int subId;
private int order;
private boolean isMpBlock;

2
src/main/java/emu/grasscutter/data/binout/config/ConfigEntityGadget.java
View File

@@ -2,9 +2,11 @@ package emu.grasscutter.data.binout.config;
import lombok.AccessLevel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.FieldDefaults;
@Data
@EqualsAndHashCode(callSuper = true)
@FieldDefaults(level = AccessLevel.PRIVATE)
public class ConfigEntityGadget extends ConfigEntityBase {
// There are more values that can be added that might be useful in the json

2
src/main/java/emu/grasscutter/data/binout/config/ConfigEntityMonster.java
View File

@@ -1,6 +1,8 @@
package emu.grasscutter.data.binout.config;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class ConfigEntityMonster extends ConfigEntityBase {}

7
src/main/java/emu/grasscutter/data/excels/ChapterData.java
View File

@@ -9,13 +9,12 @@ import lombok.Getter;
@Getter
@ResourceType(name = "ChapterExcelConfigData.json")
public class ChapterData extends GameResource {
@Getter private static final Map<Integer, ChapterData> beginQuestChapterMap
= new HashMap<>();
@Getter private static final Map<Integer, ChapterData> endQuestChapterMap
= new HashMap<>();
@Getter private static final Map<Integer, ChapterData> beginQuestChapterMap = new HashMap<>();
@Getter private static final Map<Integer, ChapterData> endQuestChapterMap = new HashMap<>();
@Getter(onMethod_ = @Override)
private int id;
private int beginQuestId;
private int endQuestId;
private int needPlayerLevel;

38
src/main/java/emu/grasscutter/data/excels/TalkConfigData.java
View File

@@ -1,37 +1,49 @@
package emu.grasscutter.data.excels;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.game.talk.TalkExec;
import lombok.*;
import com.google.gson.annotations.SerializedName;
import java.util.List;
import lombok.*;
@ResourceType(name = "TalkExcelConfigData.json")
@EqualsAndHashCode(callSuper=false)
@EqualsAndHashCode(callSuper = false)
@Data
public final class TalkConfigData extends GameResource {
@SerializedName(value="id", alternate={"_id"})
@SerializedName(
value = "id",
alternate = {"_id"})
private int id;
@SerializedName(value="finishExec", alternate={"_finishExec"})
@SerializedName(
value = "finishExec",
alternate = {"_finishExec"})
private List<TalkExecParam> finishExec;
@SerializedName(value="questId", alternate={"_questId"})
@SerializedName(
value = "questId",
alternate = {"_questId"})
private int questId;
@Override
public void onLoad() {
this.finishExec = this.finishExec == null ? List.of() :
this.finishExec.stream()
.filter(x -> x.getType() != null)
.toList();
this.finishExec =
this.finishExec == null
? List.of()
: this.finishExec.stream().filter(x -> x.getType() != null).toList();
}
@Data
public static class TalkExecParam {
@SerializedName(value="type", alternate={"_type"})
@SerializedName(
value = "type",
alternate = {"_type"})
private TalkExec type;
@SerializedName(value="param", alternate={"_param"})
@SerializedName(
value = "param",
alternate = {"_param"})
private String[] param;
}
}

28
src/main/java/emu/grasscutter/data/excels/quest/QuestData.java
View File

@@ -110,13 +110,19 @@ public class QuestData extends GameResource {
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
public static class QuestExecParam {
@SerializedName(value = "_type", alternate = {"type"})
@SerializedName(
value = "_type",
alternate = {"type"})
QuestExec type;
@SerializedName(value = "_param", alternate = {"param"})
@SerializedName(
value = "_param",
alternate = {"param"})
String[] param;
@SerializedName(value = "_count", alternate = {"count"})
@SerializedName(
value = "_count",
alternate = {"count"})
String count;
}
@@ -126,16 +132,24 @@ public class QuestData extends GameResource {
@Data
public static class QuestCondition<TYPE extends Enum<?> & QuestTrigger> {
@SerializedName(value = "_type", alternate = {"type"})
@SerializedName(
value = "_type",
alternate = {"type"})
private TYPE type;
@SerializedName(value = "_param", alternate = {"param"})
@SerializedName(
value = "_param",
alternate = {"param"})
private int[] param;
@SerializedName(value = "_param_str", alternate = {"param_str"})
@SerializedName(
value = "_param_str",
alternate = {"param_str"})
private String paramStr = "";
@SerializedName(value = "_count", alternate = {"count"})
@SerializedName(
value = "_count",
alternate = {"count"})
private int count;
public String asKey() {

2
src/main/java/emu/grasscutter/data/excels/quest/QuestGlobalVarData.java
View File

@@ -6,7 +6,7 @@ import lombok.*;
import lombok.experimental.FieldDefaults;
@ResourceType(name = "QuestGlobalVarConfigData.json")
@EqualsAndHashCode(callSuper=false)
@EqualsAndHashCode(callSuper = false)
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
public final class QuestGlobalVarData extends GameResource {