Added shrooms.

This commit is contained in:
Lizbeth Rika committed 2015-02-23 18:10:21 +00:00
1 parent c27eeaa3ff
commit 233b461196
26 files changed
+201 -4

No files matched your search

@@ -30,6 +30,7 @@ import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.block.decor.BlockManaBeacon;
import vazkii.botania.common.block.decor.BlockManaFlame;
import vazkii.botania.common.block.decor.BlockManaGlass;
import vazkii.botania.common.block.decor.BlockModMushroom;
import vazkii.botania.common.block.decor.BlockPetalBlock;
import vazkii.botania.common.block.decor.BlockPrismarine;
import vazkii.botania.common.block.decor.BlockReeds;
@@ -202,6 +203,7 @@ public final class ModBlocks {
public static Block corporeaIndex;
public static Block corporeaFunnel;
public static Block endStoneBrick;
public static Block mushroom;
public static void init() {
flower = new BlockModFlower();
@@ -264,7 +266,8 @@ public final class ModBlocks {
corporeaIndex = new BlockCorporeaIndex();
corporeaFunnel = new BlockCorporeaFunnel();
endStoneBrick = new BlockEndStoneBrick();
mushroom = new BlockModMushroom();
ModFluffBlocks.init();
for(int i = 0; i < 16; i++)
@@ -0,0 +1,145 @@
/**
* This class was created by <Vazkii>. 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 @ [Feb 23, 2015, 4:24:08 PM (GMT)]
*/
package vazkii.botania.common.block.decor;
import java.util.List;
import java.util.Random;
import thaumcraft.api.crafting.IInfusionStabiliser;
import vazkii.botania.api.item.IGrassHornExcempt;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.integration.coloredlights.ColoredLightHelper;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockMushroom;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true)
public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IGrassHornExcempt, ILexiconable {
public static IIcon[] icons;
public int originalLight;
public BlockModMushroom() {
setBlockName(LibBlockNames.MUSHROOM);
setLightLevel(0.2F);
setHardness(0F);
setStepSound(soundTypeGrass);
setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F);
setTickRandomly(false);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
}
@Override
public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) {
// NO-OP, to prevent spreading
}
@Override
public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_) {
if(p_149718_3_ >= 0 && p_149718_3_ < 256) {
Block block = p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_);
return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockMetadata(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == 2 || block.canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this);
}
return false;
}
@Override
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for(int i = 0; i < 16; i++)
par3List.add(new ItemStack(par1, 1, i));
}
@Override
public Block setBlockName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setBlockName(par1Str);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
icons = new IIcon[17];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
}
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
return super.setLightLevel(p_149715_1_);
}
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(IBlockAccess world, int x, int y, int z) {
return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight);
}
@Override
public IIcon getIcon(int par1, int par2) {
return icons[par2];
}
@Override
public int damageDropped(int par1) {
return par1;
}
@Override
public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
int meta = par1World.getBlockMetadata(par2, par3, par4);
float[] color = EntitySheep.fleeceColorTable[meta];
if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F)
Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5);
}
@Override
public boolean canStabaliseInfusion(World world, int x, int y, int z) {
return true;
}
@Override
public boolean canUproot(World world, int x, int y, int z) {
return false;
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.mushrooms;
}
}
@@ -224,6 +224,7 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.floatingFlower);
addBlock(ModBlocks.floatingSpecialFlower);
addBlock(ModBlocks.petalBlock);
addBlock(ModBlocks.mushroom);
addBlock(ModBlocks.unstableBlock);
addBlock(ModBlocks.manaBeacon);
addItem(ModItems.signalFlare);
@@ -44,10 +44,20 @@ public class BiomeDecorationHandler {
int y1 = y + event.rand.nextInt(4) - event.rand.nextInt(4);
int z1 = z + event.rand.nextInt(8) - event.rand.nextInt(8);
if (flowers && event.world.isAirBlock(x1, y1, z1) && (!event.world.provider.hasNoSky || y1 < 127) && ModBlocks.flower.canBlockStay(event.world, x1, y1, z1))
if (event.world.isAirBlock(x1, y1, z1) && (!event.world.provider.hasNoSky || y1 < 127) && ModBlocks.flower.canBlockStay(event.world, x1, y1, z1))
event.world.setBlock(x1, y1, z1, ModBlocks.flower, color, 2);
}
}
for(int i = 0; i < ConfigHandler.mushroomQuantity; i++) {
int x = event.chunkX + event.rand.nextInt(16) + 8;
int z = event.chunkZ + event.rand.nextInt(16) + 8;
int y = event.rand.nextInt(26) + 4;
int color = event.rand.nextInt(16);
if(event.world.isAirBlock(x, y, z) && ModBlocks.mushroom.canBlockStay(event.world, x, y, z))
event.world.setBlock(x, y, z, ModBlocks.mushroom, color, 2);
}
}
}
}
@@ -58,6 +58,7 @@ public final class ConfigHandler {
public static int flowerQuantity = 2;
public static int flowerDensity = 16;
public static int mushroomQuantity = 40;
public static int potionIDSoulCross = 91;
public static int potionIDFeatherfeet = 92;
@@ -155,12 +156,15 @@ public final class ConfigHandler {
desc = "Set to false to disable the Mana Enchanter. Since some people find it OP or something. This only disables the entry and creation. Old ones that are already in the world will stay.";
enchanterEnabled = loadPropBool("manaEnchanter.enabled", desc, enchanterEnabled);
desc = "The quanity of flower patches to generate in the world, defaults to 2, the lower the number the less patches geenrate.";
desc = "The quanity of flower patches to generate in the world, defaults to 2, the lower the number the less patches generate.";
flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, flowerQuantity);
desc = "The density of each flower patch generataed, defaults to 16, the lower the number, the less each patch will have.";
flowerDensity = loadPropInt("worldgen.flower.density", desc, flowerDensity);
desc = "The quantity of mushrooms to generate underground, in the world, defaults to 10, the lower the number the less patches generate.";
mushroomQuantity = loadPropInt("worldgen.mushroom.quantity", desc, mushroomQuantity);
potionIDSoulCross = loadPropPotionId(LibPotionNames.SOUL_CROSS, potionIDSoulCross);
potionIDFeatherfeet = loadPropPotionId(LibPotionNames.FEATHER_FEET, potionIDFeatherfeet);
potionIDEmptiness = loadPropPotionId(LibPotionNames.EMPTINESS, potionIDEmptiness);
@@ -238,6 +238,7 @@ public final class ModCraftingRecipes {
public static IRecipe recipeLivingwoodBow;
public static IRecipe recipeCrystalBow;
public static List<IRecipe> recipesCosmeticItems;
public static List<IRecipe> recipesMushrooms;
public static void init() {
// Lexicon Recipe
@@ -1562,7 +1563,6 @@ public final class ModCraftingRecipes {
recipeCrystalBow = BotaniaAPI.getLatestAddedRecipe();
// Cosmetic Items Recipes
recipesCosmeticItems = new ArrayList();
for(int i = 0; i < 32; i++)
addOreDictRecipe(new ItemStack(ModItems.cosmetic, 1, i),
"PPP", "PSP", "PPP",
@@ -1570,6 +1570,12 @@ public final class ModCraftingRecipes {
'S', LibOreDict.MANA_STRING);
recipesCosmeticItems = BotaniaAPI.getLatestAddedRecipes(32);
for(int i = 0; i < 16; i++) {
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.mushroom, 1, i), new ItemStack(Blocks.red_mushroom), new ItemStack(ModItems.dye, 1, i));
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.mushroom, 1, i), new ItemStack(Blocks.brown_mushroom), new ItemStack(ModItems.dye, 1, i));
}
recipesMushrooms = BotaniaAPI.getLatestAddedRecipes(32);
// Storage Block Recipes
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
"III", "III", "III",
@@ -226,6 +226,7 @@ public final class LexiconData {
public static LexiconEntry azulejo;
public static LexiconEntry starfield;
public static LexiconEntry dirtPath;
public static LexiconEntry mushrooms;
public static LexiconEntry tcIntegration;
public static LexiconEntry bcIntegration;
@@ -826,6 +827,9 @@ public final class LexiconData {
dirtPath = new BLexiconEntry(LibLexicon.MISC_DIRT_PATH, categoryMisc);
dirtPath.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDirtPath), new PageCraftingRecipe("2", ModCraftingRecipes.recipeDirtPathSlab));
mushrooms = new BLexiconEntry(LibLexicon.MISC_MUSHROOMS, categoryMisc);
mushrooms.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesMushrooms));
if(Botania.bcTriggersLoaded) {
bcIntegration = new BLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc);
bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone));
@@ -75,6 +75,7 @@ public final class LibBlockNames {
public static final String CORPOREA_INDEX = "corporeaIndex";
public static final String CORPOREA_FUNNEL = "corporeaFunnel";
public static final String END_STONE_BRICK = "endStoneBrick";
public static final String MUSHROOM = "mushroom";
public static final String SUBTILE_PUREDAISY = "puredaisy";
public static final String SUBTILE_MANASTAR = "manastar";
@@ -200,6 +200,7 @@ public final class LibLexicon {
public static final String MISC_AZULEJO = "azulejo";
public static final String MISC_STARFIELD = "starfield";
public static final String MISC_DIRT_PATH = "dirtPath";
public static final String MISC_MUSHROOMS = "mushrooms";
public static final String MISC_TC_INTEGRATION = "tcIntegration";
public static final String MISC_BC_INTEGRATION = "bcIntegration";