tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into mc1.14/dev

Browse source
This commit is contained in:
simibubi 2020-05-05 20:26:53 +02:00
commit 0f67b9afe2
6 changed files with 19 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipeSerializer.java
View file

@ -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")) {

12
src/main/resources/data/create/recipes/mixing/blazing_axe.json
View file

@ -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": [

12
src/main/resources/data/create/recipes/mixing/blazing_pickaxe.json
View file

@ -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": [

12
src/main/resources/data/create/recipes/mixing/blazing_shovel.json
View file

@ -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": [

12
src/main/resources/data/create/recipes/mixing/blazing_sword.json
View file

@ -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": [

18
src/main/resources/data/create/recipes/mixing/chromatic_compound.json
View file

@ -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",