Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5

# Conflicts: # neoforge/src/main/resources/META-INF/accesstransformer.cfg
shedaniel · Sep 17, 2024 · ed9454b · ed9454b
2 parents 581543c + 20317a9
commit ed9454b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg
@@ -48,4 +48,5 @@ public-f net.minecraft.client.gui.font.CodepointMap blockMap # blockMap
 public-f net.minecraft.client.gui.font.CodepointMap blockConstructor # blockConstructor
 public net.minecraft.world.item.CreativeModeTab displayItemsGenerator # displayItemsGenerator
 public net.minecraft.world.item.CreativeModeTab$ItemDisplayBuilder
+public net.minecraft.client.multiplayer.ClientLevel connection # connection
 public net.minecraft.client.multiplayer.MultiPlayerGameMode connection # connection
diff --git a/...src/main/java/me/shedaniel/rei/impl/client/gui/performance/DisplayRegistryInfoScreen.java b/...src/main/java/me/shedaniel/rei/impl/client/gui/performance/DisplayRegistryInfoScreen.java
@@ -24,7 +24,6 @@
 package me.shedaniel.rei.impl.client.gui.performance;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import me.shedaniel.clothconfig2.gui.widget.DynamicElementListWidget;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.registry.display.DisplayRegistry;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
@@ -33,14 +32,14 @@
 import me.shedaniel.rei.impl.client.gui.modules.Menu;
 import me.shedaniel.rei.impl.client.gui.modules.entries.ToggleMenuEntry;
 import me.shedaniel.rei.impl.client.gui.screen.ScreenWithMenu;
+import me.shedaniel.rei.impl.client.gui.widget.UpdatedListWidget;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.FormattedCharSequence;
 
@@ -102,18 +101,17 @@ private Stream<Map.Entry<CategoryIdentifier<?>, List<Display>>> sort(Stream<Map.
 
     @Override
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-        renderDirtBackground(graphics);
+        super.render(graphics, mouseX, mouseY, delta);
         list.render(graphics, mouseX, mouseY, delta);
         graphics.drawString(this.font, this.title.getVisualOrderText(), (int) (this.width / 2.0F - this.font.width(this.title) / 2.0F), 12, -1);
-        super.render(graphics, mouseX, mouseY, delta);
     }
 
-    public static abstract class ListEntry extends DynamicElementListWidget.ElementEntry<ListEntry> {
+    public static abstract class ListEntry extends UpdatedListWidget.ElementEntry<ListEntry> {
     }
 
-    private class ListWidget extends DynamicElementListWidget<ListEntry> {
+    private class ListWidget extends UpdatedListWidget<ListEntry> {
         public ListWidget() {
-            super(DisplayRegistryInfoScreen.this.minecraft, DisplayRegistryInfoScreen.this.width, DisplayRegistryInfoScreen.this.height, 30, DisplayRegistryInfoScreen.this.height, Screen.BACKGROUND_LOCATION);
+            super(DisplayRegistryInfoScreen.this.minecraft, DisplayRegistryInfoScreen.this.width, DisplayRegistryInfoScreen.this.height, 30, DisplayRegistryInfoScreen.this.height);
         }
 
         @Override