From 5dc7d357ac970805412ccb5ab727043a1d175738 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Fri, 22 Jul 2022 20:08:45 +0200
Subject: [PATCH] Changed Updater Icon handling

---
 .../client/gui/screens/UpdatesScreen.java     | 21 ++++++++-----
 .../bclib/entrypoints/BCLibEntryPoint.java    |  4 ---
 .../bclib/entrypoints/EntrypointUtil.java     | 31 -------------------
 .../networking/VersionCheckEntryPoint.java    |  9 ------
 4 files changed, 13 insertions(+), 52 deletions(-)
 delete mode 100644 src/main/java/org/betterx/bclib/entrypoints/BCLibEntryPoint.java
 delete mode 100644 src/main/java/org/betterx/bclib/entrypoints/EntrypointUtil.java
 delete mode 100644 src/main/java/org/betterx/bclib/networking/VersionCheckEntryPoint.java

diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java
index 3715b576..4ba093ec 100644
--- a/src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java
+++ b/src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java
@@ -2,8 +2,6 @@ package org.betterx.bclib.client.gui.screens;
 
 import org.betterx.bclib.BCLib;
 import org.betterx.bclib.config.Configs;
-import org.betterx.bclib.entrypoints.EntrypointUtil;
-import org.betterx.bclib.networking.VersionCheckEntryPoint;
 import org.betterx.bclib.networking.VersionChecker;
 import org.betterx.ui.ColorUtil;
 import org.betterx.ui.layout.components.HorizontalStack;
@@ -24,6 +22,7 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
+import net.fabricmc.loader.api.metadata.CustomValue;
 
 @Environment(EnvType.CLIENT)
 public class UpdatesScreen extends BCLibLayoutScreen {
@@ -38,12 +37,18 @@ public class UpdatesScreen extends BCLibLayoutScreen {
         if (modID.equals(BCLib.MOD_ID)) {
             return UPDATE_LOGO_LOCATION;
         }
-        return EntrypointUtil.getCommon(VersionCheckEntryPoint.class)
-                             .stream()
-                             .map(vc -> vc.updaterIcon(modID))
-                             .filter(r -> r != null)
-                             .findAny()
-                             .orElse(null);
+        ModContainer nfo = FabricLoader.getInstance().getModContainer(modID).orElse(null);
+        if (nfo != null) {
+            CustomValue element = nfo.getMetadata().getCustomValue("bclib");
+            if (element != null) {
+                CustomValue.CvObject obj = element.getAsObject();
+                if (obj != null) {
+                    CustomValue icon = obj.get("updater_icon");
+                    return new ResourceLocation(modID, icon.getAsString());
+                }
+            }
+        }
+        return null;
     }
 
     @Override
diff --git a/src/main/java/org/betterx/bclib/entrypoints/BCLibEntryPoint.java b/src/main/java/org/betterx/bclib/entrypoints/BCLibEntryPoint.java
deleted file mode 100644
index 92c6f34e..00000000
--- a/src/main/java/org/betterx/bclib/entrypoints/BCLibEntryPoint.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.betterx.bclib.entrypoints;
-
-public interface BCLibEntryPoint {
-}
diff --git a/src/main/java/org/betterx/bclib/entrypoints/EntrypointUtil.java b/src/main/java/org/betterx/bclib/entrypoints/EntrypointUtil.java
deleted file mode 100644
index d5eee36f..00000000
--- a/src/main/java/org/betterx/bclib/entrypoints/EntrypointUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.betterx.bclib.entrypoints;
-
-import net.fabricmc.loader.api.FabricLoader;
-
-import java.util.List;
-import org.jetbrains.annotations.ApiStatus;
-
-@ApiStatus.Internal
-public class EntrypointUtil {
-    private static <T extends BCLibEntryPoint> List<T> getEntryPoints(boolean client, Class<T> select) {
-        return FabricLoader.getInstance()
-                           .getEntrypoints(
-                                   client ? "bclib_client" : "bclib",
-                                   BCLibEntryPoint.class
-                           )
-                           .stream()
-                           .filter(o -> select.isAssignableFrom(o.getClass()))
-                           .map(e -> (T) e)
-                           .toList();
-    }
-
-    @ApiStatus.Internal
-    public static <T extends BCLibEntryPoint> List<T> getCommon(Class<T> select) {
-        return getEntryPoints(false, select);
-    }
-
-    @ApiStatus.Internal
-    public static <T extends BCLibEntryPoint> List<T> getClient(Class<T> select) {
-        return getEntryPoints(true, select);
-    }
-}
diff --git a/src/main/java/org/betterx/bclib/networking/VersionCheckEntryPoint.java b/src/main/java/org/betterx/bclib/networking/VersionCheckEntryPoint.java
deleted file mode 100644
index f44be706..00000000
--- a/src/main/java/org/betterx/bclib/networking/VersionCheckEntryPoint.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.betterx.bclib.networking;
-
-import org.betterx.bclib.entrypoints.BCLibEntryPoint;
-
-import net.minecraft.resources.ResourceLocation;
-
-public interface VersionCheckEntryPoint extends BCLibEntryPoint {
-    ResourceLocation updaterIcon(String modID);
-}