From 1d4cc9d2fd23dfa4d61a355d503f3774e3f09ace Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Thu, 18 Dec 2014 19:28:15 -0800 Subject: [PATCH 1/4] Flourless --- .../botania/api/item/IFlowerlessBiome.java | 22 +++++++++++++++++++ .../core/handler/BiomeDecorationHandler.java | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java diff --git a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java new file mode 100644 index 000000000..27f83d7b1 --- /dev/null +++ b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java @@ -0,0 +1,22 @@ +/** +* 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 a +* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License +* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) +* +* File Created @ [? (GMT)] +*/ +package vazkii.botania.api.item; +import net.minecraft.world.World; +/** +* A BiomeGenBase that implements this will not have Botania flowers generated. +*/ +public interface IFlowerlessBiome { + /** + * @return Should this world be allowed to generate flowers? + */ + public boolean generateFlowers(World world, int x, int z); +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 5b85eeb38..2b0e2d1ad 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -14,6 +14,7 @@ package vazkii.botania.common.core.handler; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType; import vazkii.botania.api.item.IFlowerlessWorld; +import vazkii.botania.api.item.IFlowerlessBiome; import vazkii.botania.common.block.ModBlocks; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.EventPriority; @@ -27,6 +28,8 @@ public class BiomeDecorationHandler { boolean flowers = true; if(event.world.provider instanceof IFlowerlessWorld) flowers = ((IFlowerlessWorld) event.world.provider).generateFlowers(event.world); + else if(event.world.getBiomeGenForCoords(event.chunkX, event.chunkZ) instanceof IFlowerlessBiome) + flowers = ((IFlowerlessBiome)event.world.getBiomeGenForCoords(event.chunkX, event.chunkZ)).generateFlowers(event.world, event.chunkX, event.chunkZ); if(!flowers) return; From 53270f665b1b1eada9898cf696e969668b71a162 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Fri, 19 Dec 2014 07:05:33 -0800 Subject: [PATCH 2/4] CAN you generate? --- src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java | 2 +- src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java | 2 +- .../botania/common/core/handler/BiomeDecorationHandler.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java index 27f83d7b1..e48e10eec 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java @@ -18,5 +18,5 @@ public interface IFlowerlessBiome { /** * @return Should this world be allowed to generate flowers? */ - public boolean generateFlowers(World world, int x, int z); + public boolean canGenerateFlowers(World world, int x, int z); } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java b/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java index af81969d1..5f0d4aa9a 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java @@ -21,5 +21,5 @@ public interface IFlowerlessWorld { /** * @return Should this world be allowed to generate flowers? */ - public boolean generateFlowers(World world); + public boolean canGenerateFlowers(World world); } diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 2b0e2d1ad..14ac70a92 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -27,9 +27,9 @@ public class BiomeDecorationHandler { if((event.getResult() == Result.ALLOW || event.getResult() == Result.DEFAULT) && event.type == EventType.FLOWERS) { boolean flowers = true; if(event.world.provider instanceof IFlowerlessWorld) - flowers = ((IFlowerlessWorld) event.world.provider).generateFlowers(event.world); + flowers = ((IFlowerlessWorld) event.world.provider).canGenerateFlowers(event.world); else if(event.world.getBiomeGenForCoords(event.chunkX, event.chunkZ) instanceof IFlowerlessBiome) - flowers = ((IFlowerlessBiome)event.world.getBiomeGenForCoords(event.chunkX, event.chunkZ)).generateFlowers(event.world, event.chunkX, event.chunkZ); + flowers = ((IFlowerlessBiome)event.world.getBiomeGenForCoords(event.chunkX, event.chunkZ)).canGenerateFlowers(event.world, event.chunkX, event.chunkZ); if(!flowers) return; From a9007603823cee141217013d6caa4fcfb442ad0f Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Fri, 19 Dec 2014 07:05:53 -0800 Subject: [PATCH 3/4] Livingwood makes leaves live --- .../vazkii/botania/common/block/BlockLivingwood.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index de36613ea..a78861003 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -102,5 +102,14 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } + + @Override + public boolean canSustainLeaves(IBlockAccess world, int x, int y, int z) + { + if(world.getBlockMetadata(x, y, z) == 0) + return true; + else + return false; + } } From 9a433c23f2d7d2f2c016076ece56b1c53ae133db Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 19 Dec 2014 15:50:57 +0000 Subject: [PATCH 4/4] jd pls --- src/main/java/vazkii/botania/api/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 337c87916..0e1e90659 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "25", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "26", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API;