mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 04:09:40 +00:00
Added Sunny Quartz.
This commit is contained in:
1 parent
54eb8d3f1b
commit
b3abe6e514
17 files changed
+37
-9
No files matched your search
@@ -133,7 +133,11 @@ public final class ModFluffBlocks {
|
||||
public static Block elfQuartzSlab;
|
||||
public static Block elfQuartzSlabFull;
|
||||
public static Block elfQuartzStairs;
|
||||
|
||||
public static Block sunnyQuartz;
|
||||
public static Block sunnyQuartzSlab;
|
||||
public static Block sunnyQuartzSlabFull;
|
||||
public static Block sunnyQuartzStairs;
|
||||
|
||||
public static Block dirtPathSlab;
|
||||
public static Block dirtPathSlabFull;
|
||||
|
||||
@@ -234,7 +238,11 @@ public final class ModFluffBlocks {
|
||||
elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false);
|
||||
elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true);
|
||||
elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz);
|
||||
|
||||
sunnyQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_SUNNY);
|
||||
sunnyQuartzSlab = new BlockSpecialQuartzSlab(sunnyQuartz, false);
|
||||
sunnyQuartzSlabFull = new BlockSpecialQuartzSlab(sunnyQuartz, true);
|
||||
sunnyQuartzStairs = new BlockSpecialQuartzStairs(sunnyQuartz);
|
||||
|
||||
dirtPathSlab = new BlockDirtPathSlab(false);
|
||||
dirtPathSlabFull = new BlockDirtPathSlab(true);
|
||||
|
||||
@@ -271,7 +279,9 @@ public final class ModFluffBlocks {
|
||||
((BlockModSlab) redQuartzSlabFull).register();
|
||||
((BlockModSlab) elfQuartzSlab).register();
|
||||
((BlockModSlab) elfQuartzSlabFull).register();
|
||||
|
||||
((BlockModSlab) sunnyQuartzSlab).register();
|
||||
((BlockModSlab) sunnyQuartzSlabFull).register();
|
||||
|
||||
((BlockModSlab) livingwoodSlab).register();
|
||||
((BlockModSlab) livingwoodSlabFull).register();
|
||||
((BlockModSlab) livingwoodPlankSlab).register();
|
||||
|
||||
@@ -54,6 +54,8 @@ public class BlockSpecialQuartzSlab extends BlockModSlab {
|
||||
return (BlockSlab) ModFluffBlocks.redQuartzSlabFull;
|
||||
if(source == ModFluffBlocks.elfQuartz)
|
||||
return (BlockSlab) ModFluffBlocks.elfQuartzSlabFull;
|
||||
if(source == ModFluffBlocks.sunnyQuartz)
|
||||
return (BlockSlab) ModFluffBlocks.sunnyQuartzSlabFull;
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -72,6 +74,8 @@ public class BlockSpecialQuartzSlab extends BlockModSlab {
|
||||
return (BlockSlab) ModFluffBlocks.redQuartzSlab;
|
||||
if(source == ModFluffBlocks.elfQuartz)
|
||||
return (BlockSlab) ModFluffBlocks.elfQuartzSlab;
|
||||
if(source == ModFluffBlocks.sunnyQuartz)
|
||||
return (BlockSlab) ModFluffBlocks.sunnyQuartzSlab;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -313,7 +313,10 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addBlock(ModFluffBlocks.elfQuartz);
|
||||
addBlock(ModFluffBlocks.elfQuartzSlab);
|
||||
addBlock(ModFluffBlocks.elfQuartzStairs);
|
||||
|
||||
addBlock(ModFluffBlocks.sunnyQuartz);
|
||||
addBlock(ModFluffBlocks.sunnyQuartzSlab);
|
||||
addBlock(ModFluffBlocks.sunnyQuartzStairs);
|
||||
|
||||
addBlock(ModFluffBlocks.stone);
|
||||
for(int i= 0; i < 8; i++)
|
||||
addBlock(ModFluffBlocks.stoneStairs[i]);
|
||||
|
||||
@@ -129,6 +129,7 @@ public final class ModCraftingRecipes {
|
||||
public static IRecipe recipeBlazeQuartz;
|
||||
public static List<IRecipe> recipesLavenderQuartz;
|
||||
public static IRecipe recipeRedQuartz;
|
||||
public static IRecipe recipeSunnyQuartz;
|
||||
public static IRecipe recipeAlfPortal;
|
||||
public static IRecipe recipeNaturaPylon;
|
||||
public static IRecipe recipeWaterRod;
|
||||
@@ -829,6 +830,8 @@ public final class ModCraftingRecipes {
|
||||
recipeRedQuartz = addQuartzRecipes(4, Items.redstone, ModFluffBlocks.redQuartz, ModFluffBlocks.redQuartzStairs, ModFluffBlocks.redQuartzSlab);
|
||||
addQuartzRecipes(5, null, ModFluffBlocks.elfQuartz, ModFluffBlocks.elfQuartzStairs, ModFluffBlocks.elfQuartzSlab);
|
||||
|
||||
recipeSunnyQuartz = addQuartzRecipes(6, Item.getItemFromBlock(Blocks.double_plant), ModFluffBlocks.sunnyQuartz, ModFluffBlocks.sunnyQuartzStairs, ModFluffBlocks.sunnyQuartzSlab);
|
||||
|
||||
// Alfheim Portal Recipe
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.alfPortal),
|
||||
"WWW", "WTW", "WWW",
|
||||
@@ -1275,9 +1278,9 @@ public final class ModCraftingRecipes {
|
||||
|
||||
// Wing Recipes
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.flightTiara, 1, 1), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), new ItemStack(Items.quartz));
|
||||
for(int i = 0; i < 6; i++)
|
||||
for(int i = 0; i < 7; i++)
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.flightTiara, 1, 2 + i), new ItemStack(ModItems.flightTiara, 1, Short.MAX_VALUE), new ItemStack(ModItems.quartz, 1, i));
|
||||
recipesWings = BotaniaAPI.getLatestAddedRecipes(7);
|
||||
recipesWings = BotaniaAPI.getLatestAddedRecipes(8);
|
||||
|
||||
// Mana Fluxfield Recipe
|
||||
if(ConfigHandler.fluxfieldEnabled) {
|
||||
|
||||
@@ -25,7 +25,7 @@ import vazkii.botania.common.lib.LibItemNames;
|
||||
|
||||
public class ItemQuartz extends ItemMod implements IElvenItem {
|
||||
|
||||
private static final int SUBTYPES = 6;
|
||||
private static final int SUBTYPES = 7;
|
||||
IIcon[] icons;
|
||||
|
||||
public ItemQuartz() {
|
||||
|
||||
@@ -839,11 +839,11 @@ public final class LexiconData {
|
||||
if(ConfigHandler.darkQuartzEnabled)
|
||||
decorativeBlocks.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingrockDecor1), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingrockDecor2), new PageCraftingRecipe("3", ModCraftingRecipes.recipeLivingrockDecor3), new PageCraftingRecipe("4", ModCraftingRecipes.recipeLivingrockDecor4),
|
||||
new PageCraftingRecipe("5", ModCraftingRecipes.recipeLivingwoodDecor1), new PageCraftingRecipe("6", ModCraftingRecipes.recipeLivingwoodDecor2), new PageCraftingRecipe("7", ModCraftingRecipes.recipeLivingwoodDecor3), new PageCraftingRecipe("8", ModCraftingRecipes.recipeLivingwoodDecor4), new PageCraftingRecipe("9", ModCraftingRecipes.recipeLivingwoodDecor5),
|
||||
new PageText("10"), new PageCraftingRecipe("11", ModCraftingRecipes.recipeDarkQuartz), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaQuartzRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz),
|
||||
new PageText("10"), new PageCraftingRecipe("11", ModCraftingRecipes.recipeDarkQuartz), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaQuartzRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz),
|
||||
new PageText("16"), new PageCraftingRecipe("17", ModCraftingRecipes.recipeReedBlock), new PageCraftingRecipe("18", ModCraftingRecipes.recipeThatch), new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile), new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick), new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick), new PageCraftingRecipe("22", ModCraftingRecipes.recipeSnowBrick));
|
||||
else decorativeBlocks.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingrockDecor1), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingrockDecor2), new PageCraftingRecipe("3", ModCraftingRecipes.recipeLivingrockDecor3), new PageCraftingRecipe("4", ModCraftingRecipes.recipeLivingrockDecor4),
|
||||
new PageCraftingRecipe("5", ModCraftingRecipes.recipeLivingwoodDecor1), new PageCraftingRecipe("6", ModCraftingRecipes.recipeLivingwoodDecor2), new PageCraftingRecipe("7", ModCraftingRecipes.recipeLivingwoodDecor3), new PageCraftingRecipe("8", ModCraftingRecipes.recipeLivingwoodDecor4), new PageCraftingRecipe("9", ModCraftingRecipes.recipeLivingwoodDecor5),
|
||||
new PageText("10"), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaQuartzRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz),
|
||||
new PageText("10"), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaQuartzRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeBlazeQuartz), new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz),
|
||||
new PageText("16"), new PageCraftingRecipe("17", ModCraftingRecipes.recipeReedBlock), new PageCraftingRecipe("18", ModCraftingRecipes.recipeThatch), new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile), new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick), new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick), new PageCraftingRecipe("22", ModCraftingRecipes.recipeSnowBrick));
|
||||
|
||||
dispenserTweaks = new BLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc);
|
||||
|
||||
@@ -128,5 +128,6 @@ public final class LibBlockNames {
|
||||
public static final String QUARTZ_LAVENDER = "Lavender";
|
||||
public static final String QUARTZ_RED = "Red";
|
||||
public static final String QUARTZ_ELF = "Elf";
|
||||
public static final String QUARTZ_SUNNY = "Sunny";
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user