cancelly

Author: sisby-folk

src/main/java/net/modfest/ballotbox/mixin/client/GameMenuScreenMixin.java

@@ -39,6 +39,7 @@ private void onInitWidgets(CallbackInfo ci, @Local GridLayout instance) {
 		var reorganize = false;
 		var children = ((GridLayoutAccessor) instance).getChildren();
 		for (var pair : BallotBoxButtons.createButtons()) {
+			boolean found = false;
 			Map<String, ButtonActionType> settings = pair.getA();
 			Set<String> replace = settings.entrySet().stream().filter(e -> e.getValue() == ButtonActionType.REPLACE).map(Map.Entry::getKey).collect(Collectors.toSet());
 			if (!replace.isEmpty()) {
@@ -67,13 +68,14 @@ private void onInitWidgets(CallbackInfo ci, @Local GridLayout instance) {
 							containerAccessor.getOccupiedRows(), containerAccessor.getOccupiedColumns(),
 							childContainer.layoutSettings
 						));
+						found = true;
 						break;
 					}
 				}
 			}
 			Set<String> insert = new HashSet<>(settings.keySet());
 			insert.removeAll(replace);
-			if (!insert.isEmpty()) {
+			if (!found && !insert.isEmpty()) {
 				reorganize = true;
 
 				for (int i = 0; i < children.size(); i++) {

src/main/java/net/modfest/ballotbox/mixin/client/TitleScreenMixin.java

@@ -41,6 +41,7 @@ protected TitleScreenMixin(Component title) {
 		findButtons.sort(Comparator.comparing(AbstractWidget::getY));
 
 		for (var pair : BallotBoxButtons.createButtons()) {
+			boolean found = false;
 			var settings = pair.getA();
 
 			Set<String> replace = settings.entrySet().stream().filter(e -> e.getValue() == ButtonActionType.REPLACE).map(Map.Entry::getKey).collect(Collectors.toSet());
@@ -55,13 +56,14 @@ protected TitleScreenMixin(Component title) {
 							this.realmsNotificationsScreen = null;
 						}
 						this.addRenderableWidget(button);
+						found = true;
 						break;
 					}
 				}
 			}
 			Set<String> insert = new HashSet<>(settings.keySet());
 			insert.removeAll(replace);
-			if (!insert.isEmpty()) {
+			if (!found && !insert.isEmpty()) {
 				for (int i = 0; i < findButtons.size(); i++) {
 					var child = findButtons.get(i);
 					String firstMatch = BallotBoxButtons.match(child, insert);