MineTogether Integration

build.gradle

@@ -15,4 +15,16 @@ buildscript {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
         classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
     }
+}
+repositories {
+    maven {
+        url "https://cursemaven.com"
+    }
+    maven {
+        url "https://maven.architectury.dev/"
+    }
+}
+dependencies {
+    compileOnly fg.deobf("curse.maven:ctm-267172:3805535");//MineTogether
+    compileOnly fg.deobf("dev.architectury:architectury-forge:4.9.83")
 }

gradle.properties

@@ -6,7 +6,7 @@ fg_version=1.18-38.0.12
 #-----------------------------
 mod_name=GameMenuModOption
 mod_id=gamemenumodoption
-mod_version=1.14
+mod_version=1.14.1
 mod_group=net.morimori0317
 mod_vendor=MORIMORI0317
 mod_implevendor=MORIMORI0317
@@ -21,7 +21,7 @@ curesforge_id=353051
 modrinth_id=7V0nY9Tu
 release_type=release
 loader_type=Forge
-support_versions=1.18
+support_versions=1.18,1.18.1,1.18.2
 required_mods=
 optional_mods=catalogue
 embedded_mods=

src/main/java/net/morimori0317/gamemenumodoption/ClientConfig.java

@@ -3,25 +3,25 @@
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.config.ModConfig;
-import org.apache.commons.lang3.tuple.Pair;
 
 public class ClientConfig {
     public static ForgeConfigSpec.ConfigValue<Boolean> ShowNotificationModUpdate;
     public static ForgeConfigSpec.ConfigValue<Boolean> RenderModListBackground;
     public static ForgeConfigSpec.ConfigValue<Boolean> SlideUpGameMenuButtons;
+    public static ForgeConfigSpec.ConfigValue<Boolean> MineTogetherCompatibility;
 
     public static void init() {
-        Pair<ConfigLoder, ForgeConfigSpec> client_config = new ForgeConfigSpec.Builder().configure(ConfigLoder::new);
-        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, client_config.getRight());
+        var config = buildConfig(new ForgeConfigSpec.Builder()).build();
+        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, config);
     }
 
-    public static class ConfigLoder {
-        public ConfigLoder(ForgeConfigSpec.Builder builder) {
-            builder.push("General");
-            ShowNotificationModUpdate = builder.define("Show notification mod update", true);
-            RenderModListBackground = builder.define("Render mod list background", true);
-            SlideUpGameMenuButtons = builder.define("Slide up game menu buttons", true);
-            builder.pop();
-        }
+    private static ForgeConfigSpec.Builder buildConfig(ForgeConfigSpec.Builder builder) {
+        builder.push("General");
+        ShowNotificationModUpdate = builder.define("Show notification mod update", true);
+        RenderModListBackground = builder.define("Render mod list background", true);
+        SlideUpGameMenuButtons = builder.define("Slide up game menu buttons", true);
+        MineTogetherCompatibility = builder.define("MineTogether Compatibility", true);
+        builder.pop();
+        return builder;
     }
 }

src/main/java/net/morimori0317/gamemenumodoption/integration/MineTogetherIntegration.java

@@ -0,0 +1,15 @@
+package net.morimori0317.gamemenumodoption.integration;
+
+import net.minecraft.client.Minecraft;
+import net.minecraftforge.fml.ModList;
+import net.morimori0317.gamemenumodoption.ClientConfig;
+
+public class MineTogetherIntegration {
+    public static boolean isCompat() {
+        return ModList.get().isLoaded("minetogether") && ClientConfig.MineTogetherCompatibility.get();
+    }
+
+    public static boolean isFixButtons() {
+        return isCompat() && Minecraft.getInstance().getSingleplayerServer() != null;
+    }
+}

src/main/java/net/morimori0317/gamemenumodoption/mixin/ConnectModuleMixin.java

