Feat: show welcome when pressing tab in game

Also fixed NPE on join relating to hitlist
Some things are probably still broken

Author: ekulxam

src/client/java/dev/spiritstudios/umbra_express/mixin/client/qol/RoundTextRendererMixin.java

@@ -0,0 +1,51 @@
+package dev.spiritstudios.umbra_express.mixin.client.qol;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import dev.doctor4t.trainmurdermystery.client.TMMClient;
+import dev.doctor4t.trainmurdermystery.client.gui.RoundTextRenderer;
+import dev.spiritstudios.umbra_express.UmbraExpress;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.network.ClientPlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = RoundTextRenderer.class, remap = false)
+public class RoundTextRendererMixin {
+
+	@Shadow
+	private static int welcomeTime;
+	@Unique
+	private static boolean umbra_express$forceShowWelcome = false;
+
+	@WrapMethod(method = "renderHud")
+	private static void showWelcomeWhenPressingPlayerList(TextRenderer renderer, ClientPlayerEntity player, DrawContext context, Operation<Void> original) {
+		if (umbra_express$forceShowWelcome) {
+			int realWelcomeTime = welcomeTime;
+			welcomeTime = 2;
+			try {
+				original.call(renderer, player, context);
+			} catch (Throwable throwable) {
+				UmbraExpress.LOGGER.error("An error occurred when wrapping RoundTextRenderer.renderHud", throwable);
+			}
+			welcomeTime = realWelcomeTime;
+		}
+	}
+
+	@Inject(method = "tick", at = @At("HEAD"))
+	private static void assumeFalse(CallbackInfo ci) {
+		umbra_express$forceShowWelcome = false;
+	}
+
+	@ModifyExpressionValue(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;isPressed()Z"))
+	private static boolean updatePressingPlayerList(boolean original) {
+		umbra_express$forceShowWelcome = original && TMMClient.gameComponent != null && TMMClient.gameComponent.isRunning();
+		return original;
+	}
+}

src/client/resources/umbra_express.client.mixins.json

@@ -1,27 +1,30 @@
 {
-    "required": true,
-    "package": "dev.spiritstudios.umbra_express.mixin.client",
-    "compatibilityLevel": "JAVA_21",
-    "mixinextras": {
-        "minVersion": "0.5.0"
-    },
-    "client": [
-        "TMMItemTooltipsAccessor",
-        "haunting.ClientPlayerInteractionManagerMixin",
-        "qol.PlayerMoodComponentMixin",
-        "qol.TMMClientMixin",
-        "roles.assassin.TMMItemTooltipsMixin",
-        "roles.bartender.BeveragePlateBlockEntityMixinMixin",
-        "roles.conductor.TimeRendererMixin",
-        "roles.mystic.TimeRendererMixin",
-        "roles.shop.LimitedInventoryScreenMixin",
-        "roles.shop.StoreItemWidgetMixin",
-        "roles.shop.StoreRendererMixin"
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    },
-    "overwrites": {
-        "requireAnnotations": true
-	}
+  "required": true,
+  "package": "dev.spiritstudios.umbra_express.mixin.client",
+  "compatibilityLevel": "JAVA_21",
+  "mixinextras": {
+    "minVersion": "0.5.0"
+  },
+  "client": [
+    "TMMItemTooltipsAccessor",
+    "haunting.ClientPlayerInteractionManagerMixin",
+    "qol.PlayerMoodComponentMixin",
+    "qol.TMMClientMixin",
+    "roles.assassin.TMMItemTooltipsMixin",
+    "roles.bartender.BeveragePlateBlockEntityMixinMixin",
+    "roles.conductor.TimeRendererMixin",
+    "roles.mystic.TimeRendererMixin",
+    "roles.shop.LimitedInventoryScreenMixin",
+    "roles.shop.StoreItemWidgetMixin",
+    "roles.shop.StoreRendererMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "overwrites": {
+    "requireAnnotations": true
+  },
+  "mixins": [
+    "qol.RoundTextRendererMixin"
+  ]
 }

src/main/java/dev/spiritstudios/umbra_express/init/UmbraExpressEvents.java

@@ -28,9 +28,12 @@ static void registerGameLifecycle() {
         TMMGameLifecycleEvents.BASE_INITIALIZED.register((serverWorld, game) -> {
             HitListWorldComponent hitlist = HitListWorldComponent.cast(game);
             resetWorld(serverWorld, hitlist);
-            hitlist.umbra_express$rerollTarget();
         });
 
+		TMMGameLifecycleEvents.INITIALIZING.register((serverWorld, game, readyPlayerList) -> {
+			HitListWorldComponent.cast(game).umbra_express$rerollTarget();
+		});
+
         // is it necessary to split these??
         TMMGameLifecycleEvents.FINALIZING.register((serverWorld, game) -> resetWorld(serverWorld, HitListWorldComponent.cast(game)));
         TMMGameLifecycleEvents.FINALIZED.register((serverWorld, game) -> HauntingVoicechatPlugin.reset());

src/main/java/dev/spiritstudios/umbra_express/mixin/event/GameFunctionsMixin.java

@@ -11,13 +11,15 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.List;
 
+@Debug(export = true)
 @Mixin(value = GameFunctions.class, remap = false)
 public class GameFunctionsMixin {
 

src/main/java/dev/spiritstudios/umbra_express/mixin/roles/assassin/GameWorldComponentMixin.java

@@ -57,7 +57,8 @@ public abstract class GameWorldComponentMixin implements HitListWorldComponent {
 				if (!GameFunctions.isPlayerAliveAndSurvival(player)) {
 					return false;
 				}
-				return !this.getRole(player).canUseKiller();
+				Role role = this.getRole(player);
+				return role != null && !this.getRole(player).canUseKiller();
 			}).toList();
 		if (targets.isEmpty()) {
 			this.umbra_express$assassinationTarget = null;

src/main/java/dev/spiritstudios/umbra_express/role/RoleReplacer.java

@@ -56,7 +56,7 @@ public interface ReplacementPredicate {
 		 * @param chance the chance that the check will succeed.
 		 *               At 1f, this will be equivalent to
 		 *               {@linkplain ReplacementPredicate#ALWAYS}
-		 * @return the checker
+		 * @return the predicate
 		 */
 		static ReplacementPredicate fromRandom(float chance) {
 			return (totalPlayers, serverWorld, uuid) -> serverWorld.getRandom().nextFloat() <= chance;