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

Cleaned some stuff up

This commit is contained in:
Forstride 2019-05-03 20:08:45 -04:00
parent ba27feabf7
commit 70cfdf7e3a
18 changed files with 39 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/biomesoplenty/api/block/BOPBlocks.java
View File

@ -243,7 +243,6 @@ public class BOPBlocks
public static Block pink_daffodil;
public static Block pink_hibiscus;
public static Block glowflower;
public static Block deathbloom;
public static Block wilted_lily;
public static Block burning_blossom;
@ -255,7 +254,6 @@ public class BOPBlocks
public static Block dune_grass;
public static Block desert_grass;
public static Block dead_grass;
public static Block devilweed;
public static Block spectral_fern;
public static Block thorn;

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

@ -81,7 +81,7 @@ public class MysticGroveBiome extends BiomeBOP
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, createCompositeFeature(Feature.MINABLE, new MinableConfig(MinableConfig.IS_ROCK, Blocks.LAPIS_ORE.getDefaultState(), 7), DEPTH_AVERAGE, new DepthAverageConfig(1, 16, 16)));
// Vegetation
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.IVY_TREE, BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE, BOPBiomeFeatures.JACARANDA_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F, 0.1F, 0.5F}, BOPBiomeFeatures.MAGIC_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(10, 0.6F, 1)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.RANDOM_FEATURE_LIST, new RandomDefaultFeatureListConfig(new Feature[]{BOPBiomeFeatures.IVY_TREE, BOPBiomeFeatures.BIG_FLOWERING_OAK_TREE, BOPBiomeFeatures.JACARANDA_TREE, BOPBiomeFeatures.BIG_MAGIC_TREE}, new IFeatureConfig[]{IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG, IFeatureConfig.NO_FEATURE_CONFIG}, new float[]{0.1F, 0.1F, 0.5F, 0.5F}, BOPBiomeFeatures.MAGIC_TREE, IFeatureConfig.NO_FEATURE_CONFIG), AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(10, 0.7F, 1)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.MYSTIC_GROVE_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(14)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.BIG_RED_MUSHROOM, IFeatureConfig.NO_FEATURE_CONFIG, AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(1, 0.1F, 1)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.DOUBLE_PLANT, new DoublePlantConfig(Blocks.LILAC.getDefaultState()), SURFACE_PLUS_32, new FrequencyConfig(4)));

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

@ -74,7 +74,7 @@ public class OriginHillsBiome extends BiomeBOP
// Vegetation
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(BOPBiomeFeatures.ORIGIN_TREE, IFeatureConfig.NO_FEATURE_CONFIG, AT_SURFACE_WITH_EXTRA, new AtSurfaceWithExtraConfig(3, 0.1F, 1)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(Feature.DEFAULT_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(3)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFlowerFeature(BOPBiomeFeatures.ORIGIN_FLOWERS, SURFACE_PLUS_32, new FrequencyConfig(3)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.REED, IFeatureConfig.NO_FEATURE_CONFIG, TWICE_SURFACE, new FrequencyConfig(15)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.LIQUIDS, new LiquidsConfig(Fluids.WATER), HEIGHT_BIASED_RANGE, new CountRangeConfig(50, 8, 8, 256)));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, createCompositeFeature(Feature.LIQUIDS, new LiquidsConfig(Fluids.LAVA), HEIGHT_VERY_BIASED_RANGE, new CountRangeConfig(20, 8, 16, 256)));

16
src/main/java/biomesoplenty/common/block/BlockFlowerBOP.java
View File

