mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-15 23:53:41 +01:00
Merge pull request #299 from LordGrimmauld/master
the "count":<n> is now supported in recipe inputs
This commit is contained in:
commit
90afffd644
6 changed files with 19 additions and 55 deletions
|
@ -28,8 +28,14 @@ public class ProcessingRecipeSerializer<T extends ProcessingRecipe<?>>
|
|||
|
||||
List<ProcessingIngredient> ingredients = new ArrayList<>();
|
||||
for (JsonElement e : JSONUtils.getJsonArray(json, "ingredients")) {
|
||||
int count = 1;
|
||||
if (JSONUtils.hasField((JsonObject) e, "count")) {
|
||||
count = JSONUtils.getInt(e.getAsJsonObject().get("count"), "count");
|
||||
}
|
||||
for(int i = 0; i < count; i++) {
|
||||
ingredients.add(ProcessingIngredient.parse(e.getAsJsonObject()));
|
||||
}
|
||||
}
|
||||
|
||||
List<ProcessingOutput> results = new ArrayList<>();
|
||||
for (JsonElement e : JSONUtils.getJsonArray(json, "results")) {
|
||||
|
|
|
@ -8,16 +8,8 @@
|
|||
"item": "create:obsidian_dust"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
"item": "minecraft:blaze_powder",
|
||||
"count": 4
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
|
|
|
@ -8,16 +8,8 @@
|
|||
"item": "create:obsidian_dust"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
"item": "minecraft:blaze_powder",
|
||||
"count": 4
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
|
|
|
@ -8,16 +8,8 @@
|
|||
"item": "create:obsidian_dust"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
"item": "minecraft:blaze_powder",
|
||||
"count": 4
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
|
|
|
@ -8,16 +8,8 @@
|
|||
"item": "create:obsidian_dust"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:blaze_powder"
|
||||
"item": "minecraft:blaze_powder",
|
||||
"count": 4
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
|
|
|
@ -2,25 +2,15 @@
|
|||
"type": "create:mixing",
|
||||
"ingredients": [
|
||||
{
|
||||
"tag": "forge:dusts/glowstone"
|
||||
},
|
||||
{
|
||||
"tag": "forge:dusts/glowstone"
|
||||
},
|
||||
{
|
||||
"tag": "forge:dusts/glowstone"
|
||||
"tag": "forge:dusts/glowstone",
|
||||
"count": 3
|
||||
},
|
||||
{
|
||||
"item": "create:polished_rose_quartz"
|
||||
},
|
||||
{
|
||||
"item": "create:obsidian_dust"
|
||||
},
|
||||
{
|
||||
"item": "create:obsidian_dust"
|
||||
},
|
||||
{
|
||||
"item": "create:obsidian_dust"
|
||||
"item": "create:obsidian_dust",
|
||||
"count": 3
|
||||
},
|
||||
{
|
||||
"item": "minecraft:dragon_breath",
|
||||
|
|
Loading…
Reference in a new issue