Merge branch 'mc/26.1.1' into mc/26w14a

# Conflicts:
#	fabric/build.gradle.kts
#	gradle.properties
#	mojmap/src/main/java/dev/qixils/crowdcontrol/plugin/fabric/commands/TakeItemCommand.java

Author: qixils

CHANGELOG.md

@@ -2,11 +2,21 @@
 
 A list of all changes made to the software in reverse chronological order.
 
+## 4.5.2
+
+- Paper: Added support for 26.1.1 and its new _Age Nearby Mobs_ effects
+- Paper: Fixed _Take Item_ not respecting limits
+- _Replace Blocks with Gravel_ no longer replaces liquids
+- Fixed minor issues with the Soft Lock Observer and tweaked its default settings
+- Custom Effects now respect item and entity limit settings
+  - Due to limitations in the Paper mod this only works on custom effects with 1 action for now
+  - On Fabric/NeoForge, stacked actions may target different random players
+- Fabric/NeoForge 26.1+: More config options are available in the GUI
+
 ## 4.5.1
 
-- Fabric: Added support for Herdcraft/26w14a/Minecraft's April Fools
 - Fabric/NeoForge 26.1+: Config GUI is now available when YACL is installed
-    - Additional options will be available at a later date
+- Fabric: Added support for Herdcraft/26w14a/Minecraft's April Fools
 
 ## 4.5.0
 

build.gradle.kts

@@ -7,9 +7,9 @@ plugins {
     id("com.gradleup.shadow") version "8.3.10" apply true
     id("net.fabricmc.fabric-loom") version "1.15-SNAPSHOT" apply false
     id("net.neoforged.moddev") version "2.0.141" apply false
-    id("xyz.jpenilla.run-paper") version "2.3.1" apply false // Adds runServer and runMojangMappedServer tasks for testing
-    id("de.eldoria.plugin-yml.bukkit") version "0.8.0" apply false // Generates plugin.yml
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19" apply false
+    id("xyz.jpenilla.run-paper") version "3.0.2" apply false // Adds runServer and runMojangMappedServer tasks for testing
+    id("de.eldoria.plugin-yml.bukkit") version "0.9.0" apply false // Generates plugin.yml
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.21" apply false
     id("me.modmuss50.mod-publish-plugin") version "1.1.0" apply false
 }
 

common/src/main/java/dev/qixils/crowdcontrol/common/LimitConfig.java

