Merge branch 'master' into 1.17

src/main/java/carpet/helpers/HopperCounter.java

@@ -281,7 +281,7 @@ public class HopperCounter
         {
             block = ((BlockItem) item).getBlock();
         }
-        else if (Registry.BLOCK.containsId(id))
+        else if (Registry.BLOCK.getOrEmpty(id).isPresent())
         {
             block = Registry.BLOCK.get(id);
         }