diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index a432f82af..5d4757a8a 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -30,6 +30,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Collection; +import java.util.Collections; import java.util.stream.Collectors; public class PureDaisyRecipeCategory implements IRecipeCategory { @@ -82,7 +83,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory public void setIngredients(RecipePureDaisy recipe, IIngredients iIngredients) { if(recipe.getInput() instanceof Tag) { Collection all = ((Tag) recipe.getInput()).getAllElements(); - iIngredients.setInputs(VanillaTypes.ITEM, all.stream().map(ItemStack::new).filter(ItemStack::isEmpty).collect(Collectors.toList())); + iIngredients.setInputLists(VanillaTypes.ITEM, Collections.singletonList(all.stream().map(ItemStack::new).filter(s -> !s.isEmpty()).collect(Collectors.toList()))); } else if(recipe.getInput() instanceof Block || recipe.getInput() instanceof BlockState) { BlockState state = recipe.getInput() instanceof BlockState ? (BlockState) recipe.getInput() : ((Block) recipe.getInput()).getDefaultState(); Block b = state.getBlock(); diff --git a/src/main/resources/assets/botania/models/block/creative_pool.json b/src/main/resources/assets/botania/models/block/creative_pool.json index 1a849e39b..ed581b977 100644 --- a/src/main/resources/assets/botania/models/block/creative_pool.json +++ b/src/main/resources/assets/botania/models/block/creative_pool.json @@ -2,11 +2,5 @@ "parent": "botania:block/shapes/pool", "textures": { "all": "botania:blocks/pool_infinite" - }, - "overrides": [{ - "predicate": { - "botania:full": 1 - }, - "model": "botania:block/creative_pool_full" - }] + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/diluted_pool.json b/src/main/resources/assets/botania/models/block/diluted_pool.json index fba208832..955329894 100644 --- a/src/main/resources/assets/botania/models/block/diluted_pool.json +++ b/src/main/resources/assets/botania/models/block/diluted_pool.json @@ -2,11 +2,5 @@ "parent": "botania:block/shapes/pool", "textures": { "all": "botania:blocks/pool_diluted" - }, - "overrides": [{ - "predicate": { - "botania:full": 1 - }, - "model": "botania:block/diluted_pool_full" - }] + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fabulous_pool.json b/src/main/resources/assets/botania/models/block/fabulous_pool.json index ccce255f8..635710901 100644 --- a/src/main/resources/assets/botania/models/block/fabulous_pool.json +++ b/src/main/resources/assets/botania/models/block/fabulous_pool.json @@ -2,11 +2,5 @@ "parent": "botania:block/shapes/pool", "textures": { "all": "botania:blocks/livingrock0" - }, - "overrides": [{ - "predicate": { - "botania:full": 1 - }, - "model": "botania:block/fabulous_pool_full" - }] + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_pool.json b/src/main/resources/assets/botania/models/block/mana_pool.json index 1256afc80..635710901 100644 --- a/src/main/resources/assets/botania/models/block/mana_pool.json +++ b/src/main/resources/assets/botania/models/block/mana_pool.json @@ -2,11 +2,5 @@ "parent": "botania:block/shapes/pool", "textures": { "all": "botania:blocks/livingrock0" - }, - "overrides": [{ - "predicate": { - "botania:full": 1 - }, - "model": "botania:block/mana_pool_full" - }] + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/creative_pool.json b/src/main/resources/assets/botania/models/item/creative_pool.json index 1b909fe01..25024663b 100644 --- a/src/main/resources/assets/botania/models/item/creative_pool.json +++ b/src/main/resources/assets/botania/models/item/creative_pool.json @@ -1,3 +1,11 @@ { - "parent": "botania:block/creative_pool_full" + "parent": "botania:block/creative_pool", + "overrides": [ + { + "predicate": { + "botania:full": 1 + }, + "model": "botania:block/creative_pool_full" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/diluted_pool.json b/src/main/resources/assets/botania/models/item/diluted_pool.json index 1af811eb6..10b4ce484 100644 --- a/src/main/resources/assets/botania/models/item/diluted_pool.json +++ b/src/main/resources/assets/botania/models/item/diluted_pool.json @@ -1,3 +1,11 @@ { - "parent": "botania:block/diluted_pool" + "parent": "botania:block/diluted_pool", + "overrides": [ + { + "predicate": { + "botania:full": 1 + }, + "model": "botania:block/diluted_pool_full" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fabulous_pool.json b/src/main/resources/assets/botania/models/item/fabulous_pool.json index 0ebc10233..801b49b36 100644 --- a/src/main/resources/assets/botania/models/item/fabulous_pool.json +++ b/src/main/resources/assets/botania/models/item/fabulous_pool.json @@ -1,3 +1,11 @@ { - "parent": "botania:block/fabulous_pool" + "parent": "botania:block/fabulous_pool", + "overrides": [ + { + "predicate": { + "botania:full": 1 + }, + "model": "botania:block/fabulous_pool_full" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_pool.json b/src/main/resources/assets/botania/models/item/mana_pool.json index 54347469c..c9016260d 100644 --- a/src/main/resources/assets/botania/models/item/mana_pool.json +++ b/src/main/resources/assets/botania/models/item/mana_pool.json @@ -1,3 +1,11 @@ { - "parent": "botania:block/mana_pool" + "parent": "botania:block/mana_pool", + "overrides": [ + { + "predicate": { + "botania:full": 1 + }, + "model": "botania:block/mana_pool_full" + } + ] } \ No newline at end of file