Added 1.8 stones.

This commit is contained in:
Lizbeth Rika committed 2015-04-10 21:29:23 +01:00
1 parent f375bd2cae
commit afe6c3000a
11 files changed
+280 -1

No files matched your search

@@ -11,11 +11,13 @@
package vazkii.botania.common.block;
import net.minecraft.block.Block;
import vazkii.botania.common.block.decor.Block18Stone;
import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA;
import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneB;
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz;
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab;
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs;
import vazkii.botania.common.block.decor.slabs.Block18StoneSlab;
import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab;
import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab;
import vazkii.botania.common.block.decor.slabs.BlockEndStoneSlab;
@@ -35,6 +37,7 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab;
import vazkii.botania.common.block.decor.slabs.prismarine.BlockDarkPrismarineSlab;
import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab;
import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab;
import vazkii.botania.common.block.decor.stairs.Block18StoneStairs;
import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs;
import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs;
import vazkii.botania.common.block.decor.stairs.BlockReedStairs;
@@ -136,11 +139,16 @@ public final class ModFluffBlocks {
public static Block biomeStoneA;
public static Block biomeStoneB;
public static Block stone;
public static Block[] biomeStoneStairs = new Block[24];
public static Block[] biomeStoneSlabs = new Block[24];
public static Block[] biomeStoneFullSlabs = new Block[24];
public static Block[] stoneStairs = new Block[8];
public static Block[] stoneSlabs = new Block[8];
public static Block[] stoneFullSlabs = new Block[8];
public static Block endStoneSlab;
public static Block endStoneSlabFull;
public static Block endStoneStairs;
@@ -197,7 +205,8 @@ public final class ModFluffBlocks {
biomeStoneA = new BlockBiomeStoneA();
biomeStoneB = new BlockBiomeStoneB();
stone = new Block18Stone();
if(ConfigHandler.darkQuartzEnabled) {
darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK);
darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false);
@@ -236,6 +245,13 @@ public final class ModFluffBlocks {
biomeStoneSlabs[i] = new BlockBiomeStoneSlab(false, block, meta, i);
biomeStoneFullSlabs[i] = new BlockBiomeStoneSlab(true, block, meta, i);
}
for(int i = 0; i < 8; i++) {
int meta = i > 3 ? i + 4 : i;
stoneStairs[i] = new Block18StoneStairs(meta);
stoneSlabs[i] = new Block18StoneSlab(false, meta, i);
stoneFullSlabs[i] = new Block18StoneSlab(true, meta, i);
}
endStoneSlab = new BlockEndStoneSlab(false);
endStoneSlabFull = new BlockEndStoneSlab(true);
@@ -300,6 +316,11 @@ public final class ModFluffBlocks {
((BlockModSlab) biomeStoneSlabs[i]).register();
((BlockModSlab) biomeStoneFullSlabs[i]).register();
}
for(int i = 0; i < 8; i++) {
((BlockModSlab) stoneSlabs[i]).register();
((BlockModSlab) stoneFullSlabs[i]).register();
}
}
}
@@ -0,0 +1,90 @@
/**
* 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 @ [Apr 10, 2015, 7:34:31 PM (GMT)]
*/
package vazkii.botania.common.block.decor;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.GameRegistry;
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.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
public class Block18Stone extends BlockMod implements ILexiconable {
private static IIcon[] icons = new IIcon[16];
public Block18Stone() {
super(Material.rock);
setHardness(1.5F);
setResistance(10F);
setStepSound(soundTypeStone);
setBlockName(LibBlockNames.STONE);
}
@Override
public void registerBlockIcons(IIconRegister register) {
for(int i = 0; i < 16; i++)
icons[i] = IconHelper.forBlock(register, this, i);
}
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
for(int i = 0; i < 16; i++)
list.add(new ItemStack(item, 1, i));
}
@Override
public IIcon getIcon(int side, int meta) {
return icons[meta];
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(int par1) {
return par1;
}
@Override
public Block setBlockName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setBlockName(par1Str);
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
int meta = world.getBlockMetadata(x, y, z);
return new ItemStack(this, 1, meta);
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.stoneAlchemy;
}
}
@@ -0,0 +1,48 @@
/**
* 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 @ [Apr 10, 2015, 7:52:06 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.lexicon.LexiconData;
public class Block18StoneSlab extends BlockLivingSlab {
int index;
public Block18StoneSlab(boolean full, int meta, int index) {
super(full, ModFluffBlocks.stone, meta);
this.index = index;
setHardness(1.5F);
setResistance(10F);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.stoneFullSlabs[index];
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.stoneSlabs[index];
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.stoneAlchemy;
}
}
@@ -0,0 +1,32 @@
/**
* 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 @ [Apr 10, 2015, 7:51:29 PM (GMT)]
*/
package vazkii.botania.common.block.decor.stairs;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.lexicon.LexiconData;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class Block18StoneStairs extends BlockLivingStairs {
public Block18StoneStairs(int meta) {
super(ModFluffBlocks.stone, meta);
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.stoneAlchemy;
}
}
@@ -314,6 +314,12 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModFluffBlocks.elfQuartzSlab);
addBlock(ModFluffBlocks.elfQuartzStairs);
addBlock(ModFluffBlocks.stone);
for(int i= 0; i < 8; i++)
addBlock(ModFluffBlocks.stoneStairs[i]);
for(int i= 0; i < 8; i++)
addBlock(ModFluffBlocks.stoneSlabs[i]);
addBlock(ModFluffBlocks.biomeStoneA);
addBlock(ModFluffBlocks.biomeStoneB);
for(int i = 0; i < 24; i++)
@@ -247,6 +247,9 @@ public final class ModCraftingRecipes {
public static List<IRecipe> recipesPetalsDouble;
public static IRecipe recipeKeepIvy;
public static IRecipe recipeBlackHoleTalisman;
public static List<IRecipe> recipe18StonePolish;
public static List<IRecipe> recipe18StoneBrick;
public static List<IRecipe> recipe18StoneChisel;
public static void init() {
// Lexicon Recipe
@@ -1640,6 +1643,27 @@ public final class ModCraftingRecipes {
'A', LibOreDict.ENDER_AIR_BOTTLE);
recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe();
// 1.8 Stone Recipes
recipe18StonePolish = new ArrayList();
recipe18StoneBrick = new ArrayList();
recipe18StoneChisel = new ArrayList();
for(int i = 0; i < 4; i++) {
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 8, i + 4),
"SSS", "S S", "SSS",
'S', new ItemStack(ModFluffBlocks.stone, 1, i));
recipe18StonePolish.add(BotaniaAPI.getLatestAddedRecipe());
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 8),
"SS", "SS",
'S', new ItemStack(ModFluffBlocks.stone, 1, i));
recipe18StoneBrick.add(BotaniaAPI.getLatestAddedRecipe());
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 1, i + 12),
"S", "S",
'S', new ItemStack(ModFluffBlocks.stoneSlabs[i + 4], 1, i));
recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe());
}
// Storage Block Recipes
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
"III", "III", "III",
@@ -1699,6 +1723,12 @@ public final class ModCraftingRecipes {
addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]);
}
// 1.8 Block Stone Stairs & Slabs
for(int i = 0; i < 4; i++) {
addStairsAndSlabs(ModFluffBlocks.stone, i, ModFluffBlocks.stoneStairs[i], ModFluffBlocks.stoneSlabs[i]);
addStairsAndSlabs(ModFluffBlocks.stone, i + 8, ModFluffBlocks.stoneStairs[i + 4], ModFluffBlocks.stoneSlabs[i + 4]);
}
// Misc Recipes
GameRegistry.addShapelessRecipe(new ItemStack(Items.reeds, 9, 0), new ItemStack(ModBlocks.reedBlock));
GameRegistry.addShapelessRecipe(new ItemStack(Items.wheat, 4, 0), new ItemStack(ModBlocks.thatch));
@@ -48,6 +48,7 @@ public final class ModManaAlchemyRecipes {
public static List<RecipeManaInfusion> clayBreakdownRecipes;
public static RecipeManaInfusion coarseDirtRecipe;
public static RecipeManaInfusion prismarineRecipe;
public static List<RecipeManaInfusion> stoneRecipes;
public static void init() {
leatherRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.leather), new ItemStack(Items.rotten_flesh), 600);
@@ -127,5 +128,10 @@ public final class ModManaAlchemyRecipes {
coarseDirtRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.dirt), 120);
prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.quartz), 200);
stoneRecipes = new ArrayList();
stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone), "stone", 200));
for(int i = 0; i < 4; i++)
stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone, 1, i), new ItemStack(ModFluffBlocks.stone, 1, i == 0 ? 3 : i - 1), 200));
}
}
@@ -237,6 +237,7 @@ public final class LexiconData {
public static LexiconEntry dirtPath;
public static LexiconEntry mushrooms;
public static LexiconEntry phantomInk;
public static LexiconEntry stoneAlchemy;
public static LexiconEntry tcIntegration;
public static LexiconEntry bcIntegration;
@@ -867,6 +868,9 @@ public final class LexiconData {
phantomInk = new BLexiconEntry(LibLexicon.MISC_PHANTOM_INK, categoryMisc);
phantomInk.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePhantomInk));
stoneAlchemy = new BLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc);
stoneAlchemy.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes), new PageCraftingRecipe("2", ModCraftingRecipes.recipe18StonePolish), new PageCraftingRecipe("3", ModCraftingRecipes.recipe18StoneBrick), new PageCraftingRecipe("4", ModCraftingRecipes.recipe18StoneChisel));
if(Botania.bcTriggersLoaded) {
bcIntegration = new BLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc);
bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone));
@@ -78,6 +78,7 @@ public final class LibBlockNames {
public static final String MUSHROOM = "mushroom";
public static final String PUMP = "pump";
public static final String DOUBLE_FLOWER = "doubleFlower";
public static final String STONE = "stone";
public static final String SUBTILE_PUREDAISY = "puredaisy";
public static final String SUBTILE_MANASTAR = "manastar";
@@ -209,6 +209,7 @@ public final class LibLexicon {
public static final String MISC_DIRT_PATH = "dirtPath";
public static final String MISC_MUSHROOMS = "mushrooms";
public static final String MISC_PHANTOM_INK = "phantomInk";
public static final String MISC_STONE_ALCHEMY = "stoneAlchemy";
public static final String MISC_TC_INTEGRATION = "tcIntegration";
public static final String MISC_BC_INTEGRATION = "bcIntegration";