@ -56,10 +56,6 @@ public class BlockFlowerBOP extends BlockFlower
if (entityIn instanceof EntityLivingBase)
{
if (block == BOPBlocks.deathbloom)
{
((EntityLivingBase) entityIn).addPotionEffect(new PotionEffect(MobEffects.WITHER, 200));
}
if (block == BOPBlocks.burning_blossom)
{
((EntityLivingBase) entityIn).setFire(1);
@ -74,18 +70,6 @@ public class BlockFlowerBOP extends BlockFlower
super.animateTick(stateIn, worldIn, pos, rand);
Block block = stateIn.getBlock();
if (block == BOPBlocks.deathbloom)
{
if (rand.nextInt(4) == 0)
{
worldIn.addParticle(Particles.MYCELIUM, (double)((float)pos.getX() + rand.nextFloat()), (double)((float)pos.getY() + rand.nextFloat()), (double)((float)pos.getZ() + rand.nextFloat()), 0.0D, 0.0D, 0.0D);
}
if (rand.nextInt(4) == 0)
{
worldIn.addParticle(Particles.SMOKE, (double)((float)pos.getX() + rand.nextFloat()), (double)((float)pos.getY() + rand.nextFloat()), (double)((float)pos.getZ() + rand.nextFloat()), 0.0D, 0.0D, 0.0D);
}
}
if (block == BOPBlocks.burning_blossom)
{
if (rand.nextInt(4) == 0)

2
src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java
View File

@ -37,6 +37,7 @@ public class BOPBiomeFeatures
public static final AbstractTreeFeature<NoFeatureConfig> BIG_OAK_TREE = new BigTreeFeature.Builder().create();
public static final AbstractTreeFeature<NoFeatureConfig> ORIGIN_TREE = new BasicTreeFeature.Builder().leaves(BOPBlocks.origin_leaves.getDefaultState()).minHeight(5).maxHeight(8).create();
public static final AbstractTreeFeature<NoFeatureConfig> MAGIC_TREE = new BasicTreeFeature.Builder().log(BOPBlocks.magic_log.getDefaultState()).leaves(BOPBlocks.magic_leaves.getDefaultState()).create();
public static final AbstractTreeFeature<NoFeatureConfig> BIG_MAGIC_TREE = new BigTreeFeature.Builder().log(BOPBlocks.magic_log.getDefaultState()).leaves(BOPBlocks.magic_leaves.getDefaultState()).create();
public static final AbstractTreeFeature<NoFeatureConfig> JACARANDA_TREE = new BasicTreeFeature.Builder().log(BOPBlocks.jacaranda_log.getDefaultState()).leaves(BOPBlocks.jacaranda_leaves.getDefaultState()).create();
public static final AbstractTreeFeature<NoFeatureConfig> FLOWERING_OAK_TREE = new BasicTreeFeature.Builder().altLeaves(BOPBlocks.flowering_oak_leaves.getDefaultState()).create();
public static final AbstractTreeFeature<NoFeatureConfig> BIG_FLOWERING_OAK_TREE = new BigTreeFeature.Builder().altLeaves(BOPBlocks.flowering_oak_leaves.getDefaultState()).create();
@ -73,6 +74,7 @@ public class BOPBiomeFeatures
public static final AbstractFlowersFeature LUSH_SWAMP_FLOWERS = new LushSwampFlowersFeature();
public static final AbstractFlowersFeature MEADOW_FLOWERS = new MeadowFlowersFeature();
public static final AbstractFlowersFeature MYSTIC_GROVE_FLOWERS = new MysticGroveFlowersFeature();
public static final AbstractFlowersFeature ORIGIN_FLOWERS = new OriginFlowersFeature();
public static final AbstractFlowersFeature SHRUBLAND_FLOWERS = new ShrublandFlowersFeature();
public static final AbstractFlowersFeature SNOWY_FLOWERS = new SnowyFlowersFeature();
public static final AbstractFlowersFeature WASTELAND_FLOWERS = new WastelandFlowersFeature();

33
src/main/java/biomesoplenty/common/world/gen/feature/OriginFlowersFeature.java Normal file
View File

@ -0,0 +1,33 @@
/*******************************************************************************
* Copyright 2014-2019, 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.common.world.gen.feature;
import java.util.Random;
import biomesoplenty.api.block.BOPBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.tags.BlockTags;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.IWorld;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.IChunkGenSettings;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.gen.feature.AbstractFlowersFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.NoFeatureConfig;
public class OriginFlowersFeature extends AbstractFlowersFeature
{
public IBlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_)
{
return p_202355_1_.nextFloat() > 0.6666667F ? Blocks.DANDELION.getDefaultState() : BOPBlocks.rose.getDefaultState();
}
}

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

@ -52,7 +52,7 @@ public class ClientProxy extends CommonProxy
//Grass Coloring
blockColors.register((state, world, pos, tintIndex) ->
world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.get(0.5D, 1.0D),
BOPBlocks.short_grass, BOPBlocks.devilweed);
BOPBlocks.short_grass);
//Foliage Coloring
blockColors.register((state, world, pos, tintIndex) ->
@ -64,7 +64,7 @@ public class ClientProxy extends CommonProxy
itemColors.register((stack, tintIndex) -> {
IBlockState iblockstate = ((ItemBlock)stack.getItem()).getBlock().getDefaultState();
return blockColors.getColor(iblockstate, null, null, tintIndex); },
BOPBlocks.short_grass, BOPBlocks.devilweed, BOPBlocks.flowering_oak_leaves, BOPBlocks.mahogany_leaves,
BOPBlocks.short_grass, BOPBlocks.flowering_oak_leaves, BOPBlocks.mahogany_leaves,
BOPBlocks.palm_leaves, BOPBlocks.willow_leaves, BOPBlocks.ivy, BOPBlocks.willow_vine);
}

2
src/main/java/biomesoplenty/init/ModBlocks.java
View File

@ -269,7 +269,6 @@ public class ModBlocks
pink_daffodil = registerBlock(new BlockFlowerBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "pink_daffodil");
pink_hibiscus = registerBlock(new BlockFlowerBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "pink_hibiscus");
glowflower = registerBlock(new BlockFlowerBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT).lightValue(9)), "glowflower");
deathbloom = registerBlock(new BlockFlowerBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "deathbloom");
wilted_lily = registerBlock(new BlockFlowerBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "wilted_lily");
burning_blossom = registerBlock(new BlockFlowerBOP(Block.Properties.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT).lightValue(8)), "burning_blossom");
@ -281,7 +280,6 @@ public class ModBlocks
dune_grass = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE, MaterialColor.LIME_TERRACOTTA).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "dune_grass");
desert_grass = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE, MaterialColor.ORANGE_TERRACOTTA).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "desert_grass");
dead_grass = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE, MaterialColor.WOOD).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "dead_grass");
devilweed = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "devilweed");
spectral_fern = registerBlock(new BlockFoliageBOP(Block.Properties.create(Material.VINE, MaterialColor.RED).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "spectral_fern");
thorn = registerBlock(new BlockPlantBOP(Block.Properties.create(Material.PLANTS, MaterialColor.LIGHT_GRAY_TERRACOTTA).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "thorn");

5
src/main/resources/assets/biomesoplenty/blockstates/deathbloom.json
View File

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "biomesoplenty:block/deathbloom" }
}
}

5
src/main/resources/assets/biomesoplenty/blockstates/devilweed.json
View File

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "biomesoplenty:block/devilweed" }
}
}

2
src/main/resources/assets/biomesoplenty/lang/en_us.json
View File

@ -139,9 +139,7 @@
"block.biomesoplenty.dead_trapdoor": "Dead Trapdoor",
"block.biomesoplenty.dead_wood": "Dead Wood",
"block.biomesoplenty.dead_wood_slab": "Dead Slab",
"block.biomesoplenty.deathbloom": "Deathbloom",
"block.biomesoplenty.desert_grass": "Desert Grass",
"block.biomesoplenty.devilweed": "Devilweed",
"block.biomesoplenty.dried_sand": "Dried Sand",
"block.biomesoplenty.dune_grass": "Dune Grass",
"block.biomesoplenty.ethereal_button": "Ethereal Button",

6
src/main/resources/assets/biomesoplenty/models/block/deathbloom.json
View File

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

6
src/main/resources/assets/biomesoplenty/models/block/devilweed.json
View File

@ -1,6 +0,0 @@
{
"parent": "block/tinted_cross",
"textures": {
"cross": "biomesoplenty:blocks/devilweed"
}
}

6
src/main/resources/assets/biomesoplenty/models/item/deathbloom.json
View File

@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:blocks/deathbloom"
}
}

6
src/main/resources/assets/biomesoplenty/models/item/devilweed.json
View File

@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:blocks/devilweed"
}
}

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 583 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 470 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 527 B