diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 1a7ad32b..d4b85a6f 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -2277,6 +2277,22 @@ public interface Material extends Keyed, Comparable<Material> {
         return getMaterial(filtered, legacyName);
     }
 
+    /**
+     * @param name of the material.
+     * @return the material with the given name.
+     * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead.
+     */
+    @NotNull
+    @Deprecated
+    public static Material valueOf(@NotNull String name) {
+        Material material = Registry.MATERIAL.get(NamespacedKey.fromString(name.toLowerCase()));
+        if (material == null) {
+            material = Bukkit.getUnsafe().getLegacyMaterial(name);
+        }
+        Preconditions.checkArgument(material != null, "No Material found with the name %s", name);
+        return material;
+    }
+
     /**
      * Do not use for any reason.
      *
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index a0504f80..993f18db 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -455,7 +455,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
         Map<String, Object> result = new LinkedHashMap<String, Object>();
 
         result.put("v", Bukkit.getUnsafe().getDataVersion()); // Include version to indicate we are using modern material names (or LEGACY prefix)
-        result.put("type", getType().getKey());
+        result.put("type", getType().getKey().toString());
 
         if (getAmount() != 1) {
             result.put("amount", getAmount());
diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
index 593c7ec2..38b0ac53 100644
--- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
+++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
@@ -10,7 +10,6 @@ import org.bukkit.TestServer;
 public abstract class AbstractTestingBase {
 
     static {
-        System.out.println("Beginning");
         TestServer.setup();
     }
 }