Refactor MenuInfo, split client and server apis, new dual PluginManager system, remove @NotNull

Signed-off-by: shedaniel <daniel@shedaniel.me>

1 files changed, 0 insertions, 336 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
deleted file mode 100644
index 6f58a8ceb..000000000
--- a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * This file is licensed under the MIT License, part of Roughly Enough Items.
- * Copyright (c) 2018, 2019, 2020 shedaniel
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package me.shedaniel.rei.impl;
-
-import com.google.common.collect.Lists;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Matrix4f;
-import me.shedaniel.architectury.hooks.ScreenHooks;
-import me.shedaniel.architectury.platform.Platform;
-import me.shedaniel.autoconfig.AutoConfig;
-import me.shedaniel.autoconfig.annotation.ConfigEntry;
-import me.shedaniel.autoconfig.gui.ConfigScreenProvider;
-import me.shedaniel.autoconfig.gui.registry.GuiRegistry;
-import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
-import me.shedaniel.autoconfig.util.Utils;
-import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Jankson;
-import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.JsonNull;
-import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.JsonObject;
-import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.JsonPrimitive;
-import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.api.SyntaxError;
-import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
-import me.shedaniel.clothconfig2.api.Modifier;
-import me.shedaniel.clothconfig2.api.ModifierKeyCode;
-import me.shedaniel.clothconfig2.gui.entries.KeyCodeEntry;
-import me.shedaniel.clothconfig2.impl.EasingMethod;
-import me.shedaniel.rei.RoughlyEnoughItemsCore;
-import me.shedaniel.rei.api.config.ConfigManager;
-import me.shedaniel.rei.api.REIHelper;
-import me.shedaniel.rei.api.favorites.FavoriteEntry;
-import me.shedaniel.rei.api.gui.config.DisplayScreenType;
-import me.shedaniel.rei.api.gui.config.SyntaxHighlightingMode;
-import me.shedaniel.rei.api.gui.config.entry.*;
-import me.shedaniel.rei.api.ingredient.EntryStack;
-import me.shedaniel.rei.api.registry.entry.EntryRegistry;
-import me.shedaniel.rei.api.util.CollectionUtils;
-import me.shedaniel.rei.gui.ContainerScreenOverlay;
-import me.shedaniel.rei.gui.TransformingScreen;
-import me.shedaniel.rei.gui.WarningAndErrorScreen;
-import me.shedaniel.rei.gui.credits.CreditsScreen;
-import me.shedaniel.rei.impl.filtering.FilteringRule;
-import me.shedaniel.rei.impl.filtering.rules.ManualFilteringRule;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.TagParser;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.util.Mth;
-import net.minecraft.util.Tuple;
-import net.minecraft.world.InteractionResult;
-import org.apache.commons.lang3.mutable.MutableLong;
-import org.jetbrains.annotations.ApiStatus;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import static me.shedaniel.autoconfig.util.Utils.getUnsafely;
-import static me.shedaniel.autoconfig.util.Utils.setUnsafely;
-
-@ApiStatus.Internal
-@Environment(EnvType.CLIENT)
-public class ConfigManagerImpl implements ConfigManager {
-    private boolean craftableOnly;
-    private final Gson gson = new GsonBuilder().create();
-    private ConfigObjectImpl object;
-    
-    public ConfigManagerImpl() {
-        this.craftableOnly = false;
-        Jankson jankson = Jankson.builder().build();
-        AutoConfig.register(ConfigObjectImpl.class, (definition, configClass) -> new JanksonConfigSerializer<>(definition, configClass, Jankson.builder().registerPrimitiveTypeAdapter(InputConstants.Key.class, it -> {
-            return it instanceof String ? InputConstants.getKey((String) it) : null;
-        }).registerSerializer(InputConstants.Key.class, (it, marshaller) -> new JsonPrimitive(it.getName())).registerTypeAdapter(ModifierKeyCode.class, o -> {
-            String code = ((JsonPrimitive) o.get("keyCode")).asString();
-            if (code.endsWith(".unknown")) return ModifierKeyCode.unknown();
-            InputConstants.Key keyCode = InputConstants.getKey(code);
-            Modifier modifier = Modifier.of(((Number) ((JsonPrimitive) o.get("modifier")).getValue()).shortValue());
-            return ModifierKeyCode.of(keyCode, modifier);
-        }).registerSerializer(ModifierKeyCode.class, (keyCode, marshaller) -> {
-            JsonObject object = new JsonObject();
-            object.put("keyCode", new JsonPrimitive(keyCode.getKeyCode().getName()));
-            object.put("modifier", new JsonPrimitive(keyCode.getModifier().getValue()));
-            return object;
-        }).registerSerializer(EntryStack.class, (stack, marshaller) -> {
-            try {
-                return jankson.load(gson.toJson(stack.toJson()));
-            } catch (SyntaxError syntaxError) {
-                syntaxError.printStackTrace();
-                return JsonNull.INSTANCE;
-            }
-        }).registerPrimitiveTypeAdapter(EntryStack.class, it -> {
-            return it instanceof String ? EntryStack.readFromJson(gson.fromJson((String) it, JsonElement.class)) : null;
-        }).registerTypeAdapter(EntryStack.class, it -> {
-            return EntryStack.readFromJson(gson.fromJson(it.toString(), JsonElement.class));
-        }).registerSerializer(FavoriteEntry.class, (favoriteEntry, marshaller) -> {
-            try {
-                return jankson.load(favoriteEntry.toJson(new com.google.gson.JsonObject()).toString());
-            } catch (SyntaxError syntaxError) {
-                syntaxError.printStackTrace();
-                return JsonNull.INSTANCE;
-            }
-        }).registerTypeAdapter(FavoriteEntry.class, it -> {
-            com.google.gson.JsonObject object = gson.fromJson(it.toString(), com.google.gson.JsonObject.class);
-            return FavoriteEntry.delegate(() -> FavoriteEntry.fromJson(object), () -> object);
-        }).registerPrimitiveTypeAdapter(FavoriteEntry.class, it -> {
-            com.google.gson.JsonObject object = gson.fromJson(it.toString(), com.google.gson.JsonObject.class);
-            return FavoriteEntry.delegate(() -> FavoriteEntry.fromJson(object), () -> object);
-        }).registerSerializer(FilteringRule.class, (rule, marshaller) -> {
-            return new JsonPrimitive(FilteringRule.toTag(rule, new CompoundTag()).toString());
-        }).registerPrimitiveTypeAdapter(FilteringRule.class, it -> {
-            try {
-                return it instanceof String ? FilteringRule.fromTag(TagParser.parseTag((String) it)) : null;
-            } catch (Exception e) {
-                e.printStackTrace();
-                return null;
-            }
-        }).build()));
-        GuiRegistry guiRegistry = AutoConfig.getGuiRegistry(ConfigObjectImpl.class);
-        guiRegistry.registerPredicateProvider((i13n, field, config, defaults, guiProvider) -> {
-            if (field.isAnnotationPresent(ConfigEntry.Gui.Excluded.class))
-                return Collections.emptyList();
-            KeyCodeEntry entry = ConfigEntryBuilder.create().startModifierKeyCodeField(new TranslatableComponent(i13n), getUnsafely(field, config, ModifierKeyCode.unknown())).setModifierDefaultValue(() -> getUnsafely(field, defaults)).setModifierSaveConsumer(newValue -> setUnsafely(field, config, newValue)).build();
-            return Collections.singletonList(entry);
-        }, field -> field.getType() == ModifierKeyCode.class);
-        guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) -> {
-            ConfigObjectImpl.UsePercentage bounds = field.getAnnotation(ConfigObjectImpl.UsePercentage.class);
-            return Collections.singletonList(ConfigEntryBuilder.create().startIntSlider(new TranslatableComponent(i13n), Mth.ceil(Utils.getUnsafely(field, config, 0.0) * 100), Mth.ceil(bounds.min() * 100), Mth.ceil(bounds.max() * 100)).setDefaultValue(() -> Mth.ceil((double) Utils.getUnsafely(field, defaults) * 100)).setSaveConsumer((newValue) -> {
-                setUnsafely(field, config, newValue / 100d);
-            }).setTextGetter(integer -> new TextComponent(bounds.prefix() + String.format("%d%%", integer))).build());
-        }, (field) -> field.getType() == Double.TYPE || field.getType() == Double.class, ConfigObjectImpl.UsePercentage.class);
-        
-        guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) ->
-                        Collections.singletonList(new RecipeScreenTypeEntry(220, new TranslatableComponent(i13n), getUnsafely(field, config, DisplayScreenType.UNSET), getUnsafely(field, defaults), type -> setUnsafely(field, config, type)))
-                , (field) -> field.getType() == DisplayScreenType.class, ConfigObjectImpl.UseSpecialRecipeTypeScreen.class);
-        guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) ->
-                        Collections.singletonList(new SearchFilterSyntaxHighlightingEntry(new TranslatableComponent(i13n), getUnsafely(field, config, SyntaxHighlightingMode.COLORFUL), getUnsafely(field, defaults), type -> setUnsafely(field, config, type)))
-                , (field) -> field.getType() == SyntaxHighlightingMode.class, ConfigObjectImpl.UseSpecialSearchFilterSyntaxHighlightingScreen.class);
-        guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) ->
-                        REIHelper.getInstance().getPreviousContainerScreen() == null || Minecraft.getInstance().getConnection() == null || Minecraft.getInstance().getConnection().getRecipeManager() == null ?
-                                Collections.singletonList(new NoFilteringEntry(220, getUnsafely(field, config, new ArrayList<>()), getUnsafely(field, defaults), list -> setUnsafely(field, config, list)))
-                                :
-                                Collections.singletonList(new FilteringEntry(220, getUnsafely(field, config, new ArrayList<>()), ((ConfigObjectImpl.Advanced.Filtering) config).filteringRules, getUnsafely(field, defaults), list -> setUnsafely(field, config, list), list -> ((ConfigObjectImpl.Advanced.Filtering) config).filteringRules = Lists.newArrayList(list)))
-                , (field) -> field.getType() == List.class, ConfigObjectImpl.UseFilteringScreen.class);
-        saveConfig();
-        RoughlyEnoughItemsCore.LOGGER.info("Config loaded.");
-    }
-    
-    @Override
-    public void startReload() {
-    }
-    
-    public static ConfigManagerImpl getInstance() {
-        return (ConfigManagerImpl) ConfigManager.getInstance();
-    }
-    
-    @Override
-    public void saveConfig() {
-        if (getConfig().getFavoriteEntries() != null)
-            getConfig().getFavoriteEntries().removeIf(Objects::isNull);
-        if (getConfig().getFilteredStacks() != null) {
-            getConfig().getFilteredStacks().removeIf(EntryStack::isEmpty);
-            List<EntryStack<?>> normalizedFilteredStacks = CollectionUtils.map(getConfig().getFilteredStacks(), EntryStack::normalize);
-            getConfig().getFilteredStacks().clear();
-            getConfig().getFilteredStacks().addAll(normalizedFilteredStacks);
-        }
-        if (getConfig().getFilteringRules().stream().noneMatch(filteringRule -> filteringRule instanceof ManualFilteringRule)) {
-            getConfig().getFilteringRules().add(new ManualFilteringRule());
-        }
-        AutoConfig.getConfigHolder(ConfigObjectImpl.class).save();
-        AutoConfig.getConfigHolder(ConfigObjectImpl.class).registerLoadListener((configHolder, configObject) -> {
-            object = configObject;
-            return InteractionResult.PASS;
-        });
-    }
-    
-    @Override
-    public ConfigObjectImpl getConfig() {
-        if (object == null) {
-            object = AutoConfig.getConfigHolder(ConfigObjectImpl.class).getConfig();
-        }
-        return object;
-    }
-    
-    @Override
-    public boolean isCraftableOnlyEnabled() {
-        return craftableOnly;
-    }
-    
-    @Override
-    public void toggleCraftableOnly() {
-        craftableOnly = !craftableOnly;
-    }
-    
-    @SuppressWarnings("deprecation")
-    @Override
-    public Screen getConfigScreen(Screen parent) {
-        try {
-            if (Platform.isFabric() && !detectWorkingOptifabric()) {
-                List<Tuple<String, String>> warnings = Lists.newArrayList();
-                warnings.add(new Tuple<>(I18n.get("text.rei.config.optifine.title"), null));
-                warnings.add(new Tuple<>(I18n.get("text.rei.config.optifine.description"), null));
-                WarningAndErrorScreen screen = new WarningAndErrorScreen("config screen", warnings, Collections.emptyList(), Minecraft.getInstance()::setScreen);
-                screen.setParent(parent);
-                return screen;
-            }
-            TransformingScreen parentTranslated;
-            {
-                MutableLong current = new MutableLong(0);
-                parentTranslated = new TransformingScreen(true, parent,
-                        null,
-                        () -> current.setValue(current.getValue() == 0 ? Util.getMillis() + (!getConfig().isConfigScreenAnimated() ? -3000 : 0) : current.getValue()),
-                        () -> 0, () -> (EasingMethod.EasingMethodImpl.EXPO.apply(Mth.clamp((Util.getMillis() - current.getValue()) / 750.0, 0, 1)))
-                                       * Minecraft.getInstance().getWindow().getGuiScaledHeight(), () -> Util.getMillis() - current.getValue() > 800);
-                parentTranslated.setInitAfter(true);
-            }
-            ConfigScreenProvider<ConfigObjectImpl> provider = (ConfigScreenProvider<ConfigObjectImpl>) AutoConfig.getConfigScreen(ConfigObjectImpl.class, parentTranslated);
-            provider.setI13nFunction(manager -> "config.roughlyenoughitems");
-            provider.setOptionFunction((baseI13n, field) -> field.isAnnotationPresent(ConfigObjectImpl.DontApplyFieldName.class) ? baseI13n : String.format("%s.%s", baseI13n, field.getName()));
-            provider.setCategoryFunction((baseI13n, categoryName) -> String.format("%s.%s", baseI13n, categoryName));
-            provider.setBuildFunction(builder -> {
-                builder.setGlobalized(true);
-                builder.setGlobalizedExpanded(false);
-                if (Minecraft.getInstance().getConnection() != null && Minecraft.getInstance().getConnection().getRecipeManager() != null) {
-                    builder.getOrCreateCategory(new TranslatableComponent("config.roughlyenoughitems.advanced")).getEntries().add(0, new ReloadPluginsEntry(220));
-                }
-                return builder.setAfterInitConsumer(screen -> {
-                    ScreenHooks.addButton(screen, new Button(screen.width - 104, 4, 100, 20, new TranslatableComponent("text.rei.credits"), button -> {
-                        MutableLong current = new MutableLong(0);
-                        CreditsScreen creditsScreen = new CreditsScreen(screen);
-                        Minecraft.getInstance().setScreen(new TransformingScreen(false, creditsScreen,
-                                screen,
-                                () -> current.setValue(current.getValue() == 0 ? Util.getMillis() + (!getConfig().isCreditsScreenAnimated() ? -3000 : 0) : current.getValue()),
-                                () -> (1 - EasingMethod.EasingMethodImpl.EXPO.apply(Mth.clamp((Util.getMillis() - current.getValue()) / 750.0, 0, 1)))
-                                      * Minecraft.getInstance().getWindow().getGuiScaledWidth() * 1.3,
-                                () -> 0,
-                                () -> Util.getMillis() - current.getValue() > 800));
-                    }));
-                }).setSavingRunnable(() -> {
-                    saveConfig();
-                    EntryRegistry.getInstance().refilter();
-                    if (REIHelperImpl.getSearchField() != null)
-                        ContainerScreenOverlay.getEntryListWidget().updateSearch(REIHelperImpl.getSearchField().getText(), true);
-                }).build();
-            });
-            Screen configScreen = provider.get();
-            parentTranslated.setLastScreen(configScreen);
-            MutableLong current = new MutableLong(0);
-            return new TransformingScreen(false, configScreen,
-                    parent,
-                    () -> current.setValue(current.getValue() == 0 ? Util.getMillis() + (!getConfig().isConfigScreenAnimated() ? -3000 : 0) : current.getValue()),
-                    () -> 0, () -> (1 - EasingMethod.EasingMethodImpl.EXPO.apply(Mth.clamp((Util.getMillis() - current.getValue()) / 750.0, 0, 1)))
-                                   * Minecraft.getInstance().getWindow().getGuiScaledHeight() * 1.3, () -> Util.getMillis() - current.getValue() > 800);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-    
-    private boolean detectWorkingOptifabric() {
-        try {
-            String renderText = FabricLoader.getInstance().getMappingResolver().mapMethodName("intermediary", "net.minecraft.class_327", "method_1724", "(Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F");
-            Method method = Font.class.getDeclaredMethod(renderText, String.class, Float.TYPE, Float.TYPE, Integer.TYPE, Boolean.TYPE, Matrix4f.class, MultiBufferSource.class, Boolean.TYPE, Integer.TYPE, Integer.TYPE);
-            return !java.lang.reflect.Modifier.isPrivate(method.getModifiers());
-        } catch (Throwable ignored) {
-            return false;
-        }
-    }
-    
-    public static class ConfigErrorScreen extends Screen {
-        private final Component message;
-        private final Screen parent;
-        
-        public ConfigErrorScreen(Screen parent, Component title, Component message) {
-            super(title);
-            this.parent = parent;
-            this.message = message;
-        }
-        
-        @Override
-        public void init() {
-            super.init();
-            this.addButton(new Button(this.width / 2 - 100, 140, 200, 20, CommonComponents.GUI_CANCEL, button -> this.minecraft.setScreen(parent)));
-        }
-        
-        @Override
-        public void render(PoseStack matrices, int mouseX, int mouseY, float delta) {
-            this.renderBackground(matrices);
-            drawCenteredString(matrices, this.font, this.title, this.width / 2, 90, 16777215);
-            drawCenteredString(matrices, this.font, this.message, this.width / 2, 110, 16777215);
-            super.render(matrices, mouseX, mouseY, delta);
-        }
-        
-        @Override
-        public boolean shouldCloseOnEsc() {
-            return false;
-        }
-    }
-    
-}