From 9454942af62ebee8b79be5e1c642020b75257755 Mon Sep 17 00:00:00 2001
From: pompompopi <143640209+pompompopi@users.noreply.github.com>
Date: Fri, 10 May 2024 13:45:53 +0100
Subject: [PATCH] Ensure ViaManager is destroyed on the server at graceful
shutdown (#328)
Fixes #327
---
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1122.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1144.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1165.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1171.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1182.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1194.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1201.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1204.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric1206.shutdown.json | 13 +++++++
.../shutdown/server/MixinMinecraftServer.java | 34 +++++++++++++++++++
.../src/main/resources/fabric.mod.json | 3 +-
.../mixins.viafabric189.shutdown.json | 13 +++++++
30 files changed, 490 insertions(+), 10 deletions(-)
create mode 100644 viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1122/src/main/resources/mixins.viafabric1122.shutdown.json
create mode 100644 viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1144/src/main/resources/mixins.viafabric1144.shutdown.json
create mode 100644 viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1165/src/main/resources/mixins.viafabric1165.shutdown.json
create mode 100644 viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1171/src/main/resources/mixins.viafabric1171.shutdown.json
create mode 100644 viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1182/src/main/resources/mixins.viafabric1182.shutdown.json
create mode 100644 viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1194/src/main/resources/mixins.viafabric1194.shutdown.json
create mode 100644 viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1201/src/main/resources/mixins.viafabric1201.shutdown.json
create mode 100644 viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1204/src/main/resources/mixins.viafabric1204.shutdown.json
create mode 100644 viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc1206/src/main/resources/mixins.viafabric1206.shutdown.json
create mode 100644 viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/shutdown/server/MixinMinecraftServer.java
create mode 100644 viafabric-mc189/src/main/resources/mixins.viafabric189.shutdown.json
diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..3c2d944
--- /dev/null
+++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1122.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stopRunning", at = @At("TAIL"))
+ private void onStopRunning(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1122/src/main/resources/fabric.mod.json b/viafabric-mc1122/src/main/resources/fabric.mod.json
index b7835f1..8710841 100644
--- a/viafabric-mc1122/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1122/src/main/resources/fabric.mod.json
@@ -54,6 +54,7 @@
"mixins.viafabric1122.address.json",
"mixins.viafabric1122.gui.json",
"mixins.viafabric1122.debug.json",
- "mixins.viafabric1122.pipeline.json"
+ "mixins.viafabric1122.pipeline.json",
+ "mixins.viafabric1122.shutdown.json"
]
}
diff --git a/viafabric-mc1122/src/main/resources/mixins.viafabric1122.shutdown.json b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.shutdown.json
new file mode 100644
index 0000000..e474d71
--- /dev/null
+++ b/viafabric-mc1122/src/main/resources/mixins.viafabric1122.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_8",
+ "package": "com.viaversion.fabric.mc1122.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..bbc787a
--- /dev/null
+++ b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1144.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stop", at = @At("TAIL"))
+ private void onStop(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1144/src/main/resources/fabric.mod.json b/viafabric-mc1144/src/main/resources/fabric.mod.json
index a03f207..0bfa718 100644
--- a/viafabric-mc1144/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1144/src/main/resources/fabric.mod.json
@@ -69,7 +69,8 @@
"mixins.viafabric1144.address.json",
"mixins.viafabric1144.gui.json",
"mixins.viafabric1144.debug.json",
- "mixins.viafabric1144.pipeline.json"
+ "mixins.viafabric1144.pipeline.json",
+ "mixins.viafabric1144.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc1144/src/main/resources/mixins.viafabric1144.shutdown.json b/viafabric-mc1144/src/main/resources/mixins.viafabric1144.shutdown.json
new file mode 100644
index 0000000..f6c5fc1
--- /dev/null
+++ b/viafabric-mc1144/src/main/resources/mixins.viafabric1144.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_8",
+ "package": "com.viaversion.fabric.mc1144.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..fe8722c
--- /dev/null
+++ b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1165.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stop", at = @At("TAIL"))
+ private void onStop(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1165/src/main/resources/fabric.mod.json b/viafabric-mc1165/src/main/resources/fabric.mod.json
index 2940781..9d17a66 100644
--- a/viafabric-mc1165/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1165/src/main/resources/fabric.mod.json
@@ -65,7 +65,8 @@
"mixins.viafabric1165.address.json",
"mixins.viafabric1165.gui.json",
"mixins.viafabric1165.debug.json",
- "mixins.viafabric1165.pipeline.json"
+ "mixins.viafabric1165.pipeline.json",
+ "mixins.viafabric1165.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc1165/src/main/resources/mixins.viafabric1165.shutdown.json b/viafabric-mc1165/src/main/resources/mixins.viafabric1165.shutdown.json
new file mode 100644
index 0000000..7014072
--- /dev/null
+++ b/viafabric-mc1165/src/main/resources/mixins.viafabric1165.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_8",
+ "package": "com.viaversion.fabric.mc1165.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..2390454
--- /dev/null
+++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1171.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stop", at = @At("TAIL"))
+ private void onStop(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1171/src/main/resources/fabric.mod.json b/viafabric-mc1171/src/main/resources/fabric.mod.json
index 8650860..8a7946f 100644
--- a/viafabric-mc1171/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1171/src/main/resources/fabric.mod.json
@@ -68,7 +68,8 @@
"mixins.viafabric1171.address.json",
"mixins.viafabric1171.gui.json",
"mixins.viafabric1171.debug.json",
- "mixins.viafabric1171.pipeline.json"
+ "mixins.viafabric1171.pipeline.json",
+ "mixins.viafabric1171.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc1171/src/main/resources/mixins.viafabric1171.shutdown.json b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.shutdown.json
new file mode 100644
index 0000000..089828a
--- /dev/null
+++ b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_16",
+ "package": "com.viaversion.fabric.mc1171.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..e945e63
--- /dev/null
+++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1182.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stop", at = @At("TAIL"))
+ private void onStop(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1182/src/main/resources/fabric.mod.json b/viafabric-mc1182/src/main/resources/fabric.mod.json
index 454665e..2f283e1 100644
--- a/viafabric-mc1182/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1182/src/main/resources/fabric.mod.json
@@ -68,7 +68,8 @@
"mixins.viafabric1182.address.json",
"mixins.viafabric1182.gui.json",
"mixins.viafabric1182.debug.json",
- "mixins.viafabric1182.pipeline.json"
+ "mixins.viafabric1182.pipeline.json",
+ "mixins.viafabric1182.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc1182/src/main/resources/mixins.viafabric1182.shutdown.json b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.shutdown.json
new file mode 100644
index 0000000..25a7606
--- /dev/null
+++ b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_17",
+ "package": "com.viaversion.fabric.mc1182.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..2e3a958
--- /dev/null
+++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1194.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stop", at = @At("TAIL"))
+ private void onStop(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1194/src/main/resources/fabric.mod.json b/viafabric-mc1194/src/main/resources/fabric.mod.json
index e758363..6041667 100644
--- a/viafabric-mc1194/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1194/src/main/resources/fabric.mod.json
@@ -68,7 +68,8 @@
"mixins.viafabric1194.address.json",
"mixins.viafabric1194.gui.json",
"mixins.viafabric1194.debug.json",
- "mixins.viafabric1194.pipeline.json"
+ "mixins.viafabric1194.pipeline.json",
+ "mixins.viafabric1194.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc1194/src/main/resources/mixins.viafabric1194.shutdown.json b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.shutdown.json
new file mode 100644
index 0000000..301309b
--- /dev/null
+++ b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_17",
+ "package": "com.viaversion.fabric.mc1194.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..df081b2
--- /dev/null
+++ b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1201.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stop", at = @At("TAIL"))
+ private void onStop(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1201/src/main/resources/fabric.mod.json b/viafabric-mc1201/src/main/resources/fabric.mod.json
index 3402ec3..057640f 100644
--- a/viafabric-mc1201/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1201/src/main/resources/fabric.mod.json
@@ -68,7 +68,8 @@
"mixins.viafabric1201.address.json",
"mixins.viafabric1201.gui.json",
"mixins.viafabric1201.debug.json",
- "mixins.viafabric1201.pipeline.json"
+ "mixins.viafabric1201.pipeline.json",
+ "mixins.viafabric1201.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc1201/src/main/resources/mixins.viafabric1201.shutdown.json b/viafabric-mc1201/src/main/resources/mixins.viafabric1201.shutdown.json
new file mode 100644
index 0000000..80134b4
--- /dev/null
+++ b/viafabric-mc1201/src/main/resources/mixins.viafabric1201.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_17",
+ "package": "com.viaversion.fabric.mc1201.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..ce799fd
--- /dev/null
+++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1204.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stop", at = @At("TAIL"))
+ private void onStop(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1204/src/main/resources/fabric.mod.json b/viafabric-mc1204/src/main/resources/fabric.mod.json
index ed379e2..1792a21 100644
--- a/viafabric-mc1204/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1204/src/main/resources/fabric.mod.json
@@ -68,7 +68,8 @@
"mixins.viafabric1204.address.json",
"mixins.viafabric1204.gui.json",
"mixins.viafabric1204.debug.json",
- "mixins.viafabric1204.pipeline.json"
+ "mixins.viafabric1204.pipeline.json",
+ "mixins.viafabric1204.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc1204/src/main/resources/mixins.viafabric1204.shutdown.json b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.shutdown.json
new file mode 100644
index 0000000..0ace632
--- /dev/null
+++ b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_17",
+ "package": "com.viaversion.fabric.mc1204.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..daf8695
--- /dev/null
+++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc1206.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stop", at = @At("TAIL"))
+ private void onStop(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc1206/src/main/resources/fabric.mod.json b/viafabric-mc1206/src/main/resources/fabric.mod.json
index 36a935a..bc91086 100644
--- a/viafabric-mc1206/src/main/resources/fabric.mod.json
+++ b/viafabric-mc1206/src/main/resources/fabric.mod.json
@@ -68,7 +68,8 @@
"mixins.viafabric1206.address.json",
"mixins.viafabric1206.gui.json",
"mixins.viafabric1206.debug.json",
- "mixins.viafabric1206.pipeline.json"
+ "mixins.viafabric1206.pipeline.json",
+ "mixins.viafabric1206.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc1206/src/main/resources/mixins.viafabric1206.shutdown.json b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.shutdown.json
new file mode 100644
index 0000000..a72e4e6
--- /dev/null
+++ b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_21",
+ "package": "com.viaversion.fabric.mc1206.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}
diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/shutdown/server/MixinMinecraftServer.java
new file mode 100644
index 0000000..41c33fd
--- /dev/null
+++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/mixin/shutdown/server/MixinMinecraftServer.java
@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric
+ * Copyright (C) 2018-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package com.viaversion.fabric.mc189.mixin.shutdown.server;
+
+import com.viaversion.viaversion.ViaManagerImpl;
+import com.viaversion.viaversion.api.Via;
+import net.minecraft.server.MinecraftServer;
+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(MinecraftServer.class)
+public class MixinMinecraftServer {
+ @Inject(method = "stopRunning", at = @At("TAIL"))
+ private void onStopRunning(CallbackInfo ci) {
+ ((ViaManagerImpl) Via.getManager()).destroy();
+ }
+}
diff --git a/viafabric-mc189/src/main/resources/fabric.mod.json b/viafabric-mc189/src/main/resources/fabric.mod.json
index 671b45a..7ffc07c 100644
--- a/viafabric-mc189/src/main/resources/fabric.mod.json
+++ b/viafabric-mc189/src/main/resources/fabric.mod.json
@@ -65,7 +65,8 @@
"mixins.viafabric189.address.json",
"mixins.viafabric189.gui.json",
"mixins.viafabric189.debug.json",
- "mixins.viafabric189.pipeline.json"
+ "mixins.viafabric189.pipeline.json",
+ "mixins.viafabric189.shutdown.json"
],
"custom": {
"modmenu": {
diff --git a/viafabric-mc189/src/main/resources/mixins.viafabric189.shutdown.json b/viafabric-mc189/src/main/resources/mixins.viafabric189.shutdown.json
new file mode 100644
index 0000000..1ba23f2
--- /dev/null
+++ b/viafabric-mc189/src/main/resources/mixins.viafabric189.shutdown.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "compatibilityLevel": "JAVA_8",
+ "package": "com.viaversion.fabric.mc189.mixin.shutdown",
+ "mixins": [
+ ],
+ "server": [
+ "server.MixinMinecraftServer"
+ ],
+ "injectors": {
+ "defaultRequire": 0
+ }
+}