Obfuscate REI Internals

4 files changed, 1 insertions, 23 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
index 50877066c..e0e68828a 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
@@ -51,7 +51,6 @@ import me.shedaniel.rei.api.common.util.ImmutableTextComponent;
 import me.shedaniel.rei.impl.client.ClientInternals;
 import me.shedaniel.rei.impl.client.REIRuntimeImpl;
 import me.shedaniel.rei.impl.client.gui.InternalCursorState;
-import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
 import me.shedaniel.rei.impl.client.gui.widget.CatchingExceptionUtils;
 import me.shedaniel.rei.impl.client.gui.widget.TooltipContextImpl;
 import me.shedaniel.rei.impl.client.gui.widget.TooltipImpl;
@@ -292,7 +291,7 @@ public class RoughlyEnoughItemsCoreClient {
             if (!(screen instanceof DisplayScreen)) {
                 getOverlay().render(matrices, mouseX, mouseY, delta);
             }
-            ((ScreenOverlayImpl) getOverlay()).lateRender(matrices, mouseX, mouseY, delta);
+            getOverlay().lateRender(matrices, mouseX, mouseY, delta);
             resetFocused(screen);
         });
         ClientScreenInputEvent.MOUSE_DRAGGED_PRE.register((minecraftClient, screen, mouseX1, mouseY1, button, mouseX2, mouseY2) -> {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java
index d14d6a72b..7173da20c 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java
@@ -24,7 +24,6 @@
 package me.shedaniel.rei.impl.client;
 
 import com.mojang.blaze3d.platform.Window;
-import com.mojang.blaze3d.systems.RenderSystem;
 import dev.architectury.event.EventResult;
 import dev.architectury.event.events.client.ClientGuiEvent;
 import dev.architectury.event.events.client.ClientTickEvent;
@@ -39,8 +38,6 @@ import me.shedaniel.rei.api.client.search.SearchProvider;
 import me.shedaniel.rei.api.common.registry.ReloadStage;
 import me.shedaniel.rei.impl.client.gui.DisplayScreenStack;
 import me.shedaniel.rei.impl.client.gui.InternalTextures;
-import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
-import me.shedaniel.rei.impl.client.gui.widget.CachedEntryListRender;
 import me.shedaniel.rei.impl.client.provider.OverlayTicker;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -166,11 +163,6 @@ public class REIRuntimeImpl implements REIRuntime {
         SearchProvider.getInstance().clearCache();
         getOverlay().ifPresent(ScreenOverlay::queueReloadOverlay);
         DisplayScreenStack.clear();
-        if (!RenderSystem.isOnRenderThread()) {
-            RenderSystem.recordRenderCall(CachedEntryListRender::refresh);
-        } else {
-            CachedEntryListRender.refresh();
-        }
     }
     
     @Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
index b06294a6a..3a38adf77 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java
@@ -27,12 +27,9 @@ import me.shedaniel.rei.api.client.gui.widgets.Panel;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.screen.ExclusionZones;
 import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry;
-import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl;
 import me.shedaniel.rei.impl.client.gui.screen.DefaultDisplayViewingScreen;
-import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesListWidget;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.screens.Screen;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Collections;
@@ -49,14 +46,5 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin {
                 return Collections.emptyList();
             return Collections.singletonList(widget.getBounds().clone());
         });
-        zones.register(Screen.class, screen -> {
-            FavoritesListWidget widget = ScreenOverlayImpl.getFavoritesListWidget();
-            if (widget != null) {
-                if (widget.togglePanelButton.isVisible()) {
-                    return Collections.singletonList(widget.togglePanelButton.bounds);
-                }
-            }
-            return Collections.emptyList();
-        });
     }
 }
diff --git a/runtime/src/main/resources/META-INF/services/me.shedaniel.rei.impl.ClientInternals$WidgetsProvider b/runtime/src/main/resources/META-INF/services/me.shedaniel.rei.impl.ClientInternals$WidgetsProvider
deleted file mode 100644
index 014b4a2f5..000000000
--- a/runtime/src/main/resources/META-INF/services/me.shedaniel.rei.impl.ClientInternals$WidgetsProvider
+++ /dev/null
@@ -1 +0,0 @@
-me.shedaniel.rei.impl.client.gui.widget.basewidgets.WidgetsProvider
\ No newline at end of file