Rename method to reflect the 1.11 changes.
This commit is contained in:
parent
d53f4dafc1
commit
463740ac99
2 changed files with 4 additions and 4 deletions
|
@ -41,7 +41,7 @@ import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static techreborn.utils.OreDictUtils.getDictData;
|
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.isDictPrefixed;
|
||||||
import static techreborn.utils.OreDictUtils.joinDictName;
|
import static techreborn.utils.OreDictUtils.joinDictName;
|
||||||
|
|
||||||
|
@ -433,7 +433,7 @@ public class ModRecipes {
|
||||||
|
|
||||||
for (String oreDictionaryName : OreDictionary.getOreNames()) {
|
for (String oreDictionaryName : OreDictionary.getOreNames()) {
|
||||||
if (isDictPrefixed(oreDictionaryName, "ore", "gem", "ingot")) {
|
if (isDictPrefixed(oreDictionaryName, "ore", "gem", "ingot")) {
|
||||||
ItemStack oreStack = getDictOreOrNull(oreDictionaryName, 1);
|
ItemStack oreStack = getDictOreOrEmpty(oreDictionaryName, 1);
|
||||||
String[] data = getDictData(oreDictionaryName);
|
String[] data = getDictData(oreDictionaryName);
|
||||||
|
|
||||||
//High-level ores shouldn't grind here
|
//High-level ores shouldn't grind here
|
||||||
|
@ -448,7 +448,7 @@ public class ModRecipes {
|
||||||
|
|
||||||
boolean ore = data[0].equals("ore");
|
boolean ore = data[0].equals("ore");
|
||||||
Core.logHelper.debug("Ore: " + data[1]);
|
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) {
|
if (dust == ItemStack.EMPTY || dust.getItem() == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,7 +56,7 @@ public class OreDictUtils {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
public static ItemStack getDictOreOrNull(String name, int amount) {
|
public static ItemStack getDictOreOrEmpty(String name, int amount) {
|
||||||
List<ItemStack> ores = OreDictionary.getOres(name);
|
List<ItemStack> ores = OreDictionary.getOres(name);
|
||||||
if (ores.isEmpty())
|
if (ores.isEmpty())
|
||||||
return ItemStack.EMPTY;
|
return ItemStack.EMPTY;
|
||||||
|
|
Loading…
Reference in a new issue