Make clientside config editable with Configured on Forge 1.19.2

Common/src/main/java/mezz/jei/common/gui/elements/package-info.java

@@ -4,4 +4,4 @@
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;

Common/src/main/java/mezz/jei/common/network/packets/PacketGiveItemStack.java

@@ -4,7 +4,7 @@
 import mezz.jei.common.network.PacketIdServer;
 import mezz.jei.common.network.ServerPacketContext;
 import mezz.jei.common.network.ServerPacketData;
-import mezz.jei.core.config.GiveMode;
+import mezz.jei.api.config.GiveMode;
 import mezz.jei.common.util.ServerCommandUtil;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.MinecraftServer;

Common/src/main/java/mezz/jei/common/util/ServerCommandUtil.java

@@ -6,7 +6,7 @@
 import mezz.jei.common.network.IConnectionToClient;
 import mezz.jei.common.network.ServerPacketContext;
 import mezz.jei.common.network.packets.PacketCheatPermission;
-import mezz.jei.core.config.GiveMode;
+import mezz.jei.api.config.GiveMode;
 import mezz.jei.core.config.IServerConfig;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;

Core/src/main/java/mezz/jei/core/FieldsAndMethodsAreNonnullByDefault.java → CommonApi/src/main/java/mezz/jei/api/FieldsAndMethodsAreNonnullByDefault.java

@@ -1,4 +1,4 @@
-package mezz.jei.core;
+package mezz.jei.api;
 
 import javax.annotation.Nonnull;
 import javax.annotation.meta.TypeQualifierDefault;

Core/src/main/java/mezz/jei/core/config/GiveMode.java → CommonApi/src/main/java/mezz/jei/api/config/GiveMode.java

