Merge pull request #93 from FTBTeam/dev

Dev

common/src/main/java/dev/ftb/mods/ftblibrary/snbt/config/BaseValue.java

@@ -17,13 +17,12 @@ public abstract class BaseValue<T> implements Comparable<BaseValue<T>> {
 	public final String key;
 	public final T defaultValue;
 	private T value;
-	boolean excluded;
-	BooleanSupplier enabled = SNBTUtils.ALWAYS_TRUE;
+	protected boolean excluded;
+	protected BooleanSupplier enabled = SNBTUtils.ALWAYS_TRUE;
 	protected int displayOrder = 0;
+	protected List<String> comment = new ArrayList<>(0);
 
-	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;

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);
 	}
 

common/src/main/java/dev/ftb/mods/ftblibrary/ui/misc/AbstractButtonListScreen.java

@@ -135,6 +135,7 @@ public void addWidgets() {
 
 			if (hasSearchBox) {
 				add(searchBox);
+				searchBox.setFocused(true);
 			}
 		}
 

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 
 # Mod
 mod_id=ftblibrary
-mod_version=2006.1.1
+mod_version=2006.1.2
 mod_author=FTB Team
 
 # Maven
@@ -15,7 +15,7 @@ minecraft_version=1.20.6
 
 # Deps
 forge_version=49.0.31
-neoforge_version=20.6.100-beta
+neoforge_version=20.6.116
 neoforge_loader_version=1
 fabric_loader_version=0.15.10
 fabric_api_version=0.99.0+1.20.6