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

Author: desht

common/src/main/java/dev/ftb/mods/ftblibrary/config/ConfigGroup.java

@@ -23,14 +23,14 @@
  */
 public class ConfigGroup implements Comparable<ConfigGroup> {
     private final String id;
-    private final ConfigGroup parent;
+    private final @Nullable ConfigGroup parent;
     private final Map<String, ConfigValue<?>> values;
     private final Map<String, ConfigGroup> subgroups;
-    private final ConfigCallback savedCallback;
+    private final @Nullable ConfigCallback savedCallback;
     private final int displayOrder;
     private String nameKey;
 
-    private ConfigGroup(String id, ConfigGroup parent, ConfigCallback savedCallback, int displayOrder) {
+    private ConfigGroup(String id, @Nullable ConfigGroup parent, @Nullable ConfigCallback savedCallback, int displayOrder) {
         this.id = id;
         this.parent = parent;
         this.values = new LinkedHashMap<>();

common/src/main/java/dev/ftb/mods/ftblibrary/config/ui/resource/EntityFaceResource.java

@@ -8,6 +8,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.EntityType;
+import org.jspecify.annotations.NonNull;
 
 public class EntityFaceResource implements SelectableResource<EntityType<?>>, Comparable<EntityFaceResource> {
     public static final EntityFaceResource NONE = new EntityFaceResource(EntityFaceConfig.NONE);

common/src/main/java/dev/ftb/mods/ftblibrary/sidebar/RegisteredSidebarButton.java

@@ -23,7 +23,7 @@ public class RegisteredSidebarButton implements SidebarButton {
     private final Component tooltip;
     private final List<ButtonOverlayRender> extraRenderers;
     private Supplier<List<Component>> tooltipOverride;
-    private boolean visible = true;
+    private BooleanSupplier visible = () -> true;
     private boolean forceHidden = false;
 
     public RegisteredSidebarButton(Identifier id, SidebarButtonData data) {
@@ -75,7 +75,7 @@ public List<Component> getTooltip(boolean shift) {
 
     public void clickButton(boolean shift) {
         if (data.loadingScreen()) {
-            new LoadingScreen(Component.translatable(getLangKey())).openGui();
+            new LoadingScreen(Component. translatable(getLangKey())).openGui();
         }
 
         boolean canShift = shift && data.shiftClickEvent().isPresent();
@@ -86,7 +86,7 @@ public void clickButton(boolean shift) {
     }
 
     public boolean canSee() {
-        return !forceHidden && visible;
+        return !forceHidden && visible.getAsBoolean();
     }
 
     public void setForceHidden(boolean forceHidden) {
@@ -95,7 +95,8 @@ public void setForceHidden(boolean forceHidden) {
 
     @Override
     public void addVisibilityCondition(BooleanSupplier condition) {
-        visible = visible && condition.getAsBoolean();
+        BooleanSupplier previous = visible;
+        visible = () -> previous.getAsBoolean() && condition.getAsBoolean();
     }
 
     @Override
@@ -112,4 +113,3 @@ public List<ButtonOverlayRender> getExtraRenderers() {
         return extraRenderers;
     }
 }
-

common/src/main/java/dev/ftb/mods/ftblibrary/util/client/ClientUtils.java

@@ -24,7 +24,9 @@
 import java.util.function.BooleanSupplier;
 
 public class ClientUtils {
-    public static final BooleanSupplier IS_CLIENT_OP = () -> Minecraft.getInstance().player != null && Minecraft.getInstance().player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER);
+    public static final BooleanSupplier IS_CLIENT_OP = () ->
+            Minecraft.getInstance().player != null && Minecraft.getInstance().player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER);
+
     public static final List<Runnable> RUN_LATER = new ArrayList<>();
 
     public static void execClientCommand(String command, boolean printChat) {