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

Fixed a crash with biome config files, fixed inventory colouring

Browse source
This commit is contained in:
Adubbz 2016-03-18 23:52:38 +11:00
parent 711f8d94d7
commit 32a814b7e2
37 changed files with 187 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/biomesoplenty/api/biome/BOPBiome.java
View file

@ -415,11 +415,7 @@ public class BOPBiome extends BiomeGenBase implements IExtendedBiome
public PropsBuilder(String name) { this.biomeName = name; }
public PropsBuilder withGuiColour(int colour)
{
this.guiColour = colour; return this;
}
public PropsBuilder withGuiColour(Integer colour) { if (colour != null) this.guiColour = colour; return this; }
public PropsBuilder withTemperature(Float temperature) { if (temperature != null) this.temperature = temperature; return this; }
public PropsBuilder withRainfall(Float rainfall) { if (rainfall != null) this.rainfall = rainfall; return this; }
public PropsBuilder withBaseHeight(Float baseHeight) { if (baseHeight != null) this.baseHeight = baseHeight; return this; }
@ -427,7 +423,7 @@ public class BOPBiome extends BiomeGenBase implements IExtendedBiome
public PropsBuilder withRainDisabled() { this.enableRain = false; return this; }
public PropsBuilder withSnowEnabled() { this.enableSnow = true; return this; }
public PropsBuilder withWaterColor(Integer waterColor) { if (waterColor != null) this.waterColor = waterColor; return this; }
public PropsBuilder withBaseBiome(String name) { this.baseBiomeRegName = name; return this; }
public PropsBuilder withBaseBiome(String name) { if (name != null) this.baseBiomeRegName = name; return this; }
public BiomeProps build()
{

5
src/main/java/biomesoplenty/api/block/IBOPBlock.java
View file

@ -11,6 +11,7 @@ package biomesoplenty.api.block;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.ItemBlock;
public interface IBOPBlock {
@ -20,6 +21,6 @@ public interface IBOPBlock {
public IProperty[] getNonRenderingProperties();
public String getStateName(IBlockState state);
public IBlockColor getColourHandler();
public IBlockColor getBlockColor();
public IItemColor getItemColor();
}

5
src/main/java/biomesoplenty/common/block/BlockBOPBones.java
View file

@ -18,6 +18,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
@ -53,7 +54,9 @@ public class BlockBOPBones extends Block implements IBOPBlock
@Override
protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { AXIS, VARIANT });}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
// implement IBOPBlock
@Override

5
src/main/java/biomesoplenty/common/block/BlockBOPCrystal.java
View file

