Skip to content

Commit fea94fc

Browse files
ComputerEliteComputerElite
authored
Merge pull request #4 from kodenamekrak/master
1.26.2
2 parents 2303464 + 8cbcdf9 commit fea94fc

6 files changed

Lines changed: 66 additions & 71 deletions

File tree

‎include/ModConfig.hpp‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,9 @@ DECLARE_CONFIG(ModConfig,
99
CONFIG_VALUE(Fadeout, bool, "Fadeout", false);
1010
CONFIG_VALUE(FullFade, bool, "Use fade between 15% and 95% colors", false);
1111
CONFIG_VALUE(Alpha, float, "Alpha", 1.0);
12-
CONFIG_VALUE(Diehp, UnityEngine::Color, "under 15% energy", UnityEngine::Color(1.0f, 0.0f, 0.0f, 0.0f));
13-
CONFIG_VALUE(Lowhp, UnityEngine::Color, "under 50% energy", UnityEngine::Color(1.0f, 0.0f, 0.0f, 0.0f));
14-
CONFIG_VALUE(Midhp, UnityEngine::Color, "over 70% energy", UnityEngine::Color(0.0f, 1.0f, 0.0f, 0.0f));
15-
CONFIG_VALUE(Highhp, UnityEngine::Color, "over 95% energy", UnityEngine::Color(0.0f, 1.0f, 1.0f, 0.0f));
16-
CONFIG_VALUE(Defhp, UnityEngine::Color, "over 50% energy", UnityEngine::Color(1.0f, 1.0f, 1.0f, 0.0f));
17-
18-
CONFIG_INIT_FUNCTION(
19-
CONFIG_INIT_VALUE(Rainbow);
20-
CONFIG_INIT_VALUE(AlwaysRainbow);
21-
CONFIG_INIT_VALUE(Fadeout);
22-
CONFIG_INIT_VALUE(FullFade);
23-
CONFIG_INIT_VALUE(Alpha);
24-
CONFIG_INIT_VALUE(Diehp);
25-
CONFIG_INIT_VALUE(Lowhp);
26-
CONFIG_INIT_VALUE(Midhp);
27-
CONFIG_INIT_VALUE(Highhp);
28-
CONFIG_INIT_VALUE(Defhp);
29-
)
12+
CONFIG_VALUE(Diehp, UnityEngine::Color, "under 15% energy", ConfigUtils::Color(1.0f, 0.0f, 0.0f, 0.0f));
13+
CONFIG_VALUE(Lowhp, UnityEngine::Color, "under 50% energy", ConfigUtils::Color(1.0f, 0.0f, 0.0f, 0.0f));
14+
CONFIG_VALUE(Midhp, UnityEngine::Color, "over 70% energy", ConfigUtils::Color(0.0f, 1.0f, 0.0f, 0.0f));
15+
CONFIG_VALUE(Highhp, UnityEngine::Color, "over 95% energy", ConfigUtils::Color(0.0f, 1.0f, 1.0f, 0.0f));
16+
CONFIG_VALUE(Defhp, UnityEngine::Color, "over 50% energy", ConfigUtils::Color(1.0f, 1.0f, 1.0f, 0.0f));
3017
)

