R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复实体加速器黑名单和倍率名单无法热重载的问题

Browse Source
This commit is contained in:
C-H716 2025-09-23 23:00:58 +08:00
parent d3a47ea3d3
commit dbf2ad7be2
1 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/com/extendedae_plus/util/ConfigParsingUtils.java
View File

@ -1,6 +1,7 @@
package com.extendedae_plus.util; package com.extendedae_plus.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException; import java.util.regex.PatternSyntaxException;
@ -114,34 +115,71 @@ public final class ConfigParsingUtils {
// ------------------ 全局缓存与接口 ------------------ // ------------------ 全局缓存与接口 ------------------
private static volatile List<Pattern> cachedBlacklist = null; private static volatile List<Pattern> cachedBlacklist = null;
private static volatile List<MultiplierEntry> cachedMultiplierEntries = null; private static volatile List<MultiplierEntry> cachedMultiplierEntries = null;
private static volatile List<String> cachedBlacklistSourceSnapshot = null;
private static volatile List<String> cachedMultiplierSourceSnapshot = null;
private static final Object CACHE_LOCK = new Object(); private static final Object CACHE_LOCK = new Object();
/** /**
* 获取已解析并缓存的黑名单（线程安全、懒加载）。 * 获取已解析并缓存的黑名单（线程安全、懒加载）。
*/ */
public static List<Pattern> getCachedBlacklist(java.util.List<? extends String> source) { public static List<Pattern> getCachedBlacklist(java.util.List<? extends String> source) {
if (cachedBlacklist == null) { List<String> normalized = normalizeSource(source);
synchronized (CACHE_LOCK) {
if (cachedBlacklist == null) { // fast path: identical snapshot reference or equal contents
cachedBlacklist = compilePatterns(source); if (cachedBlacklist != null && listEquals(cachedBlacklistSourceSnapshot, normalized)) {
} return Collections.unmodifiableList(cachedBlacklist);
} }
synchronized (CACHE_LOCK) {
if (cachedBlacklist == null || !listEquals(cachedBlacklistSourceSnapshot, normalized)) {
cachedBlacklist = compilePatterns(normalized);
cachedBlacklistSourceSnapshot = normalized.isEmpty() ? Collections.emptyList() : new ArrayList<>(normalized);
}
return Collections.unmodifiableList(cachedBlacklist);
} }
return java.util.List.copyOf(cachedBlacklist);
} }
/** /**
* 获取已解析并缓存的倍率列表（线程安全、懒加载）。 * 获取已解析并缓存的倍率列表（线程安全、懒加载）。
*/ */
public static List<MultiplierEntry> getCachedMultiplierEntries(java.util.List<? extends String> source) { public static List<MultiplierEntry> getCachedMultiplierEntries(java.util.List<? extends String> source) {
if (cachedMultiplierEntries == null) { List<String> normalized = normalizeSource(source);
synchronized (CACHE_LOCK) {
if (cachedMultiplierEntries == null) { if (cachedMultiplierEntries != null && listEquals(cachedMultiplierSourceSnapshot, normalized)) {
cachedMultiplierEntries = parseMultiplierList(source); return Collections.unmodifiableList(cachedMultiplierEntries);
}
}
} }
return java.util.List.copyOf(cachedMultiplierEntries);
synchronized (CACHE_LOCK) {
if (cachedMultiplierEntries == null || !listEquals(cachedMultiplierSourceSnapshot, normalized)) {
cachedMultiplierEntries = parseMultiplierList(normalized);
cachedMultiplierSourceSnapshot = normalized.isEmpty() ? Collections.emptyList() : new ArrayList<>(normalized);
}
return Collections.unmodifiableList(cachedMultiplierEntries);
}
}
// Normalize the incoming source list: trim entries, drop blanks, keep stable ordering
private static List<String> normalizeSource(java.util.List<? extends String> source) {
List<String> out = new ArrayList<>();
if (source == null) return out;
for (String s : source) {
if (s == null) continue;
String t = s.trim();
if (t.isEmpty()) continue;
out.add(t);
}
return out;
}
// Null-safe equality for two lists of strings. Uses size + element equals.
private static boolean listEquals(List<String> a, List<String> b) {
if (a == b) return true;
if (a == null || b == null) return false;
if (a.size() != b.size()) return false;
for (int i = 0; i < a.size(); i++) {
if (!a.get(i).equals(b.get(i))) return false;
}
return true;
} }
/** /**