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
This commit is contained in:
KingRainbow44
2023-04-18 17:17:55 -04:00
parent 75f163f704
commit ee298235c2
44 changed files with 598 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,26 +189,33 @@ public final class GameData {
@Getter
private static final Int2ObjectMap<CookRecipeData> cookRecipeDataMap =
new Int2ObjectOpenHashMap<>();
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<CompoundData> compoundDataMap = new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<DailyDungeonData> dailyDungeonDataMap =
new Int2ObjectOpenHashMap<>();
@Getter private static final Int2ObjectMap<DropTableData> dropTableDataMap = new Int2ObjectOpenHashMap<>();
@Getter private static final Int2ObjectMap<DropMaterialData> dropMaterialDataMap = new Int2ObjectOpenHashMap<>();
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<DropTableData> dropTableDataMap =
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<DropMaterialData> dropMaterialDataMap =
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<DungeonData> dungeonDataMap = new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<DungeonEntryData> dungeonEntryDataMap =
new Int2ObjectOpenHashMap<>();
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<EnvAnimalGatherConfigData> envAnimalGatherConfigDataMap =
new Int2ObjectOpenHashMap<>();
new Int2ObjectOpenHashMap<>();
@Getter
private static final Int2ObjectMap<EquipAffixData> equipAffixDataMap =

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

@@ -44,11 +44,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.val;
import org.reflections.Reflections;
import javax.script.Bindings;
import javax.script.CompiledScript;
import lombok.val;
import org.reflections.Reflections;
public final class ResourceLoader {
@@ -666,27 +665,31 @@ public final class ResourceLoader {
val pattern = Pattern.compile("ConfigLevelEntity_(.+?)\\.json");
try {
var stream = Files.newDirectoryStream(getResourcePath("BinOutput/LevelEntity/"), "ConfigLevelEntity_*.json");
stream.forEach(path -> {
val matcher = pattern.matcher(path.getFileName().toString());
if (!matcher.find()) return;
Map<String, ConfigLevelEntity> config;
var stream =
Files.newDirectoryStream(
getResourcePath("BinOutput/LevelEntity/"), "ConfigLevelEntity_*.json");
stream.forEach(
path -> {
val matcher = pattern.matcher(path.getFileName().toString());
if (!matcher.find()) return;
Map<String, ConfigLevelEntity> config;
try {
config = JsonUtils.loadToMap(path, String.class, ConfigLevelEntity.class);
} catch (Exception e) {
Grasscutter.getLogger().error("Error loading player ability embryos:", e);
return;
}
GameData.getConfigLevelEntityDataMap().putAll(config);
});
try {
config = JsonUtils.loadToMap(path, String.class, ConfigLevelEntity.class);
} catch (Exception e) {
Grasscutter.getLogger().error("Error loading player ability embryos:", e);
return;
}
GameData.getConfigLevelEntityDataMap().putAll(config);
});
stream.close();
} catch (IOException e) {
Grasscutter.getLogger().error("Error loading config level entity: no files found");
return;
}
if (GameData.getConfigLevelEntityDataMap() == null || GameData.getConfigLevelEntityDataMap().isEmpty()) {
if (GameData.getConfigLevelEntityDataMap() == null
|| GameData.getConfigLevelEntityDataMap().isEmpty()) {
Grasscutter.getLogger().error("No config level entity loaded!");
return;
}
@@ -698,33 +701,52 @@ public final class ResourceLoader {
try {
var bindings = ScriptLoader.getEngine().createBindings();
var stream = Files.newDirectoryStream(getResourcePath("Scripts/Quest/Share/"), "Q*ShareConfig.lua");
stream.forEach(path -> {
val matcher = pattern.matcher(path.getFileName().toString());
if (!matcher.find()) return;
var stream =
Files.newDirectoryStream(getResourcePath("Scripts/Quest/Share/"), "Q*ShareConfig.lua");
stream.forEach(
path -> {
val matcher = pattern.matcher(path.getFileName().toString());
if (!matcher.find()) return;
var cs = ScriptLoader.getScript("Quest/Share/" + path.getFileName().toString());
if (cs == null) return;
var cs = ScriptLoader.getScript("Quest/Share/" + path.getFileName().toString());
if (cs == null) return;
try{
cs.eval(bindings);
// these are Map<String, class>
var teleportDataMap = ScriptLoader.getSerializer().toMap(TeleportData.class, bindings.get("quest_data"));
var rewindDataMap = ScriptLoader.getSerializer().toMap(RewindData.class, bindings.get("rewind_data"));
// convert them to Map<Integer, class> and cache
GameData.getTeleportDataMap().putAll(teleportDataMap.entrySet().stream().collect(Collectors.toMap(entry -> Integer.valueOf(entry.getKey()), Entry::getValue)));
GameData.getRewindDataMap().putAll(rewindDataMap.entrySet().stream().collect(Collectors.toMap(entry -> Integer.valueOf(entry.getKey()), Entry::getValue)));
} catch (Throwable e){
Grasscutter.getLogger().error("Error while loading Quest Share Config: {}", path.getFileName().toString());
}
});
try {
cs.eval(bindings);
// these are Map<String, class>
var teleportDataMap =
ScriptLoader.getSerializer()
.toMap(TeleportData.class, bindings.get("quest_data"));
var rewindDataMap =
ScriptLoader.getSerializer().toMap(RewindData.class, bindings.get("rewind_data"));
// convert them to Map<Integer, class> and cache
GameData.getTeleportDataMap()
.putAll(
teleportDataMap.entrySet().stream()
.collect(
Collectors.toMap(
entry -> Integer.valueOf(entry.getKey()), Entry::getValue)));
GameData.getRewindDataMap()
.putAll(
rewindDataMap.entrySet().stream()
.collect(
Collectors.toMap(
entry -> Integer.valueOf(entry.getKey()), Entry::getValue)));
} catch (Throwable e) {
Grasscutter.getLogger()
.error(
"Error while loading Quest Share Config: {}", path.getFileName().toString());
}
});
stream.close();
} catch (IOException e) {
Grasscutter.getLogger().error("Error loading Quest Share Config: no files found");
return;
}
if (GameData.getTeleportDataMap() == null || GameData.getTeleportDataMap().isEmpty()
|| GameData.getRewindDataMap() == null || GameData.getRewindDataMap().isEmpty()) {
if (GameData.getTeleportDataMap() == null
|| GameData.getTeleportDataMap().isEmpty()
|| GameData.getRewindDataMap() == null
|| GameData.getRewindDataMap().isEmpty()) {
Grasscutter.getLogger().error("No Quest Share Config loaded!");
return;
}
@@ -735,8 +757,9 @@ public final class ResourceLoader {
val gadgetMap = GameData.getGadgetMappingMap();
try {
JsonUtils.loadToList(getResourcePath("Server/GadgetMapping.json"), GadgetMapping.class)
.forEach(entry -> gadgetMap.put(entry.getGadgetId(), entry));
} catch (IOException | NullPointerException ignored) {}
.forEach(entry -> gadgetMap.put(entry.getGadgetId(), entry));
} catch (IOException | NullPointerException ignored) {
}
Grasscutter.getLogger().debug("Loaded {} gadget mappings.", gadgetMap.size());
} catch (Exception e) {
Grasscutter.getLogger().error("Unable to load gadget mappings.", e);
@@ -747,8 +770,11 @@ public final class ResourceLoader {
try {
val gadgetMap = GameData.getActivityCondGroupMap();
try {
JsonUtils.loadToList(getResourcePath("Server/ActivityCondGroups.json"), ActivityCondGroup.class).forEach(entry -> gadgetMap.put(entry.getCondGroupId(), entry));
} catch (IOException | NullPointerException ignored) {}
JsonUtils.loadToList(
getResourcePath("Server/ActivityCondGroups.json"), ActivityCondGroup.class)
.forEach(entry -> gadgetMap.put(entry.getCondGroupId(), entry));
} catch (IOException | NullPointerException ignored) {
}
Grasscutter.getLogger().debug("Loaded {} ActivityCondGroups.", gadgetMap.size());
} catch (Exception e) {
Grasscutter.getLogger().error("Unable to load ActivityCondGroups.", e);
@@ -760,40 +786,47 @@ public final class ResourceLoader {
String pathName = "CustomResources/TrialAvatarExcels/";
try {
JsonUtils.loadToList(
getResourcePath(pathName + "TrialAvatarActivityDataExcelConfigData.json"),
TrialAvatarActivityDataData.class).forEach(instance -> {
instance.onLoad();
GameData.getTrialAvatarActivityDataCustomData()
.put(instance.getTrialAvatarIndexId(), instance);
});
} catch (IOException | NullPointerException ignored) {}
getResourcePath(pathName + "TrialAvatarActivityDataExcelConfigData.json"),
TrialAvatarActivityDataData.class)
.forEach(
instance -> {
instance.onLoad();
GameData.getTrialAvatarActivityDataCustomData()
.put(instance.getTrialAvatarIndexId(), instance);
});
} catch (IOException | NullPointerException ignored) {
}
Grasscutter.getLogger().debug("Loaded trial activity custom data.");
try {
JsonUtils.loadToList(
getResourcePath(pathName + "TrialAvatarActivityExcelConfigData.json"),
TrialAvatarActivityCustomData.class).forEach(instance -> {
instance.onLoad();
GameData.getTrialAvatarActivityCustomData()
.put(instance.getScheduleId(), instance);
});
} catch (IOException | NullPointerException ignored) {}
getResourcePath(pathName + "TrialAvatarActivityExcelConfigData.json"),
TrialAvatarActivityCustomData.class)
.forEach(
instance -> {
instance.onLoad();
GameData.getTrialAvatarActivityCustomData()
.put(instance.getScheduleId(), instance);
});
} catch (IOException | NullPointerException ignored) {
}
Grasscutter.getLogger().debug("Loaded trial activity schedule custom data.");
try {
JsonUtils.loadToList(
getResourcePath(pathName + "TrialAvatarData.json"),
TrialAvatarCustomData.class).forEach(instance -> {
instance.onLoad();
GameData.getTrialAvatarCustomData()
.put(instance.getTrialAvatarId(), instance);
});
} catch (IOException | NullPointerException ignored) {}
getResourcePath(pathName + "TrialAvatarData.json"), TrialAvatarCustomData.class)
.forEach(
instance -> {
instance.onLoad();
GameData.getTrialAvatarCustomData().put(instance.getTrialAvatarId(), instance);
});
} catch (IOException | NullPointerException ignored) {
}
Grasscutter.getLogger().debug("Loaded trial avatar custom data.");
} catch (Exception e) {
Grasscutter.getLogger().error("Unable to load trial avatar custom data.", e);
}
}
private static void loadGroupReplacements(){
private static void loadGroupReplacements() {
Bindings bindings = ScriptLoader.getEngine().createBindings();
CompiledScript cs = ScriptLoader.getScript("Scene/groups_replacement.lua");
@@ -802,21 +835,29 @@ public final class ResourceLoader {
return;
}
try{
try {
cs.eval(bindings);
// these are Map<String, class>
var replacementsMap = ScriptLoader.getSerializer().toMap(GroupReplacementData.class, bindings.get("replacements"));
var replacementsMap =
ScriptLoader.getSerializer()
.toMap(GroupReplacementData.class, bindings.get("replacements"));
// convert them to Map<Integer, class> and cache
GameData.getGroupReplacements().putAll(replacementsMap.entrySet().stream().collect(Collectors.toMap(entry -> Integer.valueOf(entry.getValue().getId()), Entry::getValue)));
GameData.getGroupReplacements()
.putAll(
replacementsMap.entrySet().stream()
.collect(
Collectors.toMap(
entry -> Integer.valueOf(entry.getValue().getId()), Entry::getValue)));
} catch (Throwable e){
} catch (Throwable e) {
Grasscutter.getLogger().error("Error while loading Group Replacements");
}
if (GameData.getGroupReplacements() == null || GameData.getGroupReplacements().isEmpty()) {
Grasscutter.getLogger().error("No Group Replacements loaded!");
} else {
Grasscutter.getLogger().debug("Loaded {} group replacements.", GameData.getGroupReplacements().size());
Grasscutter.getLogger()
.debug("Loaded {} group replacements.", GameData.getGroupReplacements().size());
}
}

3
src/main/java/emu/grasscutter/data/common/DropItemData.java
View File

@@ -5,8 +5,9 @@ import lombok.Getter;
@Getter
public class DropItemData {
@SerializedName(value="itemId")
@SerializedName(value = "itemId")
private int id;
private String countRange;
private int weight;
}

1
src/main/java/emu/grasscutter/data/excels/DropMaterialData.java
View File

@@ -9,6 +9,7 @@ import lombok.Getter;
public class DropMaterialData extends GameResource {
@Getter(onMethod_ = @Override)
private int id;
private boolean useOnGain;
private boolean disableFirstGainHint;
private boolean autoPick;

8
src/main/java/emu/grasscutter/data/excels/DropTableData.java
View File

@@ -4,15 +4,17 @@ import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.ResourceType.LoadPriority;
import emu.grasscutter.data.common.DropItemData;
import java.util.List;
import lombok.Getter;
import java.util.List;
@ResourceType(name ={"DropTableExcelConfigData.json","DropSubTableExcelConfigData.json"} , loadPriority = LoadPriority.HIGH)
@ResourceType(
name = {"DropTableExcelConfigData.json", "DropSubTableExcelConfigData.json"},
loadPriority = LoadPriority.HIGH)
@Getter
public class DropTableData extends GameResource {
@Getter(onMethod_ = @Override)
private int id;
private int randomType;
private int dropLevel;
private List<DropItemData> dropVec;

3
src/main/java/emu/grasscutter/data/excels/dungeon/DungeonData.java
View File

@@ -5,10 +5,9 @@ import emu.grasscutter.data.GameResource;
import emu.grasscutter.data.ResourceType;
import emu.grasscutter.data.excels.RewardPreviewData;
import emu.grasscutter.game.dungeons.enums.*;
import java.util.List;
import emu.grasscutter.scripts.data.SceneMeta;
import emu.grasscutter.utils.Position;
import java.util.List;
import lombok.Getter;
@ResourceType(name = "DungeonExcelConfigData.json")

11
src/main/java/emu/grasscutter/data/server/Grid.java
View File

@@ -3,7 +3,6 @@ package emu.grasscutter.data.server;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.utils.GridPosition;
import emu.grasscutter.utils.Position;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -11,15 +10,11 @@ import java.util.Set;
public class Grid {
public Map<String, Set<Integer>> grid;
public Map<GridPosition, Set<Integer>> gridMap
= new LinkedHashMap<>();
public Map<GridPosition, Set<Integer>> gridMap = new LinkedHashMap<>();
/**
* Loads the correct grid map.
*/
/** Loads the correct grid map. */
public void load() {
this.grid.forEach((position, groups) ->
this.gridMap.put(new GridPosition(position), groups));
this.grid.forEach((position, groups) -> this.gridMap.put(new GridPosition(position), groups));
}
/**