From f67619e58ff5bc5e3e956f580bd62007af24b00c Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Mon, 4 Aug 2014 20:41:13 -0400 Subject: [PATCH] Tweaked a few textures, added Wisteria block for future use --- .../biomesoplenty/api/content/BOPCBlocks.java | 1 + .../biome/overworld/BiomeGenArctic.java | 15 ++--- .../common/biome/overworld/BiomeGenBayou.java | 12 ++-- .../common/biome/overworld/BiomeGenCrag.java | 12 ++-- .../biome/overworld/BiomeGenDeadSwamp.java | 11 ++-- .../common/biome/overworld/BiomeGenFen.java | 13 ++-- .../biome/overworld/BiomeGenFrostForest.java | 12 ++-- .../biome/overworld/BiomeGenMysticGrove.java | 54 +++++----------- .../biome/overworld/BiomeGenSludgepit.java | 13 ++-- .../BiomeGenTemperateRainforest.java | 10 ++- .../biome/overworld/BiomeGenWasteland.java | 14 ++--- .../common/blocks/BlockWisteria.java | 58 ++++++++++++++++++ .../biomesoplenty/common/core/BOPBlocks.java | 5 ++ .../itemblocks/ItemBlockColorizedSapling.java | 11 ++++ .../assets/biomesoplenty/lang/en_US.lang | 1 + .../textures/blocks/item_bamboo.png | Bin 427 -> 402 bytes .../textures/blocks/item_cattail.png | Bin 597 -> 558 bytes .../textures/blocks/item_flax.png | Bin 592 -> 571 bytes .../textures/blocks/item_reed.png | Bin 456 -> 474 bytes .../textures/blocks/item_rivercane.png | Bin 283 -> 308 bytes .../textures/blocks/item_root.png | Bin 645 -> 629 bytes .../textures/blocks/plank_dark.png | Bin 710 -> 743 bytes .../textures/blocks/watergrassbottom.png | Bin 622 -> 0 bytes .../textures/blocks/watergrasstop.png | Bin 589 -> 0 bytes .../textures/blocks/whitesand.png | Bin 673 -> 0 bytes .../textures/blocks/wisteria.png | Bin 0 -> 673 bytes 26 files changed, 140 insertions(+), 102 deletions(-) create mode 100644 src/main/java/biomesoplenty/common/blocks/BlockWisteria.java delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/watergrassbottom.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/watergrasstop.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/whitesand.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png diff --git a/src/main/java/biomesoplenty/api/content/BOPCBlocks.java b/src/main/java/biomesoplenty/api/content/BOPCBlocks.java index fd67e004b..065a8846c 100644 --- a/src/main/java/biomesoplenty/api/content/BOPCBlocks.java +++ b/src/main/java/biomesoplenty/api/content/BOPCBlocks.java @@ -18,6 +18,7 @@ public class BOPCBlocks public static Block ivy; public static Block treeMoss; public static Block flowerVine; + public static Block wisteria; public static Block foliage; public static Block turnip; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenArctic.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenArctic.java index 462fb8a0e..efb547604 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenArctic.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenArctic.java @@ -6,9 +6,10 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; -public class BiomeGenArctic extends BOPOverworldBiome +public class BiomeGenArctic extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(0F, 0F); @@ -63,20 +64,20 @@ public class BiomeGenArctic extends BOPOverworldBiome return 11903827; } - /* + @Override - public int getFogColour() + public int getFogColour(int x, int y, int z) { return 12638463; } - */ - /* + + @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 0.4F; } - */ + } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java index 91b0d8395..358f8ab62 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java @@ -6,10 +6,9 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; @@ -18,7 +17,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBayou1; import biomesoplenty.common.world.features.trees.WorldGenBayou2; import biomesoplenty.common.world.features.trees.WorldGenBayou3; -public class BiomeGenBayou extends BOPOverworldBiome +public class BiomeGenBayou extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(-0.1F, 0.1F); @@ -122,17 +121,16 @@ public class BiomeGenBayou extends BOPOverworldBiome else return super.getSkyColorByTemp(par1); } - /*@Override - public int getFogColour() + @Override + public int getFogColour(int x, int y, int z) { return 9482133; } @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 0.6F; } - */ } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java index c2271f431..e323f7dd3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java @@ -5,12 +5,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; -public class BiomeGenCrag extends BOPOverworldBiome +public class BiomeGenCrag extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(2.0F, 3.0F); @@ -65,20 +65,16 @@ public class BiomeGenCrag extends BOPOverworldBiome /** * Fog Color */ - /* @Override - public int getFogColour() + public int getFogColour(int x, int y, int z) { return 10514245; } - */ - /* @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 1.0F; } - */ } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java index a24ddd292..8178011db 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java @@ -5,16 +5,16 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; -public class BiomeGenDeadSwamp extends BOPOverworldBiome +public class BiomeGenDeadSwamp extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(0.0F, 0.1F); @@ -106,17 +106,16 @@ public class BiomeGenDeadSwamp extends BOPOverworldBiome else return super.getSkyColorByTemp(par1); } - /*@Override - public int getFogColour() + @Override + public int getFogColour(int x, int y, int z) { return 9219993; } @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 0.6F; } - */ } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java index 2803e1a1b..d8b20094b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java @@ -3,13 +3,11 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; @@ -19,7 +17,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga1; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; -public class BiomeGenFen extends BOPOverworldBiome +public class BiomeGenFen extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -115,17 +113,16 @@ public class BiomeGenFen extends BOPOverworldBiome return 13547897; } - /*@Override - public int getFogColour() + @Override + public int getFogColour(int x, int y, int z) { return 12638463; } @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 0.8F; } - */ } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java index 0d0ba725a..a5381a9dd 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java @@ -5,15 +5,15 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTallGrass; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPFlora; -public class BiomeGenFrostForest extends BOPOverworldBiome +public class BiomeGenFrostForest extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -96,17 +96,17 @@ public class BiomeGenFrostForest extends BOPOverworldBiome else return super.getSkyColorByTemp(par1); } - /*@Override - public int getFogColour() + @Override + public int getFogColour(int x, int y, int z) { return 12239814; } @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 0.6F; } - */ + } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index 2a79dc0a8..43166d2ad 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -6,18 +6,18 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; +import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; -public class BiomeGenMysticGrove extends BOPOverworldBiome +public class BiomeGenMysticGrove extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(0.1F, 0.2F); @@ -112,49 +112,27 @@ public class BiomeGenMysticGrove extends BOPOverworldBiome return 7397529; } - /** - * Fog Color - */ - /* - @Override - public int getFogColour() - { - return 16755401; - } - */ - - /** - * takes temperature, returns color - */ - /* @Override public int getSkyColorByTemp(float par1) { - if (BOPConfigurationMisc.skyColors) - return 8972496; - else - { - par1 /= 3.0F; - - if (par1 < -1.0F) - { - par1 = -1.0F; - } - - if (par1 > 1.0F) - { - par1 = 1.0F; - } - - return Color.getHSBColor(0.62222224F - par1 * 0.05F, 0.5F + par1 * 0.1F, 1.0F).getRGB(); - } + if (BOPConfigurationMisc.skyColors) return 8972496; + else return super.getSkyColorByTemp(par1); + } + + /** + * Fog Color + */ + @Override + public int getFogColour(int x, int y, int z) + { + return 16755401; } @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 1.0F; } - */ + } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSludgepit.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSludgepit.java index 1257258e2..332fe2701 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSludgepit.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSludgepit.java @@ -3,20 +3,18 @@ package biomesoplenty.common.biome.overworld; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBogTree1; import biomesoplenty.common.world.features.trees.WorldGenBogTree2; -public class BiomeGenSludgepit extends BOPOverworldBiome +public class BiomeGenSludgepit extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(0.0F, 0.1F); @@ -108,17 +106,16 @@ public class BiomeGenSludgepit extends BOPOverworldBiome } - /*@Override - public int getFogColour() + @Override + public int getFogColour(int x, int y, int z) { return 10463856; } @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 0.6F; } - */ } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java index 6be3f50ce..bd828f449 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java @@ -5,10 +5,10 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenShrub; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPDoubleFlora; @@ -18,7 +18,7 @@ import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga3; -public class BiomeGenTemperateRainforest extends BOPOverworldBiome +public class BiomeGenTemperateRainforest extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(0.0F, 0.3F); @@ -119,17 +119,15 @@ public class BiomeGenTemperateRainforest extends BOPOverworldBiome else return super.getSkyColorByTemp(par1); } - /*@Override - public int getFogColour() + public int getFogColour(int x, int y, int z) { return 13753294; } @Override - public float getFogCloseness() + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 0.8F; } - */ } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java index 29807906d..0e33f7a60 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java @@ -5,15 +5,15 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import biomesoplenty.api.content.BOPCBlocks; +import biomesoplenty.client.fog.IBiomeFog; import biomesoplenty.common.biome.BOPOverworldBiome; import biomesoplenty.common.configuration.BOPConfigurationMisc; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenDeadTree; -public class BiomeGenWasteland extends BOPOverworldBiome +public class BiomeGenWasteland extends BOPOverworldBiome implements IBiomeFog { private static final Height biomeHeight = new Height(0.1F, 0.1F); @@ -96,18 +96,16 @@ public class BiomeGenWasteland extends BOPOverworldBiome else return super.getSkyColorByTemp(par1); } - /*@Override - public int getFogColour() + @Override + public int getFogColour(int x, int y, int z) { return 12106885; } - */ - /*@Override - public float getFogCloseness() + @Override + public float getFogDensity(int x, int y, int z) { // TODO Auto-generated method stub return 0.3F; } - */ } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockWisteria.java b/src/main/java/biomesoplenty/common/blocks/BlockWisteria.java new file mode 100644 index 000000000..77dee398e --- /dev/null +++ b/src/main/java/biomesoplenty/common/blocks/BlockWisteria.java @@ -0,0 +1,58 @@ +package biomesoplenty.common.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockVine; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.world.IBlockAccess; +import biomesoplenty.BiomesOPlenty; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockWisteria extends BlockVine +{ + public BlockWisteria() + { + //TODO: this.setHardness + this.setHardness(0.2F); + + //TODO setStepSound(Block.soundGrassFootstep) + this.setStepSound(Block.soundTypeGrass); + + //TODO: setTickRandomly() + this.setTickRandomly(true); + + //TODO: this.setCreativeTab() + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + } + + @Override + //TODO: registerIcons() + public void registerBlockIcons(IIconRegister iconRegister) + { + //TODO: blockIcon + this.blockIcon = iconRegister.registerIcon("biomesoplenty:wisteria"); + } + + @Override + @SideOnly(Side.CLIENT) + public int getBlockColor() + { + return 16777215; + } + + // JAVADOC METHOD $$ func_149741_i + @Override + @SideOnly(Side.CLIENT) + public int getRenderColor(int p_149741_1_) + { + return 16777215; + } + + // JAVADOC METHOD $$ func_149720_d + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, int p_149720_3_, int p_149720_4_) + { + return 16777215; + } +} diff --git a/src/main/java/biomesoplenty/common/core/BOPBlocks.java b/src/main/java/biomesoplenty/common/core/BOPBlocks.java index ba4d9bafe..d33ff2173 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBlocks.java +++ b/src/main/java/biomesoplenty/common/core/BOPBlocks.java @@ -74,6 +74,7 @@ import static biomesoplenty.api.content.BOPCBlocks.treeMoss; import static biomesoplenty.api.content.BOPCBlocks.turnip; import static biomesoplenty.api.content.BOPCBlocks.willow; import static biomesoplenty.api.content.BOPCBlocks.willowStairs; +import static biomesoplenty.api.content.BOPCBlocks.wisteria; import static biomesoplenty.api.content.BOPCBlocks.woodenDoubleSlab1; import static biomesoplenty.api.content.BOPCBlocks.woodenDoubleSlab2; import static biomesoplenty.api.content.BOPCBlocks.woodenSingleSlab1; @@ -130,6 +131,7 @@ import biomesoplenty.common.blocks.BlockStoneFormations; import biomesoplenty.common.blocks.BlockTreeMoss; import biomesoplenty.common.blocks.BlockTurnip; import biomesoplenty.common.blocks.BlockWillow; +import biomesoplenty.common.blocks.BlockWisteria; import biomesoplenty.common.fluids.blocks.BlockBloodFluid; import biomesoplenty.common.fluids.blocks.BlockHoneyFluid; import biomesoplenty.common.fluids.blocks.BlockPoisonFluid; @@ -188,6 +190,7 @@ public class BOPBlocks ivy = registerBlock(new BlockIvy().setBlockName("ivy"), ItemBlockIvy.class); treeMoss = registerBlock(new BlockTreeMoss().setBlockName("treeMoss")); flowerVine = registerBlock(new BlockFlowerVine().setBlockName("flowerVine")); + wisteria = registerBlock(new BlockWisteria().setBlockName("wisteria")); foliage = registerBlock(new BlockBOPFoliage().setBlockName("foliage"), ItemBlockFoliage.class); turnip = registerBlock(new BlockTurnip().setBlockName("turnip")); @@ -324,6 +327,8 @@ public class BOPBlocks Blocks.fire.setFireInfo(BOPCBlocks.moss, 15, 100); Blocks.fire.setFireInfo(BOPCBlocks.treeMoss, 15, 100); Blocks.fire.setFireInfo(BOPCBlocks.willow, 15, 100); + Blocks.fire.setFireInfo(BOPCBlocks.flowerVine, 15, 100); + Blocks.fire.setFireInfo(BOPCBlocks.wisteria, 15, 100); } public static Block registerBlock(Block block) diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java index d0666a2b5..5974b11dd 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java @@ -42,4 +42,15 @@ public class ItemBlockColorizedSapling extends ItemBlock //TODO: block getIcon() return field_150939_a.getIcon(0, meta); } + + @Override + public boolean hasEffect(ItemStack itemStack, int pass) + { + if (itemStack.getItemDamage() == 0) + { + return true; + } + + return false; + } } diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index b5492d90c..0d30bb849 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -128,6 +128,7 @@ tile.longGrass.name=Long Grass Block tile.overgrownNetherrack.name=Overgrown Netherrack tile.treeMoss.name=Tree Moss tile.flowerVine.name=Flowering Vines +tile.wisteria.name=Wisteria tile.coral1.kelpsingle.name=Kelp tile.coral1.pinkcoral.name=Pink Coral diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/item_bamboo.png b/src/main/resources/assets/biomesoplenty/textures/blocks/item_bamboo.png index 339415942a217856390a6e2937c330d5db06f219..1af1813124994f298bd6fc996ca88eddde46187c 100644 GIT binary patch delta 351 zcmV-l0igb?1Cj%fJb%0Z01mtXmArCE0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@LjOLe60003HNklGECd83uc2f zKmO7FA4G%rcnt{75%_=pOWOZg`wjnt*vOifZBN8+!2Ty;|9^Mf_5Tl|CvMZg&H;LN@>a0VhdBK~y+TWBC97KSda;ASoEm;Njr`V-R3sVq#!qWCXKe049Io zX~};W8>ay*EG!Ij51IT2(Q0aH4AXY&f;E9OKmO7FA7%(n1Ajn(o12^A{Fk)4FF+gW@d)w6;l6uHY)$G?+W~1T@a6< z8H8~f0K?l)C;dNuyXb#bk;{L7HwzTaAdJ@lm}U??X;Bb{W)Q|{0LaONG=nf!13-SA zFee`9??kZXrE#Zh{?s`u|18E&m^Q8veg;vno&}A~9h#09i9A zwAWs8`46%cq;dTfH!!WOt&Q6NkN`|Ghz&A8QBe_0gEWHxvStuQF@Ri*Rgif6p8){9 WJ>`L7aa6Pb0000-Jb%Fe01m+cxRGn^0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@LjOLe600053Nkl zVFp112n}yNL`a{}L-Y^Me$9@xkc9W&T**<{>u!^1t zq{B{nOob^EonSI5`c%lly>!D*&=LV`DkOrm;<1vuzmxLY0eVP=DDE2KzC}Rq;3($e zO($^=4`bu)j(?91=Oz{T>pjO$z;aQoR$ByY8(vy=Th#DCe4JLj!`$aKee`mbr00A_ zh1%l4yyu~wIXe%J9t6me@KW#mDEDyol#URx!7LWH2=p&FnABl0{*YH)EQbDkeTMFL z11b~DgU3&hA==Y^CV}kC2APNo7YIu?}5(2}J9a^M3lV81(RW1?x%Nqw;~*tUF delta 548 zcmV+<0^9wr1l0tPJb%If01mH;LN@>a0ntfBK~y+TZByw=f>98?uCLI(n3a_+mIf&pT4vcsQ4x}$Ru(-# zP*_3G0zvh&9}&@G^dovJai2VsbNk8$u5<6qJu_#{^;1N|tAARp>V2hB(R*3Qmr5m- z%jNXla=EPdfK8!LXaLDF7ME2l7TI$*quK3tWwY6o*=$xOlZj&=ucx(}O2^)xj|n)& za+SK_f_SUdsxITx^m=nh7K?@BXPbU{xymp=m@vKnEFE^!Ln=&rvm*?E$2k=mA{5sJ zgaK%aq0?O=NPo*-CnwLh0(74YQOwg#G6v{#b0`Z#Rm^`7^>C-7n3uumc)dME`;pP_ zPBr^{%hvk-VIbDO?xUrN9v$qA4bzIRmvzW)OwrRtl5=SMs{p7ucD&RQadBW^H$XiJ zAGOX6Fl{huz-L@4ImVq mfo$YmQ5{)gU}roxE>d4|Nsl4mXfg{57<;t0UE6Kx_Z2;PkkLGt_k3in!n z2xi+E-fu_H+I0lG_eo|V62kQ6Cyf2)nA!SblHOT}5{&~Bi$Szl4q%^pF8Xk5+=fc4u|K0XzM!UNHvM;2i2(U%jUYM zISmF+DU7ofs2|8-6JZdUWV8i1R(E87GJ*Q}S``W#Q_($q$z}$337g9dq$as_$xNV0 z)UUCs(c`>BlX(x5%ON2q2(fiT1Jhh3^0diN*CfHU8YWhnGhnn|^SjXd7_7&Tekox< zKhE!W4PDeX_D3$PUFmgpy1+vVX&Q{sy7?OEn?OsTN4FoO$^%lPN|uGv>L?7&KBIkR@Dl!W z8?-Guu(@t&L5eyI9gZ95oVmgVGHo;q40@jE$i%GCEvI_@u#{K$4gC~x$-H2mHUX~X xpHa&?C4$9-AVKHikC?BI{k51NDE=K$$Oq^S1A2TfOqnQLu~p|Kb>(|MOb||DRr!^o!G`GqBe{Guie~@7ywvW9E*!D0Nh!;TK0V~D^K#EpQ%=zzOtpK(W}T!1me2|GSI*{!cFV2ipiTtTM^?|EZN3{}Y2u|AV~MQ|b!# z8dM7cfE361nty>61v+T{KejaGf0(E7|Ha*DV4F+h^ue^Bqw4?EKm$wzK#D<{L4F6( zX~Bm7vqR1Qhk6)+!@|{E?tg%z3Rn(njDQ3|nn5l}3o`m2` S3nCH#0000O!%=0000QbVXQnQ*UN;cVTj608n9RZgehAMN}Ym zGcGkQF)>H;LN@>a0YpheK~y+TV;CCX^wyI93)_PKL%GC(dCdV}4cq5t{s$Ql;;KQ| zfHjli;EIA>)c+U9==`7G8uRQ71F?PVRlpja6Y6c(^p0I31dSiyn$abRbI z46)ReL5Vt8EZ_yn0s3G?AVa`3F`5P#FfafBz?;4ukPopzwEzGB07*qoM6N<$f?@l^ AiU0rr diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/item_rivercane.png b/src/main/resources/assets/biomesoplenty/textures/blocks/item_rivercane.png index b46401411e648811c9ea7c68612468efb27cde76..ebc72b33e65fa3b4bcb735509d75d3b78da52cc5 100644 GIT binary patch delta 256 zcmV+b0ssD+0<;2HxM!`xs7=)%r0qY%tlZV&*>+!=R2wk8Pv!#MV+ zhzT+?-~8^x1l;@E*cua{qaHi!=n2B;w@0MnKcwRCwDJK@yLBc1jIVV70000;jBIoz69BqsXPDEmEmVYAcg8&(+mZ>T4=WXMLCO4t3v}M9D#?d>y>3#elzij)wL6RJuQRyW z3xK|t#1xA~_dy^5B+FznCVjan$sb;H@W4=Al!$)N6RjWfb`*&O%h*Y1L8lz z2#vJhTgZpK#eW{$><92=zDo#*HQ8)d0JH=t0hN7T7{t-W5HeR$Ec;t=u`_{_=m_Qp z9)b#)CoD?B8Kl!`Ly7kJN2wm2_2F!56n_pwct6pBjh9bAWm-&Rb6|Wh$bmB9_d!sq zUG7X`b-W#Glb!hV>ZyRW?R-9euYhZ!<%GGy*mR2kSbuqas!LQ5xH9%wdiTysF71a& zTopm7iwGjGd$9GUPr#~d>3Op|KvBRC%61y_BRJF~fbIEy1fD$*U%yi+-`>@`4*Ls_ zwz&XW9<8Xdz4AG5Vddl9@FN!-kH;m>tuV$!1yMGw4qmQYE+>hcHY>0{$|QlxrRBPr zOJ7@;i#^A-Z6VQta;2^Fg>P S_dzTG0000H;LN@>a0s%=xK~y+TRa09_lwlBl|BPNFBwD7D3RZ+d;yEqdG)ouPv#yJV zh>!>JCQOkE^-8_S8!5et^w%uQvI~1YA0EGFVm>}E=AFYgGk?!BGrJ}hi2%uUayhXJg@Op}Y&L5`p^yEK7<#Jh= z@f(E=uMehiwLfKjzTZTssKY`QuvsFJkj9LkZ4Tq~^AOIrT%he_Bt_~tX|u`A@iNF{ z{&fR>eR+@ViGOD7dRp;&Z_-Nn4``Cfq!ds)7pTnseDlEFQH>pU3%16aaK7!r#%Mjr zkl&??HsKE9@whCN$m<_pVsD`hwDGPcjSflZ4*{UTBRw4OebDFg!A;a zK^EUvIx*Jvz;a%rR}88h1)+<&gbc>wM>{mARuvGg@{blBGRVT#mkdQ zrOb!+DovS_2pokp*+A)1^W4m(t)t6Bi9{lX+t!70Swsm2gW|J5(UrA~KqDLui+0YZ iXQkE{n>zp60L&c=HpcMjz~nms0000uzaR-yX%JAPf7@#}>3NHnzz1d_@lS9FJIlSj2)x;uX9ryujIAIwix*Z11tL;HC9(A7^ltT2*rFA1d$!Z}IM&6BL? zN{B;r%_KGj7NRf+aUA<;07EH$i4#D-j1wn34RQu~1Ub36F_sxHPUYzl`Q8`e0x$9t zB_Q!%6gELuBtJq%Q-(wLMi}}_PwruWg;E0H(u3TioQ<<-m?z_WGA@U`t{rrJr|Sn@ t+Zjjo^lg0Wd*kij?x-F=cbcxA{sYfwnPa1Sh-&}<002ovPDHLkV1m8KH5vc_ delta 626 zcmV-&0*(FW1;z!CJPN`901m{xlQ+{;;KWqxT&jH|l*hnj2KmG`dfa0x|=t_W4QDys6mLYKC^;I`?q zs3ZAOY|>(ob5ET)^lU}Xf=a9>|jE02zTrXrfEPzG8 zv)u8QwJa=ih&qW;WtxCoHa@5(N)2))4yYTli=MLwn|jt>kyoDgRC7ano_XSbH|i`~ zH?n&T)+X|#dNO2C00bRH_643dua-Ir#&uO&p317gC~xz(^Y!gqe3V_?KJX{}9uzj` z>Y7*ipS&q*Sk5+a1e12|HyON4Y&3uhp;D7XRVxNP_e|4$XE83vP90DRV0hQGL55_1 zAXJWeIjY2?nIT%i5F=+vo>G%t#hC;bAdj98l6^5giywV}cWRWDc?aQ{q@7o=f0rIK zz@6;g+;M~3`re}F<=j*kgg$U{MfIsIi|&SQ=-mGPb%I1Sry3Wx|I~rCtkdttasU7T M07*qoM6N<$f&o`2i~s-t diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/watergrassbottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/watergrassbottom.png deleted file mode 100644 index 15cb408937abe6e46aac9d7d8d75ef617381e492..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmV-!0+IcRP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0005qNkl!H)S%DM0dGd-0^s{R;y*3&Bp$J-0gOA{eIsXjfUREV$s&? zwe5C0Tdh`BC=~4RcsP9S^?JGI^XW>Zl2xl!JDpDU{eIncyS3qP_zRp&CQ4i`msYFQ z1WcTq0Nn3)2LMUf%H^^x77GFLCK-RP*VCKi&*$?8K$Y|PEGKk*0@dd8xdA>JjU<7AZB1i3ohnXL&_yKzkbsRd7!0i0Z0Zdwk`jr8 zVP~A!)qN`YF{V-}Q9~z;s7wKN1iuG@6-A{Vtpw2^kkje3&@-8gk^+H%bvhl57=TzT zCchZ?js}B4WBULgiH`I3P0Q!=vawK9Cx=|oz(7@~MIsT+yW8y=5@1FWYYijcJP)ET ze~Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0005JNklpo6TnSe!t!0@o>-QGvvt; z^FA1T*6X#!f!JcP`2PM$Ie$K%kf$&f6!@wh&~CSFI-P!xzl-tQ^?FroyWRdO5L_;o zM&NR}1k%A^U;vR#%q!r|YPB-{3Xr5)x7*bPVpyls5$XASmOr1*zrP6wx7lnAa?a`v1z5FOHAo=9XAS_lT(8$9ncR3hHrf-x?RE;*b5JEtkv`9=rqPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0006INkl?7sgoN$bE6S|0qX+OO= zBtlp5S#X8;uD$+3^;o`}ZYj}-49pA^@r9c=OugQ@F%>CvpStNa z#MJp{$^)xz3DcpUPM0t6rz`yUY)*MYc*uKlGIT`33?)v9cK?zwLlr`eRunv zG?$;GuYK_cM0N8au@rxq?Hbc)4}lu^!}|MWtFbOb5UX-R|q`Ofi4hRISKpH($^%-M?_qey{F&WxeACjoHcHBfpb~)=En~SNJ zJgkw?)TL(FdDogD1q6-orkf`S-(Mbgb@l^+TCfUt2`W$*shr{U-g_^6nkngeA-;)J zK(~aPrwy`)s;NUJa|JTR`e3GMJ`h?WqOdA7tgR|VD)*S_qWR_9!A)D+ezLhmt`R7# zOGsytTLc6!?pII=TO?X|EkafmLN^G*E7rucn}khH;}N`dv%vC1ea4cS@qoOb1nY<= zv>_rCVAPxg=?h3BMK~>d#TKZsc(EtfEp-p;;OPOKkNoXF`=z|KD`CHK00000NkvXX Hu0mjfr?Dm? diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png new file mode 100644 index 0000000000000000000000000000000000000000..8c48a04bfc725eba6636ce30ab06de0e8b1bea56 GIT binary patch literal 673 zcmV;S0$%-zP)N2bZe?^J zG%heMGmPe!Pyhe|A4x<(R5(v?pfh`fi4a_2iJr!Kth?FQwZFRf}VD`Eg*r(3;XjG z5mL<1UTyOWjD(`8=&hMFK;|Kn(KRTim->_a4dpy^uKbLjNue+8lz4>eyfqUlwGhtOvY!j!9lg zSQ1jnyw6ZB_~3nkt(!Ys^gj?^GS#nm