‎mod.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"name": "RedBar",
44
"id": "RedBar",
55
"author": "ComputerElite",
6-
"version": "1.11.0",
6+
"version": "1.12.0",
77
"packageId": "com.beatgames.beatsaber",
8-
"packageVersion": "1.25.1",
8+
"packageVersion": "1.26.2",
99
"coverImage": "cover.png",
1010
"dependencies": [
1111
{
12-
"version": "^0.15.21",
12+
"version": "^0.15.22",
1313
"id": "custom-types",
14-
"downloadIfMissing": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.21/CustomTypes.qmod"
14+
"downloadIfMissing": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.22/CustomTypes.qmod"
1515
},
1616
{
17-
"version": "^0.28.0",
17+
"version": "^0.31.0",
1818
"id": "codegen",
19-
"downloadIfMissing": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.28.0/Codegen.qmod"
19+
"downloadIfMissing": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.31.0/Codegen.qmod"
2020
},
2121
{
22-
"version": "^0.17.5",
22+
"version": "^0.17.9",
2323
"id": "questui",
24-
"downloadIfMissing": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.5/QuestUI.qmod"
24+
"downloadIfMissing": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.9/QuestUI.qmod"
2525
}
2626
],
2727
"modFiles": [

‎mod.template.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"_QPVersion": "0.1.1",
33
"id": "RedBar",
44
"name": "RedBar",
5-
"version": "1.11.0",
5+
"version": "1.12.0",
66
"author": "ComputerElite",
77
"packageId": "com.beatgames.beatsaber",
8-
"packageVersion": "1.25.1",
8+
"packageVersion": "1.26.2",
99
"coverImage": "cover.png",
1010
"modFiles": [
1111
],

‎qpm.json‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"info": {
55
"name": "RedBar",
66
"id": "RedBar",
7-
"version": "1.9.1",
7+
"version": "1.12.0",
88
"url": null,
99
"additionalData": {
1010
"overrideSoName": "libRedBar.so"
@@ -22,25 +22,24 @@
2222
"additionalData": {}
2323
},
2424
{
25-
"id": "questui",
26-
"versionRange": "^0.17.5",
25+
"id": "codegen",
26+
"versionRange": "^0.31.0",
2727
"additionalData": {}
2828
},
2929
{
30-
"id": "codegen",
31-
"versionRange": "^0.28.0",
30+
"id": "questui",
31+
"versionRange": "^0.17.9",
3232
"additionalData": {}
3333
},
3434
{
3535
"id": "custom-types",
36-
"versionRange": "^0.15.21",
36+
"versionRange": "^0.15.22",
3737
"additionalData": {}
3838
},
3939
{
4040
"id": "config-utils",
41-
"versionRange": "^0.8.0",
41+
"versionRange": "^1.0.1",
4242
"additionalData": {}
4343
}
44-
],
45-
"additionalData": {}
44+
]
4645
}

