Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
#	src/main/java/carpet/script/value/BlockValue.java

src/main/java/carpet/script/value/EntityValue.java

@@ -1,6 +1,5 @@
 package carpet.script.value;
 
-import carpet.CarpetSettings;
 import carpet.fakes.EntityInterface;
 import carpet.fakes.ItemEntityInterface;
 import carpet.fakes.LivingEntityInterface;
@@ -12,10 +11,10 @@ import carpet.script.CarpetContext;
 import carpet.script.EntityEventsGroup;
 import carpet.script.argument.Vector3Argument;
 import carpet.script.exception.InternalExpressionException;
-import carpet.utils.Messenger;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.entity.player.HungerManager;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.network.packet.s2c.play.EntityPassengersSetS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket;
@@ -61,6 +60,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.UUID;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
@@ -976,22 +976,37 @@ public class EntityValue extends Value
             if(e instanceof PlayerEntity) ((PlayerEntity) e).getHungerManager().setSaturationLevelClient((float)NumericValue.asNumber(v).getLong());
         });
 
-        // gamemode         [check]
-        // spectate         [check]
-        // "fire"           [check]
-        // "extinguish"     [set fire ticks to 0]
-        // "silent"         [check]
-        // "gravity"        [check]
-        // "invulnerable"   [check]
+        put("nbt", (e, v) -> {
+            if (!(e instanceof PlayerEntity))
+            {
+                UUID uUID = e.getUuid();
+                Value tagValue = NBTSerializableValue.fromValue(v);
+                if (tagValue instanceof NBTSerializableValue)
+                {
+                    e.fromTag(((NBTSerializableValue) tagValue).getCompoundTag());
+                    e.setUuid(uUID);
+                }
+            }
+        });
+        put("nbt_merge", (e, v) -> {
+            if (!(e instanceof PlayerEntity))
+            {
+                UUID uUID = e.getUuid();
+                Value tagValue = NBTSerializableValue.fromValue(v);
+                if (tagValue instanceof NBTSerializableValue)
+                {
+                    CompoundTag nbttagcompound = e.toTag((new CompoundTag()));
+                    nbttagcompound.copyFrom(((NBTSerializableValue) tagValue).getCompoundTag());
+                    e.fromTag(nbttagcompound);
+                    e.setUuid(uUID);
+                }
+            }
+        });
+
         // "dimension"      []
         // "item"           []
         // "count",         []
-        // "age",           [check]
         // "effect_"name    []
-        // "hold"           [inventory_set?]
-        // "hold_offhand"   [inventory_set?] 
-        // "jump"           [check]
-        // "nbt" <-big one, for now use run('data merge entity ...
     }};
 
     public void setEvent(CarpetContext cc, String eventName, FunctionValue fun, List<Value> args)
@@ -1001,4 +1016,14 @@ public class EntityValue extends Value
             throw new InternalExpressionException("Unknown entity event: " + eventName);
         ((EntityInterface)entity).getEventContainer().addEvent(event, cc, fun, args);
     }
+
+    @Override
+    public Tag toTag(boolean force)
+    {
+        if (!force) throw new NBTSerializableValue.IncompatibleTypeException(this);
+        CompoundTag tag = new CompoundTag();
+        tag.put("Data", getEntity().toTag( new CompoundTag()));
+        tag.put("Name", StringTag.of(Registry.ENTITY_TYPE.getId(entity.getType()).toString()));
+        return tag;
+    }
 }