From 02c8067c66c7e5a598b632ff8a5e6a90886e6d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 1 Aug 2021 18:15:35 +0200 Subject: [PATCH] Update manual lib. --- gradle.properties | 2 +- src/main/java/li/cil/oc2/client/manual/Manuals.java | 8 ++++---- .../java/li/cil/oc2/client/manual/ModManualStyle.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 461323af..a38a40c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ version_minor=0 version_patch=1 oc2_sedna_version_min=0.0.1 -manual_version=1.0.1+ +manual_version=1.1.0+ jei_minecraft_version=1.16.4 jei_version=7.6.1.71 diff --git a/src/main/java/li/cil/oc2/client/manual/Manuals.java b/src/main/java/li/cil/oc2/client/manual/Manuals.java index caf8d403..69cd74d1 100644 --- a/src/main/java/li/cil/oc2/client/manual/Manuals.java +++ b/src/main/java/li/cil/oc2/client/manual/Manuals.java @@ -3,11 +3,11 @@ package li.cil.oc2.client.manual; import li.cil.manual.api.ManualModel; import li.cil.manual.api.Tab; import li.cil.manual.api.prefab.Manual; -import li.cil.manual.api.prefab.provider.NamespaceContentProvider; +import li.cil.manual.api.prefab.provider.NamespaceDocumentProvider; import li.cil.manual.api.prefab.provider.NamespacePathProvider; import li.cil.manual.api.prefab.tab.ItemStackTab; import li.cil.manual.api.prefab.tab.TextureTab; -import li.cil.manual.api.provider.ContentProvider; +import li.cil.manual.api.provider.DocumentProvider; import li.cil.manual.api.provider.PathProvider; import li.cil.oc2.api.API; import li.cil.oc2.common.block.Blocks; @@ -33,11 +33,11 @@ public final class Manuals { public static void initialize() { final DeferredRegister pathProviders = RegistryUtils.create(PathProvider.class); - final DeferredRegister contentProviders = RegistryUtils.create(ContentProvider.class); + final DeferredRegister contentProviders = RegistryUtils.create(DocumentProvider.class); final DeferredRegister tabs = RegistryUtils.create(Tab.class); pathProviders.register("path_provider", () -> new NamespacePathProvider(API.MOD_ID)); - contentProviders.register("content_provider", () -> new NamespaceContentProvider(API.MOD_ID, "doc")); + contentProviders.register("content_provider", () -> new NamespaceDocumentProvider(API.MOD_ID, "doc")); tabs.register("home", () -> new TextureTab( ManualModel.LANGUAGE_KEY + "/index.md", diff --git a/src/main/java/li/cil/oc2/client/manual/ModManualStyle.java b/src/main/java/li/cil/oc2/client/manual/ModManualStyle.java index cc0dfd64..84156ee2 100644 --- a/src/main/java/li/cil/oc2/client/manual/ModManualStyle.java +++ b/src/main/java/li/cil/oc2/client/manual/ModManualStyle.java @@ -2,7 +2,7 @@ package li.cil.oc2.client.manual; import li.cil.manual.api.ManualStyle; import li.cil.manual.api.render.FontRenderer; -import li.cil.oc2.client.renderer.font.TerminalFontRenderer; +import li.cil.oc2.client.renderer.font.MonospaceFontRenderer; import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvents; import net.minecraftforge.api.distmarker.Dist; @@ -44,7 +44,7 @@ public final class ModManualStyle implements ManualStyle { @Override public FontRenderer getMonospaceFont() { - return TerminalFontRenderer.INSTANCE; + return MonospaceFontRenderer.INSTANCE; } @Override