From 463740ac99dc9fe76e144b072787a9f86431a272 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 5 Dec 2016 11:19:37 +0000 Subject: [PATCH] Rename method to reflect the 1.11 changes. --- src/main/java/techreborn/init/ModRecipes.java | 6 +++--- src/main/java/techreborn/utils/OreDictUtils.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 674fcd0e9..9fe407879 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -41,7 +41,7 @@ import java.util.Collections; import java.util.List; import static techreborn.utils.OreDictUtils.getDictData; -import static techreborn.utils.OreDictUtils.getDictOreOrNull; +import static techreborn.utils.OreDictUtils.getDictOreOrEmpty; import static techreborn.utils.OreDictUtils.isDictPrefixed; import static techreborn.utils.OreDictUtils.joinDictName; @@ -433,7 +433,7 @@ public class ModRecipes { for (String oreDictionaryName : OreDictionary.getOreNames()) { if (isDictPrefixed(oreDictionaryName, "ore", "gem", "ingot")) { - ItemStack oreStack = getDictOreOrNull(oreDictionaryName, 1); + ItemStack oreStack = getDictOreOrEmpty(oreDictionaryName, 1); String[] data = getDictData(oreDictionaryName); //High-level ores shouldn't grind here @@ -448,7 +448,7 @@ public class ModRecipes { boolean ore = data[0].equals("ore"); Core.logHelper.debug("Ore: " + data[1]); - ItemStack dust = getDictOreOrNull(joinDictName("dust", data[1]), ore ? 2 : 1); + ItemStack dust = getDictOreOrEmpty(joinDictName("dust", data[1]), ore ? 2 : 1); if (dust == ItemStack.EMPTY || dust.getItem() == null) { continue; } diff --git a/src/main/java/techreborn/utils/OreDictUtils.java b/src/main/java/techreborn/utils/OreDictUtils.java index 8ebf14187..4e534e73a 100644 --- a/src/main/java/techreborn/utils/OreDictUtils.java +++ b/src/main/java/techreborn/utils/OreDictUtils.java @@ -56,7 +56,7 @@ public class OreDictUtils { } @Nonnull - public static ItemStack getDictOreOrNull(String name, int amount) { + public static ItemStack getDictOreOrEmpty(String name, int amount) { List ores = OreDictionary.getOres(name); if (ores.isEmpty()) return ItemStack.EMPTY;