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

Changed barley to tall wheat and made tweaks to the Pasture biome

This commit is contained in:
Forstride 2020-02-19 14:45:18 -05:00
parent 050344333f
commit e9d75a5a4f
15 changed files with 35 additions and 31 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

@ -246,12 +246,12 @@ public class BOPBlocks
public static Block sprout;
public static Block bush;
public static Block barley;
public static Block dune_grass;
public static Block desert_grass;
public static Block dead_grass;
public static Block cattail;
public static Block tall_cattail;
public static Block tall_wheat;
public static Block reed;
public static Block watergrass;
public static Block mangrove_root;

10
src/main/java/biomesoplenty/common/biome/overworld/PastureBiome.java
View File

@ -11,6 +11,7 @@ import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.common.biome.BiomeBOP;
import biomesoplenty.common.world.biome.BiomeFeatureHelper;
import biomesoplenty.common.world.gen.feature.StandardGrassFeature;
import net.minecraft.block.Blocks;
import net.minecraft.entity.EntityClassification;
import net.minecraft.entity.EntityType;
import net.minecraft.util.math.BlockPos;
@ -49,8 +50,9 @@ public class PastureBiome extends BiomeBOP
////////////////////////////////////////////////////////////
// Vegetation
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, new StandardGrassFeature(NoFeatureConfig::deserialize).configured(IFeatureConfig.NONE).decorated(Placement.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyConfig(10))));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.barley.defaultBlockState())).decorated(Placement.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyConfig(500))));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, new StandardGrassFeature(NoFeatureConfig::deserialize).configured(IFeatureConfig.NONE).decorated(Placement.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyConfig(15))));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfigurationDouble(Blocks.TALL_GRASS.defaultBlockState())).decorated(Placement.COUNT_HEIGHTMAP_32.configured(new FrequencyConfig(30))));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfigurationDouble(BOPBlocks.tall_wheat.defaultBlockState())).decorated(Placement.COUNT_HEIGHTMAP_32.configured(new FrequencyConfig(500))));
////////////////////////////////////////////////////////////
@ -78,13 +80,13 @@ public class PastureBiome extends BiomeBOP
@Override
public int getGrassColor(double x, double z)
{
return 0xC8E580;
return 0xEAE177;
}
@OnlyIn(Dist.CLIENT)
@Override
public int getFoliageColor()
{
return 0xADE07B;
return 0xD6E672;
}
}

1
src/main/java/biomesoplenty/common/biome/overworld/SteppeBiome.java
View File

@ -53,7 +53,6 @@ public class SteppeBiome extends BiomeBOP
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfigurationDoubleWater(BOPBlocks.reed.defaultBlockState())).decorated(Placement.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyConfig(10))));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfigurationDouble(Blocks.TALL_GRASS.defaultBlockState())).decorated(Placement.COUNT_HEIGHTMAP_32.configured(new FrequencyConfig(4))));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.desert_grass.defaultBlockState())).decorated(Placement.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyConfig(20))));
this.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Feature.RANDOM_PATCH.configured(BiomeFeatureHelper.createClusterConfiguration(BOPBlocks.barley.defaultBlockState())).decorated(Placement.COUNT_HEIGHTMAP_DOUBLE.configured(new FrequencyConfig(5))));
////////////////////////////////////////////////////////////

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

