Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4 Format Support #552

Draft
wants to merge 49 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
53082a3
Add v2 and v4 Info classes for vanilla properties
XAce1337manX Oct 4, 2024
295c234
Move Info classes into separate folder
XAce1337manX Oct 4, 2024
07309f0
Move BaseContributor from Beatmap Base to Info Base
XAce1337manX Oct 4, 2024
7b2b156
Implement V2Contributor
XAce1337manX Oct 4, 2024
7e73006
Add V4Contributor
XAce1337manX Oct 4, 2024
4a399f1
Implement CustomContributors
XAce1337manX Oct 4, 2024
17eaac7
Implement difficulty custom properties
XAce1337manX Oct 5, 2024
35938c8
Implement difficulty custom colors
XAce1337manX Oct 6, 2024
66c4af6
Implement custom characteristic data
XAce1337manX Oct 6, 2024
d14de0e
wip: SongList displays v4 now!
XAce1337manX Oct 6, 2024
a8f79e5
wip: ok the left side of the song edit works
XAce1337manX Oct 6, 2024
ab9444d
wip: the right side probably works
XAce1337manX Oct 7, 2024
8132366
wip: fix: you can make new maps now oops
XAce1337manX Oct 7, 2024
8479f79
Move DefaultColors to separate class
XAce1337manX Oct 7, 2024
11eae83
Move BeatSaberSong.CleanObject() to SimpleJSONHelper
XAce1337manX Oct 7, 2024
0da24e7
Replace uses of BeatSaberSong with BaseInfo
XAce1337manX Oct 7, 2024
34bcd0a
Replace uses of DifficultyBeatmap with InfoDifficulty
XAce1337manX Oct 7, 2024
df34003
Remove replaced code
XAce1337manX Oct 7, 2024
202cad8
v4 difficulty loading poc
XAce1337manX Oct 8, 2024
e3ec68b
Implement info editor metadata
XAce1337manX Oct 12, 2024
9b40c19
fix: apparently v4 colorScheme colors don't start with ##
XAce1337manX Oct 12, 2024
e30449c
fix: always indent Info.dat
XAce1337manX Oct 12, 2024
f9a7961
Implement custom environment metadata
XAce1337manX Oct 13, 2024
8a21e93
fix: v4 custom characteristic write
XAce1337manX Oct 13, 2024
a8db81c
Correct lastEditedByKey for ediors metadaa
XAce1337manX Oct 17, 2024
7ef4180
Create song in correct directory
XAce1337manX Oct 17, 2024
6e80010
We love null reference exceptions
XAce1337manX Oct 20, 2024
855881e
Implement v4 diff loading
XAce1337manX Oct 21, 2024
f22349c
Implement v4 saving beatmap file
XAce1337manX Oct 23, 2024
635eb0d
Add basic group lighting unit test
XAce1337manX Oct 25, 2024
fa10020
Implement v4 saving lightshow file
XAce1337manX Oct 26, 2024
f798264
Add undefined key for v4 custom property
XAce1337manX Oct 28, 2024
c2b90e5
v4 objects displays v3 json in node editor
XAce1337manX Oct 28, 2024
0e2b9da
Parse v4 rotation property
XAce1337manX Nov 17, 2024
1e4c6ca
Remove loading of spawnRotations from v4
XAce1337manX Nov 25, 2024
697923a
Update save warning for incompatible rotation events in v4
XAce1337manX Nov 25, 2024
a1384c6
Update SongEditMenu UI
XAce1337manX Nov 25, 2024
956ac39
Add localization strings
XAce1337manX Dec 8, 2024
2d7d739
Load environment from 2.1.0 environmentNames
XAce1337manX Dec 8, 2024
2bb186a
Key case consistency
XAce1337manX Dec 8, 2024
492411f
Can now change beatmap version to v4
XAce1337manX Dec 8, 2024
615ad3f
Don't write empty customData in Info
XAce1337manX Dec 8, 2024
47ae98e
More fixes to song info ui
XAce1337manX Dec 8, 2024
de67a97
Fix some missing raycast targets
XAce1337manX Dec 8, 2024
3b9f062
Display custom properties on v4 so we don't yeet on read
XAce1337manX Dec 10, 2024
d2a6679
Add NJS Events from 4.1.0 difficulty format
XAce1337manX Dec 11, 2024
5c6dfe8
Add new colorScheme fields from 4.0.1 Info format
XAce1337manX Dec 11, 2024
30bd0e0
Update unit tests
XAce1337manX Dec 11, 2024
3544392
Initial support for NJS events
XAce1337manX Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-da
- m_GUID: 073d070e3bcac9d4396b082b94a7b4ec
m_Address: Contributors_da
m_ReadOnly: 1
m_SerializedLabels:
- Locale-da
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: e23e8b2f902e0bb44ac91bbfe747321d
m_SerializeEntries:
- m_GUID: 073d070e3bcac9d4396b082b94a7b4ec
m_Address: Contributors_da
m_ReadOnly: 1
m_SerializedLabels:
- Locale-da
- m_GUID: 831513a1beae93348a0fd9afa3f9d3d7
m_Address: Mapper_da
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-nl
- m_GUID: 629d8a24657e936408405d0528afe267
m_Address: Contributors_nl
m_ReadOnly: 1
m_SerializedLabels:
- Locale-nl
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: e5277bae54c1ce04bbe6c4841e4353e8
m_SerializeEntries:
- m_GUID: 629d8a24657e936408405d0528afe267
m_Address: Contributors_nl
m_ReadOnly: 1
m_SerializedLabels:
- Locale-nl
- m_GUID: 93e4496d786ba6b48b7d4549a1d292e6
m_Address: Mapper_nl
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- m_GUID: 1411c398524482f409501269230bab2b
m_Address: Contributors_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 8c01df2a9e2e9254099a9aabd160e28d
m_SerializeEntries:
- m_GUID: 1411c398524482f409501269230bab2b
m_Address: Contributors_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- m_GUID: a1b2a80d039a1294fb15e297b29b0654
m_Address: Contributors_en-PT
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en-PT
- m_GUID: 883e08d6981d70949aa461f5b0efc2b9
m_Address: Contributors_en-OWO
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en-OWO
- m_GUID: 7d243bcc9348bd34ab47236f8648b568
m_Address: Mapper_en
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-et
- m_GUID: b3ec86905fffa1d428a29becc38f9446
m_Address: Contributors_et
m_ReadOnly: 1
m_SerializedLabels:
- Locale-et
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 32d2181c2354f8449b708994cc1ccf06
m_SerializeEntries:
- m_GUID: b3ec86905fffa1d428a29becc38f9446
m_Address: Contributors_et
m_ReadOnly: 1
m_SerializedLabels:
- Locale-et
- m_GUID: 11e7f3a057b90bd47aeef52511b23090
m_Address: Mapper_et
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fi
- m_GUID: 1f65fefdc19fbce4cb20efca47c130bb
m_Address: Contributors_fi
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fi
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: e5906e6aba19aea4d80cf9d3a868fe3e
m_SerializeEntries:
- m_GUID: 1f65fefdc19fbce4cb20efca47c130bb
m_Address: Contributors_fi
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fi
- m_GUID: bf2716ae1ae3ac748ae435e371eeaa6c
m_Address: Mapper_fi
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
- m_GUID: 980b25747d747f241a0301a8b7c65f2a
m_Address: Contributors_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 4e3c43f4e56bf1e408ec7a906a6b655b
m_SerializeEntries:
- m_GUID: 980b25747d747f241a0301a8b7c65f2a
m_Address: Contributors_fr
m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
- m_GUID: 31885116beacb504c96e24fc9c389d4e
m_Address: Mapper_fr
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-de
- m_GUID: 0dcf706cb64b1d1498c7ec13957fc5ae
m_Address: Contributors_de
m_ReadOnly: 1
m_SerializedLabels:
- Locale-de
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: a38606dd660bbc94fa632eec7ddc9202
m_SerializeEntries:
- m_GUID: 0dcf706cb64b1d1498c7ec13957fc5ae
m_Address: Contributors_de
m_ReadOnly: 1
m_SerializedLabels:
- Locale-de
- m_GUID: e273e83c4c3888e49b8cd3387c4ba4b7
m_Address: Mapper_de
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ja
- m_GUID: 703b4bd8428e6a34599b39a457355389
m_Address: Contributors_ja
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ja
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 52544d0fb68a23241bc7a4074024b2fa
m_SerializeEntries:
- m_GUID: 703b4bd8428e6a34599b39a457355389
m_Address: Contributors_ja
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ja
- m_GUID: 0862733bb4a5eaf4c9916d82d2c19c8b
m_Address: Mapper_ja
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en-PT
- m_GUID: a1b2a80d039a1294fb15e297b29b0654
m_Address: Contributors_en-PT
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en-PT
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ru
- m_GUID: c152a40414918dd42a29b83133d08146
m_Address: Contributors_ru
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ru
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 1959ada9b7c3ff7448c14d8c7a0ab454
m_SerializeEntries:
- m_GUID: c152a40414918dd42a29b83133d08146
m_Address: Contributors_ru
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ru
- m_GUID: 2042684ccca6f2b429a2a4297e62d24f
m_Address: Mapper_ru
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 5996082b52a6b964b8266ec4dcb7a83a
m_SerializeEntries:
- m_GUID: de32a74a72c3f564199a3b867e84e0d9
m_Address: Contributors_es-ES
m_ReadOnly: 1
m_SerializedLabels:
- Locale-es-ES
- m_GUID: 7fb6de7586d07b844b31b2670f5e17d6
m_Address: Mapper_es-ES
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-es-ES
- m_GUID: de32a74a72c3f564199a3b867e84e0d9
m_Address: Contributors_es-ES
m_ReadOnly: 1
m_SerializedLabels:
- Locale-es-ES
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 7913ec13eb217cb4fa9867515853bf00
m_SerializeEntries:
- m_GUID: 9f793d99c69041d4a8090d2c7e89789e
m_Address: Contributors_sv-SE
m_ReadOnly: 1
m_SerializedLabels:
- Locale-sv-SE
- m_GUID: bde88879d26980941988724ceef45a79
m_Address: Mapper_sv-SE
m_ReadOnly: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-sv-SE
- m_GUID: 9f793d99c69041d4a8090d2c7e89789e
m_Address: Contributors_sv-SE
m_ReadOnly: 1
m_SerializedLabels:
- Locale-sv-SE
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en-OWO
- m_GUID: 883e08d6981d70949aa461f5b0efc2b9
m_Address: Contributors_en-OWO
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en-OWO
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: be3f562163bab164eadc484f377f1007, type: 2}
m_SchemaSet:
Expand Down
15 changes: 13 additions & 2 deletions Assets/Locales/Contributors Shared Data.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3}
m_Name: Contributors Shared Data
m_EditorClassIdentifier:
m_NextAvailableId: 14
m_TableCollectionName: Contributors
m_TableCollectionNameGuidString: bf1f1381b5de9c449a6d9b276b62b271
m_Entries:
Expand Down Expand Up @@ -68,7 +67,19 @@ MonoBehaviour:
m_Key: removeall
m_Metadata:
m_Items: []
- m_Id: 2582460100608
m_Key: clearall
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
rid: 6011579213837762567
references:
version: 1
version: 2
RefIds:
- rid: 6011579213837762567
type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables,
asm: Unity.Localization}
data:
m_CustomEpoch: 1732197976278
7 changes: 6 additions & 1 deletion Assets/Locales/Contributors_en.asset
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,10 @@ MonoBehaviour:
m_Localized: Are you sure you want to remove all contributors?
m_Metadata:
m_Items: []
- m_Id: 2582460100608
m_Localized: Clear All
m_Metadata:
m_Items: []
references:
version: 1
version: 2
RefIds: []
16 changes: 16 additions & 0 deletions Assets/Locales/Mapper Shared Data.asset
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,22 @@ MonoBehaviour:
m_Key: countersplus.chains
m_Metadata:
m_Items: []
- m_Id: 444025876411969536
m_Key: unsupported.properties.warning.header
m_Metadata:
m_Items: []
- m_Id: 444026126589620224
m_Key: unsupported.properties.warning.subheader
m_Metadata:
m_Items: []
- m_Id: 444093981712576512
m_Key: change.beatmap.version
m_Metadata:
m_Items: []
- m_Id: 444094241088335872
m_Key: change.beatmap.version.warning
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
Expand Down
Loading