Spectators see more & Lobby F5 by LevAlTru · Pull Request #77 · doctor4t/Wathe

LevAlTru · 2025-11-25T18:57:47Z

Copy of #49 because of its accidental closure.

Spectators & creative players can see the poison now.
Spectators had the ability to tell who the murderer is, but for some reason the murderers had the white outline instead of a red one.
F5 for players in the lobby, so they can be happy about how pretty their skin is.

MrSquidson

Seems like some of the things broke while moving your old PR to this one...

Main issue seems to be colors and the fact that no one can see poison particles now...

MrSquidson · 2025-11-25T21:05:23Z

src/main/java/dev/doctor4t/trainmurdermystery/mixin/client/restrictions/GameOptionsMixin.java

    @ModifyReturnValue(method = "getPerspective", at = @At("RETURN"))
    public Perspective getPerspective(Perspective original) {
-        if (GameFunctions.isPlayerAliveAndSurvival(MinecraftClient.getInstance().player)) {
+        if (TMMClient.isPlayerAliveAndInSurvival() && TMMClient.gameComponent.isRunning()) {


Cannot open world because of a NullpointerException thrown by `TMMClient.gameComponent.isRunning()
I've changed the line to;

if (TMMClient.isPlayerAliveAndInSurvival() && (TMMClient.gameComponent != null && TMMClient.gameComponent.isRunning())) {

And now im able to enter the world again...

This does actually throw a NullpointerException though... above does fix it...

src/main/java/dev/doctor4t/trainmurdermystery/client/TMMClient.java

        if (target instanceof PlayerEntity player) {
            if (GameFunctions.isPlayerSpectatingOrCreative(player)) return -1;
-            if (isKiller() && gameComponent.canUseKillerFeatures(player)) return MathHelper.hsvToRgb(0F, 1.0F, 0.6F);
+            if (isKiller() || gameComponent.canUseKillerFeatures(player)) return MathHelper.hsvToRgb(0F, 1.0F, 0.6F);


...in/java/dev/doctor4t/trainmurdermystery/mixin/client/self/BeveragePlateBlockEntityMixin.java

+                (!TMMClient.isKiller() &&
+                        !TMMClient.isPlayerSpectatingOrCreative() &&
+                        !CanSeePoison.EVENT.invoker().visible(MinecraftClient.getInstance().player)
+                ) || tray.getPoisoner() == null) {


MrSquidson

Disregard above- I had the old PR checked out...

MrSquidson

Changes are only needed in;
src/main/java/dev/doctor4t/trainmurdermystery/mixin/client/restrictions/GameOptionsMixin.java since it gives a NullpointerException... otherwise everything works :)

MrSquidson · 2025-11-25T21:45:40Z

src/main/java/dev/doctor4t/trainmurdermystery/mixin/client/restrictions/GameOptionsMixin.java

    @ModifyReturnValue(method = "getPerspective", at = @At("RETURN"))
    public Perspective getPerspective(Perspective original) {
-        if (GameFunctions.isPlayerAliveAndSurvival(MinecraftClient.getInstance().player)) {
+        if (TMMClient.isPlayerAliveAndInSurvival() && TMMClient.gameComponent.isRunning()) {


This does actually throw a NullpointerException though... above does fix it...

src/main/java/dev/doctor4t/trainmurdermystery/client/TMMClient.java

        if (target instanceof PlayerEntity player) {
            if (GameFunctions.isPlayerSpectatingOrCreative(player)) return -1;
-            if (isKiller() && gameComponent.canUseKillerFeatures(player)) return MathHelper.hsvToRgb(0F, 1.0F, 0.6F);
+            if (isKiller() || gameComponent.canUseKillerFeatures(player)) return MathHelper.hsvToRgb(0F, 1.0F, 0.6F);


MrSquidson · 2025-11-25T21:52:42Z

src/main/java/dev/doctor4t/trainmurdermystery/mixin/client/restrictions/KeyBindingMixin.java

+                    this.equals(MinecraftClient.getInstance().options.advancementsKey))
+                return true;
+            if (TMMClient.gameComponent != null && TMMClient.gameComponent.isRunning())
+                return this.equals(MinecraftClient.getInstance().options.togglePerspectiveKey);


Can do f5 in the lobby as expected, if a game starts you enter first person.

...in/java/dev/doctor4t/trainmurdermystery/mixin/client/self/BeveragePlateBlockEntityMixin.java

+                (!TMMClient.isKiller() &&
+                        !TMMClient.isPlayerSpectatingOrCreative() &&
+                        !CanSeePoison.EVENT.invoker().visible(MinecraftClient.getInstance().player)
+                ) || tray.getPoisoner() == null) {


LevAlTru · 2025-11-26T05:25:58Z

@MrSquidson thank you for verifying my code all over again. I wouldn't have so much patience to do the same.

DragonSlayr15001 · 2025-11-26T07:28:35Z

make sure you're not completely rewriting the borders: innocents should appear with a border corresponding to their mood, not just green all the time

LevAlTru · 2025-11-26T07:59:47Z

The only change I made is one check for red colors. I dont think that affects the innocents in any way, but I will check when I will be able to.

MrSquidson · 2025-11-26T10:26:10Z

I'll try and look if mood still displays... I'd expect so since the Innocent borders ain't changed here, but you never know...

MrSquidson · 2025-11-26T16:14:23Z

src/main/java/dev/doctor4t/trainmurdermystery/mixin/client/restrictions/GameOptionsMixin.java

    @ModifyReturnValue(method = "getPerspective", at = @At("RETURN"))
    public Perspective getPerspective(Perspective original) {
-        if (GameFunctions.isPlayerAliveAndSurvival(MinecraftClient.getInstance().player)) {
+        if (TMMClient.isPlayerAliveAndInSurvival() && (TMMClient.gameComponent != null && TMMClient.gameComponent.isRunning())) {


Mood border still works! As expected ;)

MrSquidson · 2025-11-26T16:16:14Z

I'd say this is ready for merge when a maintainer has looked it over :)

ekulxam · 2025-11-29T00:41:21Z

src/main/java/dev/doctor4t/trainmurdermystery/client/TMMClient.java

        if (target instanceof PlayerEntity player) {
            if (GameFunctions.isPlayerSpectatingOrCreative(player)) return -1;
-            if (isKiller() && gameComponent.canUseKillerFeatures(player)) return MathHelper.hsvToRgb(0F, 1.0F, 0.6F);
+            if (gameComponent.canUseKillerFeatures(player)) return MathHelper.hsvToRgb(0F, 1.0F, 0.6F);


IMO this should check MoodType and return the role's color if the MoodType is fake, in addition to the original killer check.

I like the idea, but i think it needs a little refactoring which this pull request was not created for, because we'd need to add another field to the role class and someone might did in another pull request and so and etc. etc. etc. I think we better wait until all the other pull requests are either approved or discarded.

(we'd need another field because not all roles should be highlighted to the killers, like the jester)

…nto spectator-features-&-lobby-f3 # Conflicts: # src/main/java/dev/doctor4t/wathe/block_entity/TrimmedBedBlockEntity.java # src/main/java/dev/doctor4t/wathe/mixin/client/restrictions/GameOptionsMixin.java # src/main/java/dev/doctor4t/wathe/mixin/client/restrictions/KeyBindingMixin.java # src/main/java/dev/doctor4t/wathe/mixin/client/self/BeveragePlateBlockEntityMixin.java

MrSquidson · 2025-12-20T13:10:09Z

@LevAlTru isn't the keybinding mixin supposed to still use wathe$ instead of tmm$ ?

LevAlTru and others added 11 commits November 23, 2025 22:14

i wanna see my skin in lobby

b8422cb

Fewer restrictions for spectators

c77ee38

Fewer restrictions for spectators

416fc8b

Clean some imports

6207893

thx MrSquidson

d29981f

extra measure to prevent crushing

14ef7aa

Merge branch 'doctor4t:main' into main

ef315ca

Moved if statements around

f5dca9c

Merge remote-tracking branch 'origin/main'

62f629c

Merge branch 'main' into main

bcdc6d4

Make spectators see the poison again

7667bb6

MrSquidson suggested changes Nov 25, 2025

View reviewed changes

MrSquidson approved these changes Nov 25, 2025

View reviewed changes

MrSquidson suggested changes Nov 25, 2025

View reviewed changes

Yet another null check

9187a35

LevAlTru requested a review from MrSquidson November 26, 2025 08:00

MrSquidson approved these changes Nov 26, 2025

View reviewed changes

LevAlTru and others added 2 commits November 28, 2025 19:26

Merge branch 'doctor4t:main' into spectator-features-&-lobby-f3

90b0558

Everyone is red when you're a killer fix

36b89e2

ekulxam reviewed Nov 29, 2025

View reviewed changes

Beds fix

ea642f4

LevAlTru marked this pull request as draft December 20, 2025 02:34

LevAlTru closed this Dec 20, 2025

LevAlTru force-pushed the spectator-features-&-lobby-f3 branch from ea642f4 to 7a336c9 Compare December 20, 2025 02:50

renaming TMM to Wathe

8a7ed22

LevAlTru reopened this Dec 20, 2025

LevAlTru marked this pull request as ready for review December 20, 2025 03:14

add and replace tmm with wathe

bf9aa09

MrSquidson mentioned this pull request Dec 21, 2025

Snow Particle Client Settings: Returns #122

Closed

Conversation

LevAlTru commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MrSquidson left a comment

Choose a reason for hiding this comment

Uh oh!

MrSquidson Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

MrSquidson Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

MrSquidson left a comment

Choose a reason for hiding this comment

Uh oh!

MrSquidson left a comment

Choose a reason for hiding this comment

Uh oh!

MrSquidson Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

MrSquidson Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

LevAlTru commented Nov 26, 2025

Uh oh!

DragonSlayr15001 commented Nov 26, 2025

Uh oh!

LevAlTru commented Nov 26, 2025

Uh oh!

MrSquidson commented Nov 26, 2025

Uh oh!

MrSquidson Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

MrSquidson commented Nov 26, 2025

Uh oh!

ekulxam Nov 29, 2025

Choose a reason for hiding this comment

Uh oh!

LevAlTru Nov 29, 2025

Choose a reason for hiding this comment

Uh oh!

LevAlTru Nov 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MrSquidson commented Dec 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

LevAlTru commented Nov 25, 2025 •

edited

Loading

LevAlTru Nov 29, 2025 •

edited

Loading