Skip to content

fix: Resolved merge issues; Adjusted workflows for BepInEx #48

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.

Sign up for GitHub

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

Merged
KaBooMa merged 3 commits into from
Apr 27, 2025
Merged

fix: Resolved merge issues; Adjusted workflows for BepInEx #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dc0bbc
fix: Resolved merge issues; Adjusted workflows for BepInEx
KaBooMa Apr 27, 2025
f82cda1
fix: Added BepInEx assembly path for private repo
KaBooMa Apr 27, 2025
69a1cc5
fix: Removed stale code
KaBooMa Apr 27, 2025
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
23 changes: 16 additions & 7 deletions .github/workflows/deploy-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,27 @@ jobs:
sed -i "s/{VERSION_NUMBER}/${{ steps.semantic-release.outputs.new_release_version }}/" ./S1API/S1API.cs
sed -i "s/{VERSION_NUMBER}/${{ steps.semantic-release.outputs.new_release_version }}/" ./S1APILoader/S1APILoader.cs

- name: Run .NET build for Mono
run: dotnet build ./S1API.sln -c Mono -f netstandard2.1
- name: Run .NET build for MonoBepInEx
run: dotnet build ./S1API.sln -c MonoBepInEx -f netstandard2.1

- name: Run .NET build for Il2Cpp
run: dotnet build ./S1API.sln -c Il2Cpp -f netstandard2.1
- name: Run .NET build for Il2CppBepInEx
run: dotnet build ./S1API.sln -c Il2CppBepInEx -f net6.0

- name: Run .NET build for MonoMelon
run: dotnet build ./S1API.sln -c MonoMelon -f netstandard2.1

- name: Run .NET build for Il2CppMelon
run: dotnet build ./S1API.sln -c Il2CppMelon -f net6.0

- name: Build artifact zip for Thunderstore
run: |
mkdir -p ./artifacts/thunderstore/Plugins/S1API
cp ./S1APILoader/bin/Mono/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.dll
cp ./S1API/bin/Il2Cpp/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.dll
cp ./S1API/bin/Mono/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.dll
cp ./S1APILoader/bin/MonoMelon/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.MelonLoader.dll
cp ./S1APILoader/bin/MonoBepInEx/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.BepInEx.dll
cp ./S1API/bin/Il2CppMelon/net6.0/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.MelonLoader.dll
cp ./S1API/bin/MonoMelon/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.MelonLoader.dll
cp ./S1API/bin/Il2CppMelon/net6.0/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.BepInEx.dll
cp ./S1API/bin/MonoMelon/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.BepInEx.dll

- name: Publish artifact to Thunderstore
uses: GreenTF/upload-thunderstore-package@v4.3
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/verify-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,15 @@ jobs:

- name: Restore .NET Dependencies
run: dotnet restore

- name: Run .NET Build for Mono
run: dotnet build ./S1API.sln -c Mono -f netstandard2.1

- name: Run .NET Build for Il2Cpp
run: dotnet build ./S1API.sln -c Il2Cpp -f netstandard2.1

- name: Run .NET build for MonoBepInEx
run: dotnet build ./S1API.sln -c MonoBepInEx -f netstandard2.1

- name: Run .NET build for Il2CppBepInEx
run: dotnet build ./S1API.sln -c Il2CppBepInEx -f net6.0

- name: Run .NET build for MonoMelon
run: dotnet build ./S1API.sln -c MonoMelon -f netstandard2.1

