1.39

Aeroluna · Nov 13, 2024 · 307c316 · 307c316
1 parent e94a634
commit 307c316
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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

diff --git a/CustomJSONData.sln b/CustomJSONData.sln
@@ -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
@@ -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

diff --git a/CustomJSONData/CustomBeatmap/EventData/CustomSpawnRotationBeatmapEventdata.cs b/CustomJSONData/CustomBeatmap/EventData/CustomSpawnRotationBeatmapEventdata.cs
@@ -1,4 +1,5 @@
-using System;
+#if !LATEST
+using System;
 
 namespace CustomJSONData.CustomBeatmap
 {
@@ -31,3 +32,4 @@ public override BeatmapDataItem GetCopy()
         }
     }
 }
+#endif
diff --git a/CustomJSONData/CustomBeatmap/ObjectData/CustomNoteData.cs b/CustomJSONData/CustomBeatmap/ObjectData/CustomNoteData.cs
@@ -8,6 +8,7 @@ public CustomNoteData(
             float time,
 #if LATEST
             float beat,
+            int rotation,
 #endif
             int lineIndex,
             NoteLineLayer noteLineLayer,
@@ -28,6 +29,7 @@ public CustomNoteData(
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 lineIndex,
                 noteLineLayer,
@@ -55,6 +57,7 @@ public static CustomNoteData CreateCustomBasicNoteData(
             float time,
 #if LATEST
             float beat,
+            int rotation,
 #endif
             int lineIndex,
             NoteLineLayer noteLineLayer,
@@ -67,6 +70,7 @@ public static CustomNoteData CreateCustomBasicNoteData(
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 lineIndex,
                 noteLineLayer,
@@ -89,6 +93,7 @@ public static CustomNoteData CreateCustomBombNoteData(
             float time,
 #if LATEST
             float beat,
+            int rotation,
 #endif
             int lineIndex,
             NoteLineLayer noteLineLayer,
@@ -99,6 +104,7 @@ public static CustomNoteData CreateCustomBombNoteData(
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 lineIndex,
                 noteLineLayer,
@@ -121,6 +127,7 @@ public static CustomNoteData CreateCustomBurstSliderNoteData(
             float time,
 #if LATEST
             float beat,
+            int rotation,
 #endif
             int lineIndex,
             NoteLineLayer noteLineLayer,
@@ -134,6 +141,7 @@ public static CustomNoteData CreateCustomBurstSliderNoteData(
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 lineIndex,
                 noteLineLayer,
@@ -158,6 +166,7 @@ public override BeatmapDataItem GetCopy()
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 lineIndex,
                 noteLineLayer,

diff --git a/CustomJSONData/CustomBeatmap/ObjectData/CustomObstacleData.cs b/CustomJSONData/CustomBeatmap/ObjectData/CustomObstacleData.cs
@@ -9,6 +9,7 @@ public CustomObstacleData(
 #if LATEST
             float startBeat,
             float endBeat,
+            int rotation,
 #endif
             int lineIndex,
             NoteLineLayer lineLayer,
@@ -22,6 +23,7 @@ public CustomObstacleData(
 #if LATEST
                 startBeat,
                 endBeat,
+                rotation,
 #endif
                 lineIndex,
                 lineLayer,
@@ -44,6 +46,7 @@ public override BeatmapDataItem GetCopy()
 #if LATEST
                 beat,
                 endBeat,
+                rotation,
 #endif
                 lineIndex,
                 lineLayer,

diff --git a/CustomJSONData/CustomBeatmap/ObjectData/CustomSliderData.cs b/CustomJSONData/CustomBeatmap/ObjectData/CustomSliderData.cs
@@ -11,6 +11,7 @@ public CustomSliderData(
             float headTime,
 #if LATEST
             float headBeat,
+            int rotation,
 #endif
             int headLineIndex,
             NoteLineLayer headLineLayer,
@@ -20,6 +21,7 @@ public CustomSliderData(
             float headCutDirectionAngleOffset,
             bool hasTailNote,
             float tailTime,
+            int tailRotation,
             int tailLineIndex,
             NoteLineLayer tailLineLayer,
             NoteLineLayer tailBeforeJumpLineLayer,
@@ -38,6 +40,7 @@ public CustomSliderData(
                 headTime,
 #if LATEST
                 headBeat,
+                rotation,
 #endif
                 headLineIndex,
                 headLineLayer,
@@ -47,6 +50,9 @@ public CustomSliderData(
                 headCutDirectionAngleOffset,
                 hasTailNote,
                 tailTime,
+#if LATEST
+                tailRotation,
+#endif
                 tailLineIndex,
                 tailLineLayer,
                 tailBeforeJumpLineLayer,
@@ -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,
@@ -93,6 +103,7 @@ public static SliderData CreateCustomSliderData(
                 headTime,
 #if LATEST
                 headBeat,
+                rotation,
 #endif
                 headLineIndex,
                 headLineLayer,
@@ -102,6 +113,9 @@ public static SliderData CreateCustomSliderData(
                 0,
                 false,
                 tailTime,
+#if LATEST
+                tailRotation,
+#endif
                 tailLineIndex,
                 tailLineLayer,
                 tailBeforeJumpLineLayer,
@@ -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,
@@ -141,6 +159,7 @@ public static SliderData CreateCustomBurstSliderData(
                 headTime,
 #if LATEST
                 headBeat,
+                rotation,
 #endif
                 headLineIndex,
                 headLineLayer,
@@ -150,6 +169,9 @@ public static SliderData CreateCustomBurstSliderData(
                 0,
                 false,
                 tailTime,
+#if LATEST
+                tailRotation,
+#endif
                 tailLineIndex,
                 tailLineLayer,
                 tailBeforeJumpLineLayer,
@@ -172,6 +194,7 @@ public override BeatmapDataItem GetCopy()
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 headLineIndex,
                 headLineLayer,
@@ -181,6 +204,9 @@ public override BeatmapDataItem GetCopy()
                 headCutDirectionAngleOffset,
                 hasTailNote,
                 tailTime,
+#if LATEST
+                tailRotation,
+#endif
                 tailLineIndex,
                 tailLineLayer,
                 tailBeforeJumpLineLayer,

diff --git a/CustomJSONData/CustomBeatmap/ObjectData/CustomWaypointData.cs b/CustomJSONData/CustomBeatmap/ObjectData/CustomWaypointData.cs
@@ -8,6 +8,7 @@ public CustomWaypointData(
             float time,
 #if LATEST
             float beat,
+            int rotation,
 #endif
             int lineIndex,
             NoteLineLayer noteLineLayer,
@@ -18,6 +19,7 @@ public CustomWaypointData(
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 lineIndex,
                 noteLineLayer,
@@ -37,6 +39,7 @@ public override BeatmapDataItem GetCopy()
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 lineIndex,
                 lineLayer,

diff --git a/CustomJSONData/CustomJSONData.csproj b/CustomJSONData/CustomJSONData.csproj
@@ -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>

diff --git a/CustomJSONData/HarmonyPatches/CustomBeatmapData/BurstSliderSpawnerCustomify.cs b/CustomJSONData/HarmonyPatches/CustomBeatmapData/BurstSliderSpawnerCustomify.cs
@@ -28,6 +28,7 @@ private static NoteData CreateCustomBurstSliderNoteData(
             float time,
 #if LATEST
             float beat,
+            int rotation,
 #endif
             int lineIndex,
             NoteLineLayer noteLineLayer,
@@ -43,6 +44,7 @@ private static NoteData CreateCustomBurstSliderNoteData(
                     time,
 #if LATEST
                     beat,
+                    rotation,
 #endif
                     lineIndex,
                     noteLineLayer,
@@ -57,6 +59,7 @@ private static NoteData CreateCustomBurstSliderNoteData(
                 time,
 #if LATEST
                 beat,
+                rotation,
 #endif
                 lineIndex,
                 noteLineLayer,