From eef347106421fe02467755f88cd772634cb4aae6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 5 Mar 2014 17:41:51 +0000 Subject: [PATCH] Added the Mana Void. --- .../botania/common/block/BlockManaVoid.java | 46 ++++++++++++++++++ .../botania/common/block/ModBlocks.java | 4 ++ .../common/block/tile/TileManaVoid.java | 38 +++++++++++++++ .../common/core/BotaniaCreativeTab.java | 1 + .../common/core/handler/ConfigHandler.java | 1 + .../common/crafting/ModCrafingRecipes.java | 8 +++ .../botania/common/lexicon/LexiconData.java | 4 ++ .../botania/common/lib/LibBlockIDs.java | 1 + .../botania/common/lib/LibBlockNames.java | 1 + .../vazkii/botania/common/lib/LibLexicon.java | 3 +- resources/assets/botania/lang/en_US.lang | 6 +++ .../botania/textures/blocks/manaVoid.png | Bin 0 -> 3637 bytes 12 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 MODSRC/vazkii/botania/common/block/BlockManaVoid.java create mode 100644 MODSRC/vazkii/botania/common/block/tile/TileManaVoid.java create mode 100644 resources/assets/botania/textures/blocks/manaVoid.png diff --git a/MODSRC/vazkii/botania/common/block/BlockManaVoid.java b/MODSRC/vazkii/botania/common/block/BlockManaVoid.java new file mode 100644 index 000000000..cb59519cd --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockManaVoid.java @@ -0,0 +1,46 @@ +/** + * 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 5, 2014, 12:55:47 AM (GMT)] + */ +package vazkii.botania.common.block; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import vazkii.botania.api.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.tile.TileManaVoid; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockIDs; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockManaVoid extends BlockModContainer implements ILexiconable { + + protected BlockManaVoid() { + super(LibBlockIDs.idManaVoid, Material.rock); + setHardness(2.0F); + setResistance(10.0F); + setStepSound(soundStoneFootstep); + setUnlocalizedName(LibBlockNames.MANA_VOID); + } + + @Override + public TileEntity createNewTileEntity(World world) { + return new TileManaVoid(); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.manaVoid; + } + +} diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 0c9b98a09..048d9ac1b 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -26,6 +26,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileDistributor; import vazkii.botania.common.block.tile.TileManaBeacon; +import vazkii.botania.common.block.tile.TileManaVoid; import vazkii.botania.common.block.tile.TilePool; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; @@ -51,6 +52,7 @@ public final class ModBlocks { public static Block pistonRelay; public static Block distributor; public static Block manaBeacon; + public static Block manaVoid; public static void init() { flower = new BlockModFlower(); @@ -66,6 +68,7 @@ public final class ModBlocks { pistonRelay = new BlockPistonRelay(); distributor = new BlockDistributor(); manaBeacon = new BlockManaBeacon(); + manaVoid = new BlockManaVoid(); for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower.blockID, 1, i)); @@ -86,6 +89,7 @@ public final class ModBlocks { GameRegistry.registerTileEntity(TilePylon.class, LibBlockNames.PYLON); GameRegistry.registerTileEntity(TileDistributor.class, LibBlockNames.DISTRIBUTOR); GameRegistry.registerTileEntity(TileManaBeacon.class, LibBlockNames.MANA_BEACON); + GameRegistry.registerTileEntity(TileManaVoid.class, LibBlockNames.MANA_VOID); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileManaVoid.java b/MODSRC/vazkii/botania/common/block/tile/TileManaVoid.java new file mode 100644 index 000000000..4ce49bdb6 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TileManaVoid.java @@ -0,0 +1,38 @@ +/** + * 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 5, 2014, 12:59:27 AM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import vazkii.botania.api.mana.IManaReceiver; + +public class TileManaVoid extends TileMod implements IManaReceiver { + + @Override + public int getCurrentMana() { + return 0; + } + + @Override + public boolean isFull() { + return false; + } + + @Override + public void recieveMana(int mana) { + // All your mana is belong to the void + } + + @Override + public boolean canRecieveManaFromBursts() { + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index ce18d367a..d14803099 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -63,6 +63,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.pool); addBlock(ModBlocks.distributor); + addBlock(ModBlocks.manaVoid); addBlock(ModBlocks.spreader); addItem(ModItems.lens); } diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 9fe4053d6..ab3d042d0 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -54,6 +54,7 @@ public final class ConfigHandler { LibBlockIDs.idPistonRelay = loadBlock(LibBlockNames.PISTON_RELAY, LibBlockIDs.idPistonRelay); LibBlockIDs.idDistributor = loadBlock(LibBlockNames.DISTRIBUTOR, LibBlockIDs.idDistributor); LibBlockIDs.idManaBeacon = loadBlock(LibBlockNames.MANA_BEACON, LibBlockIDs.idManaBeacon); + LibBlockIDs.idManaVoid = loadBlock(LibBlockNames.MANA_VOID, LibBlockIDs.idManaVoid); // Item IDs LibItemIDs.idLexicon = loadItem(LibItemNames.LEXICON, LibItemIDs.idLexicon); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 76578fc08..4737078ea 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -63,6 +63,7 @@ public final class ModCrafingRecipes { public static IRecipe livingwoodDecorRecipe4; public static List recipesManaBeacons; public static List recipesSignalFlares; + public static IRecipe recipeManaVoid; public static void init() { // Lexicon Recipe @@ -247,6 +248,13 @@ public final class ModCrafingRecipes { 'I', "ingotIron", 'W', LibOreDict.LIVING_WOOD); recipesSignalFlares = BotaniaAPI.getLatestAddedRecipes(16); + + // MANA VOID RECIPE + addOreDictRecipe(new ItemStack(ModBlocks.manaVoid), + "SSS", "O O", "SSS", + 'S', LibOreDict.LIVING_ROCK, + 'O', new ItemStack(Block.obsidian)); + recipeManaVoid = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 5f9fec42a..69fb8ef95 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -48,6 +48,7 @@ public final class LexiconData { public static LexiconEntry spreader; public static LexiconEntry pool; public static LexiconEntry distributor; + public static LexiconEntry manaVoid; public static LexiconEntry lensVelocity; public static LexiconEntry lensPotency; public static LexiconEntry lensResistance; @@ -141,6 +142,9 @@ public final class LexiconData { lensDamaging = new BLexiconEntry(LibLexicon.MANA_LENS_DAMAGING, categoryMana); lensDamaging.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensDamaging)); + manaVoid = new BLexiconEntry(LibLexicon.MANA_VOID, categoryMana); + manaVoid.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeManaVoid)); + // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java b/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java index 7d4275696..922673513 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockIDs.java @@ -26,5 +26,6 @@ public final class LibBlockIDs { public static int idPistonRelay = 1965; public static int idDistributor = 1966; public static int idManaBeacon = 1967; + public static int idManaVoid = 1968; } diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 4c21ea659..98a0dc6ef 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -28,6 +28,7 @@ public final class LibBlockNames { public static final String PISTON_RELAY = LibResources.PREFIX_MOD + "pistonRelay"; public static final String DISTRIBUTOR = LibResources.PREFIX_MOD + "distributor"; public static final String MANA_BEACON = LibResources.PREFIX_MOD + "manaBeacon"; + public static final String MANA_VOID = LibResources.PREFIX_MOD + "manaVoid"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 0b82f957a..1a9dfe964 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -42,7 +42,8 @@ public final class LibLexicon { public static final String MANA_LENS_GRAVITY = "lensGravity"; public static final String MANA_LENS_BORE = "lensBore"; public static final String MANA_LENS_DAMAGING = "lensDamaging"; - + public static final String MANA_VOID = "manaVoid"; + public static final String FFLOWER_INTRO = "fIntro"; public static final String FFLOWER_JADED_AMARANTHUS = "jadedAmaranthus"; public static final String FFLOWER_BELLETHORNE = "bellethorne"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index ba255778d..b5acabd0d 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -97,6 +97,7 @@ tile.botania:manaBeacon12.name=Brown Unstable Beacon tile.botania:manaBeacon13.name=Green Unstable Beacon tile.botania:manaBeacon14.name=Red Unstable Beacon tile.botania:manaBeacon15.name=Black Unstable Beacon +tile.botania:manaVoid.name=Mana Void # FLOWER NAMES tile.botania:flower..name=Botania Flower @@ -301,6 +302,11 @@ botania.entry.distributor=Mana Distributor botania.page.distributor0=Any botanist will eventually reach a point where a single &1Mana Pool&0 setup is not enough.
The &1Mana Distributor&0 will fix all those issues. By placing it adjacently to a few &1Mana Pools&0 on it's sides, when it receives &4Mana&0 through &4Mana Bursts&0 it'll equally spread it to the adjacent pools. botania.page.distributor1=Crafting the distributor +# -- MANA VOID +botania.entry.manaVoid=Mana Void +botania.page.manaVoid0=The &1Mana Void&0 is, in layman's terms, the grave for &4Mana&0. Any &4Mana&0 shot into this block will simply vanish into the void, never to be seen again. +botania.page.manaVoid1=Crafting the void block + # -- MANA LENS: VELOCITY botania.entry.lensVelocity=Mana Lens: Velocity botania.page.lensVelocity0=The &1Velocity Lens&0 will drastically increase the speed at which a &4Mana Burst&0 travels, but not only does the beam start to lose it's &4Mana&0 a lot faster, it can also carry a bit less. diff --git a/resources/assets/botania/textures/blocks/manaVoid.png b/resources/assets/botania/textures/blocks/manaVoid.png new file mode 100644 index 0000000000000000000000000000000000000000..79582336477742cd9469653506e9f9f8e14a0eb9 GIT binary patch literal 3637 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