From dddf57781454c5031cd84a43c05b757a4216ac80 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 21 May 2022 20:25:00 +0800 Subject: Fix #856 --- .../shedaniel/rei/fabric/PluginDetectorImpl.java | 55 +++++++++++++++++----- fabric/src/main/resources/fabric.mod.json | 6 ++- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java b/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java index 017bc99d5..8305c966a 100644 --- a/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java +++ b/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java @@ -23,7 +23,8 @@ package me.shedaniel.rei.fabric; -import com.google.common.collect.Iterables; +import dev.architectury.platform.Platform; +import dev.architectury.utils.Env; import me.shedaniel.rei.RoughlyEnoughItemsInitializer; import me.shedaniel.rei.RoughlyEnoughItemsState; import me.shedaniel.rei.api.client.plugins.REIClientPlugin; @@ -32,22 +33,52 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.entrypoint.EntrypointContainer; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import org.apache.commons.lang3.tuple.Pair; -import java.util.Collection; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.*; +import java.util.function.BiConsumer; import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; public class PluginDetectorImpl { private static

> void loadPlugin(Class pluginClass, Consumer> consumer) { + Map entrypoints = new LinkedHashMap<>(); + entrypoints.put("rei_server", Env.SERVER); + entrypoints.put("rei_common", null); + entrypoints.put("rei", null); + entrypoints.put("rei_client", Env.CLIENT); + Set deprecatedEntrypoints = new LinkedHashSet<>(Arrays.asList( + "rei_containers", + "rei_plugins", + "rei_plugins_v0", + "rei" + )); + List, String>> containers = Stream.concat(entrypoints.entrySet().stream() + .filter(entry -> entry.getValue() == null || Platform.getEnvironment() == entry.getValue()) + .map(Map.Entry::getKey) + , deprecatedEntrypoints.stream()) + .distinct() + .flatMap(name -> FabricLoader.getInstance().getEntrypointContainers(name, REIPluginProvider.class) + .stream() + .map(container -> Pair.of(container, name))) + .collect(Collectors.toList()); + out: - for (EntrypointContainer container : Iterables.concat( - FabricLoader.getInstance().getEntrypointContainers("rei_containers", REIPluginProvider.class), - FabricLoader.getInstance().getEntrypointContainers("rei_server", REIPluginProvider.class), - FabricLoader.getInstance().getEntrypointContainers("rei", REIPluginProvider.class), - FabricLoader.getInstance().getEntrypointContainers("rei_common", REIPluginProvider.class), - FabricLoader.getInstance().getEntrypointContainers("rei_plugins", REIPluginProvider.class), - FabricLoader.getInstance().getEntrypointContainers("rei_plugins_v0", REIPluginProvider.class) - )) { + for (Pair, String> pair : containers) { + EntrypointContainer container = pair.getLeft(); + String name = pair.getRight(); try { + if (deprecatedEntrypoints.contains(name)) { + RoughlyEnoughItemsState.LOGGER.warn("The entrypoint used by %s, \"%s\" is deprecated and will be removed in a future version of Roughly Enough Items. Please use \"rei_server\", \"rei_client\" or \"rei_common\" instead.".formatted(container.getProvider().getMetadata().getName(), name)); + } + REIPluginProvider

plugin = container.getEntrypoint(); if (pluginClass.isAssignableFrom(plugin.getPluginProviderClass())) { consumer.accept(new REIPluginProvider

() { @@ -70,8 +101,10 @@ public class PluginDetectorImpl { } catch (Throwable t) { Throwable throwable = t; while (throwable != null) { - if (throwable.getMessage() != null && throwable.getMessage().contains("environment type SERVER") && !RoughlyEnoughItemsInitializer.isClient()) + if (throwable.getMessage() != null && throwable.getMessage().contains("environment type SERVER") && !RoughlyEnoughItemsInitializer.isClient()) { + RoughlyEnoughItemsState.LOGGER.warn("Rerached side issue when loading REI plugin by %s. Please use \"rei_server\", \"rei_client\" or \"rei_common\" instead.".formatted(container.getProvider().getMetadata().getName())); continue out; + } throwable = throwable.getCause(); } String error = "Could not create REI Plugin [" + getSimpleName(pluginClass) + "] due to errors, provided by '" + container.getProvider().getMetadata().getId() + "'!"; diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 33f15f614..31b38e671 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -22,9 +22,11 @@ "me.shedaniel.rei.fabric.RoughlyEnoughItemsFabric", "me.shedaniel.rei.RoughlyEnoughItemsInitializer::onInitializeClient" ], - "rei": [ + "rei_common": [ "me.shedaniel.rei.plugin.common.DefaultPlugin", - "me.shedaniel.rei.plugin.common.DefaultRuntimePlugin", + "me.shedaniel.rei.plugin.common.DefaultRuntimePlugin" + ], + "rei_client": [ "me.shedaniel.rei.plugin.client.DefaultClientPlugin", "me.shedaniel.rei.plugin.client.DefaultClientRuntimePlugin" ] -- cgit