@ -19,6 +19,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.entity.boss.EntityDragon;
import net.minecraft.item.Item;
@ -39,7 +40,9 @@ public class BlockBOPCrystal extends Block implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPCrystal() {
super(Material.glass);

5
src/main/java/biomesoplenty/common/block/BlockBOPDecoration.java
View file

@ -19,6 +19,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
@ -44,7 +45,9 @@ public class BlockBOPDecoration extends Block implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
// constructor
public BlockBOPDecoration() {

5
src/main/java/biomesoplenty/common/block/BlockBOPDirt.java
View file

@ -24,6 +24,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
@ -68,7 +69,9 @@ public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType
return (Boolean.TRUE.equals(state.getValue(COARSE)) ? "coarse_" : "") + ((BOPDirtType) state.getValue(VARIANT)).getName() + "_dirt";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPDirt() {

5
src/main/java/biomesoplenty/common/block/BlockBOPDoor.java
View file

@ -19,6 +19,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@ -44,7 +45,9 @@ public class BlockBOPDoor extends BlockDoor implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
// Map from woods to BlockBOPDoor instance and back
private static Map<BOPWoods, BlockBOPDoor> variantToBlock = new HashMap<BOPWoods, BlockBOPDoor>();

2
src/main/java/biomesoplenty/common/block/BlockBOPDoublePlant.java
View file

@ -86,7 +86,7 @@ public class BlockBOPDoublePlant extends BlockBOPDoubleDecoration implements ISh
}
}
public IBlockColor getColourHandler()
public IBlockColor getBlockColor()
{
return new IBlockColor()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPDoubleWoodSlab.java
View file

@ -24,6 +24,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
@ -87,7 +88,9 @@ public class BlockBOPDoubleWoodSlab extends BlockSlab implements IBOPBlock
return "double_" + ((BOPWoods)state.getValue(this.variantProperty)).getName() + "_wood_slab";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
private BlockBOPDoubleWoodSlab()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPFarmland.java
View file

@ -23,6 +23,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -78,7 +79,9 @@ public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock
return ((BlockBOPDirt.BOPDirtType) state.getValue(this.variantProperty)).getName() + "_farmland";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPFarmland()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPFence.java
View file

@ -21,6 +21,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
@ -40,7 +41,9 @@ public class BlockBOPFence extends BlockFence implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
// Map from woods to BlockBOPFence instance and back
private static Map<BOPWoods, BlockBOPFence> variantToBlock = new HashMap<BOPWoods, BlockBOPFence>();

5
src/main/java/biomesoplenty/common/block/BlockBOPFenceGate.java
View file

@ -20,6 +20,7 @@ import net.minecraft.block.SoundType;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
@ -40,7 +41,9 @@ public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
// Map from woods to BlockBOPFenceGate instance and back
private static Map<BOPWoods, BlockBOPFenceGate> variantToBlock = new HashMap<BOPWoods, BlockBOPFenceGate>();

5
src/main/java/biomesoplenty/common/block/BlockBOPFlesh.java
View file

@ -19,6 +19,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
@ -44,7 +45,9 @@ public class BlockBOPFlesh extends Block implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPFlesh() {
super(Material.sponge);

5
src/main/java/biomesoplenty/common/block/BlockBOPGem.java
View file

@ -19,6 +19,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.ItemBlock;
public class BlockBOPGem extends Block implements IBOPBlock
@ -42,7 +43,9 @@ public class BlockBOPGem extends Block implements IBOPBlock
return ((BOPGems) state.getValue(VARIANT)).getName() + "_block";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPGem()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPGemOre.java
View file

@ -24,6 +24,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.math.BlockPos;
@ -52,7 +53,9 @@ public class BlockBOPGemOre extends Block implements IBOPBlock
return ((BOPGems) state.getValue(VARIANT)).getName() + "_ore";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPGemOre()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPGeneric.java
View file

@ -20,6 +20,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@ -39,7 +40,9 @@ public class BlockBOPGeneric extends Block implements IBOPBlock, ISustainsPlantT
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPGeneric() {
// use rock as default material

5
src/main/java/biomesoplenty/common/block/BlockBOPGrass.java
View file

@ -27,6 +27,7 @@ import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.particle.EffectRenderer;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -87,7 +88,9 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla
}
}
@Override
public IBlockColor getColourHandler() { return ModBlocks.GRASS_COLORING; }
public IBlockColor getBlockColor() { return ModBlocks.GRASS_COLORING; }
@Override
public IItemColor getItemColor() { return ModBlocks.BLOCK_ITEM_COLORING; }
public BlockBOPGrass()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPHalfOtherSlab.java
View file

@ -23,6 +23,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
@ -85,7 +86,9 @@ public class BlockBOPHalfOtherSlab extends BlockSlab implements IBOPBlock
return ((SlabType) state.getValue(VARIANT)).getName() + "_slab";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public IBlockState getFullBlockVariantState(SlabType type)
{

5
src/main/java/biomesoplenty/common/block/BlockBOPHalfWoodSlab.java
View file

@ -23,6 +23,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
@ -85,7 +86,9 @@ public class BlockBOPHalfWoodSlab extends BlockSlab implements IBOPBlock
return ((BOPWoods) state.getValue(this.variantProperty)).getName() + "_wood_slab";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
private BlockBOPHalfWoodSlab()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPHive.java
View file

@ -22,6 +22,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.IStringSerializable;
@ -64,7 +65,9 @@ public class BlockBOPHive extends Block implements IBOPBlock
return ((HiveType) state.getValue(VARIANT)).getName() + "_block";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPHive()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPHoney.java
View file

@ -16,6 +16,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
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.minecraftforge.fml.relauncher.Side;
@ -34,7 +35,9 @@ public class BlockBOPHoney extends Block implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPHoney() {
super(Material.glass);

6
src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java
View file

@ -15,6 +15,7 @@ import biomesoplenty.api.block.IBOPBlock;
import biomesoplenty.api.item.BOPItems;
import biomesoplenty.common.enums.BOPPlants;
import biomesoplenty.common.enums.BOPTrees;
import biomesoplenty.common.init.ModBlocks;
import biomesoplenty.common.item.ItemBOPBlock;
import biomesoplenty.common.util.block.VariantPagingHelper;
import net.minecraft.block.BlockLeaves;
@ -23,6 +24,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@ -117,7 +119,7 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
}
@Override
public IBlockColor getColourHandler()
public IBlockColor getBlockColor()
{
final IProperty variantProp = this.variantProperty;
@ -142,6 +144,8 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
}
};
}
@Override
public IItemColor getItemColor() { return ModBlocks.BLOCK_ITEM_COLORING; }
private BlockBOPLeaves()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java
View file

@ -17,6 +17,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.AxisAlignedBB;
@ -64,7 +65,9 @@ public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock
return "lily_"+type.getName();
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPLilypad()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPLog.java
View file

@ -17,6 +17,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
@ -79,7 +80,9 @@ public class BlockBOPLog extends BlockLog implements IBOPBlock
}
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
private BlockBOPLog()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPMud.java
View file

