Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2025-04-04 18:15:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow all ingedients of recipes into the cauldron

Browse Source
This commit is contained in:
Sn0wStorm 2015-03-16 16:31:45 +01:00
parent b8e0f1f38b
commit 82837e1977
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/dre/brewery/BIngredients.java
View File

@ -1,8 +1,10 @@
package com.dre.brewery; package com.dre.brewery;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Set;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -11,7 +13,7 @@ import org.bukkit.potion.PotionEffectType;
import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.inventory.meta.PotionMeta;
public class BIngredients { public class BIngredients {
public static ArrayList<Material> possibleIngredients = new ArrayList<Material>(); public static Set<Material> possibleIngredients = new HashSet<Material>();
public static ArrayList<BRecipe> recipes = new ArrayList<BRecipe>(); public static ArrayList<BRecipe> recipes = new ArrayList<BRecipe>();
public static Map<Material, String> cookedNames = new HashMap<Material, String>(); public static Map<Material, String> cookedNames = new HashMap<Material, String>();
private static int lastId = 0; private static int lastId = 0;

1
src/com/dre/brewery/BRecipe.java
View File

@ -72,6 +72,7 @@ public class BRecipe {
if (mat != null) { if (mat != null) {
ItemStack stack = new ItemStack(mat, P.p.parseInt(ingredParts[1]), durability); ItemStack stack = new ItemStack(mat, P.p.parseInt(ingredParts[1]), durability);
this.ingredients.add(stack); this.ingredients.add(stack);
BIngredients.possibleIngredients.add(mat);
} else { } else {
P.p.errorLog("Unknown Material: " + ingredParts[0]); P.p.errorLog("Unknown Material: " + ingredParts[0]);
this.ingredients = null; this.ingredients = null;

23
src/com/dre/brewery/P.java
View File

@ -70,7 +70,15 @@ public class P extends JavaPlugin {
String v = Bukkit.getBukkitVersion(); String v = Bukkit.getBukkitVersion();
useUUID = !v.matches(".*1\\.[1-6].*") && !v.matches(".*1\\.7\\.[0-5].*"); useUUID = !v.matches(".*1\\.[1-6].*") && !v.matches(".*1\\.7\\.[0-5].*");
if (!readConfig()) { // load the Config
try {
if (!readConfig()) {
p = null;
getServer().getPluginManager().disablePlugin(this);
return;
}
} catch (Exception e) {
e.printStackTrace();
p = null; p = null;
getServer().getPluginManager().disablePlugin(this); getServer().getPluginManager().disablePlugin(this);
return; return;
@ -161,7 +169,18 @@ public class P extends JavaPlugin {
} }
// load the Config // load the Config
readConfig(); try {
if (!readConfig()) {
p = null;
getServer().getPluginManager().disablePlugin(this);
return;
}
} catch (Exception e) {
e.printStackTrace();
p = null;
getServer().getPluginManager().disablePlugin(this);
return;
}
// save and load LanguageReader // save and load LanguageReader
languageReader.save(); languageReader.save();