Skip to content

Commit 3f70c4e

Browse files
KaBooMaKaBooMa
authored
Merge pull request #48 from KaBooMa/fixes
fix: Resolved merge issues; Adjusted workflows for BepInEx
2 parents 1a11aa6 + 69a1cc5 commit 3f70c4e

File tree

110 files changed

+178
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+178
-174
lines changed

‎.github/workflows/deploy-build.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,27 @@ jobs:
5656
sed -i "s/{VERSION_NUMBER}/${{ steps.semantic-release.outputs.new_release_version }}/" ./S1API/S1API.cs
5757
sed -i "s/{VERSION_NUMBER}/${{ steps.semantic-release.outputs.new_release_version }}/" ./S1APILoader/S1APILoader.cs
5858
59-
- name: Run .NET build for Mono
60-
run: dotnet build ./S1API.sln -c Mono -f netstandard2.1
59+
- name: Run .NET build for MonoBepInEx
60+
run: dotnet build ./S1API.sln -c MonoBepInEx -f netstandard2.1
6161

62-
- name: Run .NET build for Il2Cpp
63-
run: dotnet build ./S1API.sln -c Il2Cpp -f netstandard2.1
62+
- name: Run .NET build for Il2CppBepInEx
63+
run: dotnet build ./S1API.sln -c Il2CppBepInEx -f net6.0
64+
65+
- name: Run .NET build for MonoMelon
66+
run: dotnet build ./S1API.sln -c MonoMelon -f netstandard2.1
67+
68+
- name: Run .NET build for Il2CppMelon
69+
run: dotnet build ./S1API.sln -c Il2CppMelon -f net6.0
6470

6571
- name: Build artifact zip for Thunderstore
6672
run: |
6773
mkdir -p ./artifacts/thunderstore/Plugins/S1API
68-
cp ./S1APILoader/bin/Mono/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.dll
69-
cp ./S1API/bin/Il2Cpp/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.dll
70-
cp ./S1API/bin/Mono/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.dll
74+
cp ./S1APILoader/bin/MonoMelon/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.MelonLoader.dll
75+
cp ./S1APILoader/bin/MonoBepInEx/netstandard2.1/S1APILoader.dll ./artifacts/thunderstore/Plugins/S1APILoader.BepInEx.dll
76+
cp ./S1API/bin/Il2CppMelon/net6.0/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.MelonLoader.dll
77+
cp ./S1API/bin/MonoMelon/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.MelonLoader.dll
78+
cp ./S1API/bin/Il2CppMelon/net6.0/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Il2Cpp.BepInEx.dll
79+
cp ./S1API/bin/MonoMelon/netstandard2.1/S1API.dll ./artifacts/thunderstore/Plugins/S1API/S1API.Mono.BepInEx.dll
7180
7281
- name: Publish artifact to Thunderstore
7382
uses: GreenTF/upload-thunderstore-package@v4.3

‎.github/workflows/verify-build.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,15 @@ jobs:
2727

2828
- name: Restore .NET Dependencies
2929
run: dotnet restore
30-
31-
- name: Run .NET Build for Mono
32-
run: dotnet build ./S1API.sln -c Mono -f netstandard2.1
33-
34-
- name: Run .NET Build for Il2Cpp
35-
run: dotnet build ./S1API.sln -c Il2Cpp -f netstandard2.1
30+
31+
- name: Run .NET build for MonoBepInEx
32+
run: dotnet build ./S1API.sln -c MonoBepInEx -f netstandard2.1
33+
34+
- name: Run .NET build for Il2CppBepInEx
35+
run: dotnet build ./S1API.sln -c Il2CppBepInEx -f net6.0
36+
37+
- name: Run .NET build for MonoMelon
38+
run: dotnet build ./S1API.sln -c MonoMelon -f netstandard2.1
39+
40+
- name: Run .NET build for Il2CppMelon
41+
run: dotnet build ./S1API.sln -c Il2CppMelon -f net6.0

