Update to 22w44a

3 files changed, 15 insertions, 12 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java
index 403b125e9..034b9d8e7 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java
@@ -40,6 +40,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 @ApiStatus.Internal
 public class FilteringCategoriesEntry extends AbstractConfigListEntry<Map<CategoryIdentifier<?>, Boolean>> {
@@ -51,7 +52,7 @@ public class FilteringCategoriesEntry extends AbstractConfigListEntry<Map<Catego
     private final AbstractWidget buttonWidget = new Button(0, 0, 150, 20, Component.translatable("config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure"), button -> {
         filteringScreen.parent = Minecraft.getInstance().screen;
         Minecraft.getInstance().setScreen(filteringScreen);
-    });
+    }, Button.NO_TOOLTIP, Supplier::get) {};
     private final List<AbstractWidget> children = ImmutableList.of(buttonWidget);
     
     public FilteringCategoriesEntry(Component fieldName, Map<CategoryIdentifier<?>, Boolean> configFiltered, Map<CategoryIdentifier<?>, Boolean> defaultValue, Consumer<Map<CategoryIdentifier<?>, Boolean>> saveConsumer) {
@@ -81,15 +82,15 @@ public class FilteringCategoriesEntry extends AbstractConfigListEntry<Map<Catego
     public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
         super.render(matrices, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
         Window window = Minecraft.getInstance().getWindow();
-        this.buttonWidget.y = y;
+        this.buttonWidget.setY(y);
         
         Component displayedFieldName = this.getDisplayedFieldName();
         if (Minecraft.getInstance().font.isBidirectional()) {
             Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), (float) (window.getGuiScaledWidth() - x - Minecraft.getInstance().font.width(displayedFieldName)), (float) (y + 6), 16777215);
-            this.buttonWidget.x = x + 2;
+            this.buttonWidget.setX(x + 2);
         } else {
             Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), (float) x, (float) (y + 6), this.getPreferredTextColor());
-            this.buttonWidget.x = x + entryWidth - 150;
+            this.buttonWidget.setX(x + entryWidth - 150);
         }
         
         this.buttonWidget.render(matrices, mouseX, mouseY, delta);
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesScreen.java
index 880e4866d..dff3b46f3 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesScreen.java
@@ -42,6 +42,7 @@ import net.minecraft.sounds.SoundEvents;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Supplier;
 
 public class FilteringCategoriesScreen extends Screen {
     private final FilteringCategoriesEntry entry;
@@ -61,7 +62,7 @@ public class FilteringCategoriesScreen extends Screen {
             addRenderableWidget(new Button(4, 4, Minecraft.getInstance().font.width(backText) + 10, 20, backText, button -> {
                 minecraft.setScreen(parent);
                 this.parent = null;
-            }));
+            }, Button.NO_TOOLTIP, Supplier::get) {});
         }
         listWidget = addWidget(new ListWidget(minecraft, width, height, 30, height, BACKGROUND_LOCATION));
         for (CategoryRegistry.CategoryConfiguration<?> configuration : CategoryRegistry.getInstance()) {
@@ -180,7 +181,7 @@ public class FilteringCategoriesScreen extends Screen {
                     }
                     
                     entry.edited = true;
-                });
+                }, Button.NO_TOOLTIP, Supplier::get) {};
             }
         }
         
@@ -228,8 +229,8 @@ public class FilteringCategoriesScreen extends Screen {
                     client.font.drawShadow(matrices, id.getVisualOrderText(), xPos, y + 22, 8421504);
                 }
             }
-            toggleButton.x = x + entryWidth - 6 - toggleButton.getWidth();
-            toggleButton.y = y + 5;
+            toggleButton.setX(x + entryWidth - 6 - toggleButton.getWidth());
+            toggleButton.setY(y + 5);
             toggleButton.render(matrices, mouseX, mouseY, delta);
         }
         
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java
index 36f46cf08..6230d6a60 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java
@@ -40,13 +40,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 @ApiStatus.Internal
 public class NoFilteringCategoriesEntry extends AbstractConfigListEntry<Map<CategoryIdentifier<?>, Boolean>> {
     private Consumer<Map<CategoryIdentifier<?>, Boolean>> saveConsumer;
     private Map<CategoryIdentifier<?>, Boolean> defaultValue;
     private Map<CategoryIdentifier<?>, Boolean> configFiltered;
-    private final AbstractWidget buttonWidget = new Button(0, 0, 150, 20, Component.translatable("config.roughlyenoughitems.filteredEntries.loadWorldFirst"), button -> {});
+    private final AbstractWidget buttonWidget = new Button(0, 0, 150, 20, Component.translatable("config.roughlyenoughitems.filteredEntries.loadWorldFirst"), button -> {}, Button.NO_TOOLTIP, Supplier::get) {};
     private final List<AbstractWidget> children = ImmutableList.of(buttonWidget);
     
     public NoFilteringCategoriesEntry(Component fieldName, Map<CategoryIdentifier<?>, Boolean> configFiltered, Map<CategoryIdentifier<?>, Boolean> defaultValue, Consumer<Map<CategoryIdentifier<?>, Boolean>> saveConsumer) {
@@ -76,15 +77,15 @@ public class NoFilteringCategoriesEntry extends AbstractConfigListEntry<Map<Cate
         super.render(matrices, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta);
         Window window = Minecraft.getInstance().getWindow();
         this.buttonWidget.active = false;
-        this.buttonWidget.y = y;
+        this.buttonWidget.setY(y);
         
         Component displayedFieldName = this.getDisplayedFieldName();
         if (Minecraft.getInstance().font.isBidirectional()) {
             Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), (float) (window.getGuiScaledWidth() - x - Minecraft.getInstance().font.width(displayedFieldName)), (float) (y + 6), 16777215);
-            this.buttonWidget.x = x + 2;
+            this.buttonWidget.setX(x + 2);
         } else {
             Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), (float) x, (float) (y + 6), this.getPreferredTextColor());
-            this.buttonWidget.x = x + entryWidth - 150;
+            this.buttonWidget.setX(x + entryWidth - 150);
         }
         
         this.buttonWidget.render(matrices, mouseX, mouseY, delta);