Skip to content

Commit

Permalink
1.39
Browse files Browse the repository at this point in the history
  • Loading branch information
Aeroluna committed Nov 13, 2024
1 parent e94a634 commit 307c316
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Build
strategy:
matrix:
game-version: [ 1.29.1, 1.34.2, 1.37.1, 1.38.0 ]
game-version: [ 1.29.1, 1.34.2, 1.37.1, 1.39.0 ]
uses: Aeroluna/beat-saber-workflows/.github/workflows/build-version-release.yml@master
with:
project-path: CustomJSONData/CustomJSONData.csproj
Expand Down
12 changes: 6 additions & 6 deletions CustomJSONData.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Global
Debug-1.29.1|Any CPU = Debug-1.29.1|Any CPU
Release-1.37.1|Any CPU = Release-1.37.1|Any CPU
Debug-1.37.1|Any CPU = Debug-1.37.1|Any CPU
Release-1.38.0|Any CPU = Release-1.38.0|Any CPU
Debug-1.38.0|Any CPU = Debug-1.38.0|Any CPU
Release-1.39.0|Any CPU = Release-1.39.0|Any CPU
Debug-1.39.0|Any CPU = Debug-1.39.0|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Debug-1.34.2|Any CPU.ActiveCfg = Debug-1.34.2|Any CPU
Expand All @@ -35,10 +35,10 @@ Global
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Release-1.37.1|Any CPU.Build.0 = Release-1.37.1|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Debug-1.37.1|Any CPU.ActiveCfg = Debug-1.37.1|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Debug-1.37.1|Any CPU.Build.0 = Debug-1.37.1|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Release-1.38.0|Any CPU.ActiveCfg = Release-1.38.0|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Release-1.38.0|Any CPU.Build.0 = Release-1.38.0|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Debug-1.38.0|Any CPU.ActiveCfg = Debug-1.38.0|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Debug-1.38.0|Any CPU.Build.0 = Debug-1.38.0|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Release-1.39.0|Any CPU.ActiveCfg = Release-1.39.0|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Release-1.39.0|Any CPU.Build.0 = Release-1.39.0|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Debug-1.39.0|Any CPU.ActiveCfg = Debug-1.39.0|Any CPU
{B7B0434D-8A8F-46D2-B070-F64EDA57CE73}.Debug-1.39.0|Any CPU.Build.0 = Debug-1.39.0|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
#if !LATEST
using System;

