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

Replaced Dandelion Puff's with Wilted Lilies. Changed Miner's Delight texture

This commit is contained in:
Matt Caughey 2016-01-20 01:57:42 -05:00
parent ece60b0c8c
commit 81d8edb9af
20 changed files with 48 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/biomesoplenty/api/achievement/BOPAchievements.java
View File

@ -15,6 +15,7 @@ public class BOPAchievements
public static Achievement obtain_berry;
public static Achievement obtain_coral;
public static Achievement obtain_miners_delight;
public static Achievement obtain_wilted_lily;
public static Achievement eat_shroom_powder;
public static Achievement obtain_thorn;
public static Achievement craft_poison_jar;

2
src/main/java/biomesoplenty/api/particle/BOPParticleTypes.java
View File

@ -2,5 +2,5 @@ package biomesoplenty.api.particle;
public enum BOPParticleTypes
{
PIXIETRAIL, DANDELION, MUD, PLAYER_TRAIL;
PIXIETRAIL, MUD, PLAYER_TRAIL;
}

109
src/main/java/biomesoplenty/client/particle/EntityDandelionFX.java
View File

@ -1,109 +0,0 @@
/*******************************************************************************
* Copyright 2014-2016, the Biomes O' Plenty Team
*
* This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
*
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
******************************************************************************/
package biomesoplenty.client.particle;
import org.lwjgl.opengl.GL11;
import biomesoplenty.core.ClientProxy;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.world.World;
import net.minecraftforge.fml.client.FMLClientHandler;
public class EntityDandelionFX extends EntityFX
{
public EntityDandelionFX(World world, double xCoordIn, double yCoordIn, double zCoordIn, float par14)
{
this(world, xCoordIn, yCoordIn, zCoordIn, 0.0D, 0.0D, 0.0D, par14);
}
public EntityDandelionFX(World world, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, float par14)
{
super(world, xCoordIn, yCoordIn, zCoordIn, xSpeedIn, ySpeedIn, zSpeedIn);
// dandelion texture is at position 0,0
this.particleTextureIndexX = 0;
this.particleTextureIndexY = 0;
this.motionX *= 0.20000000149011612D;
this.motionY *= 0.10000000149011612D;
this.motionZ *= 0.20000000149011612D;
this.particleScale *= 0.25F;
this.particleScale *= par14;
this.particleMaxAge = (int)(8.0D / (Math.random() * 0.8D + 0.2D));
this.particleMaxAge = (int)((float)this.particleMaxAge * par14);
this.setAlphaF(1.0F);
this.noClip = false;
this.setSize(0.01F, 0.01F);
}
@Override
public int getFXLayer()
{
return 2;
}
@Override
public void renderParticle(WorldRenderer renderer, Entity entity, float partialTicks, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY)
{
// EffectRenderer will by default bind the vanilla particles texture, override with our own
FMLClientHandler.instance().getClient().renderEngine.bindTexture(ClientProxy.particleTexturesLocation);
GlStateManager.depthMask(false);
// TODO what's this?
GL11.glEnable(3042);
GlStateManager.enableBlend();
GlStateManager.blendFunc(770, 1);
super.renderParticle(renderer, entity, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY);
GL11.glDisable(3042);
GlStateManager.disableBlend();
GlStateManager.depthMask(true);
}
@Override
public void onUpdate()
{
prevPosX = posX;
prevPosY = posY;
prevPosZ = posZ;
if (particleAge++ >= particleMaxAge)
{
this.setDead();
}
motionY += 0.004D;
this.moveEntity(motionX, motionY, motionZ);
if (posY == prevPosY)
{
motionX *= 1.1D;
motionZ *= 1.1D;
}
motionX *= 0.9599999785423279D;
motionY *= 0.9599999785423279D;
motionZ *= 0.9599999785423279D;
if (onGround)
{
motionX *= 0.699999988079071D;
motionZ *= 0.699999988079071D;
}
}
}

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDummyTemplate.java
View File

