From d70b8353a6db5fc5d835af5d662372952703d2fd Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 12 Sep 2022 23:05:35 +0800 Subject: Obfuscate REI Internals --- .../me/shedaniel/rei/forge/PluginDetectorImpl.java | 34 ++++++++++------------ .../gui/credits/forge/CreditsScreenImpl.java | 2 ++ .../crafting/forge/DefaultCraftingDisplayImpl.java | 2 ++ 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'forge/src') diff --git a/forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java b/forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java index 7d026998d..21397c373 100644 --- a/forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/forge/PluginDetectorImpl.java @@ -29,11 +29,8 @@ import me.shedaniel.rei.api.common.plugins.PluginManager; import me.shedaniel.rei.api.common.plugins.PluginView; import me.shedaniel.rei.api.common.plugins.REIPluginProvider; import me.shedaniel.rei.api.common.plugins.REIServerPlugin; -import me.shedaniel.rei.impl.client.ClientInternals; +import me.shedaniel.rei.impl.client.gui.widget.plugin.FavoritesEntriesBuiltinPlugin; import me.shedaniel.rei.impl.init.PluginDetector; -import me.shedaniel.rei.jeicompat.JEIExtraClientPlugin; -import me.shedaniel.rei.jeicompat.JEIExtraPlugin; -import me.shedaniel.rei.jeicompat.JEIPluginDetector; import me.shedaniel.rei.plugin.autocrafting.DefaultClientTransferCategoryPlugin; import me.shedaniel.rei.plugin.client.forge.DefaultClientPluginImpl; import me.shedaniel.rei.plugin.client.runtime.DefaultClientRuntimePlugin; @@ -43,9 +40,7 @@ import me.shedaniel.rei.plugin.common.runtime.DefaultRuntimePlugin; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import org.apache.logging.log4j.util.TriConsumer; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -77,7 +72,7 @@ public class PluginDetectorImpl implements PluginDetector { public void detectServerPlugins() { PluginView.getServerInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new DefaultPluginImpl())); PluginView.getServerInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new DefaultRuntimePlugin())); - PluginView.getServerInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new JEIExtraPlugin())); + // PluginView.getServerInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new JEIExtraPlugin())); AnnotationUtils.scanAnnotation(REIPlugin.class, REIServerPlugin.class::isAssignableFrom, (modId, plugin, clazz) -> { ((PluginView) PluginManager.getServerInstance()).registerPlugin(wrapPlugin(modId, plugin.get())); }); @@ -99,21 +94,22 @@ public class PluginDetectorImpl implements PluginDetector { PluginView.getClientInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new DefaultClientRuntimePlugin())); PluginView.getClientInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new DefaultRuntimeInputMethodPlugin())); PluginView.getClientInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new DefaultClientTransferCategoryPlugin())); - PluginView.getClientInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new JEIExtraClientPlugin())); + PluginView.getClientInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new FavoritesEntriesBuiltinPlugin())); + // PluginView.getClientInstance().registerPlugin(wrapPlugin(Collections.singletonList("roughlyenoughitems"), new JEIExtraClientPlugin())); AnnotationUtils.scanAnnotation(REIPlugin.class, REIClientPlugin.class::isAssignableFrom, (modId, plugin, clazz) -> { ((PluginView) PluginManager.getClientInstance()).registerPlugin(wrapPlugin(modId, plugin.get())); }); - ClientInternals.attachInstance((Supplier>) () -> { - List modIds = new ArrayList<>(); - for (REIPluginProvider plugin : PluginManager.getClientInstance().getPluginProviders()) { - if (plugin instanceof JEIPluginDetector.JEIPluginProvider) { - modIds.addAll(((JEIPluginDetector.JEIPluginProvider) plugin).modIds); - } - } - return modIds; - }, "jeiCompatMods"); - JEIPluginDetector.detect((aClass, consumer) -> AnnotationUtils.scanAnnotation((Class) aClass, c -> true, - (TriConsumer, Supplier, Class>) (TriConsumer) consumer), PluginView.getClientInstance()::registerPlugin); +// ClientInternals.attachInstance((Supplier>) () -> { +// List modIds = new ArrayList<>(); +// for (REIPluginProvider plugin : PluginManager.getClientInstance().getPluginProviders()) { +// if (plugin instanceof JEIPluginDetector.JEIPluginProvider) { +// modIds.addAll(((JEIPluginDetector.JEIPluginProvider) plugin).modIds); +// } +// } +// return modIds; +// }, "jeiCompatMods"); +// JEIPluginDetector.detect((aClass, consumer) -> AnnotationUtils.scanAnnotation((Class) aClass, c -> true, +// (TriConsumer, Supplier, Class>) (TriConsumer) consumer), PluginView.getClientInstance()::registerPlugin); }; } } diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/credits/forge/CreditsScreenImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/credits/forge/CreditsScreenImpl.java index ef53fe3b1..bbbb37bc1 100644 --- a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/credits/forge/CreditsScreenImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/credits/forge/CreditsScreenImpl.java @@ -24,11 +24,13 @@ package me.shedaniel.rei.impl.client.gui.credits.forge; import me.shedaniel.rei.impl.client.gui.credits.CreditsScreen; +import net.minecraft.obfuscate.DontObfuscate; import net.minecraft.util.Tuple; import java.util.List; public class CreditsScreenImpl { + @DontObfuscate public static void fillTranslators(Exception[] exception, List>> translators) { } } diff --git a/forge/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/forge/DefaultCraftingDisplayImpl.java b/forge/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/forge/DefaultCraftingDisplayImpl.java index 9f5faa713..b2debc199 100644 --- a/forge/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/forge/DefaultCraftingDisplayImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/forge/DefaultCraftingDisplayImpl.java @@ -25,9 +25,11 @@ package me.shedaniel.rei.plugin.common.displays.crafting.forge; import me.shedaniel.rei.plugin.common.displays.crafting.CraftingRecipeSizeProvider; import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay; +import net.minecraft.obfuscate.DontObfuscate; import net.minecraftforge.common.crafting.IShapedRecipe; public class DefaultCraftingDisplayImpl { + @DontObfuscate public static void registerPlatformSizeProvider() { DefaultCraftingDisplay.registerSizeProvider(recipe -> { if (recipe instanceof IShapedRecipe) { -- cgit