‎qpm.shared.json‎

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"info": {
66
"name": "RedBar",
77
"id": "RedBar",
8-
"version": "1.9.1",
8+
"version": "1.12.0",
99
"url": null,
1010
"additionalData": {
1111
"overrideSoName": "libRedBar.so"
@@ -23,27 +23,26 @@
2323
"additionalData": {}
2424
},
2525
{
26-
"id": "questui",
27-
"versionRange": "^0.17.5",
26+
"id": "codegen",
27+
"versionRange": "^0.31.0",
2828
"additionalData": {}
2929
},
3030
{
31-
"id": "codegen",
32-
"versionRange": "^0.28.0",
31+
"id": "questui",
32+
"versionRange": "^0.17.9",
3333
"additionalData": {}
3434
},
3535
{
3636
"id": "custom-types",
37-
"versionRange": "^0.15.21",
37+
"versionRange": "^0.15.22",
3838
"additionalData": {}
3939
},
4040
{
4141
"id": "config-utils",
42-
"versionRange": "^0.8.0",
42+
"versionRange": "^1.0.1",
4343
"additionalData": {}
4444
}
45-
],
46-
"additionalData": {}
45+
]
4746
},
4847
"restoredDependencies": [
4948
{
@@ -61,7 +60,7 @@
6160
{
6261
"dependency": {
6362
"id": "libil2cpp",
64-
"versionRange": "^0.2.3",
63+
"versionRange": "=0.2.3",
6564
"additionalData": {
6665
"headersOnly": true
6766
}
@@ -71,35 +70,46 @@
7170
{
7271
"dependency": {
7372
"id": "config-utils",
74-
"versionRange": "^0.8.0",
73+
"versionRange": "=1.0.1",
7574
"additionalData": {
7675
"headersOnly": true,
77-
"soLink": "https://github.com/darknight1050/config-utils/releases/download/v0.8.0/libconfig-utils_test.so",
78-
"debugSoLink": "https://github.com/darknight1050/config-utils/releases/download/v0.8.0/debug_libconfig-utils_test.so",
76+
"soLink": "https://github.com/darknight1050/config-utils/releases/download/v1.0.1/libconfig-utils_test.so",
77+
"debugSoLink": "https://github.com/darknight1050/config-utils/releases/download/v1.0.1/debug_libconfig-utils_test.so",
7978
"overrideSoName": "libconfig-utils_test.so",
80-
"branchName": "version-v0.8.0"
79+
"branchName": "version-v1.0.1"
8180
}
8281
},
83-
"version": "0.8.0"
82+
"version": "1.0.1"
8483
},
8584
{
8685
"dependency": {
8786
"id": "custom-types",
88-
"versionRange": "^0.15.21",
87+
"versionRange": "=0.15.22",
8988
"additionalData": {
90-
"soLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.21/libcustom-types.so",
91-
"debugSoLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.21/debug_libcustom-types.so",
89+
"soLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.22/libcustom-types.so",
90+
"debugSoLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.22/debug_libcustom-types.so",
9291
"overrideSoName": "libcustom-types.so",
93-
"modLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.21/CustomTypes.qmod",
94-
"branchName": "version-v0.15.21"
92+
"modLink": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.22/CustomTypes.qmod",
93+
"branchName": "version-v0.15.22"
94+
}
95+
},
96+
"version": "0.15.22"
97+
},
98+
{
99+
"dependency": {
100+
"id": "rapidjson-macros",
101+
"versionRange": "=0.4.4",
102+
"additionalData": {
103+
"headersOnly": true,
104+
"branchName": "version-v0.4.4"
95105
}
96106
},
97-
"version": "0.15.21"
107+
"version": "0.4.4"
98108
},
99109
{
100110
"dependency": {
101111
"id": "beatsaber-hook",
102-
"versionRange": "^3.14.0",
112+
"versionRange": "=3.14.0",
103113
"additionalData": {
104114
"soLink": "https://github.com/sc2ad/beatsaber-hook/releases/download/v3.14.0/libbeatsaber-hook_3_14_0.so",
105115
"debugSoLink": "https://github.com/sc2ad/beatsaber-hook/releases/download/v3.14.0/debug_libbeatsaber-hook_3_14_0.so",
@@ -111,34 +121,34 @@
111121
{
112122
"dependency": {
113123
"id": "codegen",
114-
"versionRange": "^0.28.0",
124+
"versionRange": "=0.31.0",
115125
"additionalData": {
116-
"soLink": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.28.0/libcodegen.so",
126+
"soLink": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.31.0/libcodegen.so",
117127
"overrideSoName": "libcodegen.so",
118-
"modLink": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.28.0/Codegen.qmod",
119-
"branchName": "version-v0.28.0"
128+
"modLink": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.31.0/Codegen.qmod",
129+
"branchName": "version-v0.31.0"
120130
}
121131
},
122-
"version": "0.28.0"
132+
"version": "0.31.0"
123133
},
124134
{
125135
"dependency": {
126136
"id": "questui",
127-
"versionRange": "^0.17.5",
137+
"versionRange": "=0.17.9",
128138
"additionalData": {
129-
"soLink": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.5/libquestui.so",
130-
"debugSoLink": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.5/debug_libquestui.so",
139+
"soLink": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.9/libquestui.so",
140+
"debugSoLink": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.9/debug_libquestui.so",
131141
"overrideSoName": "libquestui.so",
132-
"modLink": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.5/QuestUI.qmod",
133-
"branchName": "version-v0.17.5",
142+
"modLink": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.9/QuestUI.qmod",
143+
"branchName": "version-v0.17.9",
134144
"compileOptions": {
135145
"systemIncludes": [
136146
"shared/cppcodec"
137147
]
138148
}
139149
}
140150
},
141-
"version": "0.17.5"
151+
"version": "0.17.9"
142152
}
143153
]
144154
}

‎src/main.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ using namespace UnityEngine;
3535
using namespace QuestUI;
3636

3737
static ModInfo modInfo;
38-
DEFINE_CONFIG(ModConfig);
3938

4039
Logger& getLogger() {
4140
static Logger* logger = new Logger(modInfo, LoggerOptions(false, true));

0 commit comments

Comments
 (0)