New Mod Menu API & Update to pre release 5

gradle.properties

@@ -1,18 +1,18 @@
 projectGroup=com.misterpemodder
 projectName=ShulkerBoxTooltip
-projectVersion=1.1.1+1.14Pre.4
+projectVersion=1.1.2+1.14Pre.5
 projectDescription=Adds a display of shulker box contents
 projectArchiveBaseName=shulkerboxtooltip
 
 isSnapshot=true
 
-mcVersion=1.14 Pre-Release 4
-mcMappings=1.14 Pre-Release 4+build.2
+mcVersion=1.14 Pre-Release 5
+mcMappings=1.14 Pre-Release 5+build.2
 fabricLoaderVersion=0.4.1+build.126
 fabricApiVersion=0.2.7+build.123
-refMapName=com.misterpemodder.fabric.refmap.json
+refMapName=com.misterpemodder.shulkerboxtooltip.refmap.json
 
-modMenuVersion=1.3.5-69
+modMenuVersion=1.4.0-72
 clothConfigVersion=0.1.3.7
 
 pomName=Shulker Box Tooltip

src/main/java/com/misterpemodder/shulkerboxtooltip/Configuration.java

@@ -15,6 +15,7 @@
 import me.shedaniel.cloth.gui.entries.EnumListEntry;
 import me.shedaniel.cloth.gui.entries.EnumListEntry.Translatable;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Screen;
 
 public final class Configuration {
@@ -104,6 +105,10 @@ private static ShulkerBoxTooltipType parseTooltipType(Properties properties, Str
     return defaultType;
   }
 
+  public static Screen buildConfigScreen() {
+    return buildConfigScreen(MinecraftClient.getInstance().currentScreen);
+  }
+
   public static Screen buildConfigScreen(@Nullable Screen parent) {
     ConfigScreenBuilder builder = ConfigScreenBuilder.create(parent,
         "config.shulkerboxtooltip.title", c -> saveConfiguration());

src/main/java/com/misterpemodder/shulkerboxtooltip/ModMenuCompat.java

@@ -0,0 +1,18 @@
+package com.misterpemodder.shulkerboxtooltip;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+import io.github.prospector.modmenu.api.ModMenuApi;
+import net.minecraft.client.gui.Screen;
+
+public class ModMenuCompat implements ModMenuApi {
+  @Override
+  public String getModId() {
+    return "shulkerboxtooltip";
+  }
+
+  @Override
+  public Optional<Supplier<Screen>> getConfigScreen(Screen screen) {
+    return Optional.of(Configuration::buildConfigScreen);
+  }
+}

src/main/java/com/misterpemodder/shulkerboxtooltip/ShulkerBoxTooltip.java

@@ -4,15 +4,12 @@
 import javax.annotation.Nullable;
 import com.misterpemodder.shulkerboxtooltip.Configuration.ShulkerBoxTooltipType;
 import com.misterpemodder.shulkerboxtooltip.hook.ShulkerPreviewPosGetter;
-import io.github.prospector.modmenu.api.ModMenuApi;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.util.NbtType;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.Block;
 import net.minecraft.block.ShulkerBoxBlock;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
@@ -29,13 +26,6 @@ public final class ShulkerBoxTooltip implements ClientModInitializer {
   @Override
   public void onInitializeClient() {
     Configuration.loadConfiguration();
-    if (FabricLoader.getInstance().isModLoaded("modmenu"))
-      modMenuCompat();
-  }
-
-  private static void modMenuCompat() {
-    ModMenuApi.addConfigOverride("shulkerboxtooltip", () -> MinecraftClient.getInstance()
-        .openScreen(Configuration.buildConfigScreen(MinecraftClient.getInstance().currentScreen)));
   }
 
   /**

src/main/resources/fabric.mod.json

@@ -22,6 +22,9 @@
   "entrypoints": {
     "client": [
       "com.misterpemodder.shulkerboxtooltip.ShulkerBoxTooltip"
+    ],
+    "modmenu": [
+      "com.misterpemodder.shulkerboxtooltip.ModMenuCompat"
     ]
   },
   "suggests": {