diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 1f7a5c3da..14ed7fadc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -32,7 +32,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -57,7 +57,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index e0b6e8621..da9710595 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -25,7 +25,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -55,7 +55,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index a9571b675..70a75d007 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -26,7 +26,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -64,7 +64,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index e797d0c8f..89efdab64 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -13,11 +13,14 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.world.IBlockAccess; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockElven; -import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.item.block.ItemCubeMod; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -35,7 +38,7 @@ public class BlockMod extends Block { @Override public Block setBlockName(String par1Str) { if(shouldRegisterInNameSet()) - GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemBlockMod.class, par1Str); + GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemCubeMod.class, par1Str); return super.setBlockName(par1Str); } @@ -59,5 +62,9 @@ public class BlockMod extends Block { return true; } + @Override + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { + return !ConfigHandler.noMobSpawnOnBlocks; + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index d1ff8357e..d8085a654 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -14,10 +14,13 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EnumCreatureType; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockMod; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -63,4 +66,8 @@ public abstract class BlockModContainer extends BlockConta @Override public abstract T createNewTileEntity(World world, int meta); + @Override + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { + return !ConfigHandler.noMobSpawnOnBlocks; + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index be6647ce8..0a3fdc462 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -42,7 +42,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -76,7 +76,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 75346747f..26ee783db 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -29,7 +29,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.TilePlatform; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -59,7 +59,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index 6614a15d1..e75dcbf9c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -26,7 +26,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -72,7 +72,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 063738508..a3686cd47 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -26,7 +26,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -56,7 +56,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 22b476c67..971b9cb26 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -26,7 +26,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -73,7 +73,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index d13de732d..e7a66c0db 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -23,7 +23,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -54,7 +54,7 @@ public class BlockPavement extends BlockMod { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 1ee7e2982..96f42c709 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -25,7 +25,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -52,7 +52,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 870ac12e3..79ec88dd3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -30,7 +30,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -64,7 +64,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index 0cfdf2cae..4bc2d8c72 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -22,7 +22,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.item.block.ItemCubeMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -44,7 +44,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeMod.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index bec935526..1bb73482a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -26,7 +26,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import cpw.mods.fml.common.registry.GameRegistry; @@ -75,7 +75,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index d6f502f61..8376b284a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -5,14 +5,17 @@ import java.util.Random; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import cpw.mods.fml.common.registry.GameRegistry; @@ -76,5 +79,8 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } - + @Override + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { + return !ConfigHandler.noMobSpawnOnBlocks; + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 82ad317d5..0ab767923 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.item.block.ItemCubeMod; import vazkii.botania.common.lexicon.LexiconData; import cpw.mods.fml.common.registry.GameRegistry; @@ -23,7 +23,7 @@ public class BlockModStairs extends BlockStairs implements ILexiconable { @Override public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); + GameRegistry.registerBlock(this, ItemCubeMod.class, par1Str); return super.setBlockName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index b0a3863b7..c967f464b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -23,7 +23,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.item.block.ItemBlockMod; +import vazkii.botania.common.item.block.ItemCubeMod; import vazkii.botania.common.lexicon.LexiconData; import cpw.mods.fml.common.registry.GameRegistry; @@ -51,7 +51,7 @@ public class BlockModWall extends BlockWall implements ILexiconable { } public void register(String name) { - GameRegistry.registerBlock(this, ItemBlockMod.class, name); + GameRegistry.registerBlock(this, ItemCubeMod.class, name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java index 4c457bb44..9542aa0ba 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java @@ -17,7 +17,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.item.block.ItemCubeWithMetadataAndName; import cpw.mods.fml.common.registry.GameRegistry; public class BlockVariantWall extends BlockModWall { @@ -37,7 +37,7 @@ public class BlockVariantWall extends BlockModWall { @Override public void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); } @Override diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 03bdf005e..f0c829619 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -24,7 +24,6 @@ import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibPotionNames; import cpw.mods.fml.client.event.ConfigChangedEvent; @@ -41,6 +40,7 @@ public final class ConfigHandler { public static int hardcorePassiveGeneration = 72000; + public static boolean noMobSpawnOnBlocks = true; public static boolean useAdaptativeConfig = true; public static boolean enableDefaultRecipes = true; @@ -132,6 +132,9 @@ public final class ConfigHandler { useAdaptativeConfig = loadPropBool("adaptativeConfig.enabled", desc, useAdaptativeConfig); adaptor = new ConfigAdaptor(useAdaptativeConfig); + desc = "Mobs cannot Spawn on Blocks"; + noMobSpawnOnBlocks = loadPropBool("noMobSpawnOnBlocks", desc, noMobSpawnOnBlocks); + desc = "Set this to false to disable the use of shaders for some of the mod's renders."; useShaders = loadPropBool("shaders.enabled", desc, useShaders); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java index eec1ada5e..7b8d567c3 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockDreamwood.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; -public class ItemBlockDreamwood extends ItemBlockWithMetadataAndName implements IElvenItem { +public class ItemBlockDreamwood extends ItemCubeWithMetadataAndName implements IElvenItem { public ItemBlockDreamwood(Block block) { super(block); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java index 8fad997dd..b44572c61 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java @@ -11,8 +11,13 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import vazkii.botania.api.recipe.IElvenItem; +import vazkii.botania.common.core.handler.ConfigHandler; + +import java.util.List; public class ItemBlockElven extends ItemBlockMod implements IElvenItem { @@ -25,4 +30,9 @@ public class ItemBlockElven extends ItemBlockMod implements IElvenItem { return ((IElvenItem) field_150939_a).isElvenItem(stack); } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + if (ConfigHandler.noMobSpawnOnBlocks) + list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java index 0883b4a59..f4442d7d8 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -11,9 +11,14 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import vazkii.botania.common.core.handler.ConfigHandler; + +import java.util.List; public class ItemBlockModSlab extends ItemSlab { @@ -25,5 +30,9 @@ public class ItemBlockModSlab extends ItemSlab { public String getUnlocalizedName(ItemStack par1ItemStack) { return field_150939_a.getUnlocalizedName().replaceAll("tile.", "tile.botania:"); } - + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + if (ConfigHandler.noMobSpawnOnBlocks) + list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java index 7f104d0cf..710804e46 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -11,9 +11,14 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemMultiTexture; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; +import vazkii.botania.common.core.handler.ConfigHandler; + +import java.util.List; public class ItemBlockSpecialQuartz extends ItemMultiTexture { @@ -25,4 +30,10 @@ public class ItemBlockSpecialQuartz extends ItemMultiTexture { public String getUnlocalizedName(ItemStack par1ItemStack) { return par1ItemStack.getItemDamage() >= 3 ? "" : ((BlockSpecialQuartz) field_150939_a).getNames()[par1ItemStack.getItemDamage()]; } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + if (ConfigHandler.noMobSpawnOnBlocks) + list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java index 1b196bd36..916f62b6b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; -public class ItemBlockStorage extends ItemBlockWithMetadataAndName implements IElvenItem { +public class ItemBlockStorage extends ItemCubeWithMetadataAndName implements IElvenItem { public ItemBlockStorage(Block block) { super(block); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java b/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java new file mode 100644 index 000000000..f7d237ad5 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java @@ -0,0 +1,22 @@ +package vazkii.botania.common.item.block; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.core.handler.ConfigHandler; + +import java.util.List; + +public class ItemCubeMod extends ItemBlockMod{ + public ItemCubeMod(Block block) { + super(block); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + if (ConfigHandler.noMobSpawnOnBlocks) + list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java new file mode 100644 index 000000000..a75a7c560 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java @@ -0,0 +1,22 @@ +package vazkii.botania.common.item.block; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.core.handler.ConfigHandler; + +import java.util.List; + +public class ItemCubeWithMetadataAndName extends ItemBlockWithMetadataAndName { + + public ItemCubeWithMetadataAndName(Block par2Block) { + super(par2Block); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + if (ConfigHandler.noMobSpawnOnBlocks) + list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + } +} diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 9c21bc452..9aecb208b 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -6,6 +6,8 @@ generator.botania-skyblock.info=Not recommended for botania newcomers # Something that is not localized, translators, do NOT change this line. botaniamisc.noloc=botaniamisc.noloc +nomobspawnsonthisblock.tip=Mobs cannot Spawn on this Block + botaniamisc.nextPage=Next Page botaniamisc.prevPage=Previous Page botaniamisc.back=Back diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 423e07fa2..0111a7224 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -6,6 +6,8 @@ generator.botania-skyblock.info=Не рекомендуется для нови # Something that is not localized, translators, do NOT change this line. botaniamisc.noloc=botaniamisc.noloc +botaniamisc.nextPage=Монстры не могут появляться на этом блоке + botaniamisc.nextPage=След. страница botaniamisc.prevPage=Пред. страница botaniamisc.back=Назад