@ -133,7 +133,7 @@ public class BiomeGenDummyTemplate extends BOPBiome
flowerGenerator.add("bromeliads", 1, (new GeneratorFlora.Builder().with(BOPFlowers.BROMELIAD).create()));
flowerGenerator.add("burning_blossoms", 1, (new GeneratorFlora.Builder().with(BOPFlowers.BURNING_BLOSSOM).create()));
flowerGenerator.add("clover", 1, (new GeneratorFlora.Builder().with(BOPFlowers.CLOVER).create()));
flowerGenerator.add("dandelions", 1, (new GeneratorFlora.Builder().with(BOPFlowers.DANDELION).create()));
flowerGenerator.add("wilted_lilies", 1, (new GeneratorFlora.Builder().with(BOPFlowers.WILTED_LILY).create()));
flowerGenerator.add("deathblooms", 1, (new GeneratorFlora.Builder().with(BOPFlowers.DEATHBLOOM).create()));
flowerGenerator.add("enterlotuses", 1, (new GeneratorFlora.Builder().with(BOPFlowers.ENDERLOTUS).create()));
flowerGenerator.add("glowflowers", 1, (new GeneratorFlora.Builder().with(BOPFlowers.GLOWFLOWER).create()));

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java
View File

@ -9,6 +9,7 @@
package biomesoplenty.common.biome.overworld;
import net.minecraft.block.BlockTallGrass;
import net.minecraft.block.BlockFlower.EnumFlowerType;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.init.Blocks;
@ -21,6 +22,7 @@ import biomesoplenty.common.block.BlockBOPCoral;
import biomesoplenty.common.block.BlockBOPGrass;
import biomesoplenty.common.block.BlockBOPLilypad;
import biomesoplenty.common.enums.BOPClimates;
import biomesoplenty.common.enums.BOPFlowers;
import biomesoplenty.common.enums.BOPGems;
import biomesoplenty.common.enums.BOPPlants;
import biomesoplenty.common.enums.BOPTrees;
@ -77,6 +79,11 @@ public class BiomeGenWasteland extends BOPBiome
// other plants
this.addGenerator("dead_grass", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.DEADGRASS).create());
// flowers
GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.05F);
this.addGenerator("flowers", GeneratorStage.GRASS, flowerGenerator);
flowerGenerator.add("wilted_lily", 1, (new GeneratorFlora.Builder()).with(BOPFlowers.WILTED_LILY).create());
// lakes
this.addGenerator("lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.5F).waterLakeForBiome(this).create());
this.addGenerator("poison_lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.2F).waterLakeForBiome(this).liquid(BOPBlocks.poison).frozenLiquid((IBlockState)null).create());

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

@ -131,7 +131,7 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable
this.setBlockBoundsByRadiusAndHeightWithXZOffset(0.2F, 0.8F, pos);
break;
case PINK_DAFFODIL: case DANDELION:
case PINK_DAFFODIL: case WILTED_LILY:
this.setBlockBoundsByRadiusAndHeightWithXZOffset(0.2F, 0.6F, pos);
break;
@ -254,12 +254,14 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable
boolean onDry = (groundBlock == BOPBlocks.hard_dirt || groundBlock == Blocks.hardened_clay || groundBlock == BOPBlocks.sand || groundBlock == Blocks.sand || groundBlock == BOPBlocks.hard_sand);
boolean onNetherrack = (groundBlock == Blocks.netherrack);
boolean onStone = (groundBlock == Blocks.stone);
boolean onDriedDirt = (groundBlock == BOPBlocks.dried_dirt);
boolean onSpectralMoss = false;
if (groundBlock instanceof BlockBOPGrass)
{
switch ((BlockBOPGrass.BOPGrassType) groundState.getValue(BlockBOPGrass.VARIANT))
{
case SPECTRAL_MOSS:
onSpectralMoss = true;
break;
@ -279,6 +281,8 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable
return onSpectralMoss;
case BROMELIAD:
return onDry;
case WILTED_LILY:
return onDriedDirt;
case BURNING_BLOSSOM:
return onNetherrack;
case MINERS_DELIGHT:

2
src/main/java/biomesoplenty/common/enums/BOPFlowers.java
View File

@ -13,7 +13,7 @@ import biomesoplenty.common.util.block.VariantPagingHelper.IPagedVariants;
public enum BOPFlowers implements IStringSerializable, IPagedVariants
{
CLOVER, SWAMPFLOWER, DEATHBLOOM, GLOWFLOWER, BLUE_HYDRANGEA, ORANGE_COSMOS, PINK_DAFFODIL, WILDFLOWER, VIOLET, WHITE_ANEMONE, ENDERLOTUS, BROMELIAD, DANDELION, PINK_HIBISCUS, LILY_OF_THE_VALLEY, BURNING_BLOSSOM, LAVENDER, GOLDENROD, BLUEBELLS, MINERS_DELIGHT, ICY_IRIS, ROSE;
CLOVER, SWAMPFLOWER, DEATHBLOOM, GLOWFLOWER, BLUE_HYDRANGEA, ORANGE_COSMOS, PINK_DAFFODIL, WILDFLOWER, VIOLET, WHITE_ANEMONE, ENDERLOTUS, BROMELIAD, WILTED_LILY, PINK_HIBISCUS, LILY_OF_THE_VALLEY, BURNING_BLOSSOM, LAVENDER, GOLDENROD, BLUEBELLS, MINERS_DELIGHT, ICY_IRIS, ROSE;
@Override
public String getName() {

2
src/main/java/biomesoplenty/common/init/ModAchievements.java
View File

@ -28,6 +28,7 @@ import static biomesoplenty.api.achievement.BOPAchievements.obtain_miners_deligh
import static biomesoplenty.api.achievement.BOPAchievements.obtain_pixie_dust;
import static biomesoplenty.api.achievement.BOPAchievements.obtain_thorn;
import static biomesoplenty.api.achievement.BOPAchievements.obtain_turnip;
import static biomesoplenty.api.achievement.BOPAchievements.obtain_wilted_lily;
import static biomesoplenty.api.achievement.BOPAchievements.use_biome_radar;
import static biomesoplenty.api.achievement.BOPAchievements.use_enderporter;
import net.minecraft.init.Blocks;
@ -82,6 +83,7 @@ public class ModAchievements
obtain_miners_delight = addAchievement("achievement.obtain_miners_delight", "obtain_miners_delight", 3, -4, BlockBOPFlower.paging.getVariantItem(BOPFlowers.MINERS_DELIGHT), obtain_coral);
craft_ornamental_artifact = addAchievement("achievement.craft_ornamental_artifact", "craft_ornamental_artifact", 6, -4, new ItemStack(BOPItems.ornamental_artifact), obtain_miners_delight);
obtain_pixie_dust = addAchievement("achievement.obtain_pixie_dust", "obtain_pixie_dust", 7, -2, new ItemStack(BOPItems.pixie_dust), craft_ornamental_artifact);
obtain_wilted_lily = addAchievement("achievement.obtain_wilted_lily", "obtain_wilted_lily", 8, -5, BlockBOPFlower.paging.getVariantItem(BOPFlowers.WILTED_LILY), craft_ornamental_artifact);
use_biome_radar = addAchievement("achievement.use_biome_radar", "use_biome_radar", 5, -6, new ItemStack(BOPItems.biome_finder), craft_ornamental_artifact);
explore_all_biomes = addAchievement("achievement.explore_all_biomes", "explore_all_biomes", 2, -7, new ItemStack(BOPItems.earth), use_biome_radar).setSpecial();
}

1
src/main/java/biomesoplenty/common/init/ModCrafting.java
View File

@ -55,7 +55,6 @@ public class ModCrafting
GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.white_dye), new Object[] {BlockBOPFlower.paging.getVariantItem(BOPFlowers.WHITE_ANEMONE)});
// ENDERLOTUS missing
// BROMELIAD missing
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.SILVER.getDyeDamage()), new Object[] {BlockBOPFlower.paging.getVariantItem(BOPFlowers.DANDELION)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.PINK.getDyeDamage()), new Object[] {BlockBOPFlower.paging.getVariantItem(BOPFlowers.PINK_HIBISCUS)});
GameRegistry.addShapelessRecipe(new ItemStack(BOPItems.white_dye), new Object[] {BlockBOPFlower.paging.getVariantItem(BOPFlowers.LILY_OF_THE_VALLEY)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, EnumDyeColor.ORANGE.getDyeDamage()), new Object[] {BlockBOPFlower.paging.getVariantItem(BOPFlowers.BURNING_BLOSSOM)});

2
src/main/java/biomesoplenty/common/integration/ThaumcraftCompat.java
View File

@ -139,7 +139,7 @@ public class ThaumcraftCompat
addAspectsToState(BlockBOPFlower.paging.getVariantState(BOPFlowers.SWAMPFLOWER), new Aspect[] { Aspect.PLANT }, new int[] { 4 });
addAspectsToState(BlockBOPFlower.paging.getVariantState(BOPFlowers.WILDFLOWER), new Aspect[] { Aspect.PLANT }, new int[] { 4 });
addAspectsToState(BlockBOPFlower.paging.getVariantState(BOPFlowers.ORANGE_COSMOS), new Aspect[] { Aspect.PLANT }, new int[] { 4 });
addAspectsToState(BlockBOPFlower.paging.getVariantState(BOPFlowers.DANDELION), new Aspect[] { Aspect.PLANT }, new int[] { 4 });
addAspectsToState(BlockBOPFlower.paging.getVariantState(BOPFlowers.WILTED_LILY), new Aspect[] { Aspect.PLANT }, new int[] { 2 });
addAspectsToState(BlockBOPFlower.paging.getVariantState(BOPFlowers.PINK_DAFFODIL), new Aspect[] { Aspect.PLANT }, new int[] { 4 });
addAspectsToState(BlockBOPFlower.paging.getVariantState(BOPFlowers.BROMELIAD), new Aspect[] { Aspect.PLANT }, new int[] { 4 });
addAspectsToState(BlockBOPFlower.paging.getVariantState(BOPFlowers.CLOVER), new Aspect[] { Aspect.PLANT }, new int[] { 2 });

47
src/main/java/biomesoplenty/common/item/ItemBOPFlower.java
View File

@ -32,52 +32,5 @@ public class ItemBOPFlower extends ItemBOPBlock {
if (! (this.block instanceof BlockBOPFlower)) {return null;}
return BlockBOPFlower.paging.getVariant((BlockBOPFlower)this.block, stack.getMetadata());
}
@Override
public int getMaxItemUseDuration(ItemStack stack)
{
return 20;
}
@Override
public EnumAction getItemUseAction(ItemStack stack)
{
return (this.getFlower(stack) == BOPFlowers.DANDELION) ? EnumAction.BLOCK : super.getItemUseAction(stack);
}
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
{
if (this.getFlower(stack) == BOPFlowers.DANDELION)
{
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
}
return stack;
}
@Override
public void onUsingTick(ItemStack stack, EntityPlayer player, int count)
{
if (this.getFlower(stack) == BOPFlowers.DANDELION)
{
Vec3 vec = player.getLook(0.5F);
Random rnd = player.getRNG();
if (player.worldObj.isRemote)
{
for (int p = 0; p < 4; ++p)
{
float pos = (rnd.nextFloat() - 0.5F) / 8;
BiomesOPlenty.proxy.spawnParticle(BOPParticleTypes.DANDELION, player.posX + vec.xCoord + pos, player.posY + vec.yCoord + player.getEyeHeight() + pos, player.posZ + vec.zCoord + pos);
}
}
if (count < 10 && !player.capabilities.isCreativeMode) {
player.stopUsingItem();
--stack.stackSize;
}
}
}
}

