exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 06:38:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make loading of ingredients more reliable

Browse Source
This commit is contained in:
Sn0wStorm
2020-10-31 15:59:00 +01:00
parent 0e02355cca
commit af37f248ce
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/dre/brewery/BIngredients.java
+4 -2
View File
@@ -471,7 +471,10 @@ public class BIngredients {
List<Ingredient> ing = new ArrayList<>(size); List<Ingredient> ing = new ArrayList<>(size);
for (; size > 0; size--) { for (; size > 0; size--) {
ItemLoader itemLoader = new ItemLoader(dataVersion, in, in.readUTF()); ItemLoader itemLoader = new ItemLoader(dataVersion, in, in.readUTF());
if (Ingredient.LOADERS.containsKey(itemLoader.getSaveID())) { if (!Ingredient.LOADERS.containsKey(itemLoader.getSaveID())) {
P.p.errorLog("Ingredient Loader not found: " + itemLoader.getSaveID());
break;
}
Ingredient loaded = Ingredient.LOADERS.get(itemLoader.getSaveID()).apply(itemLoader); Ingredient loaded = Ingredient.LOADERS.get(itemLoader.getSaveID()).apply(itemLoader);
int amount = in.readShort(); int amount = in.readShort();
if (loaded != null) { if (loaded != null) {
@@ -479,7 +482,6 @@ public class BIngredients {
ing.add(loaded); ing.add(loaded);
} }
} }
}
return new BIngredients(ing, cookedTime); return new BIngredients(ing, cookedTime);
} }
src/com/dre/brewery/recipe/SimpleItem.java
+2 -1
View File
@@ -132,8 +132,9 @@ public class SimpleItem extends RecipeItem implements Ingredient {
try { try {
DataInputStream in = loader.getInputStream(); DataInputStream in = loader.getInputStream();
Material mat = Material.getMaterial(in.readUTF()); Material mat = Material.getMaterial(in.readUTF());
short dur = in.readShort();
if (mat != null) { if (mat != null) {
SimpleItem item = new SimpleItem(mat, in.readShort()); SimpleItem item = new SimpleItem(mat, dur);
return item; return item;
} }
} catch (IOException e) { } catch (IOException e) {