@@ -1,4 +1,4 @@
-package mezz.jei.core.config;
+package mezz.jei.api.config;
 
 public enum GiveMode {
 	INVENTORY, MOUSE_PICKUP;

Gui/src/main/java/mezz/jei/gui/config/IClientConfig.java → CommonApi/src/main/java/mezz/jei/api/config/IClientConfig.java

@@ -1,9 +1,6 @@
-package mezz.jei.gui.config;
+package mezz.jei.api.config;
 
-import mezz.jei.core.config.GiveMode;
-import mezz.jei.core.config.IngredientSortStage;
-
-import java.util.List;
+import java.util.stream.Stream;
 
 public interface IClientConfig {
     int minRecipeGuiHeight = 175;
@@ -22,5 +19,5 @@ public interface IClientConfig {
 
 	int getMaxRecipeGuiHeight();
 
-	List<IngredientSortStage> getIngredientSorterStages();
+	Stream<IngredientSortStage> getIngredientSorterStages();
 }

Gui/src/main/java/mezz/jei/gui/config/IJeiClientConfigs.java → CommonApi/src/main/java/mezz/jei/api/config/IClientConfigs.java

@@ -1,6 +1,6 @@
-package mezz.jei.gui.config;
+package mezz.jei.api.config;
 
-public interface IJeiClientConfigs {
+public interface IClientConfigs {
     IClientConfig getClientConfig();
 
     IIngredientFilterConfig getIngredientFilterConfig();

Gui/src/main/java/mezz/jei/gui/config/IIngredientFilterConfig.java → CommonApi/src/main/java/mezz/jei/api/config/IIngredientFilterConfig.java

@@ -1,6 +1,4 @@
-package mezz.jei.gui.config;
-
-import mezz.jei.core.search.SearchMode;
+package mezz.jei.api.config;
 
 public interface IIngredientFilterConfig {
 	SearchMode getModNameSearchMode();

CommonApi/src/main/java/mezz/jei/api/config/IIngredientGridConfig.java

@@ -0,0 +1,28 @@
+package mezz.jei.api.config;
+
+import mezz.jei.api.config.gui.HorizontalAlignment;
+import mezz.jei.api.config.gui.NavigationVisibility;
+import mezz.jei.api.config.gui.VerticalAlignment;
+
+public interface IIngredientGridConfig {
+	 int minNumRows = 1;
+	 int defaultNumRows = 48;
+	 int largestNumRows = 100;
+
+	 int minNumColumns = 4;
+	 int defaultNumColumns = 9;
+	 int largestNumColumns = 100;
+
+	 VerticalAlignment defaultVerticalAlignment = VerticalAlignment.TOP;
+	 NavigationVisibility defaultButtonNavigationVisibility = NavigationVisibility.ENABLED;
+	 boolean defaultDrawBackground = false;
+
+	int getMaxColumns();
+	int getMinColumns();
+	int getMaxRows();
+	int getMinRows();
+	boolean drawBackground();
+	HorizontalAlignment getHorizontalAlignment();
+	VerticalAlignment getVerticalAlignment();
+	NavigationVisibility getButtonNavigationVisibility();
+}

Core/src/main/java/mezz/jei/core/config/IngredientSortStage.java → CommonApi/src/main/java/mezz/jei/api/config/IngredientSortStage.java

@@ -1,4 +1,4 @@
-package mezz.jei.core.config;
+package mezz.jei.api.config;
 
 import java.util.List;
 
@@ -10,4 +10,14 @@ public enum IngredientSortStage {
 		IngredientSortStage.INGREDIENT_TYPE,
 		IngredientSortStage.CREATIVE_MENU
 	);
+	public static final List<String> defaultStagesNames = defaultStages.stream().map(stage -> stage.name()).toList();
+
+	public static boolean isValidName(String name) {
+		try {
+			valueOf(name);
+			return true;
+		} catch (IllegalArgumentException e) {
+			return false;
+		}
+	}
 }

Core/src/main/java/mezz/jei/core/search/SearchMode.java → CommonApi/src/main/java/mezz/jei/api/config/SearchMode.java

@@ -1,4 +1,4 @@
-package mezz.jei.core.search;
+package mezz.jei.api.config;
 
 public enum SearchMode {
 	ENABLED, REQUIRE_PREFIX, DISABLED

Gui/src/main/java/mezz/jei/gui/util/HorizontalAlignment.java → CommonApi/src/main/java/mezz/jei/api/config/gui/HorizontalAlignment.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.util;
+package mezz.jei.api.config.gui;
 
 public enum HorizontalAlignment {
 	LEFT, CENTER, RIGHT

Gui/src/main/java/mezz/jei/gui/overlay/options/NavigationVisibility.java → CommonApi/src/main/java/mezz/jei/api/config/gui/NavigationVisibility.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.overlay.options;
+package mezz.jei.api.config.gui;
 
 public enum NavigationVisibility {
 	ENABLED, AUTO_HIDE, DISABLED

Gui/src/main/java/mezz/jei/gui/util/VerticalAlignment.java → CommonApi/src/main/java/mezz/jei/api/config/gui/VerticalAlignment.java

@@ -1,4 +1,4 @@
-package mezz.jei.gui.util;
+package mezz.jei.api.config.gui;
 
 public enum VerticalAlignment {
 	TOP, CENTER, BOTTOM

CommonApi/src/main/java/mezz/jei/api/config/gui/package-info.java

@@ -0,0 +1,8 @@
+@ParametersAreNonnullByDefault
+@FieldsAndMethodsAreNonnullByDefault
+package mezz.jei.api.config.gui;
+
+
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

Gui/src/main/java/mezz/jei/gui/overlay/options/package-info.java → CommonApi/src/main/java/mezz/jei/api/config/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package mezz.jei.gui.overlay.options;
+package mezz.jei.api.config;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

CommonApi/src/main/java/mezz/jei/api/registration/IRuntimeRegistration.java

@@ -1,5 +1,6 @@
 package mezz.jei.api.registration;
 
+import mezz.jei.api.config.IClientConfigs;
 import mezz.jei.api.helpers.IJeiHelpers;
 import mezz.jei.api.recipe.IRecipeManager;
 import mezz.jei.api.recipe.transfer.IRecipeTransferManager;
@@ -88,4 +89,7 @@ public interface IRuntimeRegistration {
      * This is used by JEI's GUI and can be used by other mods that want to use the same information from JEI.
      */
     IEditModeConfig getEditModeConfig();
+
+    // TODO: docs
+    IClientConfigs getClientConfigs();
 }

Core/build.gradle.kts

@@ -34,6 +34,7 @@ dependencies {
         name = "log4j-api",
         version = "2.17.0"
     )
+    implementation(project(mapOf("path" to ":CommonApi")))
     testImplementation(
         group = "org.junit.jupiter",
         name = "junit-jupiter-api",

Core/src/main/java/mezz/jei/core/collect/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.collect;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/config/file/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.config.file;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/config/file/serializers/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.config.file.serializers;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/config/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.config;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/config/sorting/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.config.sorting;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/config/sorting/serializers/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.config.sorting.serializers;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/package-info.java

@@ -2,4 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core;
 
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
+
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/search/CombinedSearchables.java

@@ -1,5 +1,7 @@
 package mezz.jei.core.search;
 
+import mezz.jei.api.config.SearchMode;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

Core/src/main/java/mezz/jei/core/search/ISearchable.java

@@ -1,5 +1,7 @@
 package mezz.jei.core.search;
 
+import mezz.jei.api.config.SearchMode;
+
 import java.util.Set;
 
 public interface ISearchable<T> {

Core/src/main/java/mezz/jei/core/search/PrefixInfo.java

@@ -1,5 +1,6 @@
 package mezz.jei.core.search;
 
+import mezz.jei.api.config.SearchMode;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.Collection;

Core/src/main/java/mezz/jei/core/search/PrefixedSearchable.java

@@ -1,5 +1,7 @@
 package mezz.jei.core.search;
 
+import mezz.jei.api.config.SearchMode;
+
 import java.util.Collection;
 import java.util.Set;
 

Core/src/main/java/mezz/jei/core/search/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.search;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/search/suffixtree/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.search.suffixtree;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/util/function/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.util.function;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/main/java/mezz/jei/core/util/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.core.util;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/test/java/mezz/jei/test/search/suffixtree/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.test.search.suffixtree;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Core/src/test/java/mezz/jei/test/util/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package mezz.jei.test.util;
 
-import mezz.jei.core.FieldsAndMethodsAreNonnullByDefault;
+import mezz.jei.api.FieldsAndMethodsAreNonnullByDefault;
 
 import javax.annotation.ParametersAreNonnullByDefault;

Fabric/src/main/java/mezz/jei/fabric/JustEnoughItemsClient.java

@@ -3,7 +3,9 @@
 import mezz.jei.common.Internal;
 import mezz.jei.common.gui.textures.JeiSpriteUploader;
 import mezz.jei.common.gui.textures.Textures;
+import mezz.jei.common.platform.Services;
 import mezz.jei.core.config.IServerConfig;
+import mezz.jei.fabric.config.ClientConfigs;
 import mezz.jei.fabric.config.ServerConfig;
 import mezz.jei.fabric.events.JeiIdentifiableResourceReloadListener;
 import mezz.jei.fabric.events.JeiLifecycleEvents;
@@ -13,7 +15,12 @@
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.server.packs.PackType;
 
+import java.nio.file.Path;
+
 public class JustEnoughItemsClient implements ClientModInitializer {
+
+
+
 	@Override
 	public void onInitializeClient() {
 		JeiLifecycleEvents.REGISTER_RESOURCE_RELOAD_LISTENER.register((resourceManager, textureManager) -> {
@@ -24,8 +31,11 @@ public void onInitializeClient() {
 			Internal.setTextures(textures);
 
 			ClientLifecycleEvents.CLIENT_STARTED.register(event -> {
+				Path configDir = Services.PLATFORM.getConfigHelper().createJeiConfigDir();
+				ClientConfigs jeiClientConfigs = new ClientConfigs(configDir.resolve("jei-client.ini"));
+
 				IServerConfig serverConfig = ServerConfig.getInstance();
-				ClientLifecycleHandler clientLifecycleHandler = new ClientLifecycleHandler(textures, serverConfig);
+				ClientLifecycleHandler clientLifecycleHandler = new ClientLifecycleHandler(textures, serverConfig, jeiClientConfigs);
 				clientLifecycleHandler.registerEvents();
 
 				ResourceManagerHelper.get(PackType.SERVER_DATA)

Gui/src/main/java/mezz/jei/gui/config/ClientConfig.java → Fabric/src/main/java/mezz/jei/fabric/config/ClientConfig.java

@@ -1,16 +1,18 @@
-package mezz.jei.gui.config;
+package mezz.jei.fabric.config;
 
 import com.google.common.base.Preconditions;
+import mezz.jei.api.config.IClientConfig;
 import mezz.jei.core.config.file.IConfigCategoryBuilder;
 import mezz.jei.core.config.file.IConfigSchemaBuilder;
 import mezz.jei.core.config.file.serializers.EnumSerializer;
 import mezz.jei.core.config.file.serializers.ListSerializer;
-import mezz.jei.core.config.GiveMode;
-import mezz.jei.core.config.IngredientSortStage;
+import mezz.jei.api.config.GiveMode;
+import mezz.jei.api.config.IngredientSortStage;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 public final class ClientConfig implements IClientConfig {
 	@Nullable
@@ -110,7 +112,7 @@ public int getMaxRecipeGuiHeight() {
 	}
 
 	@Override
-	public List<IngredientSortStage> getIngredientSorterStages() {
-		return ingredientSorterStages.get();
+	public Stream<IngredientSortStage> getIngredientSorterStages() {
+		return ingredientSorterStages.get().stream();
 	}
 }