4
src/main/java/biomesoplenty/core/ClientProxy.java
View File

@ -14,7 +14,6 @@ import java.util.Map;
import biomesoplenty.api.block.IBOPBlock;
import biomesoplenty.api.item.BOPItems;
import biomesoplenty.api.particle.BOPParticleTypes;
import biomesoplenty.client.particle.EntityDandelionFX;
import biomesoplenty.client.particle.EntityPixieTrailFX;
import biomesoplenty.client.particle.EntityTrailFX;
import biomesoplenty.client.texture.ForgeRedirectedResourcePack;
@ -129,9 +128,6 @@ public class ClientProxy extends CommonProxy
case PIXIETRAIL:
entityFx = new EntityPixieTrailFX(minecraft.theWorld, x, y, z, MathHelper.getRandomDoubleInRange(minecraft.theWorld.rand, -0.03, 0.03), -0.02D, MathHelper.getRandomDoubleInRange(minecraft.theWorld.rand, -0.03, 0.03));
break;
case DANDELION:
entityFx = new EntityDandelionFX(minecraft.theWorld, x, y, z, 2.0F);
break;
case MUD:
int itemId = Item.getIdFromItem(BOPItems.mudball);
minecraft.theWorld.spawnParticle(EnumParticleTypes.ITEM_CRACK, x, y, z, MathHelper.getRandomDoubleInRange(minecraft.theWorld.rand, -0.08D, 0.08D), MathHelper.getRandomDoubleInRange(minecraft.theWorld.rand, -0.08D, 0.08D), MathHelper.getRandomDoubleInRange(minecraft.theWorld.rand, -0.08D, 0.08D), new int[] {itemId});

