From 29f299d47269a1e2c9c2a9536f9a1fc755624473 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Wed, 9 Aug 2023 03:24:02 +0800
Subject: Fix plugin names in performance screen

---
 .../client/gui/performance/PerformanceScreen.java    | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'runtime/src/main/java/me')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
index 420e122a5..2125e502a 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
@@ -147,7 +147,7 @@ public class PerformanceScreen extends Screen {
         RoughlyEnoughItemsCore.PERFORMANCE_LOGGER.getStages().forEach((stage, inner) -> {
             List<PerformanceEntryImpl> entries = new ArrayList<>();
             inner.times().forEach((obj, time) -> {
-                entries.add(new PerformanceEntryImpl(Component.literal(obj instanceof Pair ? ((Pair<REIPluginProvider<?>, REIPlugin<?>>) obj).getFirst().getPluginProviderName() : Objects.toString(obj)), time));
+                entries.add(new PerformanceEntryImpl(Component.literal(obj instanceof Pair ? getNameOfPlugin(obj) : Objects.toString(obj)), time));
             });
             Collection<Long> values = inner.times().values();
             long separateTime;
@@ -165,6 +165,24 @@ public class PerformanceScreen extends Screen {
         addWidget(list);
     }
     
+    private String getNameOfPlugin(Object obj) {
+        Pair<REIPluginProvider<?>, REIPlugin<?>> pair = (Pair<REIPluginProvider<?>, REIPlugin<?>>) obj;
+        REIPluginProvider<?> provider = pair.getFirst();
+        REIPlugin<?> plugin = pair.getSecond();
+        
+        String providerName = provider.getPluginProviderName();
+        
+        if (provider.provide().size() >= 1) {
+            String pluginName = plugin.getPluginProviderName();
+            
+            if (!providerName.equals(pluginName)) {
+                providerName = pluginName + " of " + providerName;
+            }
+        }
+        
+        return providerName;
+    }
+    
     @Override
     public void render(PoseStack poses, int mouseX, int mouseY, float delta) {
         renderDirtBackground(0);
-- 
cgit