From d60fd316cc872c8e2d6500f071598ebf79364d4a Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 16 Mar 2021 01:47:33 +0800 Subject: Implement IGuiIngredientGroup, wrap FluidStack to arch FluidStack properly Signed-off-by: shedaniel --- .../java/me/shedaniel/rei/fabric/PluginDetectorImpl.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'fabric/src/main/java') 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 b7a5900c2..55293fdde 100644 --- a/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java +++ b/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java @@ -40,14 +40,10 @@ public class PluginDetectorImpl { @Environment(EnvType.CLIENT) public static void detectClientPlugins() { - for (ModContainer modContainer : FabricLoader.getInstance().getAllMods()) { - if (modContainer.getMetadata().containsCustomElement("roughlyenoughitems:plugins")) - RoughlyEnoughItemsCore.LOGGER.error("REI plugin from " + modContainer.getMetadata().getId() + " is not loaded because it is too old!"); - } - for (REIPlugin plugin : Iterables.concat( + FabricLoader.getInstance().getEntrypoints("rei", REIPlugin.class), FabricLoader.getInstance().getEntrypoints("rei_plugins", REIPlugin.class), - FabricLoader.getInstance().getEntrypoints("rei", REIPlugin.class) + FabricLoader.getInstance().getEntrypoints("rei_plugins_v0", REIPlugin.class) )) { try { registerPlugin(plugin); @@ -56,14 +52,6 @@ public class PluginDetectorImpl { RoughlyEnoughItemsCore.LOGGER.error("Can't load REI plugins from %s: %s", plugin.getClass(), e.getLocalizedMessage()); } } - for (REIPlugin reiPlugin : FabricLoader.getInstance().getEntrypoints("rei_plugins_v0", REIPlugin.class)) { - try { - registerPlugin(reiPlugin); - } catch (Exception e) { - e.printStackTrace(); - RoughlyEnoughItemsCore.LOGGER.error("Can't load REI plugins from %s: %s", reiPlugin.getClass(), e.getLocalizedMessage()); - } - } if (FabricLoader.getInstance().isModLoaded("libblockattributes-fluids")) { try { registerPlugin((REIPlugin) Class.forName("me.shedaniel.rei.compat.LBASupportPlugin").getConstructor().newInstance()); -- cgit