namespace CustomJSONData.CustomBeatmap
{
Expand Down Expand Up @@ -31,3 +32,4 @@ public override BeatmapDataItem GetCopy()
}
}
}
#endif
9 changes: 9 additions & 0 deletions CustomJSONData/CustomBeatmap/ObjectData/CustomNoteData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public CustomNoteData(
float time,
#if LATEST
float beat,
int rotation,
#endif
int lineIndex,
NoteLineLayer noteLineLayer,
Expand All @@ -28,6 +29,7 @@ public CustomNoteData(
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
noteLineLayer,
Expand Down Expand Up @@ -55,6 +57,7 @@ public static CustomNoteData CreateCustomBasicNoteData(
float time,
#if LATEST
float beat,
int rotation,
#endif
int lineIndex,
NoteLineLayer noteLineLayer,
Expand All @@ -67,6 +70,7 @@ public static CustomNoteData CreateCustomBasicNoteData(
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
noteLineLayer,
Expand All @@ -89,6 +93,7 @@ public static CustomNoteData CreateCustomBombNoteData(
float time,
#if LATEST
float beat,
int rotation,
#endif
int lineIndex,
NoteLineLayer noteLineLayer,
Expand All @@ -99,6 +104,7 @@ public static CustomNoteData CreateCustomBombNoteData(
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
noteLineLayer,
Expand All @@ -121,6 +127,7 @@ public static CustomNoteData CreateCustomBurstSliderNoteData(
float time,
#if LATEST
float beat,
int rotation,
#endif
int lineIndex,
NoteLineLayer noteLineLayer,
Expand All @@ -134,6 +141,7 @@ public static CustomNoteData CreateCustomBurstSliderNoteData(
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
noteLineLayer,
Expand All @@ -158,6 +166,7 @@ public override BeatmapDataItem GetCopy()
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
noteLineLayer,
Expand Down
3 changes: 3 additions & 0 deletions CustomJSONData/CustomBeatmap/ObjectData/CustomObstacleData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public CustomObstacleData(
#if LATEST
float startBeat,
float endBeat,
int rotation,
#endif
int lineIndex,
NoteLineLayer lineLayer,
Expand All @@ -22,6 +23,7 @@ public CustomObstacleData(
#if LATEST
startBeat,
endBeat,
rotation,
#endif
lineIndex,
lineLayer,
Expand All @@ -44,6 +46,7 @@ public override BeatmapDataItem GetCopy()
#if LATEST
beat,
endBeat,
rotation,
#endif
lineIndex,
lineLayer,
Expand Down
26 changes: 26 additions & 0 deletions CustomJSONData/CustomBeatmap/ObjectData/CustomSliderData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public CustomSliderData(
float headTime,
#if LATEST
float headBeat,
int rotation,
#endif
int headLineIndex,
NoteLineLayer headLineLayer,
Expand All @@ -20,6 +21,7 @@ public CustomSliderData(
float headCutDirectionAngleOffset,
bool hasTailNote,
float tailTime,
int tailRotation,
int tailLineIndex,
NoteLineLayer tailLineLayer,
NoteLineLayer tailBeforeJumpLineLayer,
Expand All @@ -38,6 +40,7 @@ public CustomSliderData(
headTime,
#if LATEST
headBeat,
rotation,
#endif
headLineIndex,
headLineLayer,
Expand All @@ -47,6 +50,9 @@ public CustomSliderData(
headCutDirectionAngleOffset,
hasTailNote,
tailTime,
#if LATEST
tailRotation,
#endif
tailLineIndex,
tailLineLayer,
tailBeforeJumpLineLayer,
Expand All @@ -70,13 +76,17 @@ public static SliderData CreateCustomSliderData(
float headTime,
#if LATEST
float headBeat,
int rotation,
#endif
int headLineIndex,
NoteLineLayer headLineLayer,
NoteLineLayer headBeforeJumpLineLayer,
float headControlPointLengthMultiplier,
NoteCutDirection headCutDirection,
float tailTime,
#if LATEST
int tailRotation,
#endif
int tailLineIndex,
NoteLineLayer tailLineLayer,
NoteLineLayer tailBeforeJumpLineLayer,
Expand All @@ -93,6 +103,7 @@ public static SliderData CreateCustomSliderData(
headTime,
#if LATEST
headBeat,
rotation,
#endif
headLineIndex,
headLineLayer,
Expand All @@ -102,6 +113,9 @@ public static SliderData CreateCustomSliderData(
0,
false,
tailTime,
#if LATEST
tailRotation,
#endif
tailLineIndex,
tailLineLayer,
tailBeforeJumpLineLayer,
Expand All @@ -120,12 +134,16 @@ public static SliderData CreateCustomBurstSliderData(
float headTime,
#if LATEST
float headBeat,
int rotation,
#endif
int headLineIndex,
NoteLineLayer headLineLayer,
NoteLineLayer headBeforeJumpLineLayer,
NoteCutDirection headCutDirection,
float tailTime,
#if LATEST
int tailRotation,
#endif
int tailLineIndex,
NoteLineLayer tailLineLayer,
NoteLineLayer tailBeforeJumpLineLayer,
Expand All @@ -141,6 +159,7 @@ public static SliderData CreateCustomBurstSliderData(
headTime,
#if LATEST
headBeat,
rotation,
#endif
headLineIndex,
headLineLayer,
Expand All @@ -150,6 +169,9 @@ public static SliderData CreateCustomBurstSliderData(
0,
false,
tailTime,
#if LATEST
tailRotation,
#endif
tailLineIndex,
tailLineLayer,
tailBeforeJumpLineLayer,
Expand All @@ -172,6 +194,7 @@ public override BeatmapDataItem GetCopy()
time,
#if LATEST
beat,
rotation,
#endif
headLineIndex,
headLineLayer,
Expand All @@ -181,6 +204,9 @@ public override BeatmapDataItem GetCopy()
headCutDirectionAngleOffset,
hasTailNote,
tailTime,
#if LATEST
tailRotation,
#endif
tailLineIndex,
tailLineLayer,
tailBeforeJumpLineLayer,
Expand Down
3 changes: 3 additions & 0 deletions CustomJSONData/CustomBeatmap/ObjectData/CustomWaypointData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public CustomWaypointData(
float time,
#if LATEST
float beat,
int rotation,
#endif
int lineIndex,
NoteLineLayer noteLineLayer,
Expand All @@ -18,6 +19,7 @@ public CustomWaypointData(
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
noteLineLayer,
Expand All @@ -37,6 +39,7 @@ public override BeatmapDataItem GetCopy()
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
lineLayer,
Expand Down
4 changes: 2 additions & 2 deletions CustomJSONData/CustomJSONData.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<OutputType>Library</OutputType>
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>
<Configurations>Debug-1.29.1;Release-1.29.1;Debug-1.34.2;Release-1.34.2;Debug-1.37.1;Release-1.37.1;Debug-1.38.0;Release-1.38.0</Configurations>
<Configurations>Debug-1.29.1;Release-1.29.1;Debug-1.34.2;Release-1.34.2;Debug-1.37.1;Release-1.37.1;Debug-1.39.0;Release-1.39.0</Configurations>
</PropertyGroup>

<PropertyGroup>
<PluginId>CustomJSONData</PluginId>
<PluginName>CustomJSONData</PluginName>
<Author>Aeroluna</Author>
<Version>2.6.5</Version>
<Version>2.6.6</Version>
<Description>Lets mappers include arbitrary data in beatmaps, and lets modders access that data. Why did I make this? Good question.</Description>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ private static NoteData CreateCustomBurstSliderNoteData(
float time,
#if LATEST
float beat,
int rotation,
#endif
int lineIndex,
NoteLineLayer noteLineLayer,
Expand All @@ -43,6 +44,7 @@ private static NoteData CreateCustomBurstSliderNoteData(
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
noteLineLayer,
Expand All @@ -57,6 +59,7 @@ private static NoteData CreateCustomBurstSliderNoteData(
time,
#if LATEST
beat,
rotation,
#endif
lineIndex,
noteLineLayer,
Expand Down
Loading

0 comments on commit 307c316

Please sign in to comment.