Rainbows for everyone!

This commit is contained in:
Vasco Lavos committed 2015-10-11 16:09:29 +01:00
1 parent ac9b3a4a03
commit 2752f6f0df
18 files changed
+307 -4

No files matched your search

@@ -40,6 +40,8 @@ import vazkii.botania.common.block.decor.BlockPetalBlock;
import vazkii.botania.common.block.decor.BlockPrismarine;
import vazkii.botania.common.block.decor.BlockReeds;
import vazkii.botania.common.block.decor.BlockSeaLamp;
import vazkii.botania.common.block.decor.BlockShimmerrock;
import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks;
import vazkii.botania.common.block.decor.BlockShinyFlower;
import vazkii.botania.common.block.decor.BlockStarfield;
import vazkii.botania.common.block.decor.BlockThatch;
@@ -260,6 +262,8 @@ public final class ModBlocks {
public static Block gaiaHead;
public static Block corporeaRetainer;
public static Block teruTeruBozu;
public static Block shimmerrock;
public static Block shimmerwoodPlanks;
public static void init() {
flower = new BlockModFlower();
@@ -348,6 +352,8 @@ public final class ModBlocks {
gaiaHead = new BlockGaiaHead();
corporeaRetainer = new BlockCorporeaRetainer();
teruTeruBozu = new BlockTeruTeruBozu();
shimmerrock = new BlockShimmerrock();
shimmerwoodPlanks = new BlockShimmerwoodPlanks();
ModFluffBlocks.init();
@@ -40,6 +40,8 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockBrickSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab;
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;
@@ -60,6 +62,8 @@ import vazkii.botania.common.block.decor.stairs.living.BlockLivingrockBrickStair
import vazkii.botania.common.block.decor.stairs.living.BlockLivingrockStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs;
import vazkii.botania.common.block.decor.stairs.prismarine.BlockDarkPrismarineStairs;
import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineBrickStairs;
import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineStairs;
@@ -187,6 +191,13 @@ public final class ModFluffBlocks {
public static Block enderBrickSlabFull;
public static Block enderBrickStairs;
public static Block shimmerrockSlab;
public static Block shimmerrockSlabFull;
public static Block shimmerrockStairs;
public static Block shimmerwoodPlankSlab;
public static Block shimmerwoodPlankSlabFull;
public static Block shimmerwoodPlankStairs;
public static Block managlassPane;
public static Block alfglassPane;
public static Block bifrostPane;
@@ -315,7 +326,14 @@ public final class ModFluffBlocks {
enderBrickSlab = new BlockEnderBrickSlab(false);
enderBrickSlabFull = new BlockEnderBrickSlab(true);
enderBrickStairs = new BlockEnderBrickStairs();
shimmerrockSlab = new BlockShimmerrockSlab(false);
shimmerrockSlabFull = new BlockShimmerrockSlab(true);
shimmerrockStairs = new BlockShimmerrockStairs();
shimmerwoodPlankSlab = new BlockShimmerwoodPlankSlab(false);
shimmerwoodPlankSlabFull = new BlockShimmerwoodPlankSlab(true);
shimmerwoodPlankStairs = new BlockShimmerwoodPlankStairs();
managlassPane = new BlockManaglassPane();
alfglassPane = new BlockAlfglassPane();
bifrostPane = new BlockBifrostPane();
@@ -379,6 +397,11 @@ public final class ModFluffBlocks {
((BlockModSlab) enderBrickSlab).register();
((BlockModSlab) enderBrickSlabFull).register();
((BlockModSlab) shimmerrockSlab).register();
((BlockModSlab) shimmerrockSlabFull).register();
((BlockModSlab) shimmerwoodPlankSlab).register();
((BlockModSlab) shimmerwoodPlankSlabFull).register();
for(int i = 0; i < 24; i++) {
((BlockModSlab) biomeStoneSlabs[i]).register();
((BlockModSlab) biomeStoneFullSlabs[i]).register();
@@ -0,0 +1,63 @@
/**
* 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 @ [Oct 10, 2015, 10:29:22 PM (GMT)]
*/
package vazkii.botania.common.block.decor;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.render.block.InterpolatedIcon;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockShimmerrock extends BlockMod implements ILexiconable {
public BlockShimmerrock() {
super(Material.rock);
setHardness(2.0F);
setResistance(10.0F);
setStepSound(soundTypeStone);
setBlockName(LibBlockNames.SHIMMERROCK);
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void loadTextures(TextureStitchEvent.Pre event) {
if(event.map.getTextureType() == 0) {
TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerrock");
if(event.map.setTextureEntry("botania:shimmerrock", icon))
blockIcon = icon;
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.rainbowRod;
}
}
@@ -0,0 +1,62 @@
/**
* 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 @ [Oct 11, 2015, 3:08:09 PM (GMT)]
*/
package vazkii.botania.common.block.decor;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.render.block.InterpolatedIcon;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable {
public BlockShimmerwoodPlanks() {
super(Material.wood);
setHardness(2.0F);
setStepSound(soundTypeWood);
setBlockName(LibBlockNames.SHIMMERWOOD_PLANKS);
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void loadTextures(TextureStitchEvent.Pre event) {
if(event.map.getTextureType() == 0) {
TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerwoodPlanks");
if(event.map.setTextureEntry("botania:shimmerwoodPlanks", icon))
blockIcon = icon;
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.rainbowRod;
}
}
@@ -0,0 +1,37 @@
/**
* 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 @ [Oct 11, 2015, 3:47:24 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockShimmerrockSlab extends BlockLivingSlab {
public BlockShimmerrockSlab(boolean full) {
super(full, ModBlocks.shimmerrock, 0);
setHardness(2.0F);
setResistance(10.0F);
setStepSound(soundTypeStone);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.shimmerrockSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.shimmerrockSlab;
}
}
@@ -0,0 +1,36 @@
/**
* 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 @ [Oct 11, 2015, 3:47:47 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockShimmerwoodPlankSlab extends BlockLivingSlab {
public BlockShimmerwoodPlankSlab(boolean full) {
super(full, ModBlocks.shimmerwoodPlanks, 0);
setHardness(2.0F);
setResistance(10.0F);
setStepSound(soundTypeStone);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.shimmerwoodPlankSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.shimmerwoodPlankSlab;
}
}
@@ -0,0 +1,22 @@
/**
* 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 @ [Oct 11, 2015, 3:46:12 PM (GMT)]
*/
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockShimmerrockStairs extends BlockLivingStairs {
public BlockShimmerrockStairs() {
super(ModBlocks.shimmerrock, 0);
}
}
@@ -0,0 +1,22 @@
/**
* 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 @ [Oct 11, 2015, 3:45:02 PM (GMT)]
*/
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockShimmerwoodPlankStairs extends BlockLivingStairs {
public BlockShimmerwoodPlankStairs() {
super(ModBlocks.shimmerwoodPlanks, 0);
}
}
@@ -85,6 +85,8 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.rainbowRod);
addBlock(ModBlocks.bifrostPerm);
addBlock(ModFluffBlocks.bifrostPane);
addBlock(ModBlocks.shimmerrock);
addBlock(ModBlocks.shimmerwoodPlanks);
addItem(ModItems.tornadoRod);
addItem(ModItems.fireRod);
addItem(ModItems.smeltRod);
@@ -342,6 +344,10 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModFluffBlocks.dreamwoodWall);
addBlock(ModFluffBlocks.dreamwoodPlankStairs);
addBlock(ModFluffBlocks.dreamwoodPlankSlab);
addBlock(ModFluffBlocks.shimmerwoodPlankStairs);
addBlock(ModFluffBlocks.shimmerwoodPlankSlab);
addBlock(ModFluffBlocks.shimmerrockStairs);
addBlock(ModFluffBlocks.shimmerrockSlab);
addItem(ModItems.quartz);
if(ConfigHandler.darkQuartzEnabled) {
@@ -293,6 +293,8 @@ public final class ModCraftingRecipes {
public static IRecipe recipeManaweaveLegs;
public static IRecipe recipeManaweaveBoots;
public static IRecipe recipeBifrost;
public static IRecipe recipeShimmerrock;
public static IRecipe recipeShimmerwoodPlanks;
public static IRecipe recipeAutocraftingHalo;
public static List<IRecipe> recipesPavement;
public static IRecipe recipeCellBlock;
@@ -1984,10 +1986,14 @@ public final class ModCraftingRecipes {
'S', LibOreDict.MANAWEAVE_CLOTH);
recipeManaweaveBoots = BotaniaAPI.getLatestAddedRecipe();
// Bifrost Block Recipe
// Bifrost Blocks Recipe
addShapelessOreDictRecipe(new ItemStack(ModBlocks.bifrostPerm), new ItemStack(ModItems.rainbowRod), new ItemStack(ModBlocks.elfGlass));
recipeBifrost = BotaniaAPI.getLatestAddedRecipe();
addShapelessOreDictRecipe(new ItemStack(ModBlocks.shimmerrock), LibOreDict.LIVING_ROCK, new ItemStack(ModBlocks.bifrostPerm));
recipeShimmerrock = BotaniaAPI.getLatestAddedRecipe();
addShapelessOreDictRecipe(new ItemStack(ModBlocks.shimmerwoodPlanks), new ItemStack(ModBlocks.dreamwood, 1, 1), new ItemStack(ModBlocks.bifrostPerm));
recipeShimmerwoodPlanks = BotaniaAPI.getLatestAddedRecipe();
// Manufactory Halo Recipe
addShapelessOreDictRecipe(new ItemStack(ModItems.autocraftingHalo), new ItemStack(ModItems.craftingHalo), LibOreDict.MANA_DIAMOND);
recipeAutocraftingHalo = BotaniaAPI.getLatestAddedRecipe();
@@ -2079,6 +2085,8 @@ public final class ModCraftingRecipes {
addStairsAndSlabs(ModBlocks.customBrick, 2, ModFluffBlocks.snowBrickStairs, ModFluffBlocks.snowBrickSlab);
addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab);
addStairsAndSlabs(ModBlocks.endStoneBrick, 0, ModFluffBlocks.endStoneStairs, ModFluffBlocks.endStoneSlab);
addStairsAndSlabs(ModBlocks.shimmerrock, 0, ModFluffBlocks.shimmerrockStairs, ModFluffBlocks.shimmerrockSlab);
addStairsAndSlabs(ModBlocks.shimmerwoodPlanks, 0, ModFluffBlocks.shimmerwoodPlankStairs, ModFluffBlocks.shimmerwoodPlankSlab);
// Wall Recipes
addWall(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockWall, 0);
@@ -703,7 +703,7 @@ public final class LexiconData {
openBucket.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeOpenBucket));
rainbowRod = new ALexiconEntry(LibLexicon.TOOL_RAINBOW_ROD, categoryTools);
rainbowRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRainbowRod), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBifrost));
rainbowRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRainbowRod), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBifrost), new PageCraftingRecipe("4", ModCraftingRecipes.recipeShimmerrock), new PageCraftingRecipe("5", ModCraftingRecipes.recipeShimmerwoodPlanks));
tornadoRod = new BLexiconEntry(LibLexicon.TOOL_TORNADO_ROD, categoryTools);
tornadoRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTornadoRod));
@@ -102,6 +102,8 @@ public final class LibBlockNames {
public static final String GAIA_HEAD = "gaiaHeadBlock";
public static final String CORPOREA_RETAINER = "corporeaRetainer";
public static final String TERU_TERU_BOZU = "teruTeruBozu";
public static final String SHIMMERROCK = "shimmerrock";
public static final String SHIMMERWOOD_PLANKS = "shimmerwoodPlanks";
public static final String SUBTILE_PUREDAISY = "puredaisy";
public static final String SUBTILE_MANASTAR = "manastar";