Skip to content

Commit 3548f36

Browse files
colinator27colinator27
authored
Merge pull request #2207 from UnderminersTeam/revert-2189-gameSpecificDataOptional
Revert ""GameSpecificData" folder related improvements."
2 parents 83143cc + 950abf5 commit 3548f36

File tree

7 files changed

+40
-21
lines changed

7 files changed

+40
-21
lines changed

‎.github/workflows/publish_cli.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
cp ./README.md ./CLI-${{ matrix.os }}/
4444
cp ./SCRIPTS.md ./CLI-${{ matrix.os }}/
4545
cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
46+
cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
4647
cp -r ./UndertaleModTool/Scripts/ ./CLI-${{ matrix.os }}/Scripts/
4748
- name: Upload ${{ matrix.os }} CLI
4849
uses: actions/upload-artifact@v4

‎.github/workflows/publish_gui.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
cp ./README.md ./${{ matrix.os }}
4242
cp ./SCRIPTS.md ./${{ matrix.os }}
4343
cp ./LICENSE.txt ./${{ matrix.os }}
44+
cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
4445
- name: Upload ${{ matrix.os }} GUI
4546
uses: actions/upload-artifact@v4
4647
with:

‎.github/workflows/publish_gui_nightly.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
cp ./README.md ./${{ matrix.os }}
4646
cp ./SCRIPTS.md ./${{ matrix.os }}
4747
cp ./LICENSE.txt ./${{ matrix.os }}
48+
cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
4849
- name: Create zip for nightly release Windows GUI
4950
run: |
5051
7z a -tzip GUI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}-isSingleFile-${{ matrix.singlefile }}.zip ./${{ matrix.os }}/* -mx0
@@ -91,6 +92,7 @@ jobs:
9192
cp ./README.md ./CLI-${{ matrix.os }}/
9293
cp ./SCRIPTS.md ./CLI-${{ matrix.os }}/
9394
cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
95+
cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
9496
cp -r ./UndertaleModTool/Scripts/ ./CLI-${{ matrix.os }}/Scripts/
9597
- name: Create zip for nightly release CLI
9698
run: |

‎.github/workflows/publish_gui_release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
cp ./README.md ./${{ matrix.os }}
4242
cp ./SCRIPTS.md ./${{ matrix.os }}
4343
cp ./LICENSE.txt ./${{ matrix.os }}
44+
cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
4445
- name: Create zip for stable release Windows GUI
4546
run: |
4647
7z a -tzip GUI-${{ matrix.os }}-${{ matrix.configuration }}-isBundled-${{ matrix.bundled }}-isSingleFile-${{ matrix.singlefile }}.zip ./${{ matrix.os }}/* -mx0
@@ -87,6 +88,7 @@ jobs:
8788
cp ./README.md ./CLI-${{ matrix.os }}/
8889
cp ./SCRIPTS.md ./CLI-${{ matrix.os }}/
8990
cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
91+
cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
9092
cp -r ./UndertaleModTool/Scripts/ ./CLI-${{ matrix.os }}/Scripts/
9193
- name: Create zip for stable release CLI
9294
run: |

‎.github/workflows/publish_pr.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
cp ./README.md ./${{ matrix.os }}
4444
cp ./SCRIPTS.md ./${{ matrix.os }}
4545
cp ./LICENSE.txt ./${{ matrix.os }}
46+
cp -r ./UndertaleModLib/GameSpecificData/ ./${{ matrix.os }}/GameSpecificData/
4647
- name: Upload ${{ matrix.os }} GUI
4748
uses: actions/upload-artifact@v4
4849
with:
@@ -86,6 +87,7 @@ jobs:
8687
cp ./README.md ./CLI-${{ matrix.os }}/
8788
cp ./SCRIPTS.md ./${{ matrix.os }}
8889
cp ./LICENSE.txt ./CLI-${{ matrix.os }}/
90+
cp -r ./UndertaleModLib/GameSpecificData/ ./CLI-${{ matrix.os }}/GameSpecificData/
8991
cp -r ./UndertaleModTool/Scripts/ ./CLI-${{ matrix.os }}/Scripts/
9092
- name: Upload ${{ matrix.os }} CLI
9193
uses: actions/upload-artifact@v4

‎UndertaleModLib/GameSpecificData/README.txt‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,3 @@
33
Games are defined in the "Definitions" sub-folder, where they are given conditions to match the game(s) they target. Any JSON files from this folder are loaded automatically, if available.
44

55
GML decompiler configs are contained within the "Underanalyzer" sub-folder, referenced from the original definition files. (These are loaded on-demand.)
6-
7-
If you want to load this data from another path (or you just don't need to work with GML code), then you can prevent automatic folder copying.
8-
For that, you can do one of the following:
9-
1) Edit the `CopyGameSpecificDataToOutDir` project property (change to "false").
10-
2) Override its value through "Directory.Build.props" file outside of the project (e.g. when you use "UndertaleModLib" as a git submodule).
11-
Create the file (if doesn't exists) in the solution root folder, and write the following:
12-
<Project>
13-
<PropertyGroup>
14-
<CopyGameSpecificDataToOutDir>false</CopyGameSpecificDataToOutDir>
15-
</PropertyGroup>
16-
</Project>
17-
18-
In order to change the "GameSpecificData" folder location, you should change the `GameSpecificResolver.BaseDirectory` property.

‎UndertaleModLib/UndertaleModLib.csproj‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@
2323
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2424
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2525
</PropertyGroup>
26-
<PropertyGroup>
27-
<!-- Allows disabling "GameSpecificData" folder copying to the output directory using "Directory.Build.props" outside of the project
28-
(e.g. when using this project as a git submodule) -->
29-
<CopyGameSpecificDataToOutDir Condition="$(CopyGameSpecificDataToOutDir) == ''">true</CopyGameSpecificDataToOutDir>
30-
</PropertyGroup>
3126
<ItemGroup>
3227
<PackageReference Include="Fody" Version="6.9.2">
3328
<PrivateAssets>all</PrivateAssets>
@@ -39,13 +34,42 @@
3934
<PackageReference Include="SharpZipLib" Version="1.4.2" />
4035
</ItemGroup>
4136
<ItemGroup>
42-
<None Remove="GameSpecificData\**" />
37+
<None Remove="GameSpecificData\Definitions\deltarune.json" />
38+
<None Remove="GameSpecificData\Definitions\gamemaker.json" />
39+
<None Remove="GameSpecificData\Definitions\undertale.json" />
40+
<None Remove="GameSpecificData\deltarune.json" />
41+
<None Remove="GameSpecificData\empty.json" />
42+
<None Remove="GameSpecificData\gamemaker.json" />
43+
<None Remove="GameSpecificData\README.txt" />
44+
<None Remove="GameSpecificData\undertale.json" />
4345
<None Remove="version.txt" />
4446
</ItemGroup>
4547
<ItemGroup>
4648
<None Remove="gitversion.txt" />
47-
<Content Include="GameSpecificData\**" Condition="$(CopyGameSpecificDataToOutDir)"
48-
CopyToOutputDirectory="PreserveNewest" />
49+
<Content Include="GameSpecificData\README.txt">
50+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
51+
</Content>
52+
<Content Include="GameSpecificData\Underanalyzer\deltarune.json">
53+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
54+
</Content>
55+
<Content Include="GameSpecificData\Underanalyzer\template.json">
56+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
57+
</Content>
58+
<Content Include="GameSpecificData\Underanalyzer\gamemaker.json">
59+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
60+
</Content>
61+
<Content Include="GameSpecificData\Underanalyzer\undertale.json">
62+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
63+
</Content>
64+
<Content Include="GameSpecificData\Definitions\deltarune.json">
65+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
66+
</Content>
67+
<Content Include="GameSpecificData\Definitions\gamemaker.json">
68+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
69+
</Content>
70+
<Content Include="GameSpecificData\Definitions\undertale.json">
71+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72+
</Content>
4973
<EmbeddedResource Include="gitversion.txt" />
5074
</ItemGroup>
5175
<ItemGroup>

0 commit comments

Comments
 (0)