Merge remote-tracking branch 'origin/1.20.1/dev' into 1.20.1/dev

FTBTeam · Jul 26, 2024 · f67e780 · f67e780
2 parents 10ff9fe + 55d5b01
commit f67e780
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/snbt/config/BaseValue.java b/common/src/main/java/dev/ftb/mods/ftblibrary/snbt/config/BaseValue.java
@@ -18,12 +18,12 @@ public abstract class BaseValue<T> implements Comparable<BaseValue<T>> {
 	public final T defaultValue;
 	private T value;
 	boolean excluded;
-	BooleanSupplier enabled = SNBTUtils.ALWAYS_TRUE;
+	protected BooleanSupplier enabled = SNBTUtils.ALWAYS_TRUE;
 	protected int displayOrder = 0;
 
-	List<String> comment = new ArrayList<>(0);
+	protected List<String> comment = new ArrayList<>(0);
 
-	public BaseValue(@Nullable SNBTConfig c, String n, T def) {
+	protected BaseValue(@Nullable SNBTConfig c, String n, T def) {
 		parent = c;
 		key = n;
 		defaultValue = def;

diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/snbt/config/StringValue.java b/common/src/main/java/dev/ftb/mods/ftblibrary/snbt/config/StringValue.java
@@ -10,9 +10,9 @@
 import java.util.regex.Pattern;
 
 public class StringValue extends BaseValue<String> {
-	private Pattern pattern;
+	protected Pattern pattern;
 
-	StringValue(SNBTConfig c, String n, String def) {
+	protected StringValue(SNBTConfig c, String n, String def) {
 		super(c, n, def);
 	}