From 4c03e1202c7ac31d3c9dbce89dd13bc90a582719 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 18 Jan 2015 02:12:34 +0000 Subject: [PATCH] Added Trodden Dirt. --- .../botania/common/block/ModBlocks.java | 3 + .../common/block/decor/BlockDirtPath.java | 70 ++++++++++++++++++ .../common/core/BotaniaCreativeTab.java | 4 +- .../botania/common/lib/LibBlockNames.java | 2 +- .../resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/blocks/dirtPath.png | Bin 0 -> 18510 bytes 6 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java create mode 100644 src/main/resources/assets/botania/textures/blocks/dirtPath.png diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 3dc05081a..539361c68 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -22,6 +22,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.decor.BlockBuriedPetals; import vazkii.botania.common.block.decor.BlockCustomBrick; +import vazkii.botania.common.block.decor.BlockDirtPath; import vazkii.botania.common.block.decor.BlockElfGlass; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.BlockManaBeacon; @@ -220,6 +221,7 @@ public final class ModBlocks { public static Block floatingSpecialFlower; public static Block manaFlame; public static Block prism; + public static Block dirtPath; public static Block livingwoodStairs; public static Block livingwoodSlab; @@ -350,6 +352,7 @@ public final class ModBlocks { floatingSpecialFlower = new BlockFloatingSpecialFlower(); manaFlame = new BlockManaFlame(); prism = new BlockPrism(); + dirtPath = new BlockDirtPath(); livingwoodStairs = new BlockLivingwoodStairs(); livingwoodSlab = new BlockLivingwoodSlab(false); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java new file mode 100644 index 000000000..f89dfbbca --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -0,0 +1,70 @@ +/** + * 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 @ [Jan 18, 2015, 1:47:03 AM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockDirtPath extends BlockMod { + + public BlockDirtPath() { + super(Material.ground); + setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F); + setLightOpacity(255); + setHardness(0.6F); + setStepSound(soundTypeGravel); + setBlockName(LibBlockNames.DIRT_PATH); + useNeighborBrightness = true; + } + + @Override + public void onEntityWalking(World world, int x, int y, int z, Entity entity) { + float speed = 2F; + float max = 0.4F; + + double motionX = Math.abs(entity.motionX); + double motionZ = Math.abs(entity.motionZ); + if(motionX < max) + entity.motionX *= speed; + if(motionZ < max) + entity.motionZ *= speed; + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { + return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index f58642ef8..66f51eab5 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -129,10 +129,12 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.manaBeacon); addItem(ModItems.signalFlare); + addBlock(ModBlocks.dirtPath); + addBlock(ModBlocks.dreamwood); addBlock(ModBlocks.manaGlass); addBlock(ModBlocks.elfGlass); - + addBlock(ModBlocks.prismarine); addBlock(ModBlocks.seaLamp); addBlock(ModBlocks.prismarineStairs); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 62cf32226..977af506b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -11,7 +11,6 @@ */ package vazkii.botania.common.lib; - public final class LibBlockNames { public static final String FLOWER = "flower"; @@ -69,6 +68,7 @@ public final class LibBlockNames { public static final String FLOATING_SPECIAL_FLOWER = "floatingSpecialFlower"; public static final String MANA_FLAME = "manaFlame"; public static final String PRISM = "prism"; + public static final String DIRT_PATH = "dirtPath"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 37e5156ae..5d714ac55 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -507,6 +507,7 @@ tile.botania:redStringComparator.name=Red Stringed Comparator tile.botania:redStringRelay.name=Red Stringed Spoofer tile.botania:manaFlame.name=Mana Flash tile.botania:prism.name=Mana Prism +tile.botania:dirtPath.name=Trodden Dirt # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/src/main/resources/assets/botania/textures/blocks/dirtPath.png b/src/main/resources/assets/botania/textures/blocks/dirtPath.png new file mode 100644 index 0000000000000000000000000000000000000000..374a3fff6af6bccb7f7a9314a4d70b7a56dc4701 GIT binary patch literal 18510 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 A`v3p{ literal 0 HcmV?d00001