Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-31 06:07:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added error message

Browse Source
This commit is contained in:
Indyuce 2020-07-12 15:33:24 +02:00
parent 8754d4e76e
commit 48f1e7c907
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/Indyuce/mmoitems/api/recipe/workbench/CustomRecipe.java
View File

@ -7,6 +7,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.apache.commons.lang.Validate;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
@ -27,6 +28,7 @@ public class CustomRecipe implements Comparable<CustomRecipe> {
this.output.setAmount(output.getInteger("MMOITEMS_CRAFTED_AMOUNT"));
if (shapeless) {
Validate.isTrue(recipe.size() >= 9, "Recipe does not contain 9 ingredients");
for (int i = 0; i < 9; i++) {
ItemStack stack = MMOItems.plugin.parseStack(recipe.get(i));
if (stack == null || stack.getType() == Material.AIR)

36
src/main/java/net/Indyuce/mmoitems/manager/recipe/RecipeManagerDefault.java
View File

@ -26,21 +26,21 @@ public class RecipeManagerDefault extends RecipeManager {
@Override
public void reload() {
clearCustomRecipes();
for (Type type : MMOItems.plugin.getTypes().getAll()) {
FileConfiguration config = type.getConfigFile().getConfig();
for (String id : config.getKeys(false))
try {
if (config.getConfigurationSection(id).contains("crafting")) {
if (config.getConfigurationSection(id).contains("crafting"))
try {
ConfigurationSection section = config.getConfigurationSection(id + ".crafting");
if (section.contains("shaped"))
section.getConfigurationSection("shaped").getKeys(false)
.forEach(recipe -> registerShapedRecipe(type, id, section.getStringList("shaped." + recipe)));
if (section.contains("shapeless"))
section.getConfigurationSection("shapeless").getKeys(false).forEach(
recipe -> registerShapelessRecipe(type, id, section.getStringList("shapeless." + recipe)));
section.getConfigurationSection("shapeless").getKeys(false)
.forEach(recipe -> registerShapelessRecipe(type, id, section.getStringList("shapeless." + recipe)));
if (section.contains("furnace"))
section.getConfigurationSection("furnace").getKeys(false).forEach(recipe -> registerFurnaceRecipe(type, id,
new BurningRecipeInformation(section.getConfigurationSection("furnace." + recipe)), recipe));
@ -53,20 +53,20 @@ public class RecipeManagerDefault extends RecipeManager {
if (section.contains("campfire"))
section.getConfigurationSection("campfire").getKeys(false).forEach(recipe -> registerCampfireRecipe(type, id,
new BurningRecipeInformation(section.getConfigurationSection("campfire." + recipe)), recipe));
} catch (IllegalArgumentException exception) {
MMOItems.plugin.getLogger().log(Level.WARNING, "Could not load recipe of '" + id + "': " + exception.getMessage());
}
} catch (IllegalArgumentException exception) {
MMOItems.plugin.getLogger().log(Level.WARNING, "Could not load recipe of " + id + ": " + exception.getMessage());
}
}
sortRecipes();
Bukkit.getScheduler().runTask(MMOItems.plugin,
() -> getLoadedRecipes().forEach(recipe -> Bukkit.addRecipe(recipe.getRecipe())));
sortRecipes();
Bukkit.getScheduler().runTask(MMOItems.plugin, () ->
getLoadedRecipes().forEach(recipe -> Bukkit.addRecipe(recipe.getRecipe())));
}
@Override
public void registerFurnaceRecipe(Type type, String id, BurningRecipeInformation info, String number) {
if(!info.getChoice().isValid()) {
if (!info.getChoice().isValid()) {
MMOItems.plugin.getLogger().warning("Couldn't load furnace recipe for '" + type.getId() + "." + id + "'");
return;
}
@ -77,7 +77,7 @@ public class RecipeManagerDefault extends RecipeManager {
}
public void registerBlastRecipe(Type type, String id, BurningRecipeInformation info, String number) {
if(!info.getChoice().isValid()) {
if (!info.getChoice().isValid()) {
MMOItems.plugin.getLogger().warning("Couldn't load blast furnace recipe for '" + type.getId() + "." + id + "'");
return;
}
@ -88,7 +88,7 @@ public class RecipeManagerDefault extends RecipeManager {
}
public void registerSmokerRecipe(Type type, String id, BurningRecipeInformation info, String number) {
if(!info.getChoice().isValid()) {
if (!info.getChoice().isValid()) {
MMOItems.plugin.getLogger().warning("Couldn't load smoker recipe for '" + type.getId() + "." + id + "'");
return;
}
@ -99,7 +99,7 @@ public class RecipeManagerDefault extends RecipeManager {
}
public void registerCampfireRecipe(Type type, String id, BurningRecipeInformation info, String number) {
if(!info.getChoice().isValid()) {
if (!info.getChoice().isValid()) {
MMOItems.plugin.getLogger().warning("Couldn't load campfire recipe for '" + type.getId() + "." + id + "'");
return;
}
@ -122,11 +122,11 @@ public class RecipeManagerDefault extends RecipeManager {
/*
* TODO When Bukkit changes their 'RecipeChoice.ExactChoice' API we can
* remove the suppressed warnings, but right now it works despite being
* marked as deprecated. It is just draft API and probably subject to change.
* marked as deprecated. It is just draft API and probably subject to
* change.
*/
@SuppressWarnings("deprecation")
public RecipeChoice toBukkit(MMORecipeChoice choice) {
return choice.isVanilla() ? new RecipeChoice.MaterialChoice(choice.getItem().getType())
: new RecipeChoice.ExactChoice(choice.getItem());
return choice.isVanilla() ? new RecipeChoice.MaterialChoice(choice.getItem().getType()) : new RecipeChoice.ExactChoice(choice.getItem());
}
}