Fix LocalCapture.PRINT that I forgot about.

Author: kitlith

patchwork-events-lifecycle/src/main/java/net/minecraftforge/fml/event/server/FMLServerStoppedEvent.java

@@ -0,0 +1,35 @@
+/*
+ * Minecraft Forge
+ * Copyright (c) 2016-2019.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.minecraftforge.fml.event.server;
+
+import net.minecraft.server.MinecraftServer;
+
+/**
+ * Called after {@link FMLServerStoppingEvent} when the server has completely shut down.
+ * Called immediately before shutting down, on the dedicated server, and before returning
+ * to the main menu on the client.
+ *
+ * @author cpw
+ */
+public class FMLServerStoppedEvent extends ServerLifecycleEvent {
+	public FMLServerStoppedEvent(MinecraftServer server) {
+		super(server);
+	}
+}

patchwork-events-lifecycle/src/main/java/net/minecraftforge/fml/server/ServerLifecycleHooks.java

@@ -21,11 +21,14 @@
 
 import net.minecraft.server.MinecraftServer;
 
+import java.util.concurrent.CountDownLatch;
+
 /**
  * This is a stub of the ServerLifecycleHooks class in Forge for mods that use getCurrentServer.
  */
 public class ServerLifecycleHooks {
 	public static MinecraftServer currentServer;
+	public static volatile CountDownLatch exitLatch = null;
 
 	public static MinecraftServer getCurrentServer() {
 		return currentServer;

patchwork-events-lifecycle/src/main/java/net/patchworkmc/impl/event/lifecycle/LifecycleEvents.java

@@ -20,6 +20,7 @@
 package net.patchworkmc.impl.event.lifecycle;
 
 import java.nio.file.Path;
+import java.util.concurrent.CountDownLatch;
 
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
@@ -30,6 +31,7 @@
 import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
+import net.minecraftforge.fml.event.server.FMLServerStoppedEvent;
 import net.minecraftforge.fml.loading.FileUtils;
 import net.minecraftforge.fml.server.ServerLifecycleHooks;
 
@@ -93,6 +95,18 @@ public static void handleLoadComplete() {
 		loadCompleteCallback.run();
 	}
 
+	public static void handleServerStopped(final MinecraftServer server) {
+		MinecraftForge.EVENT_BUS.post(new FMLServerStoppedEvent(server));
+		ServerLifecycleHooks.currentServer = null;
+		LogicalSidedProvider.setServer(null);
+		CountDownLatch latch = ServerLifecycleHooks.exitLatch;
+
+		if (latch != null) {
+			latch.countDown();
+			ServerLifecycleHooks.exitLatch = null;
+		}
+	}
+
 	@Override
 	public void onInitialize() {
 		WorldTickCallback.EVENT.register(world -> fireWorldTickEvent(TickEvent.Phase.END, world));

patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinMinecraftServer.java

@@ -0,0 +1,16 @@
+package net.patchworkmc.mixin.event.lifecycle;
+
+import net.minecraft.server.MinecraftServer;
+import net.patchworkmc.impl.event.lifecycle.LifecycleEvents;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+
+@SuppressWarnings("ConstantConditions")
+@Mixin(MinecraftServer.class)
+public class MixinMinecraftServer {
+	@Inject(method = "run", at = @At(value = "INVOKE", target = "net/minecraft/server/MinecraftServer.exit ()V"))
+	void serverStoppedHook() {
+		LifecycleEvents.handleServerStopped((MinecraftServer) (Object) this);
+	}
+}

patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinLootPoolSerializer.java

@@ -21,6 +21,8 @@
 
 import java.lang.reflect.Type;
 
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -38,8 +40,8 @@
 
 @Mixin(LootPool.Serializer.class)
 public class MixinLootPoolSerializer {
-	@Inject(method = "deserialize", at = @At("RETURN"), cancellable = true, locals = LocalCapture.PRINT)
-	private void addNameToConstructor(CallbackInfoReturnable<LootPool> cir, JsonObject obj) {
+	@Inject(method = "deserialize", at = @At("RETURN"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
+	private void addNameToConstructor(JsonElement elem, Type ty, JsonDeserializationContext ctx, CallbackInfoReturnable<LootPool> cir, JsonObject obj) {
 		LootPool ret = cir.getReturnValue();
 		((PatchworkLootPool) ret).patchwork$setName(LootHooks.readPoolName(obj));