- name: Run .NET build for Il2CppMelon
run: dotnet build ./S1API.sln -c Il2CppMelon -f net6.0
4 changes: 2 additions & 2 deletions S1API/Console/ConsoleHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppSystem.Collections.Generic;
using static Il2CppScheduleOne.Console;
#else
Expand All @@ -20,7 +20,7 @@ public static class ConsoleHelper
/// <param name="amount">The cash amount to add or remove.</param>
public static void RunCashCommand(int amount)
{
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
var command = new ChangeCashCommand();
var args = new Il2CppSystem.Collections.Generic.List<string>();
#else
Expand Down
12 changes: 6 additions & 6 deletions S1API/Entities/NPC.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if (IL2CPP)
#if (IL2CPPMELON || IL2CPPBEPINEX)
using S1DevUtilities = Il2CppScheduleOne.DevUtilities;
using S1Interaction = Il2CppScheduleOne.Interaction;
using S1Messaging = Il2CppScheduleOne.Messaging;
Expand All @@ -14,7 +14,7 @@
using S1Vision = Il2CppScheduleOne.Vision;
using S1NPCs = Il2CppScheduleOne.NPCs;
using Il2CppSystem.Collections.Generic;
#elif (MONO)
#elif (MONOMELON || MONOBEPINEX)
using S1DevUtilities = ScheduleOne.DevUtilities;
using S1Interaction = ScheduleOne.Interaction;
using S1Messaging = ScheduleOne.Messaging;
Expand Down Expand Up @@ -95,9 +95,9 @@ protected NPC(
S1NPC.ConversationCategories.Add(S1Messaging.EConversationCategory.Customer);

// Create our MessageConversation
#if (IL2CPP)
#if (IL2CPPMELON || IL2CPPBEPINEX)
S1NPC.CreateMessageConversation();
#elif (MONO)
#elif (MONOMELON || MONOBEPINEX)
MethodInfo createConvoMethod = AccessTools.Method(typeof(S1NPCs.NPC), "CreateMessageConversation");
createConvoMethod.Invoke(S1NPC, null);
#endif
Expand Down Expand Up @@ -162,9 +162,9 @@ protected NPC(
S1NPC.awareness.VisionCone.QuestionMarkPopup = gameObject.AddComponent<S1WorkspacePopup.WorldspacePopup>();

// Interaction behaviour
#if (IL2CPP)
#if (IL2CPPMELON || IL2CPPBEPINEX)
S1NPC.intObj = gameObject.AddComponent<S1Interaction.InteractableObject>();
#elif (MONO)
#elif (MONOMELON || MONOBEPINEX)
FieldInfo intObjField = AccessTools.Field(typeof(S1NPCs.NPC), "intObj");
intObjField.SetValue(S1NPC, gameObject.AddComponent<S1Interaction.InteractableObject>());
#endif
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/DanSamwell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/AnnaChesterfield.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/BillyKramer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/CrankyFrank.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/GenghisBarn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/JaneLucero.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/JavierPerez.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/LisaGardener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/MacCooper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/MarcoBaron.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/MelissaWood.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Docks/SalvadorMoreno.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/BradCrosby.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/ElizabethHomley.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/EugeneBuckley.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/GregFliggle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/JeffGilmore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/JenniferRivera.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/KevinOakley.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/LouisFourier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/LucyPennington.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/PhilipWentworth.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Downtown/RandyCaulfield.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/IgorRomanovich.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/MannyOakfield.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/AlbertHoover.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/AustinSteiner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/BenjiColeman.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/BethPenn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/ChloeBowers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/DonnaMartin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/GeraldinePoon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/JessiWaters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/KathyHenderson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/KyleCooley.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/LudwigMeyer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/MickLubbin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/Ming.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/PeggyMyers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/PeterFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/Northtown/SamThompson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/OscarHolland.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/PoliceOfficers/OfficerBailey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/PoliceOfficers/OfficerCooper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/PoliceOfficers/OfficerGreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/PoliceOfficers/OfficerHoward.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
2 changes: 1 addition & 1 deletion S1API/Entities/NPCs/PoliceOfficers/OfficerJackson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if IL2CPP
#if (IL2CPPMELON || IL2CPPBEPINEX)
using Il2CppScheduleOne.NPCs;
#else
using ScheduleOne.NPCs;
Expand Down
Loading
Loading