Remove some unused files, some notes about next steps as discussed on…

… Discord

README.md

@@ -3,6 +3,12 @@ Small things. Learn more at [the Mod's website](https://quarkmod.net).
 
 This mod makes use of the [Java Universal Tween Engine](https://github.com/AurelienRibon/universal-tween-engine) by Aurelien Ribon, licensed under the Apache 2.0 License.  
 
+## Zeta?
+
+*Project Zeta* is a planned rearchitecture of Quark to make it less tightly-integrated with Forge. Read the roadmap [in Vazkii's post on the Violet Moon forums](https://forum.violetmoon.org/d/78-project-zeta-aka-quark-on-fabric-real).
+
+There is still lots to do! If you'd like to contribute, see `zeta-todo/README.md`
+
 ## Release Process
 Quark's release process is mostly automated. Here's the steps:
 

src/main/java/vazkii/quark/api/config/IExternalCategory.java

@@ -7,6 +7,7 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 @OnlyIn(Dist.CLIENT)
+@Deprecated(forRemoval = true)
 public interface IExternalCategory extends IConfigCategory {
 
 	void commit();

src/main/java/vazkii/quark/api/config/IQuarkConfig.java

@@ -2,12 +2,6 @@
 
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.event.config.ModConfigEvent;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.io.File;
-import java.util.Map;
-import java.util.function.Consumer;
 
 @OnlyIn(Dist.CLIENT)
 public interface IQuarkConfig {
@@ -20,47 +14,4 @@ class Holder {
 		public static IQuarkConfig instance = null;
 
 	}
-
-	/**
-	 * Registers a category to be shown inside the q menu. Unless you have a really good reason, register only one per mod
-	 * in the interest of keeping things somewhat clean.<br><br>
-	 *
-	 * @param modid Your mod ID. This will be used to map the configs per mod, and automatically handle refreshing the config
-	 * whenever {@link ModConfigEvent} is fired. <b>Note:</b> If your config is loaded in any way where ModConfigEvent wouldn't
-	 * fire for it, you must call {@link IConfigCategory#refresh()} manually.
-	 * @param name The name of the category. This is a display only name and bears no internal significance.
-	 * @param onChangedCallback The function to be called when this config changes. You can use {@link IQuarkConfig#writeToFileCallback(String)}
-	 * to generate a callback that'll automatically regenerate the relevant config file. This function is called every time the player
-	 * clicks the Save button in the quark config screen, even if the config didn't change.
-	 * @return The top level category you can then add stuff onto.
-	 */
-	IExternalCategory registerExternalCategory(String modid, String name, Consumer<IExternalCategory> onChangedCallback);
-
-	/**
-	 * Creates a callback to output the config contents to the given file.
-	 * @see IQuarkConfig#writeToFileCallback(String) for a helper.
-	 */
-	Consumer<IExternalCategory> writeToFileCallback(File file);
-
-	/**
-	 *	{@link IQuarkConfig#writeToFileCallback(File)} helper. Passes in {@code new File("config", filename + ".toml")}.
-	 */
-	default Consumer<IExternalCategory> writeToFileCallback(String filename) {
-		return writeToFileCallback(new File("config", filename + ".toml"));
-	}
-
-	default Pair<IExternalCategory, IExternalCategory> registerClientCommonExternalCategory(String modid, String name, Consumer<IExternalCategory> commonCallback, Consumer<IExternalCategory> clientCallback) {
-		IExternalCategory main = registerExternalCategory(modid, name, (c) -> {
-			Map<String, IConfigCategory> topLevel = c.getTopLevelCategories();
-			((IExternalCategory) topLevel.get("common")).commit();
-			((IExternalCategory) topLevel.get("client")).commit();
-			c.updateDirty();
-		});
-
-		IExternalCategory common = main.addTopLevelCategory("common", commonCallback);
-		IExternalCategory client = main.addTopLevelCategory("client", clientCallback);
-
-		return Pair.of(common, client);
-	}
-
 }

src/main/java/vazkii/quark/base/client/config/ConfigCategory.java

@@ -16,7 +16,6 @@
 import vazkii.quark.api.config.IConfigCategory;
 import vazkii.quark.api.config.IConfigElement;
 import vazkii.quark.api.config.IConfigObject;
-import vazkii.quark.base.client.config.external.ExternalCategory;
 import vazkii.quark.base.client.config.screen.CategoryScreen;
 import vazkii.quark.base.client.config.screen.WidgetWrapper;
 import vazkii.quark.base.client.config.screen.inputtable.IInputtableConfigType;
@@ -38,7 +37,7 @@ public ConfigCategory(String name, String comment, IConfigCategory parent, Objec
 		super(name, comment, parent);
 
 		this.holderObject = holderObject;
-		if(parent == null || (parent instanceof ExternalCategory)) {
+		if(parent == null) {
 			path = name;
 			depth = 0;
 		} else {

src/main/java/vazkii/quark/base/client/config/IngameConfigHandler.java

@@ -7,7 +7,6 @@
 import vazkii.quark.api.config.IConfigElement;
 import vazkii.quark.api.config.IConfigObject;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.client.config.external.ExternalConfigHandler;
 import vazkii.quark.base.module.config.IConfigCallback;
 import vazkii.zeta.module.ZetaCategory;
 
@@ -68,7 +67,6 @@ public void commit() {
 		Quark.proxy.setConfigGuiSaving(true);
 		try {
 			commit(topLevelCategories);
-			ExternalConfigHandler.instance.commit();
 			Quark.proxy.handleQuarkConfigChange();
 		} finally {
 			Quark.proxy.setConfigGuiSaving(false);

src/main/java/vazkii/quark/base/client/config/screen/CategoryScreen.java

@@ -11,7 +11,6 @@
 import vazkii.quark.api.config.IConfigCategory;
 import vazkii.quark.base.Quark;
 import vazkii.quark.base.client.config.ConfigObject;
-import vazkii.quark.base.client.config.external.ExternalCategory;
 import vazkii.quark.base.client.config.screen.widgets.ConfigElementList;
 import vazkii.quark.base.client.config.screen.widgets.ScrollableWidgetList;
 
@@ -33,7 +32,7 @@ protected void init() {
 
 		breadcrumbs = category.getName();
 		IConfigCategory currCategory = category.getParent();
-		while(currCategory != null && !(currCategory instanceof ExternalCategory)) {
+		while(currCategory != null) {
 			breadcrumbs = String.format("%s > %s", currCategory.getName(), breadcrumbs);
 			currCategory = currCategory.getParent();
 		}
@@ -49,7 +48,7 @@ public void render(@Nonnull PoseStack mstack, int mouseX, int mouseY, float part
 		// change name for externals
 		String modName = WordUtils.capitalizeFully(Quark.MOD_ID);
 		IConfigCategory currCategory = category;
-		while(currCategory != null && !(currCategory instanceof ExternalCategory))
+		while(currCategory != null)
 			currCategory = currCategory.getParent();
 
 		if(currCategory != null) {

src/main/java/vazkii/quark/base/client/config/screen/QuarkConfigHomeScreen.java

@@ -22,7 +22,6 @@
 import vazkii.quark.api.config.IConfigCategory;
 import vazkii.quark.base.Quark;
 import vazkii.quark.base.client.config.IngameConfigHandler;
-import vazkii.quark.base.client.config.external.ExternalConfigHandler;
 import vazkii.quark.base.client.config.screen.widgets.CheckboxButton;
 import vazkii.quark.base.client.config.screen.widgets.IconButton;
 import vazkii.quark.base.client.config.screen.widgets.SocialButton;
@@ -45,7 +44,6 @@ protected void init() {
 		super.init();
 
 		final int perLine = 3;
-		boolean addExternal = ExternalConfigHandler.instance.hasAny();
 
 		int pad = 10;
 		int vpad = 23;
@@ -58,8 +56,6 @@ protected void init() {
 		List<ZetaCategory> categories = Quark.ZETA.modules.getInhabitedCategories();
 
 		int catCount = categories.size() + 1;
-		if(addExternal)
-			catCount++;
 
 		boolean shiftedLeft = false;
 		int useLeft = left;
@@ -94,11 +90,6 @@ protected void init() {
 		addRenderableWidget(new Button(useLeft + (bWidth + pad) * (i % perLine), vStart + (i / perLine) * vpad, bWidth, 20, componentFor(cat), categoryLink(cat)));
 		i++;
 
-		if(addExternal) {
-			cat = ExternalConfigHandler.instance.mockCategory;
-			addRenderableWidget(new Button(useLeft + (bWidth + pad) * (i % perLine), vStart + (i / perLine) * vpad, bWidth, 20, componentFor(cat), categoryLink(cat)));
-		}
-
 		bWidth = 200;
 		addRenderableWidget(new Button(width / 2 - bWidth / 2, height - 30, bWidth, 20, Component.translatable("quark.gui.config.save"), this::commit));
 

src/main/java/vazkii/quark/base/proxy/ClientProxy.java

@@ -14,14 +14,12 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import vazkii.quark.base.Quark;
 import vazkii.quark.base.QuarkClient;
 import vazkii.quark.base.client.config.IngameConfigHandler;
 import vazkii.quark.base.client.config.QButtonHandler;
-import vazkii.quark.base.client.config.external.ExternalConfigHandler;
 import vazkii.quark.base.client.config.screen.QuarkConfigHomeScreen;
 import vazkii.quark.base.client.handler.InventoryButtonHandler;
 import vazkii.quark.base.client.handler.ModelHandler;
@@ -83,8 +81,6 @@ public void start() {
 		ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory((minecraft, screen) -> new QuarkConfigHomeScreen(screen)));
 
 		copyProgrammerArtIfMissing();
-
-		(new ExternalConfigHandler()).setAPIHandler();
 	}
 
 	@Override

src/main/java/vazkii/quark/base/proxy/CommonProxy.java

@@ -44,10 +44,6 @@ public class CommonProxy {
 
 	public void start() {
 		ForgeRegistries.RECIPE_SERIALIZERS.register(Quark.MOD_ID + ":exclusion", ExclusionRecipe.SERIALIZER);
-		ForgeRegistries.RECIPE_SERIALIZERS.register(Quark.MOD_ID + ":maintaining", DataMaintainingRecipe.SERIALIZER);
-		ForgeRegistries.RECIPE_SERIALIZERS.register(Quark.MOD_ID + ":maintaining_smelting", DataMaintainingSmeltingRecipe.SERIALIZER);
-		ForgeRegistries.RECIPE_SERIALIZERS.register(Quark.MOD_ID + ":maintaining_campfire", DataMaintainingCampfireRecipe.SERIALIZER);
-		ForgeRegistries.RECIPE_SERIALIZERS.register(Quark.MOD_ID + ":maintaining_smoking", DataMaintainingSmokingRecipe.SERIALIZER);
 
 		Quark.ZETA.loadBus
 			.subscribe(BrewingHandler.class)