Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into beeper-creams

# Conflicts:
#	src/main/java/de/hysky/skyblocker/SkyblockerMod.java
#	src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java

Pull updates from upstream and NOT get a heart attack

1 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/de/hysky/skyblocker/compatibility/modmenu/ModMenuEntry.java b/src/main/java/de/hysky/skyblocker/compatibility/modmenu/ModMenuEntry.java
new file mode 100644
index 00000000..e0b0bc2f
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/compatibility/modmenu/ModMenuEntry.java
@@ -0,0 +1,15 @@
+package de.hysky.skyblocker.compatibility.modmenu;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+
+@Environment(EnvType.CLIENT)
+public class ModMenuEntry implements ModMenuApi {
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return SkyblockerConfigManager::createGUI;
+    }
+}
\ No newline at end of file