Skip to content

Commit 573abbb

Browse files
committed
Add configuration for disabling reporting in messages
1 parent c0b44f4 commit 573abbb

3 files changed

Lines changed: 16 additions & 8 deletions

File tree

src/main/java/com/jumpcutfindo/onmymark/OnMyMarkConfigModel.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,7 @@ public class OnMyMarkConfigModel {
5757
@RangeConstraint(min = 1, max = 86400)
5858
@Sync(Option.SyncMode.OVERRIDE_CLIENT)
5959
public long playerMarkerLifetimeSecs = PlayerMarkerRenderer.DEFAULT_LIFETIME_SECS;
60+
61+
@Sync(Option.SyncMode.OVERRIDE_CLIENT)
62+
public boolean enableReportingMessages = true;
6063
}

src/main/java/com/jumpcutfindo/onmymark/server/network/handlers/PlayerReportC2SHandler.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,17 @@ public void handle(PlayerReportC2SPacket payload, ServerPacketContext context) {
3030

3131
for (ServerPartyMember partyMember : party.partyMembers()) {
3232
ServerNetworkSender.sendPlayerMarker(partyMember.player(), markerPartyMember, playerMarker);
33-
ServerNetworkSender.sendMessageToPlayer(
34-
partyMember.player(),
35-
Text.translatable(
36-
"text.action.onmymark.playerReport.playerLocation",
37-
markerPartyMember.displayName(),
38-
StringUtils.coordinatesAsFancyText(context.player().getX(), context.player().getY(), context.player().getZ(), markerPartyMember.color())
39-
)
40-
);
33+
34+
if (OnMyMarkMod.CONFIG.enableReportingMessages()) {
35+
ServerNetworkSender.sendMessageToPlayer(
36+
partyMember.player(),
37+
Text.translatable(
38+
"text.action.onmymark.playerReport.playerLocation",
39+
markerPartyMember.displayName(),
40+
StringUtils.coordinatesAsFancyText(context.player().getX(), context.player().getY(), context.player().getZ(), markerPartyMember.color())
41+
)
42+
);
43+
}
4144
}
4245
} catch (PartyNotFoundException e) {
4346
ServerNetworkSender.sendMessageToPlayer(context.player(), Text.translatable("text.action.onmymark.exception.invalidParty"));

src/main/resources/assets/onmymark/lang/en_us.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
"text.config.onmymark.option.ovalClampPadding.tooltip": "Determines how padded you prefer the oval clamp to be.\nA larger value will cause the oval to be smaller in size, and vice versa.",
8181
"text.config.onmymark.option.playerMarkerLifetimeSecs": "Block marker timeout (s)",
8282
"text.config.onmymark.option.playerMarkerLifetimeSecs.tooltip": "Determines how long the player's marker will stay on your screen (when a player reports in), in seconds.\nThis value is overriden by the server.",
83+
"text.config.onmymark.option.enableReportingMessages": "Enable player reporting in messages",
84+
"text.config.onmymark.option.enableReportingMessages.tooltip": "Determines whether player reporting in messages should be sent.\nThis value is overriden by the server.",
8385
"text.config.onmymark.section.markerPositionSection": "Marker Position",
8486
"text.config.onmymark.section.markerStyleSection": "Marker Style",
8587
"text.config.onmymark.section.markerLifetimeSection": "Marker Lifetime",

0 commit comments

Comments
 (0)