@ -22,6 +22,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
@ -71,7 +72,9 @@ public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType
return ((MudType) state.getValue(VARIANT)).getName();
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPMud() {

5
src/main/java/biomesoplenty/common/block/BlockBOPPlanks.java
View file

@ -19,6 +19,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
@ -75,7 +76,9 @@ public class BlockBOPPlanks extends Block implements IBOPBlock
return ((BOPWoods) state.getValue(this.variantProperty)).getName() + "_planks";
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPPlanks()
{

29
src/main/java/biomesoplenty/common/block/BlockBOPPlant.java
View file

@ -21,6 +21,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
@ -125,10 +126,8 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable
}
@Override
public IBlockColor getColourHandler()
public IBlockColor getBlockColor()
{
final IProperty variantProp = this.variantProperty;
return new IBlockColor()
{
@Override
@ -136,7 +135,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable
{
boolean inWorld = world != null && pos != null;
switch (getColoringType((BOPPlants) state.getValue(variantProp)))
switch (getColoringType((BOPPlants) state.getValue(BlockBOPPlant.this.variantProperty)))
{
case LIKE_LEAVES:
return inWorld ? BiomeColorHelper.getFoliageColorAtPos(world, pos) : ColorizerFoliage.getFoliageColorBasic();
@ -150,6 +149,28 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable
};
}
@Override
public IItemColor getItemColor()
{
return new IItemColor()
{
@Override
public int getColorFromItemstack(ItemStack stack, int tintIndex)
{
IBlockState state = ((ItemBlock)stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata());
switch ((BOPPlants) state.getValue(BlockBOPPlant.this.variantProperty))
{
case BERRYBUSH: case SHRUB:
return 0xFFFFFF;
default:
return BlockBOPPlant.this.getBlockColor().colorMultiplier(state, null, null, tintIndex);
}
}
};
}
private BlockBOPPlant()
{
super();

5
src/main/java/biomesoplenty/common/block/BlockBOPSand.java
View file

@ -19,6 +19,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
@ -65,7 +66,9 @@ public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPl
return ((SandType) state.getValue(VARIANT)).getName();
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPSand() {

5
src/main/java/biomesoplenty/common/block/BlockBOPStone.java
View file

@ -19,6 +19,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.IStringSerializable;
@ -63,7 +64,9 @@ public class BlockBOPStone extends Block implements IBOPBlock
return (Boolean.TRUE.equals(state.getValue(POLISHED)) ? "polished_" : "") + ((StoneType) state.getValue(VARIANT)).getName();
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPStone()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPTerrarium.java
View file

@ -17,6 +17,7 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
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.IStringSerializable;
@ -64,7 +65,9 @@ public class BlockBOPTerrarium extends Block implements IBOPBlock
}
}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
public BlockBOPTerrarium()
{

5
src/main/java/biomesoplenty/common/block/BlockBOPTurnip.java
View file

@ -16,6 +16,7 @@ import net.minecraft.block.BlockCrops;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.math.BlockPos;
@ -36,7 +37,9 @@ public class BlockBOPTurnip extends BlockCrops implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
@Override
protected Item getSeed()

5
src/main/java/biomesoplenty/common/block/BlockBOPVine.java
View file

@ -16,6 +16,7 @@ import net.minecraft.block.SoundType;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
@ -39,7 +40,9 @@ public class BlockBOPVine extends BlockVine implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return useGreyScaleTextures ? ModBlocks.FOLIAGE_COLOURING : null; }
public IBlockColor getBlockColor() { return useGreyScaleTextures ? ModBlocks.FOLIAGE_COLORING : null; }
@Override
public IItemColor getItemColor() { return ModBlocks.BLOCK_ITEM_COLORING; }
// if set to true, (the default), use BlockVine getBlockColor(), getRenderColor() and colorMultiplier() functions to color the texture based on biome
// if set to false, use 0xFFFFFF for all the color functions so that the texture is used as it is

5
src/main/java/biomesoplenty/common/block/BlockBOPWoodStairs.java
View file

@ -18,6 +18,7 @@ import net.minecraft.block.BlockStairs;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
@ -38,7 +39,9 @@ public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
public IBlockColor getColourHandler() { return null; }
public IBlockColor getBlockColor() { return null; }
@Override
public IItemColor getItemColor() { return null; }
// Map from woods to BlockBOPStairs instance and back
private static Map<BOPWoods, BlockBOPWoodStairs> variantToBlock = new HashMap<BOPWoods, BlockBOPWoodStairs>();

15
src/main/java/biomesoplenty/common/init/ModBlocks.java
View file

@ -78,6 +78,7 @@ import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@ -85,6 +86,7 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemBucket;
import net.minecraft.item.ItemDoor;
import net.minecraft.item.ItemSlab;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ColorizerFoliage;
import net.minecraft.world.ColorizerGrass;
@ -98,7 +100,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class ModBlocks
{
public static final IBlockColor FOLIAGE_COLOURING = new IBlockColor()
public static final IBlockColor FOLIAGE_COLORING = new IBlockColor()
{
@Override
public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex)
@ -116,6 +118,17 @@ public class ModBlocks
}
};
public static final IItemColor BLOCK_ITEM_COLORING = new IItemColor()
{
@Override
public int getColorFromItemstack(ItemStack stack, int tintIndex)
{
IBlockState state = ((ItemBlock)stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata());
IBlockColor blockColor = ((IBOPBlock)state.getBlock()).getBlockColor();
return blockColor == null ? 0xFFFFFF : blockColor.colorMultiplier(state, null, null, tintIndex);
}
};
// TODO: use getDrops() in classes where the drops are very specific, instead of implementing all 3 of quantityDropped() getItemDropped() and damageDropped()
// TODO: docblocks!
// TODO: make better use of canSustainPlant() in BlockDecoration and children

2
src/main/java/biomesoplenty/core/BiomesOPlenty.java
View file

@ -84,7 +84,7 @@ public class BiomesOPlenty
@EventHandler
public void init(FMLInitializationEvent event)
{
BiomesOPlenty.proxy.registerColouredBlocks();
BiomesOPlenty.proxy.registerColouring();
NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
}

10
src/main/java/biomesoplenty/core/ClientProxy.java
View file

@ -84,12 +84,16 @@ public class ClientProxy extends CommonProxy
}
@Override
public void registerColouredBlocks()
public void registerColouring()
{
for (Block block : blocksToColour)
{
IBOPBlock bopBlock = (IBOPBlock)block;
Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(bopBlock.getColourHandler(), block);
if (bopBlock.getBlockColor() != null)
Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler(bopBlock.getBlockColor(), block);
if (bopBlock.getItemColor() != null)
Minecraft.getMinecraft().getItemColors().registerItemColorHandler(bopBlock.getItemColor(), block);
}
}
@ -121,7 +125,7 @@ public class ClientProxy extends CommonProxy
}
//Register colour handlers
if (bopBlock.getColourHandler() != null)
if (bopBlock.getBlockColor() != null || bopBlock.getItemColor() != null)
{
blocksToColour.add(block);
}

2
src/main/java/biomesoplenty/core/CommonProxy.java
View file

@ -15,7 +15,7 @@ import net.minecraft.item.Item;
public class CommonProxy
{
public void registerRenderers() {}
public void registerColouredBlocks() {}
public void registerColouring() {}
public void registerItemVariantModel(Item item, String name, int metadata) {}
public void registerBlockSided(Block block) {}
public void registerFluidBlockRendering(Block block, String name) {}