@ -275,7 +275,6 @@ public class ModBlocks
//Plants
sprout = registerBlock(new FoliageBlockBOP(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)), "sprout");
bush = registerBlock(new FoliageBlockBOP(Block.Properties.of(Material.REPLACEABLE_PLANT).noCollission().instabreak().sound(SoundType.GRASS)), "bush");
barley = registerBlock(new FoliageBlockBOP(Block.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.TERRACOTTA_YELLOW).noCollission().instabreak().sound(SoundType.GRASS)), "barley");
dune_grass = registerBlock(new FoliageBlockBOP(Block.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.TERRACOTTA_LIGHT_GREEN).noCollission().instabreak().sound(SoundType.GRASS)), "dune_grass");
desert_grass = registerBlock(new FoliageBlockBOP(Block.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.TERRACOTTA_ORANGE).noCollission().instabreak().sound(SoundType.GRASS)), "desert_grass");
dead_grass = registerBlock(new FoliageBlockBOP(Block.Properties.of(Material.REPLACEABLE_PLANT, MaterialColor.WOOD).noCollission().instabreak().sound(SoundType.GRASS)), "dead_grass");
@ -283,6 +282,7 @@ public class ModBlocks
//Tall Plants
tall_cattail = registerBlock(new DoubleWatersidePlantBlock(Block.Properties.of(Material.PLANT, MaterialColor.DIRT).noCollission().instabreak().sound(SoundType.GRASS)), "tall_cattail");
tall_wheat = registerBlock(new DoublePlantBlockBOP(Block.Properties.of(Material.PLANT, MaterialColor.TERRACOTTA_YELLOW).noCollission().instabreak().sound(SoundType.GRASS)), "tall_wheat");
reed = registerBlock(new DoubleWaterPlantBlock(Block.Properties.of(Material.PLANT, MaterialColor.DIRT).noCollission().instabreak().sound(SoundType.GRASS)), "reed");
watergrass = registerBlock(new DoubleWaterPlantBlock(Block.Properties.of(Material.PLANT).noCollission().instabreak().sound(SoundType.GRASS)), "watergrass");
mangrove_root = registerBlock(new DoubleWaterPlantBlock(Block.Properties.of(Material.PLANT, MaterialColor.TERRACOTTA_WHITE).noCollission().strength(1.0F, 1.5F).sound(SoundType.WOOD)), "mangrove_root");
@ -383,12 +383,12 @@ public class ModBlocks
RenderTypeLookup.setRenderLayer(willow_vine, cutoutRenderType);
RenderTypeLookup.setRenderLayer(sprout, cutoutRenderType);
RenderTypeLookup.setRenderLayer(bush, cutoutRenderType);
RenderTypeLookup.setRenderLayer(barley, cutoutRenderType);
RenderTypeLookup.setRenderLayer(dune_grass, cutoutRenderType);
RenderTypeLookup.setRenderLayer(desert_grass, cutoutRenderType);
RenderTypeLookup.setRenderLayer(dead_grass, cutoutRenderType);
RenderTypeLookup.setRenderLayer(cattail, cutoutRenderType);
RenderTypeLookup.setRenderLayer(tall_cattail, cutoutRenderType);
RenderTypeLookup.setRenderLayer(tall_wheat, cutoutRenderType);
RenderTypeLookup.setRenderLayer(reed, cutoutRenderType);
RenderTypeLookup.setRenderLayer(watergrass, cutoutRenderType);
RenderTypeLookup.setRenderLayer(mangrove_root, cutoutRenderType);

5
src/main/java/biomesoplenty/init/ModVanillaCompat.java
View File

@ -207,11 +207,11 @@ public class ModVanillaCompat
registerFlammable(BOPBlocks.willow_vine, 15, 100);
registerFlammable(BOPBlocks.sprout, 60, 100);
registerFlammable(BOPBlocks.bush, 60, 100);
registerFlammable(BOPBlocks.barley, 60, 100);
registerFlammable(BOPBlocks.dune_grass, 60, 100);
registerFlammable(BOPBlocks.desert_grass, 60, 100);
registerFlammable(BOPBlocks.dead_grass, 60, 100);
registerFlammable(BOPBlocks.dead_branch, 60, 100);
registerFlammable(BOPBlocks.tall_wheat, 60, 100);
//Log Stripping
registerStrippable(BOPBlocks.fir_log, BOPBlocks.stripped_fir_log);
@ -294,14 +294,13 @@ public class ModVanillaCompat
registerCompostable(0.5F, BOPBlocks.sprout);
registerCompostable(0.5F, BOPBlocks.bush);
registerCompostable(0.5F, BOPBlocks.barley);
registerCompostable(0.5F, BOPBlocks.dune_grass);
registerCompostable(0.5F, BOPBlocks.desert_grass);
registerCompostable(0.5F, BOPBlocks.dead_grass);
registerCompostable(0.5F, BOPBlocks.cattail);
registerCompostable(0.5F, BOPBlocks.tall_cattail);
registerCompostable(0.5F, BOPBlocks.tall_wheat);
registerCompostable(0.5F, BOPBlocks.reed);
registerCompostable(0.5F, BOPBlocks.watergrass);
registerCompostable(0.5F, BOPBlocks.mangrove_root);

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

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

