feat: FINALV1GUILDRAIDSAFETY - Disallow readying up if not a guild raid

src/tel/eden/mod/config/BridgeConfig.java

@@ -271,6 +271,9 @@ public void sanitize() {
 	/** Minimum number of gambits required to ready up normally (range 0-3, default 1). */
 	public int raidGambitMinimum = 1;
 
+	/** Disallow readying up in the raid menu if the raid is not a guild raid. */
+	public boolean requireGuildRaid = false;
+
 	/** Custom palette for the 10 party slots. Defaults to PartyHighlightManager.DEFAULT_PALETTE. */
 	public List<Integer> partyColors = new ArrayList<>(tel.eden.mod.party.PartyHighlightManager.DEFAULT_PALETTE);
 

src/tel/eden/mod/gui/BridgeConfigScreen.java

@@ -148,6 +148,7 @@ protected void init() {
 		addToggleRow(Category.PARTY_RAIDS, "Raid gambit ready safety", () -> config.raidGambitSafety, v -> config.raidGambitSafety = v, "On", "Off", true);
 		IntConfigSlider gambitSlider = new IntConfigSlider(CONTROL_W, 20, 0, 3, 1, () -> config.raidGambitMinimum, v -> config.raidGambitMinimum = v, v -> Component.literal(v == 0 ? "Off (0)" : String.valueOf(v)));
 		addSliderRow(Category.PARTY_RAIDS, "Minimum raid gambits", gambitSlider, gambitSlider::syncFromConfig, () -> config.raidGambitMinimum = 1);
+		addToggleRow(Category.PARTY_RAIDS, "Require guild raid to ready", () -> config.requireGuildRaid, v -> config.requireGuildRaid = v, "On", "Off", false);
 
 		// War & Territory
 		addToggleRow(Category.WAR, "Attack timers HUD", () -> config.warAttackTimers, v -> config.warAttackTimers = v, "On", "Off", true);

src/tel/eden/mod/mixin/AbstractContainerScreenMixin.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -33,28 +34,70 @@ public abstract class AbstractContainerScreenMixin {
 	private void edenmod$onSlotClicked(Slot slot, int slotId, int mouseButton, ClickType clickType, CallbackInfo ci) {
 		try {
 			BridgeConfig config = EdenModClient.instance().config();
-			if (RaidGambitSafety.shouldBlockReadyClick(getMenu(), slot, clickType, config)) {
+			List<String> reasons = RaidGambitSafety.getActiveBlockReasons(getMenu(), slot, clickType, config);
+			if (!reasons.isEmpty()) {
 				ci.cancel();
 				RaidGambitSafety.notifyBlocked(Minecraft.getInstance(), config.raidGambitMinimum);
+				RaidGambitSafety.showPopupWarning(reasons);
 			}
 		} catch (Throwable ignored) {
 		}
 	}
 
+	@Inject(method = "render", at = @At("RETURN"))
+	private void edenmod$renderSafetyPopup(GuiGraphics graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+		try {
+			Minecraft mc = Minecraft.getInstance();
+			if (mc != null && mc.font != null && mc.getWindow() != null) {
+				RaidGambitSafety.renderPopupWarning(graphics, mc.font, mc.getWindow().getGuiScaledWidth());
+			}
+		} catch (Throwable ignored) {
+		}
+	}
+
+	@Inject(method = "removed", at = @At("TAIL"))
+	private void edenmod$onContainerScreenRemoved(CallbackInfo ci) {
+		RaidGambitSafety.clearPopupWarning();
+	}
+
 	@Inject(method = "getTooltipFromContainerItem(Lnet/minecraft/world/item/ItemStack;)Ljava/util/List;", at = @At("RETURN"), cancellable = true)
 	private void edenmod$appendRaidReadyTooltip(ItemStack stack, CallbackInfoReturnable<List<Component>> cir) {
 		try {
 			if (this.hoveredSlot != null && RaidGambitSafety.isReadyClickSlot(this.hoveredSlot)) {
 				BridgeConfig config = EdenModClient.instance().config();
-				if (config != null && config.raidGambitSafety && config.raidGambitMinimum > 0) {
+				if (config != null) {
 					AbstractContainerMenu menu = getMenu();
 					if (RaidGambitSafety.isRaidReadyMenu(menu) && !RaidGambitSafety.isPlayerAlreadyReadied(menu)) {
-						int enabled = RaidGambitSafety.countEnabledGambits(menu);
-						if (enabled < config.raidGambitMinimum) {
+						List<Component> warnings = new ArrayList<>();
+						if (config.raidGambitSafety && config.raidGambitMinimum > 0) {
+							int enabled = RaidGambitSafety.countEnabledGambits(menu);
+							if (enabled < config.raidGambitMinimum) {
+								warnings.add(RaidGambitSafety.getTooltipWarning(config.raidGambitMinimum));
+							}
+						}
+						if (config.requireGuildRaid && !RaidGambitSafety.isGuildRaidAvailable(menu)) {
+							warnings.add(RaidGambitSafety.getGuildRaidTooltipWarning());
+						}
+						if (!warnings.isEmpty()) {
 							List<Component> base = cir.getReturnValue();
 							List<Component> tooltip = new ArrayList<>(base != null ? base : List.of());
-							tooltip.add(Component.empty());
-							tooltip.add(RaidGambitSafety.getTooltipWarning(config.raidGambitMinimum));
+							int insertIdx = -1;
+							for (int i = 0; i < tooltip.size(); i++) {
+								String text = net.minecraft.ChatFormatting.stripFormatting(tooltip.get(i).getString()).trim();
+								if (text.contains("Click to Ready Up") || text.equalsIgnoreCase("Click to Ready Up")) {
+									insertIdx = i;
+									break;
+								}
+							}
+							if (insertIdx != -1) {
+								for (Component w : warnings) {
+									tooltip.add(insertIdx++, w);
+								}
+								tooltip.add(insertIdx, Component.empty());
+							} else {
+								tooltip.add(Component.empty());
+								tooltip.addAll(warnings);
+							}
 							cir.setReturnValue(tooltip);
 						}
 					}