From 7e71fd13d37c2f56a2c74050e0eb74258f97125b Mon Sep 17 00:00:00 2001
From: IzzelAliz <csh2001331@126.com>
Date: Sun, 27 Mar 2022 15:30:06 +0800
Subject: [PATCH] Drop forge patch to tag#put (#473 #511)

---
 .../mixin/core/nbt/CompoundTagMixin.java      | 28 +++++++++++++++++++
 .../main/resources/mixins.arclight.core.json  |  5 ++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/nbt/CompoundTagMixin.java

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/nbt/CompoundTagMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/nbt/CompoundTagMixin.java
new file mode 100644
index 00000000..f15431c8
--- /dev/null
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/nbt/CompoundTagMixin.java
@@ -0,0 +1,28 @@
+package io.izzel.arclight.common.mixin.core.nbt;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
+
+import javax.annotation.Nullable;
+import java.util.Map;
+
+@Mixin(CompoundTag.class)
+public class CompoundTagMixin {
+
+    @Shadow @Final private Map<String, Tag> tags;
+
+    /**
+     * @author IzzelAliz
+     * @reason drop forge patch
+     */
+    @Overwrite
+    @Nullable
+    public Tag put(String p_128366_, Tag p_128367_) {
+        // if (p_128367_ == null) throw new IllegalArgumentException("Invalid null NBT value with key " + p_128366_);
+        return this.tags.put(p_128366_, p_128367_);
+    }
+}
diff --git a/arclight-common/src/main/resources/mixins.arclight.core.json b/arclight-common/src/main/resources/mixins.arclight.core.json
index 92d9410b..4f874c74 100644
--- a/arclight-common/src/main/resources/mixins.arclight.core.json
+++ b/arclight-common/src/main/resources/mixins.arclight.core.json
@@ -18,8 +18,8 @@
   "mixins": [
     "advancements.AdvancementMixin",
     "commands.CommandsMixin",
-    "commands.CommandSourceMixin",
     "commands.CommandSource1Mixin",
+    "commands.CommandSourceMixin",
     "commands.CommandSourceStackMixin",
     "commands.arguments.EntityArgumentMixin",
     "commands.arguments.blocks.BlockStateParserMixin",
@@ -28,6 +28,7 @@
     "commands.synchronization.ArgumentTypesMixin",
     "fluid.FlowingFluidMixin",
     "fluid.LavaFluidMixin",
+    "nbt.CompoundTagMixin",
     "network.ConnectionMixin",
     "network.ServerHandshakeNetHandlerMixin",
     "network.ServerLoginNetHandlerMixin",
@@ -48,11 +49,11 @@
     "network.rcon.RConConsoleSourceMixin",
     "server.BootstrapMixin",
     "server.CustomServerBossInfoMixin",
-    "server.WorldStemMixin",
     "server.MinecraftServerMixin",
     "server.PlayerAdvancementsMixin",
     "server.ServerFunctionManagerMixin",
     "server.ServerScoreboardMixin",
+    "server.WorldStemMixin",
     "server.commands.EffectCommandMixin",
     "server.commands.GameRuleCommandMixin",
     "server.commands.ReloadCommandMixin",