diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index 6f19e5d1e..03f9c8684 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -55,12 +55,17 @@ public class BlockPlant extends BlockCrops{ List drops = getDrops(world, pos, state, 0); boolean deductedSeedSize = false; for(ItemStack stack : drops){ - if(stack != null && stack.getItem() == this.seedItem && !deductedSeedSize){ - stack.stackSize--; - deductedSeedSize = true; + if(stack != null){ + if(stack.getItem() == this.seedItem && !deductedSeedSize){ + stack.stackSize--; + deductedSeedSize = true; + } + + if(stack.stackSize > 0){ + EntityItem entity = new EntityItem(world, pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5, stack); + world.spawnEntityInWorld(entity); + } } - EntityItem entity = new EntityItem(world, pos.getX()+.5, pos.getY()+.5, pos.getZ()+.5, stack); - world.spawnEntityInWorld(entity); } world.setBlockState(pos, getStateFromMeta(0)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java index 32fa2a49d..75dc4ac74 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java @@ -11,6 +11,7 @@ package de.ellpeck.actuallyadditions.mod.jei; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; +import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.jei.booklet.BookletRecipeCategory; import de.ellpeck.actuallyadditions.mod.jei.booklet.BookletRecipeHandler; @@ -20,7 +21,9 @@ import de.ellpeck.actuallyadditions.mod.jei.crusher.CrusherRecipeCategory; import de.ellpeck.actuallyadditions.mod.jei.crusher.CrusherRecipeHandler; import de.ellpeck.actuallyadditions.mod.jei.reconstructor.ReconstructorRecipeCategory; import de.ellpeck.actuallyadditions.mod.jei.reconstructor.ReconstructorRecipeHandler; +import de.ellpeck.actuallyadditions.mod.util.Util; import mezz.jei.api.*; +import net.minecraft.item.ItemStack; @JEIPlugin public class JEIActuallyAdditionsPlugin implements IModPlugin{ @@ -69,6 +72,14 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin{ ignoreList.ignoreNbtTagNames(InitItems.itemBatteryTriple, "Energy"); ignoreList.ignoreNbtTagNames(InitItems.itemBatteryQuadruple, "Energy"); ignoreList.ignoreNbtTagNames(InitItems.itemBatteryQuintuple, "Energy"); + + IItemBlacklist blacklist = this.helpers.getItemBlacklist(); + blacklist.addItemToBlacklist(new ItemStack(InitBlocks.blockRice)); + blacklist.addItemToBlacklist(new ItemStack(InitBlocks.blockCanola)); + blacklist.addItemToBlacklist(new ItemStack(InitBlocks.blockFlax)); + blacklist.addItemToBlacklist(new ItemStack(InitBlocks.blockCoffee)); + blacklist.addItemToBlacklist(new ItemStack(InitBlocks.blockWildPlant, 1, Util.WILDCARD)); + blacklist.addItemToBlacklist(new ItemStack(InitBlocks.blockColoredLampOn, 1, Util.WILDCARD)); } @Override