From e95266e793f111a3d8830da238cdc05ac10c2c23 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 3 Mar 2014 02:00:25 +0000 Subject: [PATCH] Added the Mana Distributor block, will get to making it do something tomorrow :s --- .../common/block/BlockDistributor.java | 53 ++++++++++++++++++ .../botania/common/block/ModBlocks.java | 2 + .../common/block/tile/TileDistributor.java | 18 ++++++ .../common/core/BotaniaCreativeTab.java | 3 +- .../common/core/handler/ConfigHandler.java | 1 + .../botania/common/lib/LibBlockIDs.java | 1 + .../botania/common/lib/LibBlockNames.java | 1 + resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/blocks/distributor0.png | Bin 0 -> 3644 bytes .../botania/textures/blocks/distributor1.png | Bin 0 -> 3621 bytes 10 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 MODSRC/vazkii/botania/common/block/BlockDistributor.java create mode 100644 MODSRC/vazkii/botania/common/block/tile/TileDistributor.java create mode 100644 resources/assets/botania/textures/blocks/distributor0.png create mode 100644 resources/assets/botania/textures/blocks/distributor1.png diff --git a/MODSRC/vazkii/botania/common/block/BlockDistributor.java b/MODSRC/vazkii/botania/common/block/BlockDistributor.java new file mode 100644 index 000000000..8d4bebc0f --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockDistributor.java @@ -0,0 +1,53 @@ +/** + * 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 @ [Mar 3, 2014, 1:44:29 AM (GMT)] + */ +package vazkii.botania.common.block; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.tile.TileDistributor; +import vazkii.botania.common.lib.LibBlockIDs; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockDistributor extends BlockModContainer { + + Icon iconSide, iconTop; + + protected BlockDistributor() { + super(LibBlockIDs.idDistributor, Material.rock); + setHardness(2.0F); + setResistance(10.0F); + setStepSound(soundStoneFootstep); + setUnlocalizedName(LibBlockNames.DISTRIBUTOR); + } + + @Override + public void registerIcons(IconRegister par1IconRegister) { + iconTop = IconHelper.forBlock(par1IconRegister, this, 0); + iconSide = IconHelper.forBlock(par1IconRegister, this, 1); + } + + @Override + public Icon getIcon(int par1, int par2) { + return par1 == 0 ? ModBlocks.livingrock.getIcon(0, 0) : par1 == 1 ? iconTop : iconSide; + } + + @Override + public TileEntity createNewTileEntity(World world) { + return new TileDistributor(); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 6a7dc306c..b9257ce53 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -44,6 +44,7 @@ public final class ModBlocks { public static Block unstableBlock; public static Block pylon; public static Block pistonRelay; + public static Block distributor; public static void init() { flower = new BlockModFlower(); @@ -57,6 +58,7 @@ public final class ModBlocks { unstableBlock = new BlockUnstable(); pylon = new BlockPylon(); pistonRelay = new BlockPistonRelay(); + distributor = new BlockDistributor(); for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower.blockID, 1, i)); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java b/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java new file mode 100644 index 000000000..e3ced2514 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java @@ -0,0 +1,18 @@ +/** + * 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 @ [Mar 3, 2014, 1:51:34 AM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import net.minecraft.tileentity.TileEntity; + +public class TileDistributor extends TileEntity { + +} diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index ed57c3806..7f4eb1843 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -57,9 +57,10 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.pylon); addBlock(ModBlocks.unstableBlock); + addBlock(ModBlocks.pool); + addBlock(ModBlocks.distributor); addBlock(ModBlocks.spreader); addItem(ModItems.lens); - addBlock(ModBlocks.pool); } private void addItem(Item item) { diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 2c4708654..169b11d56 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -52,6 +52,7 @@ public final class ConfigHandler { LibBlockIDs.idUnstableBlock = loadBlock(LibBlockNames.UNSTABLE_BLOCK, LibBlockIDs.idUnstableBlock); LibBlockIDs.idPylon = loadBlock(LibBlockNames.PYLON, LibBlockIDs.idPylon); LibBlockIDs.idPistonRelay = loadBlock(LibBlockNames.PISTON_RELAY, LibBlockIDs.idPistonRelay); + LibBlockIDs.idDistributor = loadBlock(LibBlockNames.DISTRIBUTOR, LibBlockIDs.idDistributor); // Item IDs LibItemIDs.idLexicon = loadItem(LibItemNames.LEXICON, LibItemIDs.idLexicon); diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java b/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java index 275b26cbf..61cdc5dcf 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java @@ -24,5 +24,6 @@ public final class LibBlockIDs { public static int idUnstableBlock = 1963; public static int idPylon = 1964; public static int idPistonRelay = 1965; + public static int idDistributor = 1966; } diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 9d3ed1c78..30334121f 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -26,6 +26,7 @@ public final class LibBlockNames { public static final String UNSTABLE_BLOCK = LibResources.PREFIX_MOD + "unstableBlock"; public static final String PYLON = LibResources.PREFIX_MOD + "pylon"; public static final String PISTON_RELAY = LibResources.PREFIX_MOD + "pistonRelay"; + public static final String DISTRIBUTOR = LibResources.PREFIX_MOD + "distributor"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index cdabcd3f1..7bcb245f3 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -70,6 +70,7 @@ tile.botania:unstableBlock13.name=Green Unstable Cube tile.botania:unstableBlock14.name=Red Unstable Cube tile.botania:unstableBlock15.name=Black Unstable Cube tile.botania:pistonRelay.name=Force Relay +tile.botania:distributor.name=Mana Distributor # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/resources/assets/botania/textures/blocks/distributor0.png b/resources/assets/botania/textures/blocks/distributor0.png new file mode 100644 index 0000000000000000000000000000000000000000..d0d3736cbf74dffbbe4af61a7b4c0fa08959a9f0 GIT binary patch literal 3644 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 literal 0 HcmV?d00001