From f21767ea18a1d235b035af0b6e132be35c89ef5e Mon Sep 17 00:00:00 2001 From: iTitus Date: Wed, 16 Oct 2019 22:29:25 +0200 Subject: [PATCH 1/2] Fix Pure Daisy --- .../jei/puredaisy/PureDaisyRecipeCategory.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 99deebbba..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 @@ -8,6 +8,7 @@ */ package vazkii.botania.client.integration.jei.puredaisy; +import com.mojang.blaze3d.platform.GlStateManager; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.drawable.IDrawable; @@ -16,23 +17,20 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.block.FlowingFluidBlock; import net.minecraft.client.resources.I18n; -import net.minecraft.item.Items; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; 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 { @@ -85,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(); From 7d7302b959ce98900e974c91e5ce7086c0229512 Mon Sep 17 00:00:00 2001 From: iTitus Date: Wed, 16 Oct 2019 22:30:29 +0200 Subject: [PATCH 2/2] Fix model jsons so that a pool can render as full via overrides. Overrides aren't supported in block models apparently. --- .../assets/botania/models/block/creative_pool.json | 8 +------- .../assets/botania/models/block/diluted_pool.json | 8 +------- .../assets/botania/models/block/fabulous_pool.json | 8 +------- .../assets/botania/models/block/mana_pool.json | 8 +------- .../assets/botania/models/item/creative_pool.json | 10 +++++++++- .../assets/botania/models/item/diluted_pool.json | 10 +++++++++- .../assets/botania/models/item/fabulous_pool.json | 10 +++++++++- .../assets/botania/models/item/mana_pool.json | 10 +++++++++- 8 files changed, 40 insertions(+), 32 deletions(-) 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