fix: update source generator
This commit is contained in:
parent
a6299001b6
commit
4ef4d6a003
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DalamudLinter" Version="1.0.3"/>
|
<PackageReference Include="DalamudLinter" Version="1.0.3"/>
|
||||||
<PackageReference Include="DalamudPackager" Version="2.1.4"/>
|
<PackageReference Include="DalamudPackager" Version="2.1.5"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -261,7 +261,7 @@ namespace SourceGenerator {
|
||||||
sb.Append(" pub static ref WORLDS: HashMap<u32, World> = maplit::hashmap! {\n");
|
sb.Append(" pub static ref WORLDS: HashMap<u32, World> = maplit::hashmap! {\n");
|
||||||
|
|
||||||
foreach (var world in this.Data[Language.English].GetExcelSheet<World>()!) {
|
foreach (var world in this.Data[Language.English].GetExcelSheet<World>()!) {
|
||||||
if (world.RowId == 0 || !world.IsPublic || world.DataCenter.Row == 0) {
|
if (world.RowId == 0 || !world.Unknown5 || world.Unknown4 == 0 || world.DataCenter.Row == 0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -328,7 +328,7 @@ namespace SourceGenerator {
|
||||||
pair => pair.Key,
|
pair => pair.Key,
|
||||||
pair => {
|
pair => {
|
||||||
var sheet = (ExcelSheetImpl) getSheet.Invoke(pair.Value, null)!;
|
var sheet = (ExcelSheetImpl) getSheet.Invoke(pair.Value, null)!;
|
||||||
return (sheet, sheet.EnumerateRowParsers().ToArray());
|
return (sheet, sheet.GetRowParsers().ToArray());
|
||||||
});
|
});
|
||||||
|
|
||||||
var columns = new List<int>();
|
var columns = new List<int>();
|
||||||
|
@ -369,7 +369,7 @@ namespace SourceGenerator {
|
||||||
foreach (var range in rows) {
|
foreach (var range in rows) {
|
||||||
var validRows = sheets[Language.English]
|
var validRows = sheets[Language.English]
|
||||||
.Item2
|
.Item2
|
||||||
.Select(parser => parser.Row)
|
.Select(parser => parser.RowId)
|
||||||
.ToArray();
|
.ToArray();
|
||||||
for (var i = range.Start.Value; i < range.End.Value; i++) {
|
for (var i = range.Start.Value; i < range.End.Value; i++) {
|
||||||
if (!validRows.Contains((uint) i)) {
|
if (!validRows.Contains((uint) i)) {
|
||||||
|
@ -384,7 +384,7 @@ namespace SourceGenerator {
|
||||||
foreach (var (lang, (_, parsers)) in sheets) {
|
foreach (var (lang, (_, parsers)) in sheets) {
|
||||||
// take the first column that works
|
// take the first column that works
|
||||||
foreach (var col in columns) {
|
foreach (var col in columns) {
|
||||||
var rowParser = parsers.FirstOrDefault(parser => parser.Row == i);
|
var rowParser = parsers.FirstOrDefault(parser => parser.RowId == i);
|
||||||
if (rowParser != null) {
|
if (rowParser != null) {
|
||||||
var name = rowParser.ReadColumn<SeString>(col)!;
|
var name = rowParser.ReadColumn<SeString>(col)!;
|
||||||
var text = name.TextValue().Replace("\"", "\\\"");
|
var text = name.TextValue().Replace("\"", "\\\"");
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Lumina" Version="3.4.1"/>
|
<PackageReference Include="Lumina" Version="3.5.0"/>
|
||||||
<PackageReference Include="Lumina.Excel" Version="5.50.0"/>
|
<PackageReference Include="Lumina.Excel" Version="6.0.0"/>
|
||||||
<PackageReference Include="Pidgin" Version="3.0.0"/>
|
<PackageReference Include="Pidgin" Version="3.0.0"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user