diff --git a/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 324b4d9..1de1bd5 100644 --- a/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 787fe43..7023cb4 100644 --- a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index cc8b947..80236a5 100644 --- a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 5e260d0..dfb6a56 100644 --- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 787fe43..7023cb4 100644 --- a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 787fe43..7023cb4 100644 --- a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 787fe43..7023cb4 100644 --- a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 787fe43..7023cb4 100644 --- a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 787fe43..7023cb4 100644 --- a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) { diff --git a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 324b4d9..1de1bd5 100644 --- a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -115,7 +115,11 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.getFirst().getMaterialName(); + return matchingMaterials.stream() + .filter(m -> m.getMaterialName().startsWith("mineable/")) + .findFirst() + .map(MaterialsDataGenerator.MaterialInfo::getMaterialName) + .orElseGet(() -> matchingMaterials.getFirst().getMaterialName()); } public static JsonObject generateBlock(List materials, Block block) {