Merge branch 'master' into 1.17

# Conflicts:
#	src/main/resources/carpet.mixins.json

src/main/resources/carpet.mixins.json

@@ -209,7 +209,8 @@
     "PistonBlockEntity_playerHandlingMixin",
     "BlockItem_creativeNoClipMixin",
     "WallStandingBlockItem_creativeNoClipMixin",
-    "LivingEntity_creativeFlyMixin",
+    "ShulkerBoxBlockEntity_creativeNoClipMixin",
+    "LivingEntity_creativeFlyMixin"
 
     "VeryBiasedToBottomHeightProvider_cleanLogsMixin",
     "TrapezoidHeightProvider_cleanLogsMixin"

src/main/resources/fabric.mod.json

@@ -20,10 +20,10 @@
   "environment": "*",
   "entrypoints": {
     "client": [
-      "carpet.CarpetServer"
+      "carpet.CarpetServer::CLIENT_INITIALIZER"
     ],
     "server": [
-      "carpet.CarpetServer"
+      "carpet.CarpetServer::SERVER_INITIALIZER"
     ]
   },
   "mixins": [