etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated map colors for blocks

This commit is contained in:
Forstride 2018-04-20 22:16:20 -04:00
parent 5e84eafdf4
commit ec2e483467
18 changed files with 174 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/biomesoplenty/common/block/BlockBOPAsh.java
View File

@ -10,8 +10,10 @@ package biomesoplenty.common.block;
import java.util.Random;
import biomesoplenty.api.enums.BOPTrees;
import biomesoplenty.api.item.BOPItems;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
@ -64,6 +66,12 @@ public class BlockBOPAsh extends BlockBOPGeneric
{
return 4;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
return MapColor.BLACK;
}
// randomly show some smoke particles
@Override

2
src/main/java/biomesoplenty/common/block/BlockBOPBlueFire.java
View File

@ -167,7 +167,7 @@ public class BlockBOPBlueFire extends Block implements IBOPBlock
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
return MapColor.CYAN;
return MapColor.LIGHT_BLUE;
}
@Override

7
src/main/java/biomesoplenty/common/block/BlockBOPBramblePlant.java
View File

@ -18,6 +18,7 @@ import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockGrass;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyBool;
@ -148,6 +149,12 @@ public class BlockBOPBramblePlant extends Block implements IBOPBlock
addCollisionBoxToList(pos, entityBox, collidingBoxes, new AxisAlignedBB(f, f, f1, f1, f1, 1.0D));
}
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
return MapColor.RED;
}
@Override
public int getMetaFromState(IBlockState state)

7
src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java
View File

@ -14,6 +14,7 @@ import biomesoplenty.api.item.BOPItems;
import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
@ -67,6 +68,12 @@ public class BlockBOPCrystal extends Block implements IBOPBlock
{
return BOPItems.crystal_shard;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
return MapColor.PURPLE;
}
@Override
public int quantityDropped(Random random)

6
src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java
View File

@ -14,6 +14,7 @@ import biomesoplenty.api.item.BOPItems;
import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
@ -80,6 +81,11 @@ public class BlockBOPFlesh extends Block implements IBOPBlock
return BOPItems.fleshchunk;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
return MapColor.RED;
}
@Override
public int quantityDropped(Random random)

18
src/main/java/biomesoplenty/common/block/BlockBOPFlower.java
View File

@ -14,6 +14,8 @@ import biomesoplenty.common.config.GameplayConfigurationHandler;
import biomesoplenty.common.item.ItemBOPFlower;
import biomesoplenty.common.util.block.VariantPagingHelper;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSand;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
@ -142,6 +144,22 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable, IH
}
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
switch ((BOPFlowers) state.getValue(this.variantProperty))
{
case GOLDENROD:
return MapColor.YELLOW;
case LAVENDER:
return MapColor.PURPLE;
default:
return this.blockMapColor;
}
}
// some flowers emit light
@Override
public int getLightValue(IBlockState state)

7
src/main/java/biomesoplenty/common/block/BlockBOPHive.java
View File

@ -15,6 +15,7 @@ import biomesoplenty.common.entities.EntityWasp;
import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
@ -29,6 +30,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -156,6 +158,11 @@ public class BlockBOPHive extends Block implements IBOPBlock
}
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
return MapColor.YELLOW_STAINED_HARDENED_CLAY;
}
// spawn a wasp when empty honeycomb is broken
@Override

9
src/main/java/biomesoplenty/common/block/BlockBOPHoney.java
View File

@ -11,6 +11,7 @@ package biomesoplenty.common.block;
import biomesoplenty.common.item.ItemBOPBlock;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
@ -18,6 +19,8 @@ import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -54,6 +57,12 @@ public class BlockBOPHoney extends Block implements IBOPBlock
return BlockRenderLayer.TRANSLUCENT;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
return MapColor.YELLOW;
}
@Override
public boolean isOpaqueCube(IBlockState state)
{

45
src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java
View File

@ -8,6 +8,7 @@
package biomesoplenty.common.block;
import biomesoplenty.api.enums.BOPFlowers;
import biomesoplenty.api.enums.BOPTrees;
import biomesoplenty.api.item.BOPItems;
import biomesoplenty.common.item.ItemBOPBlock;
@ -15,6 +16,7 @@ import biomesoplenty.common.util.block.VariantPagingHelper;
import com.google.common.collect.Lists;
import net.minecraft.block.BlockLeaves;
import net.minecraft.block.BlockPlanks;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
@ -230,6 +232,49 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
return treeType.hasSapling() ? BlockBOPSapling.paging.getVariantItem(treeType).getItemDamage() : 0;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
switch ((BOPTrees) state.getValue(this.variantProperty))
{
case YELLOW_AUTUMN:
return MapColor.YELLOW;
case ORANGE_AUTUMN:
return MapColor.ADOBE;
case MAGIC:
return MapColor.LIGHT_BLUE;
case UMBRAN:
return MapColor.BLUE_STAINED_HARDENED_CLAY;
case DEAD:
return MapColor.BROWN;
case PINK_CHERRY:
return MapColor.PINK;
case WHITE_CHERRY:
return MapColor.WHITE_STAINED_HARDENED_CLAY;
case MAPLE:
return MapColor.PINK_STAINED_HARDENED_CLAY;
case RED_BIG_FLOWER:
return MapColor.RED;
case YELLOW_BIG_FLOWER:
return MapColor.YELLOW;
case JACARANDA:
return MapColor.PURPLE;
default:
return this.blockMapColor;
}
}
@Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
{

26
src/main/java/biomesoplenty/common/block/BlockBOPPlant.java
View File

@ -9,11 +9,13 @@
package biomesoplenty.common.block;
import biomesoplenty.api.block.BlockQueries;
import biomesoplenty.api.enums.BOPFlowers;
import biomesoplenty.api.enums.BOPPlants;
import biomesoplenty.api.item.BOPItems;
import biomesoplenty.common.item.ItemBOPPlant;
import biomesoplenty.common.util.block.VariantPagingHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
@ -191,6 +193,30 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo
return paging.getIndex(plant);
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
switch ((BOPPlants) state.getValue(this.variantProperty))
{
case DEADGRASS:
return MapColor.BROWN;
case DESERTGRASS:
return MapColor.ORANGE_STAINED_HARDENED_CLAY;
case THORN:
return MapColor.WHITE_STAINED_HARDENED_CLAY;
case BARLEY:
return MapColor.YELLOW;
case RAFFLESIA:
return MapColor.RED;
default:
return this.blockMapColor;
}
}
// get the items dropped when you bash the bush
@Override

