Added the Marimorphosis and related blocks. That's a lot of names.

This commit is contained in:
Lizbeth Rika committed 2015-01-29 21:38:33 +00:00
1 parent ddc95c6b8b
commit ad1b82b8d3
46 files changed
+409 -2

No files matched your search

@@ -81,7 +81,6 @@ public class RenderSpark extends RenderEntity {
float f5 = 0.5F;
float f6 = 0.25F;
p_77026_1_.startDrawingQuads();
p_77026_1_.setNormal(0.0F, 1.0F, 0.0F);
p_77026_1_.setBrightness(240);
@@ -76,7 +76,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid
LibBlockNames.SUBTILE_BELLETHORN,
LibBlockNames.SUBTILE_DREADTHORN,
LibBlockNames.SUBTILE_HEISEI_DREAM,
LibBlockNames.SUBTILE_TIGERSEYE,
LibBlockNames.SUBTILE_TIGERSEYE,
LibBlockNames.SUBTILE_MARIMORPHOSIS,
LibBlockNames.SUBTILE_ORECHID,
LibBlockNames.SUBTILE_FALLEN_KANADE,
LibBlockNames.SUBTILE_EXOFLAME,
@@ -73,6 +73,7 @@ import vazkii.botania.common.block.subtile.functional.SubTileHyacidus;
import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus;
import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia;
import vazkii.botania.common.block.subtile.functional.SubTileLoonuim;
import vazkii.botania.common.block.subtile.functional.SubTileMarimorphosis;
import vazkii.botania.common.block.subtile.functional.SubTileMedumone;
import vazkii.botania.common.block.subtile.functional.SubTilePollidisiac;
import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus;
@@ -349,6 +350,7 @@ public final class ModBlocks {
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_VINCULOTUS, SubTileVinculotus.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SPECTRANTHEMUM, SubTileSpectranthemum.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MEDUMONE, SubTileMedumone.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MARIMORPHOSIS, SubTileMarimorphosis.class);
}
private static void registerTile(Class<? extends TileEntity> clazz, String key) {
@@ -11,9 +11,12 @@
package vazkii.botania.common.block;
import net.minecraft.block.Block;
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.BlockBiomeStoneSlab;
import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab;
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
import vazkii.botania.common.block.decor.slabs.BlockReedSlab;
@@ -31,6 +34,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.BlockLivingStairs;
import vazkii.botania.common.block.decor.stairs.BlockReedStairs;
import vazkii.botania.common.block.decor.stairs.BlockThatchStairs;
import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs;
@@ -128,6 +132,13 @@ public final class ModFluffBlocks {
public static Block dirtPathSlab;
public static Block dirtPathSlabFull;
public static Block biomeStoneA;
public static Block biomeStoneB;
public static Block[] biomeStoneStairs = new Block[24];
public static Block[] biomeStoneSlabs = new Block[24];
public static Block[] biomeStoneFullSlabs = new Block[24];
public static void init() {
livingwoodStairs = new BlockLivingwoodStairs();
livingwoodSlab = new BlockLivingwoodSlab(false);
@@ -177,6 +188,9 @@ public final class ModFluffBlocks {
tileStairs = new BlockTileStairs();
tileSlab = new BlockTileSlab(false);
tileSlabFull = new BlockTileSlab(true);
biomeStoneA = new BlockBiomeStoneA();
biomeStoneB = new BlockBiomeStoneB();
if(ConfigHandler.darkQuartzEnabled) {
darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK);
@@ -209,6 +223,14 @@ public final class ModFluffBlocks {
dirtPathSlab = new BlockDirtPathSlab(false);
dirtPathSlabFull = new BlockDirtPathSlab(true);
for(int i = 0; i < 24; i++) {
int meta = i % 16;
Block block = i < 16 ? biomeStoneA : biomeStoneB;
biomeStoneStairs[i] = new BlockLivingStairs(block, meta);
biomeStoneSlabs[i] = new BlockBiomeStoneSlab(false, block, meta, i);
biomeStoneFullSlabs[i] = new BlockBiomeStoneSlab(true, block, meta, i);
}
if(ConfigHandler.darkQuartzEnabled) {
((BlockModSlab) darkQuartzSlab).register();
((BlockModSlab) darkQuartzSlabFull).register();
@@ -260,6 +282,11 @@ public final class ModFluffBlocks {
((BlockModSlab) dirtPathSlab).register();
((BlockModSlab) dirtPathSlabFull).register();
for(int i = 0; i < 24; i++) {
((BlockModSlab) biomeStoneSlabs[i]).register();
((BlockModSlab) biomeStoneFullSlabs[i]).register();
}
}
}
@@ -0,0 +1,83 @@
/**
* 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 @ [Jan 29, 2015, 6:54:20 PM (GMT)]
*/
package vazkii.botania.common.block.decor.biomestone;
import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
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.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
public class BlockBiomeStone extends BlockMod {
private static IIcon[] icons = new IIcon[32];
int iconOffset;
public BlockBiomeStone(int iconOffset, String name) {
super(Material.rock);
setHardness(1.5F);
setResistance(10F);
setStepSound(soundTypeStone);
setBlockName(name);
this.iconOffset = iconOffset;
}
@Override
public void registerBlockIcons(IIconRegister register) {
for(int i = 0; i < 16; i++) {
int index = i + iconOffset;
icons[index] = IconHelper.forName(register, "biomeStone" + index);
}
}
@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 + iconOffset];
}
@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);
}
}
@@ -0,0 +1,26 @@
/**
* 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 @ [Jan 29, 2015, 7:17:35 PM (GMT)]
*/
package vazkii.botania.common.block.decor.biomestone;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockBiomeStoneA extends BlockBiomeStone {
public BlockBiomeStoneA() {
super(0, LibBlockNames.BIOME_STONE_A);
}
@Override
public int damageDropped(int par1) {
return par1 % 8 + 8;
}
}
@@ -0,0 +1,21 @@
/**
* 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 @ [Jan 29, 2015, 7:17:41 PM (GMT)]
*/
package vazkii.botania.common.block.decor.biomestone;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockBiomeStoneB extends BlockBiomeStone {
public BlockBiomeStoneB() {
super(16, LibBlockNames.BIOME_STONE_B);
}
}
@@ -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 @ [Jan 29, 2015, 7:34:16 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs;
import vazkii.botania.common.block.ModFluffBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
public class BlockBiomeStoneSlab extends BlockLivingSlab {
int index;
public BlockBiomeStoneSlab(boolean full, Block source, int meta, int index) {
super(full, source, meta);
this.index = index;
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.biomeStoneFullSlabs[index];
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.biomeStoneSlabs[index];
}
}
@@ -0,0 +1,119 @@
/**
* 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 @ [Jan 29, 2015, 8:17:55 PM (GMT)]
*/
package vazkii.botania.common.block.subtile.functional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import akka.util.Collections;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChunkCoordinates;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.core.handler.ConfigHandler;
public class SubTileMarimorphosis extends SubTileFunctional {
private static final int COST = 12;
private static final Type[] TYPES = new Type[] {
Type.FOREST,
Type.PLAINS,
Type.MOUNTAIN,
Type.MUSHROOM,
Type.SWAMP,
Type.SANDY,
Type.SNOWY,
Type.MESA
};
@Override
public void onUpdate() {
super.onUpdate();
if(redstoneSignal > 0)
return;
if(!supertile.getWorldObj().isRemote && mana >= COST && ticksExisted % 2 == 0) {
ChunkCoordinates coords = getCoordsToPut();
if(coords != null) {
ItemStack stack = getStoneToPut(coords);
if(stack != null) {
Block block = Block.getBlockFromItem(stack.getItem());
int meta = stack.getItemDamage();
supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, block, meta, 1 | 2);
if(ConfigHandler.blockBreakParticles)
supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (meta << 12));
mana -= COST;
sync();
}
}
}
}
public ItemStack getStoneToPut(ChunkCoordinates coords) {
List<Type> types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorldObj().getBiomeGenForCoords(coords.posX, coords.posZ)));
List<Integer> values = new ArrayList();
for(int i = 0; i < 8; i++) {
int times = 1;
if(types.contains(TYPES[i]))
times = 12;
for(int j = 0; j < times; j++)
values.add(i);
}
return new ItemStack(ModFluffBlocks.biomeStoneA, 1, values.get(supertile.getWorldObj().rand.nextInt(values.size())));
}
public ChunkCoordinates getCoordsToPut() {
List<ChunkCoordinates> possibleCoords = new ArrayList();
int range = 8;
int rangeY = 5;
for(int i = -range; i < range + 1; i++)
for(int j = -rangeY; j < rangeY; j++)
for(int k = -range; k < range + 1; k++) {
int x = supertile.xCoord + i;
int y = supertile.yCoord + j;
int z = supertile.zCoord + k;
Block block = supertile.getWorldObj().getBlock(x, y, z);
if(block != null && block.isReplaceableOreGen(supertile.getWorldObj(), x, y, z, Blocks.stone))
possibleCoords.add(new ChunkCoordinates(x, y, z));
}
if(possibleCoords.isEmpty())
return null;
return possibleCoords.get(supertile.getWorldObj().rand.nextInt(possibleCoords.size()));
}
@Override
public int getColor() {
return 0x769897;
}
@Override
public boolean acceptsRedstone() {
return true;
}
@Override
public int getMaxMana() {
return 1000;
}
}
@@ -203,6 +203,13 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModFluffBlocks.elfQuartz);
addBlock(ModFluffBlocks.elfQuartzSlab);
addBlock(ModFluffBlocks.elfQuartzStairs);
addBlock(ModFluffBlocks.biomeStoneA);
addBlock(ModFluffBlocks.biomeStoneB);
for(int i = 0; i < 24; i++)
addBlock(ModFluffBlocks.biomeStoneStairs[i]);
for(int i = 0; i < 24; i++)
addBlock(ModFluffBlocks.biomeStoneSlabs[i]);
addItem(ModItems.glassPick);
addItem(ModItems.manasteelPick);
@@ -292,3 +299,4 @@ public final class BotaniaCreativeTab extends CreativeTabs {
}
}
@@ -69,6 +69,8 @@ public final class LibBlockNames {
public static final String PRISM = "prism";
public static final String DIRT_PATH = "dirtPath";
public static final String ENCHANTED_SOIL = "enchantedSoil";
public static final String BIOME_STONE_A = "biomeStoneA";
public static final String BIOME_STONE_B = "biomeStoneB";
public static final String SUBTILE_PUREDAISY = "puredaisy";
public static final String SUBTILE_MANASTAR = "manastar";
@@ -105,6 +107,7 @@ public final class LibBlockNames {
public static final String SUBTILE_VINCULOTUS = "vinculotus";
public static final String SUBTILE_SPECTRANTHEMUM = "spectranthemum";
public static final String SUBTILE_MEDUMONE = "medumone";
public static final String SUBTILE_MARIMORPHOSIS = "marimorphosis";
public static final String QUARTZ_DARK = "Dark";
public static final String QUARTZ_MANA = "Mana";