diff --git a/MODSRC/vazkii/botania/common/block/BlockEnchanter.java b/MODSRC/vazkii/botania/common/block/BlockEnchanter.java new file mode 100644 index 000000000..9ac8334de --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockEnchanter.java @@ -0,0 +1,28 @@ +/** + * 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 15, 2014, 4:08:26 PM (GMT)] + */ +package vazkii.botania.common.block; + +import vazkii.botania.common.lib.LibBlockIDs; +import vazkii.botania.common.lib.LibBlockNames; +import net.minecraft.block.material.Material; + +public class BlockEnchanter extends BlockMod { + + public BlockEnchanter() { + super(LibBlockIDs.idEnchanter, Material.rock); + setHardness(3.0F); + setResistance(5.0F); + setStepSound(soundStoneFootstep); + setUnlocalizedName(LibBlockNames.ENCHANTER); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 7f9d7ce9d..7002b18f6 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -61,6 +61,7 @@ public final class ModBlocks { public static Block manaBeacon; public static Block manaVoid; public static Block manaDetector; + public static Block enchanter; public static void init() { flower = new BlockModFlower(); @@ -78,6 +79,7 @@ public final class ModBlocks { manaBeacon = new BlockManaBeacon(); manaVoid = new BlockManaVoid(); manaDetector = new BlockManaDetector(); + enchanter = new BlockEnchanter(); 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/TilePylon.java b/MODSRC/vazkii/botania/common/block/tile/TilePylon.java index 1c6f88bd4..3e97b083d 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TilePylon.java +++ b/MODSRC/vazkii/botania/common/block/tile/TilePylon.java @@ -19,12 +19,12 @@ import vazkii.botania.common.core.helper.Vector3; public class TilePylon extends TileEntity { - boolean activated = false; // TODO + boolean activated = true; // TODO @Override public void updateEntity() { if(activated && worldObj.isRemote) { - Vector3 centerBlock = new Vector3(-500.5, 4.75 + (Math.random() - 0.5 * 0.25), -411.5); + Vector3 centerBlock = new Vector3(272.5, 72.75 + (Math.random() - 0.5 * 0.25), -144.5); int id = worldObj.getBlockId(xCoord, yCoord - 1, zCoord); if(id == ModBlocks.flower.blockID) { diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index d2ed2f001..d074d4af7 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -56,6 +56,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.altar); addBlock(ModBlocks.runeAltar); addBlock(ModBlocks.pylon); + addBlock(ModBlocks.enchanter); addBlock(ModBlocks.pistonRelay); addBlock(ModBlocks.unstableBlock); addBlock(ModBlocks.manaBeacon); diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 69a67f1be..edc6b2abf 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -66,6 +66,7 @@ public final class ConfigHandler { LibBlockIDs.idManaBeacon = loadBlock(LibBlockNames.MANA_BEACON, LibBlockIDs.idManaBeacon); LibBlockIDs.idManaVoid = loadBlock(LibBlockNames.MANA_VOID, LibBlockIDs.idManaVoid); LibBlockIDs.idManaDetector = loadBlock(LibBlockNames.MANA_DETECTOR, LibBlockIDs.idManaDetector); + LibBlockIDs.idEnchanter = loadBlock(LibBlockNames.ENCHANTER, LibBlockIDs.idEnchanter); // 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 8199a3bae..499aee828 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java @@ -28,5 +28,6 @@ public final class LibBlockIDs { public static int idManaBeacon = 1967; public static int idManaVoid = 1968; public static int idManaDetector = 1969; + public static int idEnchanter = 1970; } diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 401f272a5..1b6219b8e 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -30,6 +30,7 @@ public final class LibBlockNames { public static final String MANA_BEACON = LibResources.PREFIX_MOD + "manaBeacon"; public static final String MANA_VOID = LibResources.PREFIX_MOD + "manaVoid"; public static final String MANA_DETECTOR = LibResources.PREFIX_MOD + "manaDetector"; + public static final String ENCHANTER = LibResources.PREFIX_MOD + "enchanter"; 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 b3e1f7bb8..a9315db6f 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -105,6 +105,7 @@ tile.botania:manaBeacon14.name=Red Unstable Beacon tile.botania:manaBeacon15.name=Black Unstable Beacon tile.botania:manaVoid.name=Mana Void tile.botania:manaDetector.name=Mana Detector +tile.botania:enchanter.name=Mana Enchanter # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/resources/assets/botania/textures/blocks/enchanter.png b/resources/assets/botania/textures/blocks/enchanter.png new file mode 100644 index 000000000..bd2fab014 Binary files /dev/null and b/resources/assets/botania/textures/blocks/enchanter.png differ diff --git a/resources/assets/botania/textures/blocks/enchanter.png.mcmeta b/resources/assets/botania/textures/blocks/enchanter.png.mcmeta new file mode 100644 index 000000000..5334ffbca --- /dev/null +++ b/resources/assets/botania/textures/blocks/enchanter.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": { } +} \ No newline at end of file