2
src/main/java/biomesoplenty/common/block/BlockBOPWhiteSand.java
View File

@ -44,7 +44,7 @@ public class BlockBOPWhiteSand extends BlockFalling implements IBOPBlock
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos)
{
return MapColor.SAND;
return MapColor.WHITE_STAINED_HARDENED_CLAY;
}
@SideOnly(Side.CLIENT)

2
src/main/java/biomesoplenty/common/block/BlockBOPWhiteSandstone.java
View File

@ -100,7 +100,7 @@ public class BlockBOPWhiteSandstone extends Block implements IBOPBlock
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos)
{
return MapColor.SAND;
return MapColor.WHITE_STAINED_HARDENED_CLAY;
}
// map from state to meta and vice verca

7
src/main/java/biomesoplenty/common/fluids/blocks/BlockBloodFluid.java
View File

@ -10,6 +10,7 @@ package biomesoplenty.common.fluids.blocks;
import biomesoplenty.api.block.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
@ -92,6 +93,12 @@ public class BlockBloodFluid extends BlockFluidClassic
return false;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos)
{
return MapColor.RED;
}
@Override
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing facing)
{

7
src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java
View File

@ -10,6 +10,7 @@ package biomesoplenty.common.fluids.blocks;
import biomesoplenty.api.block.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
@ -107,6 +108,12 @@ public class BlockHoneyFluid extends BlockFluidFinite
return false;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos)
{
return MapColor.YELLOW;
}
@Override
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing facing)
{

7
src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java
View File

@ -12,6 +12,7 @@ import java.util.Random;
import biomesoplenty.api.block.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
@ -122,6 +123,12 @@ public class BlockHotSpringWaterFluid extends BlockFluidClassic
return false;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos)
{
return MapColor.LIGHT_BLUE;
}
@Override
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing facing)
{

7
src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java
View File

@ -10,6 +10,7 @@ package biomesoplenty.common.fluids.blocks;
import biomesoplenty.api.block.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
@ -108,6 +109,12 @@ public class BlockPoisonFluid extends BlockFluidClassic
return false;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos)
{
return MapColor.PURPLE;
}
@Override
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing facing)
{

7
src/main/java/biomesoplenty/common/fluids/blocks/BlockQuicksandFluid.java
View File

@ -10,6 +10,7 @@ package biomesoplenty.common.fluids.blocks;
import biomesoplenty.api.block.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
@ -97,6 +98,12 @@ public class BlockQuicksandFluid extends BlockFluidClassic
return false;
}
@Override
public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos)
{
return MapColor.DIRT;
}
@Override
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing facing)
{

4
src/main/java/biomesoplenty/common/init/ModBlocks.java
View File

@ -113,7 +113,9 @@ public class ModBlocks
white_sandstone = registerBlock( new BlockBOPWhiteSandstone(), "white_sandstone" );
white_sandstone_stairs =registerBlock( new BlockBOPStoneStairs(white_sandstone.getDefaultState().withProperty(BlockBOPWhiteSandstone.VARIANT, StoneType.SMOOTH)), "white_sandstone_stairs");
dried_sand = registerBlock( (new BlockBOPGeneric()).addSupportedPlantType(EnumPlantType.Desert), "dried_sand"); dried_sand.setHarvestLevel("pickaxe",0);
dried_sand = registerBlock( (new BlockBOPGeneric(Material.GROUND, SoundType.STONE)).addSupportedPlantType(EnumPlantType.Desert), "dried_sand");
dried_sand.setHarvestLevel("pickaxe",0);
hard_ice = registerBlock( (new BlockBOPGeneric(Material.PACKED_ICE, SoundType.STONE)).setHardness(0.75F), "hard_ice" );
ash_block = registerBlock( new BlockBOPAsh(), "ash_block" );
mud = registerBlock( new BlockBOPMud(), "mud" );