@@ -0,0 +1,24 @@
+package net.morimori0317.gamemenumodoption.mixin;
+
+import dev.architectury.hooks.client.screen.ScreenAccess;
+import net.creeperhost.minetogether.module.connect.ConnectModule;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.server.IntegratedServer;
+import net.morimori0317.gamemenumodoption.ClientConfig;
+import net.morimori0317.gamemenumodoption.integration.MineTogetherIntegration;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+@Mixin(ConnectModule.class)
+public class ConnectModuleMixin {
+    @Inject(method = "onScreenOpen", at = @At(value = "INVOKE", target = "Ldev/architectury/hooks/client/screen/ScreenHooks;addRenderableWidget(Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/gui/components/AbstractWidget;)Lnet/minecraft/client/gui/components/AbstractWidget;", ordinal = 0), remap = false, locals = LocalCapture.CAPTURE_FAILHARD)
+    private static void onScreenOpen(Screen screen, ScreenAccess screenAccess, CallbackInfo ci, IntegratedServer integratedServer, AbstractWidget feedBack, AbstractWidget bugs, AbstractWidget openToLan, AbstractWidget options, Button guiButton) {
+        if (MineTogetherIntegration.isCompat() && ClientConfig.SlideUpGameMenuButtons.get())
+            guiButton.y -= 16;
+    }
+}

src/main/java/net/morimori0317/gamemenumodoption/mixin/PauseScreenMixin.java

@@ -13,6 +13,7 @@
 import net.minecraftforge.fml.ModList;
 import net.morimori0317.gamemenumodoption.ClientConfig;
 import net.morimori0317.gamemenumodoption.GameMenuModOptionAPI;
+import net.morimori0317.gamemenumodoption.integration.MineTogetherIntegration;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -39,18 +40,22 @@ private void init(CallbackInfo ci) {
         if (ModList.get().isLoaded("bettergamemenu")) return;
 
         if (this.showPauseMenu) {
+            boolean minetFlg = MineTogetherIntegration.isFixButtons();
+
             boolean gmrmflag = ModList.get().isLoaded("gamemenuremovegfarb");
             Button options = (Button) this.renderables.get(gmrmflag ? 3 : 5);
             Button returnToMenu = (Button) this.renderables.get(gmrmflag ? 5 : 7);
             Button shareToLan = (Button) this.renderables.get(6);
             if (shareToLan != null) {
-                shareToLan.x = width / 2 - 102;
-                shareToLan.setWidth(204);
+                if (!minetFlg) {
+                    shareToLan.x = width / 2 - 102;
+                    shareToLan.setWidth(204);
+                }
                 if (gmrmflag)
                     shareToLan.y -= 24;
             }
 
-            Button button = new Button(this.width / 2 + 4, this.height / 4 + (gmrmflag ? 96 : 120) - 16, 98, 20, new TranslatableComponent("menu.modoption"), (n) -> {
+            Button button = new Button(minetFlg ? width / 2 - 102 : this.width / 2 + 4, this.height / 4 + ((gmrmflag || minetFlg) ? 96 : 120) - 16, minetFlg ? 204 : 98, 20, new TranslatableComponent("menu.modoption"), (n) -> {
                 var openGui = GameMenuModOptionAPI.getOpenModOptions(this);
                 if (openGui != null)
                     Minecraft.getInstance().setScreen(openGui);
@@ -59,7 +64,7 @@ private void init(CallbackInfo ci) {
             if (showUpdate)
                 modUpdateNotification = init((PauseScreen) (Object) this, button);
 
-            if (!gmrmflag) {
+            if (!gmrmflag || minetFlg) {
                 if (options != null)
                     options.y += 24;
                 if (returnToMenu != null)

src/main/resources/gamemenumodoption.mixins.json

@@ -4,6 +4,7 @@
   "package": "net.morimori0317.gamemenumodoption.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
+    "ConnectModuleMixin",
     "PauseScreenMixin",
     "ScreenMixin"
   ],