From d406f987c3dd5469bee8e84ff2afbad58d1e6e12 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 21 Sep 2016 21:29:49 +0100 Subject: [PATCH] Re-added the seed planting. Quark will disable its own if Botania is present from now on. --- .../client/gui/lexicon/GuiLexicon.java | 1 - .../botania/common/block/ModBlocks.java | 3 + .../block/dispenser/BehaviourCocoaBeans.java | 56 +++++++++++++++++++ .../block/dispenser/BehaviourSeeds.java | 45 +++++++++++++++ .../block/dispenser/SeedBehaviours.java | 36 ++++++++++++ .../botania/common/lexicon/LexiconData.java | 4 ++ .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 6 +- 8 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java create mode 100644 src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java create mode 100644 src/main/java/vazkii/botania/common/block/dispenser/SeedBehaviours.java diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 46a40156f..66885f7dc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -325,7 +325,6 @@ public class GuiLexicon extends GuiScreen { fontRendererObj.setUnicodeFlag(unicode); } - public void drawBookmark(int x, int y, String s, boolean drawLeft) { drawBookmark(x, y, s, drawLeft, 180); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 103972d9e..908744fbb 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -46,6 +46,7 @@ import vazkii.botania.common.block.decor.BlockTinyPotato; import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin; import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart; import vazkii.botania.common.block.dispenser.BehaviourWand; +import vazkii.botania.common.block.dispenser.SeedBehaviours; import vazkii.botania.common.block.mana.BlockAlchemyCatalyst; import vazkii.botania.common.block.mana.BlockBellows; import vazkii.botania.common.block.mana.BlockBrewery; @@ -371,6 +372,8 @@ public final class ModBlocks { BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.twigWand, new BehaviourWand()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin()); + + SeedBehaviours.init(); } private static void initTileEntities() { diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java new file mode 100644 index 000000000..c656da252 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java @@ -0,0 +1,56 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [21/09/2016, 21:08:41 (GMT)] + */ +package vazkii.botania.common.block.dispenser; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockDispenser; +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.BlockOldLog; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.state.IBlockState; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.IBehaviorDispenseItem; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BehaviourCocoaBeans extends BehaviorDefaultDispenseItem { + + IBehaviorDispenseItem vanillaBehaviour; + public BehaviourCocoaBeans(IBehaviorDispenseItem vanilla) { + vanillaBehaviour = vanilla; + } + + @Override + public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { + if(par2ItemStack.getItemDamage() == EnumDyeColor.BROWN.getDyeDamage()) { + Block block = Blocks.COCOA; + EnumFacing facing = par1IBlockSource.func_189992_e().getValue(BlockDispenser.FACING); + BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); + World world = par1IBlockSource.getWorld(); + + BlockPos logPos = pos.offset(facing); + IBlockState logState = world.getBlockState(logPos); + if(logState.getBlock() == Blocks.LOG && logState.getValue(BlockOldLog.VARIANT) == BlockPlanks.EnumType.JUNGLE && world.isAirBlock(pos) && block.canPlaceBlockAt(world, pos)) { + world.setBlockState(pos, block.getDefaultState().withProperty(BlockHorizontal.FACING, facing)); + par2ItemStack.stackSize--; + return par2ItemStack; + } + } + + return vanillaBehaviour.dispense(par1IBlockSource, par2ItemStack); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java new file mode 100644 index 000000000..ea47d1be1 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -0,0 +1,45 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [21/09/2016, 21:08:33 (GMT)] + */ +package vazkii.botania.common.block.dispenser; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockDispenser; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BehaviourSeeds extends BehaviorDefaultDispenseItem { + + Block block; + + public BehaviourSeeds(Block block) { + this.block = block; + } + + @Override + public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { + EnumFacing facing = par1IBlockSource.func_189992_e().getValue(BlockDispenser.FACING); + BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); + World world = par1IBlockSource.getWorld(); + + if(world.isAirBlock(pos) && block.canPlaceBlockAt(world, pos)) { + world.setBlockState(pos, block.getDefaultState()); + par2ItemStack.stackSize--; + return par2ItemStack; + } + + return super.dispenseStack(par1IBlockSource, par2ItemStack); + } + +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/dispenser/SeedBehaviours.java b/src/main/java/vazkii/botania/common/block/dispenser/SeedBehaviours.java new file mode 100644 index 000000000..467f58faa --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/dispenser/SeedBehaviours.java @@ -0,0 +1,36 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [21/09/2016, 21:06:43 (GMT)] + */ +package vazkii.botania.common.block.dispenser; + +import net.minecraft.block.BlockDispenser; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; + +public class SeedBehaviours { + + // This entire class is a copy from Quark, for the seed planting feature + // Quark's own feature disables itself if Botania is present + + public static void init() { + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.WHEAT_SEEDS, new BehaviourSeeds(Blocks.WHEAT)); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.POTATO, new BehaviourSeeds(Blocks.POTATOES)); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.CARROT, new BehaviourSeeds(Blocks.CARROTS)); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.NETHER_WART, new BehaviourSeeds(Blocks.NETHER_WART)); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.PUMPKIN_SEEDS, new BehaviourSeeds(Blocks.PUMPKIN_STEM)); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.MELON_SEEDS, new BehaviourSeeds(Blocks.MELON_STEM)); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.BEETROOT_SEEDS, new BehaviourSeeds(Blocks.BEETROOTS)); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Item.getItemFromBlock(Blocks.CHORUS_FLOWER), new BehaviourSeeds(Blocks.CHORUS_FLOWER)); + + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Items.DYE, new BehaviourCocoaBeans(BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.getObject(Items.DYE))); + } + +} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index cf01136cb..5c9b4caef 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -268,6 +268,7 @@ public final class LexiconData { public static LexiconEntry unstableBlocks; public static LexiconEntry decorativeBlocks; + public static LexiconEntry dispenserTweaks; public static LexiconEntry shinyFlowers; public static LexiconEntry shedding; public static LexiconEntry tinyPotato; @@ -1323,6 +1324,9 @@ public final class LexiconData { new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz)); + dispenserTweaks = new BasicLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); + dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.DISPENSER)); + shinyFlowers = new BasicLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc); shinyFlowers.setLexiconPages(new PageText("0"), new PageText("3"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers), diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 104fb65f1..ec29c58e1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -242,6 +242,7 @@ public final class LibLexicon { public static final String ALF_ODIN_RING = "odinRing"; public static final String MISC_DECORATIVE_BLOCKS = "decorativeBlocks"; + public static final String MISC_DISPENSER_TWEAKS = "dispenserTweaks"; public static final String MISC_SHINY_FLOWERS = "shinyFlowers"; public static final String MISC_PRISMARINE = "prismarine"; public static final String MISC_SHEDDING = "shedding"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 2c9c9975a..2cf5b1dcf 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3641,9 +3641,9 @@ botania.page.decorativeBlocks21=Crafting &1Soul Bricks&0 botania.page.decorativeBlocks22=Crafting &1Frosty Bricks&0 # -- DISPENSER TWEAKS -botania.entry.dispenserTweaks=Dispenser Tweaks -botania.tagline.dispenserTweaks=Get more out of your dispensers -botania.page.dispenserTweaks0=&1Dispensers&0, among their normal abilities, can also plant all sorts of crops, from &1Seeds&0, &1Potatos&0 or &1Carrots&0 to even &1Nether Wart&0. The crop is planted in the block right in front of the dispenser.
The &1Dispensers&0 can also use the &1Wand of the Forest&0 for some specific tasks such as triggering a &1Runic Altar&0. +botania.entry.dispenserTweaks=Dispenser Planting +botania.tagline.dispenserTweaks=Dispensers planting seeds +botania.page.dispenserTweaks0=Botania tweaks &1Dispensers&0 to be able to plant all sorts of seeds, from normal wheat &1Seeds&0, to &1Nether Wart&0 or &1Cocoa Beans&0, the latter requiring a block of &1Jungle Wood&0 to be present in front of the dispenser with an air spot in between.
This allows for crop farming in combination with other blocks such as the &1Drum of the Wild&0. # -- GLIMMERING FLOWERS botania.entry.shinyFlowers=Glimmering Flowers