Skip to content

Commit 4f37f1a

Browse files
PatboxPatbox
committed
Update to 1.21.6
1 parent 013a5f9 commit 4f37f1a

5 files changed

Lines changed: 78 additions & 13 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
21 # Minimum supported by Minecraft
1616
]
1717
# and run on both Linux and Windows
18-
os: [ubuntu-20.04, windows-latest]
18+
os: [ubuntu-latest, windows-latest]
1919
runs-on: ${{ matrix.os }}
2020
steps:
2121
- name: checkout repository

‎.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+
}

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ dependencies {
4242
//modLocalRuntime fabricApi.module("fabric-api-base", project.fabric_version)
4343

4444
modImplementation include("eu.pb4:predicate-api:0.6.0+1.21.2")
45-
modImplementation include("eu.pb4:placeholder-api:2.6.1+1.21.5")
46-
modImplementation include("me.lucko:fabric-permissions-api:0.3.3")
47-
modImplementation include("eu.pb4:player-data-api:0.7.0+1.21.5")
45+
modImplementation include("eu.pb4:placeholder-api:2.7.0+1.21.6")
46+
modImplementation include("me.lucko:fabric-permissions-api:0.3.4-patbox")
47+
modImplementation include("eu.pb4:player-data-api:0.8.0+1.21.6")
4848

4949
modCompileOnly("maven.modrinth:vanish:1.5.2+1.20.4")
5050
//modLocalRuntime("fr.catcore:server-translations-api:1.4.17+1.19.2")

‎gradle.properties‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/use
6-
minecraft_version=1.21.5-rc1
7-
yarn_mappings=1.21.5-rc1+build.1
8-
loader_version=0.16.10
6+
minecraft_version=1.21.6
7+
yarn_mappings=1.21.6+build.1
8+
loader_version=0.16.14
9+
loom_version=1.10-SNAPSHOT
910

10-
#Fabric api
11-
fabric_version=0.119.1+1.21.5
11+
# Fabric API
12+
fabric_version=0.127.0+1.21.6
1213

1314
# Mod Properties
14-
mod_version = 2.8.0+1.21.5
15+
mod_version = 2.9.0+1.21.6
1516
maven_group = eu.pb4
1617
archives_base_name = styled-chat
1718

‎src/main/java/eu/pb4/styledchat/other/StyledChatSentMessage.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void send(ServerPlayerEntity receiver, boolean filterMaskEnabled, Message
4444
colorless.setValue(StyledChatUtils.removeColor(parameters));
4545
}
4646
if (!signedMessage.isFullyFiltered()) {
47-
var id = receiver.server.getRegistryManager().getOrThrow(RegistryKeys.MESSAGE_TYPE).getId(params.type().value());
47+
var id = receiver.getRegistryManager().getOrThrow(RegistryKeys.MESSAGE_TYPE).getId(params.type().value());
4848

4949
if (sourceType == null || Objects.equals(id, this.sourceType.getValue())) {
5050
receiver.networkHandler.sendChatMessage(signedMessage, color ? this.parameters : colorless.getValue());
@@ -62,7 +62,7 @@ public void send(ServerPlayerEntity receiver, boolean filterMaskEnabled, Message
6262
text = StyledChatUtils.removeColor(text);
6363
}
6464

65-
receiver.networkHandler.sendChatMessage(signedMessage, MessageType.params(StyledChatMod.MESSAGE_TYPE_ID, receiver.server.getRegistryManager(), text));
65+
receiver.networkHandler.sendChatMessage(signedMessage, MessageType.params(StyledChatMod.MESSAGE_TYPE_ID, receiver.getRegistryManager(), text));
6666
}
6767
}
6868
}
@@ -80,7 +80,7 @@ public Text content() {
8080

8181
@Override
8282
public void send(ServerPlayerEntity receiver, boolean filterMaskEnabled, MessageType.Parameters params) {
83-
var id = receiver.server.getRegistryManager().getOrThrow(RegistryKeys.MESSAGE_TYPE).getId(params.type().value());
83+
var id = receiver.getRegistryManager().getOrThrow(RegistryKeys.MESSAGE_TYPE).getId(params.type().value());
8484
var color = ((ExtPlayNetworkHandler) receiver.networkHandler).styledChat$chatColors();
8585
if (!color && colorless.getValue() == null) {
8686
colorless.setValue(StyledChatUtils.removeColor(parameters));

0 commit comments

Comments
 (0)