Merge pull request #2 from pixfumy/master

v1.0.2

Author: VoidXWalker

gradle.properties

@@ -8,6 +8,6 @@ yarn_mappings = 1.8.9+build.202201091851
 loader_version = 0.12.12
 
 # Mod Properties
-mod_version = 1.0.1
+mod_version = 1.0.2
 maven_group = me.voidxwalker
 archives_base_name = anchiale

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

@@ -0,0 +1,14 @@
+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 static final Logger LOGGER = LogManager.getLogger();
+    public static boolean fastReset = false;
+    @Override
+    public void onInitializeClient() {
+
+    }
+}

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

@@ -0,0 +1,45 @@
+package me.voidxwalker.anchiale.mixin;
+
+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 {
+    @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")));
+    }
+
+    @Inject(method = "buttonClicked", at = @At("HEAD"), cancellable = true)
+    private void 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();
+        }
+    }
+}

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

@@ -3,6 +3,7 @@
 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;
@@ -28,15 +29,23 @@ public IntegratedServerMixin(Proxy proxy, File file) {
 
     @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){
-        List<ServerPlayerEntity> list = Lists.newArrayList((Iterable)this.getPlayerManager().getPlayers());
-        Iterator iterator = list.iterator();
-
-        while(iterator.hasNext()) {
-            ServerPlayerEntity serverPlayerEntity = (ServerPlayerEntity)iterator.next();
-            this.getPlayerManager().remove(serverPlayerEntity);
+        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 null;
     }
-
-
 }

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

@@ -5,9 +5,7 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "IntegratedServerMixin",
-    "PlayerManagerMixin",
-    "PlayerInstanceMixin"
-
+    "GameMenuScreenMixin"
   ],
   "injectors": {
     "defaultRequire": 1

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

@@ -4,12 +4,19 @@
   "version": "${version}",
   "name": "Anchiale",
   "description": "",
+  "entrypoints": {
+    "client": [
+      "me.voidxwalker.anchiale.Anchiale"
+    ]
+  },
   "authors": [
-    "RedLime"
+    "RedLime?",
+    "voidxwalker",
+    "Gregor",
+    "pixfumy"
   ],
   "license": "MIT",
   "environment": "*",
-
   "mixins": [
     "anchiale.mixins.json"
   ],