diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 05c11d657..8e1075573 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -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(); diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index 824a0a771..c26bbc8c1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -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; } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index e9173b034..f0c69c00a 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -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]); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index d09a1a253..d6c858313 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -129,6 +129,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeBlazeQuartz; public static List 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) { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 8decbf447..0ab289299 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -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() { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 765e79fb8..7010ef975 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index a4102f688..f30125223 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -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"; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 87adc32c0..566574cd0 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -618,6 +618,11 @@ 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:blockSunnyQuartz.name=Block of Sunny Quartz +tile.botania:chiseledSunnyQuartz.name=Chiseled Sunny Quartz Block +tile.botania:pillarSunnyQuartz.name=Pillar Sunny Quartz Block +tile.botania:quartzSlabSunnyHalf.name=Sunny Quartz Slab +tile.botania:quartzStairsSunny.name=Sunny Quartz Stairs tile.botania:dreamwood0.name=Dreamwood tile.botania:dreamwood1.name=Dreamwood Planks tile.botania:dreamwood2.name=Mossy Dreamwood Planks @@ -1150,6 +1155,7 @@ 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:quartz6.name=Sunny Quartz item.botania:elementium.name=Elementium Ingot item.botania:pixieDust.name=Pixie Dust item.botania:dragonstone.name=Dragonstone @@ -2568,6 +2574,7 @@ botania.page.decorativeBlocks12=Mana Quartz botania.page.decorativeBlocks13=Blaze Quartz botania.page.decorativeBlocks14=Lavender Quartz botania.page.decorativeBlocks15=Redquartz +botania.page.decorativeBlocks23=Sunny Quartz botania.page.decorativeBlocks16=A few blocks can be organized in methods different than normal to create new building blocks, such as &1Reed Blocks&0, &1Thatch&0, &1Roof Tiles&0 and a few new &1Bricks&0.
All these also can be crafted into both stairs and slabs. botania.page.decorativeBlocks17=Crafting &1Reed Blocks&0 botania.page.decorativeBlocks18=Crafting &1Thatch&0 diff --git a/src/main/resources/assets/botania/textures/blocks/unused/chiseledYellowQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz0.png similarity index 90% rename from src/main/resources/assets/botania/textures/blocks/unused/chiseledYellowQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz0.png index 8f981d004..1b209b012 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/chiseledYellowQuartz1.png and b/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz1.png similarity index 89% rename from src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz1.png index c26270546..db47ef268 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz1.png and b/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz2.png b/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz2.png similarity index 89% rename from src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz2.png rename to src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz2.png index bd23ddb15..d9e90722a 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz2.png and b/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz2.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/chiseledYellowQuartz0.png b/src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz0.png similarity index 89% rename from src/main/resources/assets/botania/textures/blocks/unused/chiseledYellowQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz0.png index 74da7f7ca..c3e1eff5d 100644 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/chiseledYellowQuartz0.png and b/src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz1.png b/src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz1.png new file mode 100644 index 000000000..6d43ffd5c Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz0.png b/src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz0.png new file mode 100644 index 000000000..397da3ebb Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz0.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz1.png b/src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz1.png new file mode 100644 index 000000000..2ea9d9b88 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz1.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz0.png b/src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz0.png deleted file mode 100644 index ce113c2ad..000000000 Binary files a/src/main/resources/assets/botania/textures/blocks/unused/blockYellowQuartz0.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/items/quartz6.png b/src/main/resources/assets/botania/textures/items/quartz6.png new file mode 100644 index 000000000..cb7e36cea Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/quartz6.png differ