Much improved, now stable, Guide code API, create new domains, use and render existing ones, all from a stable API

Author: isXander

src/main/java/dev/isxander/controlify/Controlify.java

@@ -27,7 +27,7 @@
 import dev.isxander.controlify.driver.steamdeck.SteamDeckMode;
 import dev.isxander.controlify.driver.steamdeck.SteamDeckUtil;
 import dev.isxander.controlify.font.InputFontMapper;
-import dev.isxander.controlify.gui.guide.GuideDomain;
+import dev.isxander.controlify.gui.guide.GuideDomainImpl;
 import dev.isxander.controlify.gui.guide.GuideDomains;
 import dev.isxander.controlify.gui.screen.*;
 import dev.isxander.controlify.debug.DebugProperties;
@@ -55,6 +55,7 @@
 import net.minecraft.client.gui.screens.PauseScreen;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
@@ -184,21 +185,22 @@ public ControlifyBindApi bindings() {
                     }
 
                     @Override
-                    public GuideDomainRegistries guideRegistries() {
-                        return new GuideDomainRegistries() {
+                    public GuideDomainRegistry guideRegistries() {
+                        return new GuideDomainRegistry() {
                             @Override
-                            public GuideDomainRegistry<InGameCtx> inGame() {
+                            public GuideDomain<InGameCtx> inGame() {
                                 return GuideDomains.IN_GAME;
                             }
 
                             @Override
-                            public GuideDomainRegistry<ContainerCtx> container() {
+                            public GuideDomain<ContainerCtx> container() {
                                 return GuideDomains.CONTAINER;
                             }
 
                             @Override
-                            public <T extends FactCtx> RenderableGuideDomain<T> registerCustom(GuideDomain<T> domain) {
-                                GuideDomains.CUSTOM_DOMAINS.put(domain.id(), domain);
+                            public <T extends FactCtx> GuideDomain<T> registerCustom(Identifier domainId) {
+                                GuideDomainImpl<T> domain = new GuideDomainImpl<>(domainId);
+                                GuideDomains.CUSTOM_DOMAINS.put(domainId, domain);
                                 PlatformClientUtil.registerAssetReloadListener(domain);
                                 return domain;
                             }

src/main/java/dev/isxander/controlify/api/entrypoint/PreInitContext.java

@@ -1,10 +1,10 @@
 package dev.isxander.controlify.api.entrypoint;
 
 import dev.isxander.controlify.api.bind.ControlifyBindApi;
-import dev.isxander.controlify.api.guide.GuideDomainRegistries;
+import dev.isxander.controlify.api.guide.GuideDomainRegistry;
 
 public interface PreInitContext {
     ControlifyBindApi bindings();
 
-    GuideDomainRegistries guideRegistries();
+    GuideDomainRegistry guideRegistries();
 }

src/main/java/dev/isxander/controlify/api/guide/GuideDomain.java

@@ -0,0 +1,9 @@
+package dev.isxander.controlify.api.guide;
+
+public interface GuideDomain<T extends FactCtx> {
+    void registerFact(Fact<? super T> fact);
+
+    void registerDynamicRule(Rule rule);
+
+    GuideInstance<T> createInstance();
+}

src/main/java/dev/isxander/controlify/api/guide/GuideDomainRegistries.java

@@ -1,7 +1,11 @@
 package dev.isxander.controlify.api.guide;
 
-public interface GuideDomainRegistry<T extends FactCtx> {
-    void registerFact(Fact<? super T> fact);
+import net.minecraft.resources.Identifier;
 
-    void registerDynamicRule(Rule rule);
+public interface GuideDomainRegistry {
+    GuideDomain<InGameCtx> inGame();
+
+    GuideDomain<ContainerCtx> container();
+
+    <T extends FactCtx> GuideDomain<T> registerCustom(Identifier domainId);
 }

src/main/java/dev/isxander/controlify/api/guide/GuideDomainRegistry.java

@@ -0,0 +1,14 @@
+package dev.isxander.controlify.api.guide;
+
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.Renderable;
+
+public interface GuideInstance<T extends FactCtx> {
+    GuideDomain<T> domain();
+
+    boolean update(T context, Font font);
+
+    void extractRenderState(GuiGraphicsExtractor graphics, boolean bottomAligned, boolean textContrast);
+    Renderable renderable(boolean bottomAligned, boolean textContrast);
+}