More texture tweaks. Renamed Aloe to Bromeliad.

This commit is contained in:
Matt Caughey 2013-09-19 21:41:03 -04:00
parent 1f4f4d389e
commit 7284b73165
21 changed files with 20 additions and 18 deletions

View file

@ -178,13 +178,14 @@ public class BlockReferences {
anenome (Blocks.flowers, 9), anenome (Blocks.flowers, 9),
lilyflower (Blocks.flowers, 10), lilyflower (Blocks.flowers, 10),
rainbowflower (Blocks.flowers, 11), rainbowflower (Blocks.flowers, 11),
aloe (Blocks.flowers, 12), bromeliad (Blocks.flowers, 12),
sunflower (Blocks.flowers, 13), sunflower (Blocks.flowers, 13),
dandelion (Blocks.flowers, 15), dandelion (Blocks.flowers, 15),
hibiscus (Blocks.flowers2, 0), hibiscus (Blocks.flowers2, 0),
lilyofthevalley (Blocks.flowers2, 1), lilyofthevalley (Blocks.flowers2, 1),
burningblossom (Blocks.flowers2, 2), burningblossom (Blocks.flowers2, 2),
lavender (Blocks.flowers2, 2),
; ;
public Optional<? extends Block> block; public Optional<? extends Block> block;

View file

@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFlower extends BlockFlower public class BlockBOPFlower extends BlockFlower
{ {
private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"};
private Icon[] textures; private Icon[] textures;
private static final int SUNFLOWERTOP = 14; private static final int SUNFLOWERTOP = 14;

View file

@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFlower2 extends BlockFlower public class BlockBOPFlower2 extends BlockFlower
{ {
private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"}; private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"};
private Icon[] textures; private Icon[] textures;
protected BlockBOPFlower2(int blockID, Material material) protected BlockBOPFlower2(int blockID, Material material)

View file

@ -206,7 +206,7 @@ public class BOPBiomes {
Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfigurationIDs.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.05F)); Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfigurationIDs.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.05F));
Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F)); Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F));
Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfigurationIDs.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.5F, 1.3F)); Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfigurationIDs.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.5F, 1.3F));
Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.05F).setMinMaxHeight(0.2F, 0.4F)); Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.4F).setMinMaxHeight(0.2F, 0.4F));
Biomes.field = Optional.of((new BiomeGenField(BOPConfigurationIDs.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); Biomes.field = Optional.of((new BiomeGenField(BOPConfigurationIDs.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F));
Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfigurationIDs.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F)); Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfigurationIDs.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F));
Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.4F)); Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.4F));

View file

@ -217,7 +217,7 @@ public class ThaumcraftIntegration {
ThaumcraftApi.registerObjectTag(getBID("cosmos"), getBMeta("cosmos"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("cosmos"), getBMeta("cosmos"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("daffodil"), getBMeta("daffodil"), (new AspectList()).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("daffodil"), getBMeta("daffodil"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("aloe"), getBMeta("aloe"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.PLANT, 4)); ThaumcraftApi.registerObjectTag(getBID("bromeliad"), getBMeta("bromeliad"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.WATER, 1)); ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.WATER, 1));
ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1).add(Aspect.MAGIC, 1)); ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1).add(Aspect.MAGIC, 1));

View file

