Added Elven Quartz.

This commit is contained in:
Vasco Lavos committed 2014-06-21 23:44:49 +01:00
1 parent 29d1b6b76b
commit 9db7422dac
18 files changed
+51 -11

No files matched your search

@@ -164,7 +164,11 @@ public final class ModBlocks {
public static Block redQuartzSlab;
public static Block redQuartzSlabFull;
public static Block redQuartzStairs;
public static Block elfQuartz;
public static Block elfQuartzSlab;
public static Block elfQuartzSlabFull;
public static Block elfQuartzStairs;
public static void init() {
flower = new BlockModFlower();
altar = new BlockAltar();
@@ -238,7 +242,11 @@ public final class ModBlocks {
redQuartzSlab = new BlockSpecialQuartzSlab(redQuartz, false);
redQuartzSlabFull = new BlockSpecialQuartzSlab(redQuartz, true);
redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz);
elfQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_ELF);
elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false);
elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true);
elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz);
if(ConfigHandler.darkQuartzEnabled) {
((BlockModSlab) darkQuartzSlab).register();
((BlockModSlab) darkQuartzSlabFull).register();
@@ -251,7 +259,9 @@ public final class ModBlocks {
((BlockModSlab) lavenderQuartzSlabFull).register();
((BlockModSlab) redQuartzSlab).register();
((BlockModSlab) redQuartzSlabFull).register();
((BlockModSlab) elfQuartzSlab).register();
((BlockModSlab) elfQuartzSlabFull).register();
((BlockModSlab) livingwoodSlab).register();
((BlockModSlab) livingwoodSlabFull).register();
((BlockModSlab) livingwoodPlankSlab).register();
@@ -26,6 +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.block.ModBlocks;
import vazkii.botania.common.item.block.ItemBlockSpecialQuartz;
import vazkii.botania.common.lexicon.LexiconData;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -149,6 +150,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable {
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
return this == ModBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks;
}
}
@@ -53,8 +53,9 @@ public class BlockSpecialQuartzSlab extends BlockModSlab {
return (BlockSlab) ModBlocks.lavenderQuartzSlabFull;
if(source == ModBlocks.redQuartz)
return (BlockSlab) ModBlocks.redQuartzSlabFull;
System.out.println("none");
if(source == ModBlocks.elfQuartz)
return (BlockSlab) ModBlocks.elfQuartzSlabFull;
return this;
}
@@ -70,8 +71,9 @@ public class BlockSpecialQuartzSlab extends BlockModSlab {
return (BlockSlab) ModBlocks.lavenderQuartzSlab;
if(source == ModBlocks.redQuartz)
return (BlockSlab) ModBlocks.redQuartzSlab;
if(source == ModBlocks.elfQuartz)
return (BlockSlab) ModBlocks.elfQuartzSlab;
System.out.println("none");
return this;
}
@@ -104,7 +106,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab {
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
return this == ModBlocks.elfQuartzSlab ? LexiconData.elvenResources : LexiconData.decorativeBlocks;
}
}
@@ -12,12 +12,23 @@
package vazkii.botania.common.block.decor.quartz;
import net.minecraft.block.Block;
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.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockModStairs;
import vazkii.botania.common.lexicon.LexiconData;
public class BlockSpecialQuartzStairs extends BlockModStairs {
public BlockSpecialQuartzStairs(Block source) {
super(source, 0, "quartzStairs" + ((BlockSpecialQuartz) source).type);
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return this == ModBlocks.elfQuartzStairs ? LexiconData.elvenResources : super.getEntry(world, x, y, z, player, lexicon);
}
}
@@ -119,7 +119,10 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.redQuartz);
addBlock(ModBlocks.redQuartzSlab);
addBlock(ModBlocks.redQuartzStairs);
addBlock(ModBlocks.elfQuartz);
addBlock(ModBlocks.elfQuartzSlab);
addBlock(ModBlocks.elfQuartzStairs);
addItem(ModItems.manasteelPick);
addItem(ModItems.manasteelShovel);
addItem(ModItems.manasteelAxe);
@@ -1,5 +1,6 @@
package vazkii.botania.common.crafting;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipeElvenTrade;
@@ -13,12 +14,14 @@ public class ModElvenTradeRecipes {
public static RecipeElvenTrade elementiumRecipe;
public static RecipeElvenTrade pixieDustRecipe;
public static RecipeElvenTrade dragonstoneRecipe;
public static RecipeElvenTrade elvenQuartzRecipe;
public static void init() {
dreamwoodRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.dreamwood), LibOreDict.LIVING_WOOD);
elementiumRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 7), LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL);
pixieDustRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 8), LibOreDict.MANA_PEARL);
dragonstoneRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 9), LibOreDict.MANA_DIAMOND);
elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.quartz, 1, 5), new ItemStack(Items.quartz));
}
}
@@ -24,7 +24,7 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemQuartz extends ItemMod {
private static final int SUBTYPES = 5;
private static final int SUBTYPES = 6;
IIcon[] icons;
public ItemQuartz() {
@@ -512,7 +512,7 @@ public final class LexiconData {
elvenMessage.setPriority().setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"));
elvenResources = new ALexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy);
elvenResources.setPriority().setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), new PageText("2"), new PageElvenRecipe("3", ModElvenTradeRecipes.elementiumRecipe), new PageElvenRecipe("4", ModElvenTradeRecipes.pixieDustRecipe), new PageElvenRecipe("5", ModElvenTradeRecipes.dragonstoneRecipe));
elvenResources.setPriority().setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), new PageText("2"), new PageElvenRecipe("3", ModElvenTradeRecipes.elementiumRecipe), new PageElvenRecipe("4", ModElvenTradeRecipes.pixieDustRecipe), new PageElvenRecipe("5", ModElvenTradeRecipes.dragonstoneRecipe), new PageText("6"), new PageElvenRecipe("7", ModElvenTradeRecipes.elvenQuartzRecipe));
// MISCLENAEOUS ENTRIES
unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc);
@@ -83,4 +83,6 @@ public final class LibBlockNames {
public static final String QUARTZ_BLAZE = "Blaze";
public static final String QUARTZ_LAVENDER = "Lavender";
public static final String QUARTZ_RED = "Red";
public static final String QUARTZ_ELF = "Elf";
}
+8
View File
@@ -251,6 +251,11 @@ tile.botania:chiseledRedQuartz.name=Chiseled Redquartz Block
tile.botania:pillarRedQuartz.name=Pillar Redquartz Block
tile.botania:quartzSlabRedHalf.name=Redquartz Slab
tile.botania:quartzStairsRed.name=Redquartz Stairs
tile.botania:blockElfQuartz.name=Block of Elven Quartz
tile.botania:chiseledElfQuartz.name=Chiseled Elven Quartz Block
tile.botania:pillarElfQuartz.name=Pillar Elven Quartz Block
tile.botania:quartzSlabElfHalf.name=Elven Quartz Slab
tile.botania:quartzStairsElf.name=Elven Quartz Stairs
tile.botania:dreamwood0.name=Dreamwood
tile.botania:dreamwood1.name=Dreamwood Planks
tile.botania:dreamwood2.name=Mossy Dreamwood Planks
@@ -487,6 +492,7 @@ item.botania:quartz1.name=Mana Quartz
item.botania:quartz2.name=Blaze Quartz
item.botania:quartz3.name=Lavender Quartz
item.botania:quartz4.name=Redquartz
item.botania:quartz5.name=Elven Quartz
item.botania:elementium.name=Elementium Ingot
item.botania:pixieDust.name=Pixie Dust
item.botania:dragonstone.name=Dragonstone
@@ -1208,6 +1214,8 @@ botania.page.elfResources2=&1Dreamwood&0, similarly to &1Livingwood&0 can be tur
botania.page.elfResources3=Trading for &1Elementium&0
botania.page.elfResources4=Trading for &1Pixie Dust&0
botania.page.elfResources5=Trading for &1Dragonstone&0
botania.page.elfResources6=The &1Elves&0 are also quite keen on the white posh block from the &4Nether&0, &1Nether Quartz&0, the ones they have on their world are tinted green. This quartz works just like any other quartz, be it normal &1Nether Quartz&0 or any of the decorative variants you can find on the &4Decorative Blocks&0 entry under &4Miscelaneous&0.
botania.page.elfResources7=Trading for &1Elven Quartz&0
# - MISCLANEOUS
# -- UNSTABLE CUBE
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB