refactor

- use the passed in parameter in the redirect instead of executing it double
- trigger s&q button press instead of copypasting the code
- only add menu.quitworld when in singleplayer

Author: contariaa

src/main/java/me/voidxwalker/anchiale/Anchiale.java

@@ -1,14 +1,9 @@
 package me.voidxwalker.anchiale;
 
-import net.fabricmc.api.ClientModInitializer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class Anchiale implements ClientModInitializer {
+public class Anchiale {
     public static final Logger LOGGER = LogManager.getLogger();
     public static boolean fastReset = false;
-    @Override
-    public void onInitializeClient() {
-
-    }
 }

src/main/java/me/voidxwalker/anchiale/mixin/GameMenuScreenMixin.java

@@ -3,43 +3,33 @@
 import me.voidxwalker.anchiale.Anchiale;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.realms.RealmsBridge;
 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;
 
 @Mixin(GameMenuScreen.class)
-public class GameMenuScreenMixin extends Screen {
+public abstract class GameMenuScreenMixin extends Screen {
+
     @Inject(method = "init", at = @At("TAIL"))
-    private void addMenuQuitWorldButton(CallbackInfo ci) {
-        this.buttons.add(new ButtonWidget(1507, this.width - 200, this.height - 20, I18n.translate("menu.quitWorld")));
+    private void anchiale_addMenuQuitWorldButton(CallbackInfo ci) {
+        if (this.client.isInSingleplayer()) {
+            this.buttons.add(new ButtonWidget(1507, this.width - 106, this.height - 24, 102, 20, I18n.translate("menu.quitWorld")));
+        }
     }
 
-    @Inject(method = "buttonClicked", at = @At("HEAD"), cancellable = true)
-    private void onMenuQuitWorldClicked(ButtonWidget button, CallbackInfo ci) {
+    @Inject(method = "buttonClicked", at = @At("HEAD"))
+    private void anchiale_onMenuQuitWorldClicked(ButtonWidget button, CallbackInfo ci) {
         if (button.id == 1507) {
             Anchiale.fastReset = true;
-            boolean bl = this.client.isIntegratedServerRunning();
-            boolean bl2 = this.client.isConnectedToRealms();
-            button.active = false;
-            this.client.world.disconnect();
-            this.client.connect((ClientWorld)null);
-            Anchiale.fastReset = false;
-            if (bl) {
-                this.client.openScreen(new TitleScreen());
-            } else if (bl2) {
-                RealmsBridge realmsBridge = new RealmsBridge();
-                realmsBridge.switchToRealms(new TitleScreen());
-            } else {
-                this.client.openScreen(new MultiplayerScreen(new TitleScreen()));
-            }
-            ci.cancel();
+            button.id = 1;
         }
     }
+
+    @Inject(method = "buttonClicked", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/TitleScreen;<init>()V"))
+    private void anchiale_fastResetFalse(CallbackInfo ci) {
+        Anchiale.fastReset = false;
+    }
 }

src/main/java/me/voidxwalker/anchiale/mixin/IntegratedServerMixin.java

@@ -1,51 +1,25 @@
 package me.voidxwalker.anchiale.mixin;
 
-import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import me.voidxwalker.anchiale.Anchiale;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.server.network.ServerPlayerEntity;
-import org.apache.commons.lang3.Validate;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-import java.io.File;
-import java.net.Proxy;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 @Mixin(IntegratedServer.class)
-public abstract class IntegratedServerMixin<V> extends MinecraftServer {
-
-    public IntegratedServerMixin(Proxy proxy, File file) {
-        super(proxy, file);
-    }
+public abstract class IntegratedServerMixin {
 
     @Redirect(method = "stopRunning", at = @At(value = "INVOKE", target = "Lcom/google/common/util/concurrent/Futures;getUnchecked(Ljava/util/concurrent/Future;)Ljava/lang/Object;"))
-    public V e(Future<V> e){
+    public Object anchiale_fastReset(Future<?> e){
         if (Anchiale.fastReset) {
             Anchiale.LOGGER.info("Exiting world without waiting for server tasks to finish.");
             return null;
         } else {
             Anchiale.LOGGER.info("Exiting world normally.");
-            Futures.getUnchecked(this.execute(new Runnable() {
-                public void run() {
-                    List<ServerPlayerEntity> list = Lists.newArrayList((Iterable)IntegratedServerMixin.this.getPlayerManager().getPlayers());
-                    Iterator iterator = list.iterator();
-
-                    while(iterator.hasNext()) {
-                        ServerPlayerEntity serverPlayerEntity = (ServerPlayerEntity)iterator.next();
-                        IntegratedServerMixin.this.getPlayerManager().remove(serverPlayerEntity);
-                    }
-                }
-            }));
+            return Futures.getUnchecked(e);
         }
-        return null;
     }
 }

src/main/resources/fabric.mod.json

@@ -4,11 +4,6 @@
   "version": "${version}",
   "name": "Anchiale",
   "description": "",
-  "entrypoints": {
-    "client": [
-      "me.voidxwalker.anchiale.Anchiale"
-    ]
-  },
   "authors": [
     "RedLime?",
     "voidxwalker",
@@ -22,6 +17,6 @@
   ],
   "depends": {
     "fabricloader": ">=0.12.12",
-    "minecraft": "1.8.9"
+    "minecraft": ">=1.8 <=1.12.2"
   }
 }