diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 6218eae74..1e4ee9a9f 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import vazkii.botania.common.block.decor.Block18Stone; +import vazkii.botania.common.block.decor.BlockPavement; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneB; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; @@ -23,6 +24,7 @@ import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab; import vazkii.botania.common.block.decor.slabs.BlockEndStoneSlab; import vazkii.botania.common.block.decor.slabs.BlockEnderBrickSlab; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import vazkii.botania.common.block.decor.slabs.BlockPavementSlab; import vazkii.botania.common.block.decor.slabs.BlockReedSlab; import vazkii.botania.common.block.decor.slabs.BlockThatchSlab; import vazkii.botania.common.block.decor.slabs.bricks.BlockCustomBrickSlab; @@ -42,6 +44,7 @@ import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEnderBrickStairs; +import vazkii.botania.common.block.decor.stairs.BlockPavementStairs; import vazkii.botania.common.block.decor.stairs.BlockReedStairs; import vazkii.botania.common.block.decor.stairs.BlockThatchStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs; @@ -158,6 +161,7 @@ public final class ModFluffBlocks { public static Block biomeStoneA; public static Block biomeStoneB; public static Block stone; + public static Block pavement; public static Block[] biomeStoneStairs = new Block[24]; public static Block[] biomeStoneSlabs = new Block[24]; @@ -169,6 +173,10 @@ public final class ModFluffBlocks { public static Block[] stoneFullSlabs = new Block[8]; public static Block stoneWall; + public static Block[] pavementStairs = new Block[4]; + public static Block[] pavementSlabs = new Block[4]; + public static Block[] pavementFullSlabs = new Block[4]; + public static Block endStoneSlab; public static Block endStoneSlabFull; public static Block endStoneStairs; @@ -234,7 +242,8 @@ public final class ModFluffBlocks { biomeStoneA = new BlockBiomeStoneA(); biomeStoneB = new BlockBiomeStoneB(); stone = new Block18Stone(); - + pavement = new BlockPavement(); + if(ConfigHandler.darkQuartzEnabled) { darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK); darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false); @@ -287,6 +296,12 @@ public final class ModFluffBlocks { } stoneWall = new Block18StoneWall(); + for(int i = 0; i < 4; i++) { + pavementStairs[i] = new BlockPavementStairs(i); + pavementSlabs[i] = new BlockPavementSlab(false, i, i); + pavementFullSlabs[i] = new BlockPavementSlab(true, i, i); + } + endStoneSlab = new BlockEndStoneSlab(false); endStoneSlabFull = new BlockEndStoneSlab(true); endStoneStairs = new BlockEndStoneStairs(); @@ -362,6 +377,11 @@ public final class ModFluffBlocks { ((BlockModSlab) stoneSlabs[i]).register(); ((BlockModSlab) stoneFullSlabs[i]).register(); } + + for(int i = 0; i < 4; i++) { + ((BlockModSlab) pavementSlabs[i]).register(); + ((BlockModSlab) pavementFullSlabs[i]).register(); + } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java new file mode 100644 index 000000000..1ae2a7d6b --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -0,0 +1,95 @@ +/** + * 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 @ [Sep 1, 2015, 6:35:06 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.render.block.InterpolatedIcon; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockPavement extends BlockMod { + + private static final int TYPES = 4; + IIcon[] icons; + + public BlockPavement() { + super(Material.rock); + setHardness(2.0F); + setResistance(10.0F); + setStepSound(soundTypeStone); + setBlockName(LibBlockNames.PAVEMENT); + } + + @Override + protected boolean shouldRegisterInNameSet() { + return false; + } + + @Override + public int damageDropped(int par1) { + return par1; + } + + @Override + public Block setBlockName(String par1Str) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + return super.setBlockName(par1Str); + } + + @Override + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for(int i = 0; i < TYPES; i++) + par3List.add(new ItemStack(par1, 1, i)); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister par1IconRegister) { + icons = new IIcon[TYPES]; + for(int i = 0; i < TYPES; i++) + icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + } + + @Override + public IIcon getIcon(int par1, int par2) { + return icons[Math.min(TYPES - 1, par2)]; + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + int meta = world.getBlockMetadata(x, y, z); + return new ItemStack(this, 1, meta); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java new file mode 100644 index 000000000..9e071232f --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -0,0 +1,48 @@ +/** + * 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 @ [Sep 1, 2015, 7:17:45 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs; + +import net.minecraft.block.BlockSlab; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.lexicon.LexiconData; + +public class BlockPavementSlab extends BlockLivingSlab { + + int index; + + public BlockPavementSlab(boolean full, int meta, int index) { + super(full, ModFluffBlocks.pavement, meta); + this.index = index; + setHardness(2F); + setResistance(10F); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModFluffBlocks.pavementFullSlabs[index]; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModFluffBlocks.pavementSlabs[index]; + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.pavement; + } + + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java new file mode 100644 index 000000000..fd9624717 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java @@ -0,0 +1,31 @@ +/** + * 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 @ [Sep 1, 2015, 7:16:53 PM (GMT)] + */ +package vazkii.botania.common.block.decor.stairs; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.lexicon.LexiconData; + +public class BlockPavementStairs extends BlockLivingStairs { + + public BlockPavementStairs(int meta) { + super(ModFluffBlocks.pavement, meta); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.pavement; + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index fbd6916b2..b401ece68 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -318,7 +318,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.snowBrickSlab); addBlock(ModFluffBlocks.tileStairs); addBlock(ModFluffBlocks.tileSlab); - + addBlock(ModFluffBlocks.livingwoodStairs); addBlock(ModFluffBlocks.livingwoodSlab); addBlock(ModFluffBlocks.livingwoodWall); @@ -363,13 +363,13 @@ public final class BotaniaCreativeTab extends CreativeTabs { if(ConfigHandler.stones18Enabled) { addBlock(ModFluffBlocks.stone); - for(int i= 0; i < 8; i++) + for(int i = 0; i < 8; i++) addBlock(ModFluffBlocks.stoneStairs[i]); - for(int i= 0; i < 8; i++) + for(int i = 0; i < 8; i++) addBlock(ModFluffBlocks.stoneSlabs[i]); + addBlock(ModFluffBlocks.stoneWall); } - addBlock(ModFluffBlocks.stoneWall); - + addBlock(ModFluffBlocks.biomeStoneA); addBlock(ModFluffBlocks.biomeStoneB); for(int i = 0; i < 24; i++) @@ -377,6 +377,12 @@ public final class BotaniaCreativeTab extends CreativeTabs { for(int i = 0; i < 24; i++) addBlock(ModFluffBlocks.biomeStoneSlabs[i]); addBlock(ModFluffBlocks.biomeStoneWall); + + addBlock(ModFluffBlocks.pavement); + for(int i = 0; i < 4; i++) + addBlock(ModFluffBlocks.pavementStairs[i]); + for(int i = 0; i < 4; i++) + addBlock(ModFluffBlocks.pavementSlabs[i]); if(ConfigHandler.enderStuff19Enabled) { addBlock(ModBlocks.endStoneBrick); diff --git a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java index 0cd330ecf..2f94548ad 100644 --- a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java +++ b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java @@ -51,6 +51,7 @@ public class MultipartHandler { registerAllMultiparts(ModFluffBlocks.biomeStoneA); registerAllMultiparts(ModFluffBlocks.biomeStoneB); registerAllMultiparts(ModFluffBlocks.stone); + registerAllMultiparts(ModFluffBlocks.pavement); } private static void registerAllMultiparts(Block block) { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index dbcde3b1c..c7dd10f31 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -278,6 +278,8 @@ public final class LexiconData { public static LexiconEntry blazeBlock; public static LexiconEntry challenges; public static LexiconEntry cacophonium; + public static LexiconEntry pavement; + public static LexiconEntry tcIntegration; public static LexiconEntry bcIntegration; public static LexiconEntry banners; diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 480396977..b66a75803 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -96,6 +96,7 @@ public final class LibBlockNames { public static final String CACOPHONIUM = "cacophoniumBlock"; public static final String BELLOWS = "bellows"; public static final String BIFROST_PERM = "bifrostPerm"; + public static final String PAVEMENT = "pavement"; 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 57d0e02ec..a8e4606a7 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1026,6 +1026,18 @@ tile.botania:cacophoniumBlock.name=Cacophonium Block tile.botania:bellows.name=Manatide Bellows tile.botania:bifrost.name=Temporary Bifrost Block tile.botania:bifrostPerm.name=Bifrost Block +tile.botania:pavement0.name=White Portuguese Pavement +tile.botania:pavement1.name=Black Portuguese Pavement +tile.botania:pavement2.name=Blue Portuguese Pavement +tile.botania:pavement3.name=Red Portuguese Pavement +tile.botania:pavement0Stairs.name=White Portuguese Pavement Stairs +tile.botania:pavement1Stairs.name=Black Portuguese Pavement Stairs +tile.botania:pavement2Stairs.name=Blue Portuguese Pavement Stairs +tile.botania:pavement3Stairs.name=Red Portuguese Pavement Stairs +tile.botania:pavement0Slab.name=White Portuguese Pavement Slab +tile.botania:pavement1Slab.name=Black Portuguese Pavement Slab +tile.botania:pavement2Slab.name=Blue Portuguese Pavement Slab +tile.botania:pavement3Slab.name=Red Portuguese Pavement Slab # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement4.png b/src/main/resources/assets/botania/textures/blocks/pavement0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement4.png rename to src/main/resources/assets/botania/textures/blocks/pavement0.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement5.png b/src/main/resources/assets/botania/textures/blocks/pavement1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement5.png rename to src/main/resources/assets/botania/textures/blocks/pavement1.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement0.png b/src/main/resources/assets/botania/textures/blocks/pavement2.png similarity index 93% rename from src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement0.png rename to src/main/resources/assets/botania/textures/blocks/pavement2.png index fe6b49969..fa387bf36 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement0.png and b/src/main/resources/assets/botania/textures/blocks/pavement2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement1.png b/src/main/resources/assets/botania/textures/blocks/pavement3.png similarity index 94% rename from src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement1.png rename to src/main/resources/assets/botania/textures/blocks/pavement3.png index ac8806819..248bff15d 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement1.png and b/src/main/resources/assets/botania/textures/blocks/pavement3.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement2.png b/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement2.png deleted file mode 100644 index 5b1f5764c..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement3.png b/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement3.png deleted file mode 100644 index 56f65dc7e..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/portuguesePavement3.png and /dev/null differ