@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFlower extends ItemBlock public class ItemBlockFlower extends ItemBlock
{ {
private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"}; private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"};
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private Icon[] textures; private Icon[] textures;
private static final int SUNFLOWERTOP = 14; private static final int SUNFLOWERTOP = 14;

View file

@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFlower2 extends ItemBlock public class ItemBlockFlower2 extends ItemBlock
{ {
private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"}; private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"};
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private Icon[] textures; private Icon[] textures;

View file

@ -49,7 +49,7 @@
<entry key="tile.bop.flowers.anemone.name">Weißes Windröschen</entry> <entry key="tile.bop.flowers.anemone.name">Weißes Windröschen</entry>
<entry key="tile.bop.flowers.lilyflower.name">Wasserlilie</entry> <entry key="tile.bop.flowers.lilyflower.name">Wasserlilie</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Chromablume</entry> <entry key="tile.bop.flowers.rainbowflower.name">Chromablume</entry>
<entry key="tile.bop.flowers.aloe.name">Aloe</entry> <entry key="tile.bop.flowers.bromeliad.name">Aloe</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Sonnenblume</entry> <entry key="tile.bop.flowers.sunflowerbottom.name">Sonnenblume</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Sonnenblume</entry> <entry key="tile.bop.flowers.sunflowertop.name">Sonnenblume</entry>
<entry key="tile.bop.flowers.dandelion.name">Weißer Löwenzahn</entry> <entry key="tile.bop.flowers.dandelion.name">Weißer Löwenzahn</entry>

View file

@ -49,7 +49,7 @@
<entry key="tile.bop.flowers.anemone.name">White Anemone</entry> <entry key="tile.bop.flowers.anemone.name">White Anemone</entry>
<entry key="tile.bop.flowers.lilyflower.name">Waterlily</entry> <entry key="tile.bop.flowers.lilyflower.name">Waterlily</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry> <entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
<entry key="tile.bop.flowers.aloe.name">Aloe</entry> <entry key="tile.bop.flowers.bromeliad.name">Bromeliad</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Sunflower</entry> <entry key="tile.bop.flowers.sunflowerbottom.name">Sunflower</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Sunflower</entry> <entry key="tile.bop.flowers.sunflowertop.name">Sunflower</entry>
<entry key="tile.bop.flowers.dandelion.name">White Dandelion</entry> <entry key="tile.bop.flowers.dandelion.name">White Dandelion</entry>
@ -57,6 +57,7 @@
<entry key="tile.bop.flowers2.hibiscus.name">Pink Hibiscus</entry> <entry key="tile.bop.flowers2.hibiscus.name">Pink Hibiscus</entry>
<entry key="tile.bop.flowers2.lilyofthevalley.name">Lily of the Valley</entry> <entry key="tile.bop.flowers2.lilyofthevalley.name">Lily of the Valley</entry>
<entry key="tile.bop.flowers2.burningblossom.name">Burning Blossom</entry> <entry key="tile.bop.flowers2.burningblossom.name">Burning Blossom</entry>
<entry key="tile.bop.flowers2.lavender.name">Lavender</entry>
<entry key="tile.bop.foliage.algae.name">Algae</entry> <entry key="tile.bop.foliage.algae.name">Algae</entry>
<entry key="tile.bop.foliage.shortgrass.name">Short Grass</entry> <entry key="tile.bop.foliage.shortgrass.name">Short Grass</entry>

View file

@ -45,7 +45,7 @@
<entry key="tile.bop.flowers.violet.name">Violette</entry> <entry key="tile.bop.flowers.violet.name">Violette</entry>
<entry key="tile.bop.flowers.anemone.name">Anémone</entry> <entry key="tile.bop.flowers.anemone.name">Anémone</entry>
<entry key="tile.bop.flowers.lilyflower.name">Fleur de Nénuphar</entry> <entry key="tile.bop.flowers.lilyflower.name">Fleur de Nénuphar</entry>
<entry key="tile.bop.flowers.aloe.name">Aloé</entry> <entry key="tile.bop.flowers.bromeliad.name">Aloé</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Tornesol</entry> <entry key="tile.bop.flowers.sunflowerbottom.name">Tornesol</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Tornesol</entry> <entry key="tile.bop.flowers.sunflowertop.name">Tornesol</entry>
<entry key="tile.bop.flowers.dandelion.name">Pissenlit</entry> <entry key="tile.bop.flowers.dandelion.name">Pissenlit</entry>

View file

@ -45,7 +45,7 @@
<entry key="tile.bop.flowers.violet.name">Violette</entry> <entry key="tile.bop.flowers.violet.name">Violette</entry>
<entry key="tile.bop.flowers.anemone.name">Anémone</entry> <entry key="tile.bop.flowers.anemone.name">Anémone</entry>
<entry key="tile.bop.flowers.lilyflower.name">Fleur de Nénuphar</entry> <entry key="tile.bop.flowers.lilyflower.name">Fleur de Nénuphar</entry>
<entry key="tile.bop.flowers.aloe.name">Aloé</entry> <entry key="tile.bop.flowers.bromeliad.name">Aloé</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Tornesol</entry> <entry key="tile.bop.flowers.sunflowerbottom.name">Tornesol</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Tornesol</entry> <entry key="tile.bop.flowers.sunflowertop.name">Tornesol</entry>
<entry key="tile.bop.flowers.dandelion.name">Pissenlit</entry> <entry key="tile.bop.flowers.dandelion.name">Pissenlit</entry>

View file

@ -49,7 +49,7 @@
<entry key="tile.bop.flowers.anemone.name">Anemone Bianca</entry> <entry key="tile.bop.flowers.anemone.name">Anemone Bianca</entry>
<entry key="tile.bop.flowers.lilyflower.name">Ninfea</entry> <entry key="tile.bop.flowers.lilyflower.name">Ninfea</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry> <entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
<entry key="tile.bop.flowers.aloe.name">Aloe</entry> <entry key="tile.bop.flowers.bromeliad.name">Aloe</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Girasole</entry> <entry key="tile.bop.flowers.sunflowerbottom.name">Girasole</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Girasole</entry> <entry key="tile.bop.flowers.sunflowertop.name">Girasole</entry>
<entry key="tile.bop.flowers.dandelion.name">Dente di Leone Bianco</entry> <entry key="tile.bop.flowers.dandelion.name">Dente di Leone Bianco</entry>
@ -338,7 +338,7 @@
<entry key="item.bop.ancientStaff.ancientstaff.name">Verga Venerabile</entry> <entry key="item.bop.ancientStaff.ancientstaff.name">Verga Venerabile</entry>
<entry key="item.bop.ancientStaff.staffhandle.name">Manico della Verga Venerabile</entry> <entry key="item.bop.ancientStaff.staffhandle.name">Manico della Verga Venerabile</entry>
<entry key="item.bop.ancientStaff.staffpole.name">Corpo della Verga Venerabile</entry> <entry key="item.bop.ancientStaff.staffpole.name">Corpo della Verga Venerabile</entry>
<entry key="item.bop.ancientStaff.stafftopper.name">Sommità della Verga Venerabile</entry> <entry key="item.bop.ancientStaff.stafftopper.name">Sommit<EFBFBD> della Verga Venerabile</entry>
<entry key="item.bop.ancientStaff.ancientstaffbroken.name">Verga Venerabile Esaurita</entry> <entry key="item.bop.ancientStaff.ancientstaffbroken.name">Verga Venerabile Esaurita</entry>
<entry key="item.bop.soulManipulator.soulmanipulator_empty.name">Manipolatore d'Anima</entry> <entry key="item.bop.soulManipulator.soulmanipulator_empty.name">Manipolatore d'Anima</entry>
@ -370,8 +370,8 @@
<entry key="fluid.bop.springWater">Acqua Primaverile</entry> <entry key="fluid.bop.springWater">Acqua Primaverile</entry>
<!--Phrases --> <!--Phrases -->
<entry key="phrase.bop.promisedPortalOverworld">Un portale per la Terra Promessa è apparto nel cielo, sopra di te.</entry> <entry key="phrase.bop.promisedPortalOverworld">Un portale per la Terra Promessa <EFBFBD> apparto nel cielo, sopra di te.</entry>
<entry key="phrase.bop.promisedPortalOther">Un portale per l'Overworld è apparto nel cielo, sopra di te.</entry> <entry key="phrase.bop.promisedPortalOther">Un portale per l'Overworld <EFBFBD> apparto nel cielo, sopra di te.</entry>
<!--Creative Tab --> <!--Creative Tab -->
<entry key="itemGroup.tabBiomesOPlenty">Biomes O' Plenty</entry> <entry key="itemGroup.tabBiomesOPlenty">Biomes O' Plenty</entry>

View file

@ -45,7 +45,7 @@
<entry key="tile.bop.flowers.violet.name">Violet</entry> <entry key="tile.bop.flowers.violet.name">Violet</entry>
<entry key="tile.bop.flowers.anemone.name">Anemoon</entry> <entry key="tile.bop.flowers.anemone.name">Anemoon</entry>
<entry key="tile.bop.flowers.lilyflower.name">Waterlely</entry> <entry key="tile.bop.flowers.lilyflower.name">Waterlely</entry>
<entry key="tile.bop.flowers.aloe.name">Aloë</entry> <entry key="tile.bop.flowers.bromeliad.name">Aloë</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Zonnebloem</entry> <entry key="tile.bop.flowers.sunflowerbottom.name">Zonnebloem</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Zonnebloem</entry> <entry key="tile.bop.flowers.sunflowertop.name">Zonnebloem</entry>
<entry key="tile.bop.flowers.dandelion.name">Paardebloem</entry> <entry key="tile.bop.flowers.dandelion.name">Paardebloem</entry>

View file

@ -50,7 +50,7 @@
<entry key="tile.bop.flowers.anemone.name">Zawilec</entry> <entry key="tile.bop.flowers.anemone.name">Zawilec</entry>
<entry key="tile.bop.flowers.lilyflower.name">Lilia wodna</entry> <entry key="tile.bop.flowers.lilyflower.name">Lilia wodna</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry> <entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
<entry key="tile.bop.flowers.aloe.name">Aloes</entry> <entry key="tile.bop.flowers.bromeliad.name">Aloes</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Słonecznik</entry> <entry key="tile.bop.flowers.sunflowerbottom.name">Słonecznik</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Słonecznik</entry> <entry key="tile.bop.flowers.sunflowertop.name">Słonecznik</entry>
<entry key="tile.bop.flowers.dandelion.name">Dmuchawiec</entry> <entry key="tile.bop.flowers.dandelion.name">Dmuchawiec</entry>

View file

@ -49,7 +49,7 @@
<entry key="tile.bop.flowers.anemone.name">Белый анемон</entry> <entry key="tile.bop.flowers.anemone.name">Белый анемон</entry>
<entry key="tile.bop.flowers.lilyflower.name">Кувшинка</entry> <entry key="tile.bop.flowers.lilyflower.name">Кувшинка</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Радужный цветок</entry> <entry key="tile.bop.flowers.rainbowflower.name">Радужный цветок</entry>
<entry key="tile.bop.flowers.aloe.name">Алоэ</entry> <entry key="tile.bop.flowers.bromeliad.name">Алоэ</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Подсолнечник</entry> <entry key="tile.bop.flowers.sunflowerbottom.name">Подсолнечник</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Подсолнечник</entry> <entry key="tile.bop.flowers.sunflowertop.name">Подсолнечник</entry>
<entry key="tile.bop.flowers.dandelion.name">Белый одуванчик</entry> <entry key="tile.bop.flowers.dandelion.name">Белый одуванчик</entry>

View file

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 545 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 655 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 519 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 594 B

After

Width:  |  Height:  |  Size: 404 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 465 B

After

Width:  |  Height:  |  Size: 470 B