2
src/main/resources/assets/biomesoplenty/blockstates/flower_0.json
View File

@ -12,7 +12,7 @@
"variant=white_anemone": { "model": "biomesoplenty:white_anemone" },
"variant=enderlotus": { "model": "biomesoplenty:enderlotus" },
"variant=bromeliad": { "model": "biomesoplenty:bromeliad" },
"variant=dandelion": { "model": "biomesoplenty:dandelion" },
"variant=wilted_lily": { "model": "biomesoplenty:wilted_lily" },
"variant=pink_hibiscus": { "model": "biomesoplenty:pink_hibiscus" },
"variant=lily_of_the_valley": { "model": "biomesoplenty:lily_of_the_valley" },
"variant=burning_blossom": { "model": "biomesoplenty:burning_blossom" }

6
src/main/resources/assets/biomesoplenty/lang/en_US.lang
View File

@ -29,7 +29,9 @@ achievement.obtain_deathbloom.desc=Acquire a deadly deathbloom
achievement.obtain_honeycomb=Honeycomb's Big
achievement.obtain_honeycomb.desc=Steal a filled honeycomb from a Nether wasp hive
achievement.obtain_ghastly_soul=Soul Searching
achievement.obtain_ghastly_soul.desc=Vanquish a phantom and take its soul
achievement.obtain_ghastly_soul.desc=Reclaim a lost soul
achievement.obtain_wilted_lily=Godsend
achievement.obtain_wilted_lily.desc=Rescue a wilted lily flower
achievement.obtain_pixie_dust=Don't Breathe This
achievement.obtain_pixie_dust.desc=Kill a pixie and collect its magical dust
achievement.obtain_celestial_crystal=Far Out...
@ -224,7 +226,7 @@ tile.flower_0.violet.name=Violet
tile.flower_0.white_anemone.name=White Anemone
tile.flower_0.enderlotus.name=Enderlotus
tile.flower_0.bromeliad.name=Bromeliad
tile.flower_0.dandelion.name=Dandelion Puff
tile.flower_0.wilted_lily.name=Wilted Lily
tile.flower_0.pink_hibiscus.name=Pink Hibiscus
tile.flower_0.lily_of_the_valley.name=Lily of the Valley
tile.flower_0.burning_blossom.name=Burning Blossom

12
src/main/resources/assets/biomesoplenty/models/block/dandelion.json → src/main/resources/assets/biomesoplenty/models/block/wilted_lily.json
View File

@ -1,6 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "biomesoplenty:blocks/dandelion"
}
}
{
"parent": "block/cross",
"textures": {
"cross": "biomesoplenty:blocks/wilted_lily"
}
}

36
src/main/resources/assets/biomesoplenty/models/item/dandelion.json → src/main/resources/assets/biomesoplenty/models/item/wilted_lily.json
View File

@ -1,18 +1,18 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "biomesoplenty:blocks/dandelion"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}
{
"parent": "builtin/generated",
"textures": {
"layer0": "biomesoplenty:blocks/wilted_lily"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/dandelion.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 507 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/glowshroom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 329 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/miners_delight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 249 B

BIN
src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 371 B