‎S1API/Console/ConsoleHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IL2CPP
1+
#if (IL2CPPMELON || IL2CPPBEPINEX)
22
using Il2CppSystem.Collections.Generic;
33
using static Il2CppScheduleOne.Console;
44
#else
@@ -20,7 +20,7 @@ public static class ConsoleHelper
2020
/// <param name="amount">The cash amount to add or remove.</param>
2121
public static void RunCashCommand(int amount)
2222
{
23-
#if IL2CPP
23+
#if (IL2CPPMELON || IL2CPPBEPINEX)
2424
var command = new ChangeCashCommand();
2525
var args = new Il2CppSystem.Collections.Generic.List<string>();
2626
#else

‎S1API/Entities/NPC.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if (IL2CPP)
1+
#if (IL2CPPMELON || IL2CPPBEPINEX)
22
using S1DevUtilities = Il2CppScheduleOne.DevUtilities;
33
using S1Interaction = Il2CppScheduleOne.Interaction;
44
using S1Messaging = Il2CppScheduleOne.Messaging;
@@ -14,7 +14,7 @@
1414
using S1Vision = Il2CppScheduleOne.Vision;
1515
using S1NPCs = Il2CppScheduleOne.NPCs;
1616
using Il2CppSystem.Collections.Generic;
17-
#elif (MONO)
17+
#elif (MONOMELON || MONOBEPINEX)
1818
using S1DevUtilities = ScheduleOne.DevUtilities;
1919
using S1Interaction = ScheduleOne.Interaction;
2020
using S1Messaging = ScheduleOne.Messaging;
@@ -95,9 +95,9 @@ protected NPC(
9595
S1NPC.ConversationCategories.Add(S1Messaging.EConversationCategory.Customer);
9696

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

164164
// Interaction behaviour
165-
#if (IL2CPP)
165+
#if (IL2CPPMELON || IL2CPPBEPINEX)
166166
S1NPC.intObj = gameObject.AddComponent<S1Interaction.InteractableObject>();
167-
#elif (MONO)
167+
#elif (MONOMELON || MONOBEPINEX)
168168
FieldInfo intObjField = AccessTools.Field(typeof(S1NPCs.NPC), "intObj");
169169
intObjField.SetValue(S1NPC, gameObject.AddComponent<S1Interaction.InteractableObject>());
170170
#endif

‎S1API/Entities/NPCs/DanSamwell.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IL2CPP
1+
#if (IL2CPPMELON || IL2CPPBEPINEX)
22
using Il2CppScheduleOne.NPCs;
33
#else
44
using ScheduleOne.NPCs;

‎S1API/Entities/NPCs/Docks/AnnaChesterfield.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IL2CPP
1+
#if (IL2CPPMELON || IL2CPPBEPINEX)
22
using Il2CppScheduleOne.NPCs;
33
#else
44
using ScheduleOne.NPCs;

‎S1API/Entities/NPCs/Docks/BillyKramer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IL2CPP
1+
#if (IL2CPPMELON || IL2CPPBEPINEX)
22
using Il2CppScheduleOne.NPCs;
33
#else
44
using ScheduleOne.NPCs;

‎S1API/Entities/NPCs/Docks/CrankyFrank.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IL2CPP
1+
#if (IL2CPPMELON || IL2CPPBEPINEX)
22
using Il2CppScheduleOne.NPCs;
33
#else
44
using ScheduleOne.NPCs;

‎S1API/Entities/NPCs/Docks/GenghisBarn.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IL2CPP
1+
#if (IL2CPPMELON || IL2CPPBEPINEX)
22
using Il2CppScheduleOne.NPCs;
33
#else
44
using ScheduleOne.NPCs;

‎S1API/Entities/NPCs/Docks/JaneLucero.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IL2CPP
1+
#if (IL2CPPMELON || IL2CPPBEPINEX)
22
using Il2CppScheduleOne.NPCs;
33
#else
44
using ScheduleOne.NPCs;

0 commit comments

Comments
 (0)