Settings refactor - adding source to observers
This commit is contained in:
1 parent
6c4ffd8e98
commit
3964145907
3 files changed
+7
-7
No files matched your search
@@ -117,7 +117,7 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
|
||||
if (!value.equals(get()))
|
||||
{
|
||||
this.field.set(null, value);
|
||||
SettingsManager.notifyRuleChanged(this, stringValue);
|
||||
SettingsManager.notifyRuleChanged(source, this, stringValue);
|
||||
}
|
||||
}
|
||||
catch (IllegalAccessException e)
|
||||
|
||||
@@ -7,6 +7,7 @@ import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.apache.logging.log4j.util.TriConsumer;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
@@ -25,7 +26,6 @@ import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TreeMap;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class SettingsManager
|
||||
@@ -34,7 +34,7 @@ public class SettingsManager
|
||||
private static Map<String, ParsedRule<?>> rules = new HashMap<>();
|
||||
public boolean locked;
|
||||
private MinecraftServer server;
|
||||
private static List<BiConsumer<ParsedRule<?>, String>> observers = new ArrayList<>();
|
||||
private static List<TriConsumer<ServerCommandSource, ParsedRule<?>, String>> observers = new ArrayList<>();
|
||||
|
||||
public SettingsManager(MinecraftServer server)
|
||||
{
|
||||
@@ -53,14 +53,14 @@ public class SettingsManager
|
||||
}
|
||||
}
|
||||
|
||||
public static void addRuleObserver(BiConsumer<ParsedRule<?>, String> observer)
|
||||
public static void addRuleObserver(TriConsumer<ServerCommandSource, ParsedRule<?>, String> observer)
|
||||
{
|
||||
observers.add(observer);
|
||||
}
|
||||
|
||||
static void notifyRuleChanged(ParsedRule<?> rule, String userTypedValue)
|
||||
static void notifyRuleChanged(ServerCommandSource source, ParsedRule<?> rule, String userTypedValue)
|
||||
{
|
||||
observers.forEach(observer -> observer.accept(rule, userTypedValue));
|
||||
observers.forEach(observer -> observer.accept(source, rule, userTypedValue));
|
||||
}
|
||||
|
||||
public static Iterable<String> getCategories()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "carpet",
|
||||
"version": "0.1",
|
||||
"version": "${version}",
|
||||
|
||||
"name": "Carpet Mod in Fabric",
|
||||
"description": "Carpet made out of fabric",
|
||||
|
||||
Reference in new issue
Block a user