diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 49f6f7efb..06a8a4279 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -11,26 +11,34 @@ */ package vazkii.botania.common.block.mana; +import java.util.Random; + +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; +import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.mana.TilePrism; -import vazkii.botania.common.block.tile.mana.TileSpreader; -import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockPrism extends BlockModContainer implements IManaTrigger { +public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexiconable { + Random random; IIcon[] icons; public BlockPrism() { @@ -41,6 +49,8 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger { setBlockName(LibBlockNames.PRISM); float f = 0.25F; setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); + + random = new Random(); } @Override @@ -103,6 +113,48 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger { return true; } + @Override + public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { + TileEntity tile = par1World.getTileEntity(par2, par3, par4); + if(!(tile instanceof TileSimpleInventory)) + return; + + TileSimpleInventory inv = (TileSimpleInventory) tile; + + if (inv != null) { + for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { + ItemStack itemstack = inv.getStackInSlot(j1); + + if (itemstack != null) { + float f = random.nextFloat() * 0.8F + 0.1F; + float f1 = random.nextFloat() * 0.8F + 0.1F; + EntityItem entityitem; + + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + int k1 = random.nextInt(21) + 10; + + if (k1 > itemstack.stackSize) + k1 = itemstack.stackSize; + + itemstack.stackSize -= k1; + entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + float f3 = 0.05F; + entityitem.motionX = (float)random.nextGaussian() * f3; + entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)random.nextGaussian() * f3; + + if (itemstack.hasTagCompound()) + entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); + } + } + } + + par1World.func_147453_f(par2, par3, par4, par5); + } + + super.breakBlock(par1World, par2, par3, par4, par5, par6); + } + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TilePrism(); @@ -115,4 +167,9 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger { ((TilePrism) tile).onBurstCollision(burst); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.prism; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index f0e7a1943..7ae495e87 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -214,6 +214,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeUnholyCloak; public static IRecipe recipeCraftingHalo; public static List recipesLensFlash; + public static IRecipe recipePrism; public static void init() { // Lexicon Recipe @@ -1390,6 +1391,14 @@ public final class ModCraftingRecipes { 'L', new ItemStack(ModItems.lens)); recipesLensFlash = BotaniaAPI.getLatestAddedRecipes(2); + // Mana Prism Recipe + addOreDictRecipe(new ItemStack(ModBlocks.prism), + "GPG", "GSG", "GPG", + 'G', new ItemStack(Blocks.glass), + 'P', LibOreDict.PRISMARINE_SHARD, + 'S', new ItemStack(ModBlocks.platform, 1, 1)); + recipePrism = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 4dcd2c934..c29c67350 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -69,6 +69,7 @@ public final class LexiconData { public static LexiconEntry sparks; public static LexiconEntry sparkUpgrades; public static LexiconEntry rfGenerator; + public static LexiconEntry prism; public static LexiconEntry functionalIntro; public static LexiconEntry jadedAmaranthus; @@ -309,6 +310,9 @@ public final class LexiconData { paintLens = new ALexiconEntry(LibLexicon.MANA_PAINT_LENS, categoryMana); paintLens.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLensPaint)); + prism = new ALexiconEntry(LibLexicon.MANA_PRISM, categoryMana); + prism.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipePrism)); + // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index c7e3d9bca..733396e46 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -50,7 +50,8 @@ public final class LibLexicon { public static final String MANA_PAINT_LENS = "paintLens"; public static final String MANA_SPARKS = "sparks"; public static final String MANA_SPARK_UPGRADES = "sparkUpgrades"; - + public static final String MANA_PRISM = "prism"; + 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/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 97c1dbd3e..c3a4da1e9 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1074,6 +1074,12 @@ botania.entry.paintLens=Paintslinger Lens botania.page.paintLens0=The &4Elves&0 are one crafty bunch. This lens is somewhat unique in comparison to the other lenses. The &1Paintslinger Lens&0 needs to be dyed one of the 16 colors of the spectrum to function. When it hits a colorable block (&1Wool, Stained Clay or Glass&0...) it'll turn any blocks connected, of the same type and color, into the color of the &4Mana Burst&0 itself. It seems to work with &4Sheep&0 too. botania.page.paintLens1=A M'AIDER Stranded Girl +# -- MANA PRISM +botania.entry.prism=Mana Prism +botania.page.prism0=The concept of &1Mana Lens&0 allows for the manipulation of the power convyed through &4Mana Bursts&0, the &1Mana Prism&0 works on that technology to allow a burst to have its lens effect switched on the fly.
Using a &1Spectral Platform&0 as a component, this block does not have a physical presence, entities and bursts can go through it as if it doesn't exist. +botania.page.prism1=Right clicking it with any variety of &1Mana Lens&0 sets the lens in the prism. Whenever a &4Mana Burst&0 goes through the prism, its color and effect will be set to that of the lens in the prism. Case the lens is not dyed, the burst will turn white.
Using any of the four basic lenses also increases the time the burst can go before losing &4Mana&0, allowing it to go further. +botania.page.prism2=Another pixel in the wall + # - FUNCTIONAL FLOWERS # -- AN INTRODUCTION TO FUNCTION botania.entry.fIntro=An Introduction to Function