Skip to content

Commit c25fdec

Browse files
authored
Merge pull request #30 from LukynkaCZE/update/1.21.4
Update/1.21.4
2 parents f2e089b + 5ea92ac commit c25fdec

File tree

4 files changed

+73
-14
lines changed

4 files changed

+73
-14
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: validate gradle wrapper
2424
uses: gradle/wrapper-validation-action@v1
2525
- name: setup jdk ${{ matrix.java }}
26-
uses: actions/setup-java@v3
26+
uses: actions/setup-java@v4
2727
with:
2828
java-version: ${{ matrix.java }}
2929
distribution: 'microsoft'
@@ -34,7 +34,7 @@ jobs:
3434
run: ./gradlew build
3535
- name: capture build artifacts
3636
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
37-
uses: actions/upload-artifact@v3
37+
uses: actions/upload-artifact@v4
3838
with:
3939
name: Artifacts
4040
path: build/libs/

.profileconfig.json

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"jfrConfig": {
3+
"settings": "profile"
4+
},
5+
"asyncProfilerConfig": {
6+
"jfrsync": true,
7+
"alloc": true,
8+
"event": "wall",
9+
"misc": ""
10+
},
11+
"file": "$PROJECT_DIR/profile.jfr",
12+
"conversionConfig": {
13+
"nonProjectPackagePrefixes": [
14+
"java.",
15+
"javax.",
16+
"kotlin.",
17+
"jdk.",
18+
"com.google.",
19+
"org.apache.",
20+
"org.spring.",
21+
"sun.",
22+
"scala."
23+
],
24+
"enableMarkers": true,
25+
"initialVisibleThreads": 10,
26+
"initialSelectedThreads": 10,
27+
"includeGCThreads": false,
28+
"includeInitialSystemProperty": false,
29+
"includeInitialEnvironmentVariables": false,
30+
"includeSystemProcesses": false,
31+
"ignoredEvents": [
32+
"jdk.ActiveSetting",
33+
"jdk.ActiveRecording",
34+
"jdk.BooleanFlag",
35+
"jdk.IntFlag",
36+
"jdk.DoubleFlag",
37+
"jdk.LongFlag",
38+
"jdk.NativeLibrary",
39+
"jdk.StringFlag",
40+
"jdk.UnsignedIntFlag",
41+
"jdk.UnsignedLongFlag",
42+
"jdk.InitialSystemProperty",
43+
"jdk.InitialEnvironmentVariable",
44+
"jdk.SystemProcess",
45+
"jdk.ModuleExport",
46+
"jdk.ModuleRequire"
47+
],
48+
"minRequiredItemsPerThread": 3
49+
},
50+
"additionalGradleTargets": [
51+
{
52+
"targetPrefix": "quarkus",
53+
"optionForVmArgs": "-Djvm.args",
54+
"description": "Example quarkus config, adding profiling arguments via -Djvm.args option to the Gradle task run"
55+
}
56+
],
57+
"additionalMavenTargets": [
58+
{
59+
"targetPrefix": "quarkus:",
60+
"optionForVmArgs": "-Djvm.args",
61+
"description": "Example quarkus config, adding profiling arguments via -Djvm.args option to the Maven goal run"
62+
}
63+
]
64+
}

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ org.gradle.parallel=true
55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
77

8-
minecraft_version=1.21.3
9-
yarn_mappings=1.21.3+build.2
10-
loader_version=0.16.9
8+
minecraft_version=1.21.4
9+
yarn_mappings=1.21.4+build.8
10+
loader_version=0.16.10
1111

1212
# Fabric API
13-
fabric_version=0.108.0+1.21.3
13+
fabric_version=0.115.1+1.21.4
1414

1515
# Mod Properties
16-
mod_version=1.3.3
16+
mod_version=1.3.4
1717
maven_group=cz.lukynka
1818
archives_base_name=better-saved-hotbars

src/main/java/cz/lukynka/bettersavedhotbars/mixin/MainScreenMixin.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,13 @@ public void init(CallbackInfo ci) {
4343

4444
var text = "";
4545
if(BetterSavedHotbars.isUpdatedForThisVersion) {
46-
text = "&2⚠ &aBetter Saved Hotbars Update Available! &n&lClick to Update!&a &2⚠";
47-
fadeAfterTime = 15;
46+
text = "&7&oBetter Saved Hotbars update available";
47+
fadeAfterTime = 10;
4848
fadeTime = 5;
49-
} else {
50-
text = "&7&oBetter Saved Hotbars Update for different version available...";
51-
fadeAfterTime = 5;
52-
fadeTime = 2;
5349
}
5450

5551
startTime = System.currentTimeMillis();
5652

57-
if(BetterSavedHotbars.isDevVersion) text = "&4⚠ &cYou are running dev version of Better Saved Hotbars &4⚠";
5853
Component component = Component.literal(cz.lukynka.bettersavedhotbars.Util.translate(text));
5954

6055
button = new PlainTextButton(

0 commit comments

Comments
 (0)