@@ -13,11 +13,11 @@
  * The configuration for effect limits.
  */
 public final class LimitConfig {
-	private final boolean hostsBypass;
-	private final @NotNull Map<String, Integer> itemLimits;
-	private final int itemDefaultLimit;
-	private final @NotNull Map<String, Integer> entityLimits;
-	private final int entityDefaultLimit;
+	private boolean hostsBypass;
+	private @NotNull Map<String, Integer> itemLimits;
+	private int itemDefaultLimit;
+	private @NotNull Map<String, Integer> entityLimits;
+	private int entityDefaultLimit;
 
 	/**
 	 * Constructs a new limit configuration.
@@ -30,10 +30,8 @@ public LimitConfig(boolean hostsBypass,
 					   @Nullable Map<String, Integer> itemLimits,
 					   @Nullable Map<String, Integer> entityLimits) {
 		this.hostsBypass = hostsBypass;
-		this.itemLimits = new HashMap<>(validateNotNullElseGet(itemLimits, Collections::emptyMap));
-		itemDefaultLimit = this.itemLimits.getOrDefault("default", 0);
-		this.entityLimits = new HashMap<>(validateNotNullElseGet(entityLimits, Collections::emptyMap));
-		entityDefaultLimit = this.entityLimits.getOrDefault("default", 0);
+		itemLimits(validateNotNullElseGet(itemLimits, Collections::emptyMap));
+		entityLimits(validateNotNullElseGet(entityLimits, Collections::emptyMap));
 	}
 
 	/**
@@ -53,6 +51,19 @@ public boolean hostsBypass() {
 		return hostsBypass;
 	}
 
+	public void hostsBypass(boolean hostsBypass) {
+		this.hostsBypass = hostsBypass;
+	}
+
+	public int defaultItemLimit() {
+		return itemDefaultLimit;
+	}
+
+	public void defaultItemLimit(int defaultItemLimit) {
+		itemLimits.put("default", defaultItemLimit);
+		this.itemDefaultLimit = defaultItemLimit;
+	}
+
 	/**
 	 * Gets the limit on the given item effect.
 	 *
@@ -72,6 +83,20 @@ public int getItemLimit(@NotNull String item) {
 		return Collections.unmodifiableMap(itemLimits);
 	}
 
+	public void itemLimits(Map<String, Integer> itemLimits) {
+		this.itemLimits = new HashMap<>(itemLimits);
+		itemDefaultLimit = this.itemLimits.getOrDefault("default", 0);
+	}
+
+	public int defaultEntityLimit() {
+		return entityDefaultLimit;
+	}
+
+	public void defaultEntityLimit(int defaultEntityLimit) {
+		entityLimits.put("default", defaultEntityLimit);
+		this.entityDefaultLimit = defaultEntityLimit;
+	}
+
 	/**
 	 * Gets the limit on the given entity effect.
 	 *
@@ -91,6 +116,11 @@ public int getEntityLimit(@NotNull String entity) {
 		return Collections.unmodifiableMap(entityLimits);
 	}
 
+	public void entityLimits(Map<String, Integer> entityLimits) {
+		this.entityLimits = new HashMap<>(entityLimits);
+		entityDefaultLimit = this.entityLimits.getOrDefault("default", 0);
+	}
+
 	@Override
 	public String toString() {
 		return "LimitConfig{" +

common/src/main/java/dev/qixils/crowdcontrol/common/Plugin.java

@@ -335,6 +335,10 @@ public boolean isGlobal() {
 		return global;
 	}
 
+	public void setIsGlobal(boolean isGlobal) {
+		global = isGlobal;
+	}
+
 	/**
 	 * Returns a collection of strings representing the names of hosts.
 	 * <p>
@@ -350,6 +354,14 @@ public Collection<String> getHosts() {
 		return hosts;
 	}
 
+	public Collection<String> getRawHosts() {
+		return new ArrayList<>(hosts);
+	}
+
+	public void setRawHosts(Collection<String> hosts) {
+		this.hosts = new HashSet<>(hosts);
+	}
+
 	/**
 	 * Whether to announce the execution of effects in chat.
 	 *

common/src/main/java/dev/qixils/crowdcontrol/common/SoftLockConfig.java

@@ -9,15 +9,16 @@
  */
 public class SoftLockConfig {
 
-	public static final int DEF_PERIOD = 120;
-	public static final int DEF_DEATHS = 6;
+	public static final int DEF_PERIOD = 60;
+	public static final int DEF_DEATHS = 5;
 	public static final int DEF_SEARCH_HORIZ = 20;
 	public static final int DEF_SEARCH_VERT = 8;
 
-	private final Duration period;
-	private final int deaths;
-	private final int searchHoriz;
-	private final int searchVert;
+	private int period;
+	private transient Duration periodDuration;
+	private int deaths;
+	private int searchHoriz;
+	private int searchVert;
 
 	/**
 	 * Creates a new soft-lock config.
@@ -29,26 +30,24 @@ public SoftLockConfig() {
 	/**
 	 * Creates a new soft-lock config.
 	 *
-	 * @param period the monitoring period
+	 * @param period the monitoring period, in seconds
 	 * @param deaths the death count threshold
-	 * @param searchHoriz the horizontal search radius
-	 * @param searchVert the vertical search radius
 	 */
-	public SoftLockConfig(Duration period, int deaths, int searchHoriz, int searchVert) {
+	public SoftLockConfig(int period, int deaths, int searchHoriz, int searchVert) {
 		this.period = period;
+		this.periodDuration = Duration.ofSeconds(period);
 		this.deaths = deaths;
 		this.searchHoriz = searchHoriz;
 		this.searchVert = searchVert;
 	}
 
 	/**
-	 * Creates a new soft-lock config.
+	 * How long the monitoring period is in seconds.
 	 *
-	 * @param period the monitoring period, in seconds
-	 * @param deaths the death count threshold
+	 * @return monitoring period in seconds
 	 */
-	public SoftLockConfig(int period, int deaths, int searchHoriz, int searchVert) {
-		this(Duration.ofSeconds(period), deaths, searchHoriz, searchVert);
+	public int getPeriod() {
+		return period;
 	}
 
 	/**
@@ -57,8 +56,16 @@ public SoftLockConfig(int period, int deaths, int searchHoriz, int searchVert) {
 	 * @return monitoring period
 	 */
 	@NotNull
-	public Duration getPeriod() {
-		return period;
+	public Duration getPeriodDuration() {
+		return periodDuration;
+	}
+
+	public void setPeriod(Duration period) {
+		this.period = (int) period.toSeconds();
+	}
+
+	public void setPeriod(int period) {
+		this.period = period;
 	}
 
 	/**
@@ -70,6 +77,10 @@ public int getDeaths() {
 		return deaths;
 	}
 
+	public void setDeaths(int deaths) {
+		this.deaths = deaths;
+	}
+
 	/**
 	 * The horizontal entity search radius.
 	 *
@@ -79,6 +90,10 @@ public int getSearchH() {
 		return searchHoriz;
 	}
 
+	public void setSearchH(int searchHoriz) {
+		this.searchHoriz = searchHoriz;
+	}
+
 	/**
 	 * The vertical entity search radius.
 	 *
@@ -87,4 +102,8 @@ public int getSearchH() {
 	public int getSearchV() {
 		return searchVert;
 	}
+
+	public void setSearchV(int searchVert) {
+		this.searchVert = searchVert;
+	}
 }

common/src/main/java/dev/qixils/crowdcontrol/common/SoftLockObserver.java

@@ -52,8 +52,10 @@ protected int getSearchV() {
 	 * @param player The player who died.
 	 */
 	protected void onDeath(P player) {
-		UUID uuid = plugin.playerMapper().tryGetUniqueId(player)
-				.orElseThrow(() -> new IllegalArgumentException("Expected player to have a UUID"));
+		Optional<UUID> uuidOpt = plugin.playerMapper().tryGetUniqueId(player);
+		if (uuidOpt.isEmpty()) return;
+		UUID uuid = uuidOpt.get();
+
 		DeathData data = deathData.computeIfAbsent(uuid, $ -> new DeathData(plugin.getSoftLockConfig()));
 		if (data.isSoftLocked()) {
 			onSoftLock(player);
@@ -67,13 +69,12 @@ private static final class DeathData {
 
 		public DeathData(@NotNull SoftLockConfig config) {
 			this.config = config;
-			addDeath();
 		}
 
 		private void addDeath() {
 			LocalDateTime now = LocalDateTime.now();
-			deaths.removeIf(d -> d.isBefore(now.minus(config.getPeriod())));
 			deaths.add(now);
+			deaths.removeIf(d -> d.isBefore(now.minus(config.getPeriodDuration())));
 		}
 
 		public boolean isSoftLocked() {

common/src/main/java/dev/qixils/crowdcontrol/common/command/Command.java

@@ -454,10 +454,10 @@ default boolean isMainThread() {
 	}
 
 	default CCEffectResponse executeLimit(@NotNull PublicEffectPayload request, @NotNull List<P> players, int playerLimit, @NotNull Function<P, CCEffectResponse> supplier) {
-		if (isMainThread()) {
-			getPlugin().getSLF4JLogger().error("Effect {} is implemented incorrectly, invoking executeLimit from main thread, please report this!", getEffectName());
-			return new CCInstantEffectResponse(request.getRequestId(), ResponseStatus.FAIL_PERMANENT, "Effect is implemented incorrectly");
-		}
+//		if (isMainThread()) {
+//			getPlugin().getSLF4JLogger().error("Effect {} is implemented incorrectly, invoking executeLimit from main thread, please report this!", getEffectName());
+//			return new CCInstantEffectResponse(request.getRequestId(), ResponseStatus.FAIL_PERMANENT, "Effect is implemented incorrectly");
+//		}
 		boolean hostsBypass = getPlugin().getLimitConfig().hostsBypass();
 		int victims = 0;
 		CCEffectResponse successResp = null;

common/src/main/resources/assets/crowdcontrol/default.conf

@@ -107,7 +107,7 @@ custom-effects: {
 soft-lock-observer: {
 
   # How long the monitoring period is, in seconds.
-  period: 120
+  period: 60
 
   # How many deaths must be counted within the monitoring period to trigger the fail-safes.
   deaths: 5

common/src/main/resources/assets/crowdcontrol/lang/en_us.json

@@ -1,14 +1,38 @@
 {
-    "config.crowdcontrol.title": "Crowd Control",
-    "config.crowdcontrol.category.general": "General",
-    "config.crowdcontrol.announce.name": "Announce Effects",
-    "config.crowdcontrol.announce.description": "Whether to post an alert in chat when an effect has been activated.",
-    "config.crowdcontrol.hide_names.name": "Name Visibilty",
-    "config.crowdcontrol.hide_names.description": "Determines where to show the names of viewers who have purchased effects.",
-    "config.crowdcontrol.hide_names.option.none": "Show",
-    "config.crowdcontrol.hide_names.option.chat": "Hide in chat",
-    "config.crowdcontrol.hide_names.option.all": "Hide everywhere",
-    "config.crowdcontrol.advanced_settings": "Advanced settings can be found in the mod's config file.",
-    "config.crowdcontrol.missing": "Please install Yet Another Config Lib to visually configure the config, or manually edit the crowdcontrol.conf file.",
-    "config.crowdcontrol.missing_back": "Back"
+  "config.crowdcontrol.title": "Crowd Control",
+  "config.crowdcontrol.category.general": "General",
+  "config.crowdcontrol.announce.name": "Announce Effects",
+  "config.crowdcontrol.announce.description": "Whether to post an alert in chat when an effect has been activated.",
+  "config.crowdcontrol.hide_names.name": "Name Visibilty",
+  "config.crowdcontrol.hide_names.description": "Determines where to show the names of viewers who have purchased effects.",
+  "config.crowdcontrol.hide_names.option.none": "Show",
+  "config.crowdcontrol.hide_names.option.chat": "Hide in chat",
+  "config.crowdcontrol.hide_names.option.all": "Hide everywhere",
+  "config.crowdcontrol.global.name": "Share Effects",
+  "config.crowdcontrol.global.description": "Enables global mode which applies incoming effects to every player on the world.",
+  "config.crowdcontrol.hosts.name": "Hosts",
+  "config.crowdcontrol.hosts.description": "Specify other players that are allowed to use server-wide effects like setting the server difficulty. Can be Minecraft usernames, UUIDs, Crowd Control usernames, or Crowd Control IDs. Irrelevant with Share Effects enabled.",
+  "config.crowdcontrol.soft_lock.name": "Soft-Lock Detector",
+  "config.crowdcontrol.soft_lock.description": "Detects and prevents players getting stuck in a death loop by removing nearby sources of damage.",
+  "config.crowdcontrol.soft_lock.period.name": "Monitoring Period (seconds)",
+  "config.crowdcontrol.soft_lock.period.description": "How long the monitoring period is, in seconds.",
+  "config.crowdcontrol.soft_lock.deaths.name": "Required Deaths",
+  "config.crowdcontrol.soft_lock.deaths.description": "How many deaths must be observed during the monitoring period to trigger.",
+  "config.crowdcontrol.soft_lock.horiz_radius.name": "Horizontal Search Radius",
+  "config.crowdcontrol.soft_lock.vert_radius.name": "Vertical Search Radius",
+  "config.crowdcontrol.soft_lock.radius.description": "Radius to search for damage sources.",
+  "config.crowdcontrol.category.limits": "Limits",
+  "config.crowdcontrol.hosts_bypass.name": "Hosts Bypass Limits",
+  "config.crowdcontrol.hosts_bypass.description": "Whether users listed in the Hosts config are excluded from any limits defined below.",
+  "config.crowdcontrol.default_item_limit.name": "Default Item Limit",
+  "config.crowdcontrol.default_item_limit.description": "Default limit for how many players can receive one Give Item effect. 0 is unlimited. Applicable only to sessions with multiple linked players.",
+  "config.crowdcontrol.item_limit.name": "Item Limits",
+  "config.crowdcontrol.item_limit.description": "Individual limits for how many players can receive one Give Item effect. 0 is unlimited. Applicable only to sessions with multiple linked players.",
+  "config.crowdcontrol.default_entity_limit.name": "Default Entity Limit",
+  "config.crowdcontrol.default_entity_limit.description": "Default limit for how many players can receive one Summon/Remove Entity effect. 0 is unlimited. Applicable only to sessions with multiple linked players.",
+  "config.crowdcontrol.entity_limit.name": "Entity Limits",
+  "config.crowdcontrol.entity_limit.description": "Individual limits for how many players can receive one Summon/Remove Entity effect. 0 is unlimited. Applicable only to sessions with multiple linked players.",
+  "config.crowdcontrol.advanced_settings": "Custom Effects can be defined in the mod's config file.",
+  "config.crowdcontrol.missing": "Please install Yet Another Config Lib to visually configure the config, or manually edit the crowdcontrol.conf file.",
+  "config.crowdcontrol.missing_back": "Back"
 }

common/src/main/resources/config.yml

@@ -87,7 +87,7 @@ custom-effects:
 soft-lock-observer:
 
   # How long the monitoring period is, in seconds.
-  period: 120
+  period: 60
 
   # How many deaths must be counted within the monitoring period to trigger the fail-safes.
   deaths: 5