Merge branch 'master' into 1.17

src/main/java/carpet/mixins/HorseBaseEntity_scarpetMixin.java

@@ -0,0 +1,21 @@
+package carpet.mixins;
+
+import carpet.fakes.InventoryBearerInterface;
+import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.inventory.SimpleInventory;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(HorseBaseEntity.class)
+public class HorseBaseEntity_scarpetMixin implements InventoryBearerInterface
+{
+
+    @Shadow protected SimpleInventory items;
+
+    @Override
+    public Inventory getCMInventory()
+    {
+        return items;
+    }
+}

src/main/java/carpet/mixins/PillagerEntity_scarpetMixin.java

@@ -0,0 +1,21 @@
+package carpet.mixins;
+
+import carpet.fakes.InventoryBearerInterface;
+import net.minecraft.entity.mob.PillagerEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.inventory.SimpleInventory;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(PillagerEntity.class)
+public class PillagerEntity_scarpetMixin implements InventoryBearerInterface
+{
+    @Shadow @Final private SimpleInventory inventory;
+
+    @Override
+    public Inventory getCMInventory()
+    {
+        return inventory;
+    }
+}