6
src/main/resources/assets/biomesoplenty/blockstates/tall_wheat.json Normal file
View File

@ -0,0 +1,6 @@
{
"variants": {
"half=lower": { "model": "biomesoplenty:block/tall_wheat_bottom" },
"half=upper": { "model": "biomesoplenty:block/tall_wheat_top" }
}
}

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

@ -95,7 +95,6 @@
"item.biomesoplenty.willow_boat": "Willow Boat",
"block.biomesoplenty.ash_block": "Ash Block",
"block.biomesoplenty.barley": "Barley",
"block.biomesoplenty.blue_hydrangea": "Blue Hydrangea",
"block.biomesoplenty.bramble": "Bramble",
"block.biomesoplenty.burning_blossom": "Burning Blossom",
@ -329,6 +328,7 @@
"block.biomesoplenty.stripped_willow_log": "Stripped Willow Log",
"block.biomesoplenty.stripped_willow_wood": "Stripped Willow Wood",
"block.biomesoplenty.tall_cattail": "Tall Cattail",
"block.biomesoplenty.tall_wheat": "Tall Wheat",
"block.biomesoplenty.toadstool": "Toadstool",
"block.biomesoplenty.toadstool_block": "Toadstool Block",
"block.biomesoplenty.umbran_button": "Umbran Button",

6
src/main/resources/assets/biomesoplenty/models/block/tall_wheat_bottom.json Normal file
View File

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

2
src/main/resources/assets/biomesoplenty/models/block/barley.json → src/main/resources/assets/biomesoplenty/models/block/tall_wheat_top.json
View File

@ -1,6 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "biomesoplenty:block/barley"
"cross": "biomesoplenty:block/tall_wheat_top"
}
}

2
src/main/resources/assets/biomesoplenty/models/item/barley.json → src/main/resources/assets/biomesoplenty/models/item/tall_wheat.json
View File

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "biomesoplenty:block/barley"
"layer0": "biomesoplenty:block/tall_wheat_top"
}
}

BIN
src/main/resources/assets/biomesoplenty/textures/block/barley.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 369 B

BIN
src/main/resources/assets/biomesoplenty/textures/block/tall_wheat_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 485 B

BIN
src/main/resources/assets/biomesoplenty/textures/block/tall_wheat_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 B

21
src/main/resources/data/biomesoplenty/loot_tables/blocks/barley.json → src/main/resources/data/biomesoplenty/loot_tables/blocks/tall_wheat.json
View File

@ -17,27 +17,24 @@
}
}
],
"name": "biomesoplenty:barley"
"name": "biomesoplenty:tall_wheat"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:random_chance",
"chance": 0.125
}
],
"functions": [
"condition": "minecraft:survives_explosion"
},
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:uniform_bonus_count",
"parameters": {
"bonusMultiplier": 2
"condition": "minecraft:block_state_property",
"block": "biomesoplenty:tall_wheat",
"properties": {
"half": "lower"
}
},
{
"function": "minecraft:explosion_decay"
"condition": "minecraft:random_chance",
"chance": 0.125
}
],
"name": "minecraft:wheat_seeds"