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

Re-added Origin Grass Blocks for the Origin Hills

Browse source
This commit is contained in:
Forstride 2020-07-12 08:45:45 -04:00
parent 43f17912de
commit 3bc5724766
23 changed files with 148 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/biomesoplenty/api/block/BOPBlocks.java
View file

@ -29,6 +29,7 @@ public class BOPBlocks
public static Block mud_brick_stairs;
public static Block mud_brick_wall;
public static Block origin_grass_block;
public static Block dried_salt;
public static Block flesh;
public static Block nether_crystal_block;

12
src/main/java/biomesoplenty/common/biome/overworld/OriginBeachBiome.java
View file

@ -7,7 +7,9 @@
******************************************************************************/
package biomesoplenty.common.biome.overworld;
import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.common.biome.BiomeBOP;
import com.google.common.collect.Lists;
import net.minecraft.block.Blocks;
import net.minecraft.entity.EntityClassification;
import net.minecraft.entity.EntityType;
@ -17,10 +19,7 @@ import net.minecraft.world.biome.DefaultBiomeFeatures;
import net.minecraft.world.biome.MoodSoundAmbience;
import net.minecraft.world.gen.GenerationStage;
import net.minecraft.world.gen.carver.WorldCarver;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.IFeatureConfig;
import net.minecraft.world.gen.feature.OreFeatureConfig;
import net.minecraft.world.gen.feature.ProbabilityConfig;
import net.minecraft.world.gen.feature.*;
import net.minecraft.world.gen.placement.ChanceConfig;
import net.minecraft.world.gen.placement.CountRangeConfig;
import net.minecraft.world.gen.placement.FrequencyConfig;
@ -40,7 +39,10 @@ public class OriginBeachBiome extends BiomeBOP
this.addCarver(GenerationStage.Carving.AIR, Biome.makeCarver(WorldCarver.CAVE, new ProbabilityConfig(0.14285715F)));
DefaultBiomeFeatures.addDefaultLakes(this);
DefaultBiomeFeatures.addDefaultMonsterRoom(this);
DefaultBiomeFeatures.addDefaultSoftDisks(this);
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new SphereReplaceConfig(Blocks.SAND.defaultBlockState(), 7, 2, Lists.newArrayList(Blocks.DIRT.defaultBlockState(), BOPBlocks.origin_grass_block.defaultBlockState()))).decorated(Placement.COUNT_TOP_SOLID.configured(new FrequencyConfig(3))));
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new SphereReplaceConfig(Blocks.CLAY.defaultBlockState(), 4, 1, Lists.newArrayList(Blocks.DIRT.defaultBlockState(), Blocks.CLAY.defaultBlockState()))).decorated(Placement.COUNT_TOP_SOLID.configured(new FrequencyConfig(1))));
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new SphereReplaceConfig(Blocks.GRAVEL.defaultBlockState(), 6, 2, Lists.newArrayList(Blocks.DIRT.defaultBlockState(), BOPBlocks.origin_grass_block.defaultBlockState()))).decorated(Placement.COUNT_TOP_SOLID.configured(new FrequencyConfig(1))));
this.addFeature(GenerationStage.Decoration.UNDERGROUND_STRUCTURES, Feature.MONSTER_ROOM.configured(IFeatureConfig.NONE).decorated(Placement.DUNGEONS.configured(new ChanceConfig(8))));
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, Blocks.DIRT.defaultBlockState(), 33)).decorated(Placement.COUNT_RANGE.configured(new CountRangeConfig(10, 0, 0, 256))));

9
src/main/java/biomesoplenty/common/biome/overworld/OriginHillsBiome.java
View file

@ -8,9 +8,11 @@
package biomesoplenty.common.biome.overworld;
import biomesoplenty.api.biome.BOPBiomes;
import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.common.biome.BiomeBOP;
import biomesoplenty.common.world.gen.feature.BOPBiomeFeatures;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import net.minecraft.block.Blocks;
import net.minecraft.entity.EntityClassification;
import net.minecraft.entity.EntityType;
@ -32,13 +34,16 @@ public class OriginHillsBiome extends BiomeBOP
{
public OriginHillsBiome()
{
super((new Biome.Builder()).surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, SurfaceBuilder.CONFIG_GRASS)).precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.NONE).depth(0.1F).scale(0.2F).temperature(0.6F).downfall(0.6F).specialEffects((new BiomeAmbience.Builder()).waterColor(0x0E31FF).waterFogColor(0x070059).fogColor(0xB0CFFF).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()).parent((String)null));
super((new Biome.Builder()).surfaceBuilder(new ConfiguredSurfaceBuilder(SurfaceBuilder.DEFAULT, BOPBiomeFeatures.ORIGIN_GRASS_SURFACE)).precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.NONE).depth(0.1F).scale(0.2F).temperature(0.6F).downfall(0.6F).specialEffects((new BiomeAmbience.Builder()).waterColor(0x0E31FF).waterFogColor(0x070059).fogColor(0xB0CFFF).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build()).parent((String)null));
// Underground
this.addCarver(GenerationStage.Carving.AIR, Biome.makeCarver(WorldCarver.CAVE, new ProbabilityConfig(0.14285715F)));
DefaultBiomeFeatures.addDefaultLakes(this);
DefaultBiomeFeatures.addDefaultMonsterRoom(this);
DefaultBiomeFeatures.addDefaultSoftDisks(this);
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new SphereReplaceConfig(Blocks.SAND.defaultBlockState(), 7, 2, Lists.newArrayList(Blocks.DIRT.defaultBlockState(), BOPBlocks.origin_grass_block.defaultBlockState()))).decorated(Placement.COUNT_TOP_SOLID.configured(new FrequencyConfig(3))));
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new SphereReplaceConfig(Blocks.CLAY.defaultBlockState(), 4, 1, Lists.newArrayList(Blocks.DIRT.defaultBlockState(), Blocks.CLAY.defaultBlockState()))).decorated(Placement.COUNT_TOP_SOLID.configured(new FrequencyConfig(1))));
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.DISK.configured(new SphereReplaceConfig(Blocks.GRAVEL.defaultBlockState(), 6, 2, Lists.newArrayList(Blocks.DIRT.defaultBlockState(), BOPBlocks.origin_grass_block.defaultBlockState()))).decorated(Placement.COUNT_TOP_SOLID.configured(new FrequencyConfig(1))));
this.addFeature(GenerationStage.Decoration.UNDERGROUND_STRUCTURES, Feature.MONSTER_ROOM.configured(IFeatureConfig.NONE).decorated(Placement.DUNGEONS.configured(new ChanceConfig(8))));
this.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, Feature.ORE.configured(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE, Blocks.DIRT.defaultBlockState(), 33)).decorated(Placement.COUNT_RANGE.configured(new CountRangeConfig(10, 0, 0, 256))));

1
src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java
View file

@ -188,6 +188,7 @@ public class BOPBiomeFeatures
public static final SurfaceBuilderConfig SNOW_SNOW_GRAVEL_SURFACE = new SurfaceBuilderConfig(Blocks.SNOW_BLOCK.defaultBlockState(), Blocks.SNOW_BLOCK.defaultBlockState(), Blocks.GRAVEL.defaultBlockState());
public static final SurfaceBuilderConfig WHITE_SAND_SURFACE = new SurfaceBuilderConfig(BOPBlocks.white_sand.defaultBlockState(), BOPBlocks.white_sand.defaultBlockState(), BOPBlocks.white_sand.defaultBlockState());
public static final SurfaceBuilderConfig DRIED_SALT_SURFACE = new SurfaceBuilderConfig(BOPBlocks.dried_salt.defaultBlockState(), BOPBlocks.dried_salt.defaultBlockState(), BOPBlocks.dried_salt.defaultBlockState());
public static final SurfaceBuilderConfig ORIGIN_GRASS_SURFACE = new SurfaceBuilderConfig(BOPBlocks.origin_grass_block.defaultBlockState(), Blocks.DIRT.defaultBlockState(), Blocks.GRAVEL.defaultBlockState());
//Vanilla Biomes Features
public static final FlowersFeature VIOLET_FEATURE = new VioletFeature();

1
src/main/java/biomesoplenty/init/ModBlocks.java
View file

@ -54,6 +54,7 @@ public class ModBlocks
mud_brick_slab = registerBlock(new SlabBlock(Block.Properties.copy(mud_bricks)), "mud_brick_slab");
mud_brick_wall = registerBlock(new WallBlock(Block.Properties.copy(mud_bricks)),"mud_brick_wall");
origin_grass_block = registerBlock(new GrassBlock(AbstractBlock.Properties.of(Material.GRASS).randomTicks().strength(0.6F).sound(SoundType.GRASS).harvestTool(ToolType.SHOVEL)), "origin_grass_block");
dried_salt = registerBlock(new DriedSaltBlock(AbstractBlock.Properties.of(Material.STONE, MaterialColor.WOOD).strength(1.0F).harvestLevel(0).harvestTool(ToolType.PICKAXE).sound(new SoundType(1.0F, 0.5F, SoundEvents.GRAVEL_BREAK, SoundEvents.GRAVEL_STEP, SoundEvents.GRAVEL_PLACE, SoundEvents.GRAVEL_HIT, SoundEvents.GRAVEL_FALL))), "dried_salt");
flesh = registerBlock(new FleshBlock(AbstractBlock.Properties.of(Material.SPONGE, MaterialColor.TERRACOTTA_RED).strength(0.4F).harvestLevel(0).harvestTool(ToolType.AXE).sound(new SoundType(1.0F, 0.5F, SoundEvents.CORAL_BLOCK_BREAK, SoundEvents.CORAL_BLOCK_STEP, SoundEvents.CORAL_BLOCK_PLACE, SoundEvents.CORAL_BLOCK_HIT, SoundEvents.CORAL_BLOCK_FALL))), "flesh");

20
src/main/java/biomesoplenty/init/ModVanillaCompat.java
View file

@ -1,5 +1,6 @@
package biomesoplenty.init;
import biomesoplenty.api.biome.BOPBiomes;
import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.common.biome.BiomeBOP;
import biomesoplenty.common.world.biome.BiomeFeatureHelper;
@ -9,6 +10,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.minecraft.block.*;
import net.minecraft.item.AxeItem;
import net.minecraft.item.HoeItem;
import net.minecraft.item.ShovelItem;
import net.minecraft.util.IItemProvider;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.Biomes;
@ -243,6 +246,10 @@ public class ModVanillaCompat
registerStrippable(BOPBlocks.hellbark_log, BOPBlocks.stripped_hellbark_log);
registerStrippable(BOPBlocks.hellbark_wood, BOPBlocks.stripped_hellbark_wood);
//Tilling and Flattening
registerTillable(BOPBlocks.origin_grass_block, Blocks.FARMLAND.defaultBlockState());
registerFlattenable(BOPBlocks.origin_grass_block, Blocks.GRASS_PATH.defaultBlockState());
//Compostable Blocks
registerCompostable(0.85F, BOPBlocks.glowshroom_block);
registerCompostable(0.85F, BOPBlocks.toadstool_block);
@ -324,6 +331,16 @@ public class ModVanillaCompat
AxeItem.STRIPABLES.put(log, stripped_log);
}
public static void registerTillable(Block block, BlockState tilled_block) {
HoeItem.TILLABLES = Maps.newHashMap(HoeItem.TILLABLES);
HoeItem.TILLABLES.put(block, tilled_block);
}
public static void registerFlattenable(Block block, BlockState flattened_block) {
ShovelItem.FLATTENABLES = Maps.newHashMap(ShovelItem.FLATTENABLES);
ShovelItem.FLATTENABLES.put(block, flattened_block);
}
public static void registerCompostable(float chance, IItemProvider itemIn) {
ComposterBlock.COMPOSTABLES.put(itemIn.asItem(), chance);
}
@ -350,6 +367,8 @@ public class ModVanillaCompat
for (BiomeDictionary.Type type : includedBiomeTypes)
{
for (Biome biome : BiomeDictionary.getBiomes(type))
{
if (biome != BOPBiomes.origin_beach.get() && biome != BOPBiomes.origin_hills.get())
{
biome.addFeature(decorationStage, featureIn);
}
@ -357,3 +376,4 @@ public class ModVanillaCompat
}
}
}
}

2
src/main/resources/META-INF/accesstransformer.cfg
View file

@ -31,5 +31,7 @@ public net.minecraft.block.WoodButtonBlock <init>(Lnet/minecraft/block/Block$Pro
public net.minecraft.block.PressurePlateBlock <init>(Lnet/minecraft/block/PressurePlateBlock$Sensitivity;Lnet/minecraft/block/Block$Properties;)V # PressurePlateBlock
public-f net.minecraft.item.AxeItem field_203176_a # BLOCK_STRIPPING_MAP
public-f net.minecraft.item.HoeItem field_195973_b # TILLABLES
public-f net.minecraft.item.ShovelItem field_195955_e # FLATTENABLES
protected net.minecraft.entity.item.BoatEntity func_184447_s()V #tickLerp

10
src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"snowy=false": {
"model": "biomesoplenty:block/origin_grass_block"
},
"snowy=true": {
"model": "biomesoplenty:block/origin_grass_block_snow"
}
}
}

1
src/main/resources/assets/biomesoplenty/lang/en_us.json
View file

@ -232,6 +232,7 @@
"block.biomesoplenty.orange_autumn_leaves": "Orange Autumn Leaves",
"block.biomesoplenty.orange_autumn_sapling": "Orange Autumn Sapling",
"block.biomesoplenty.orange_cosmos": "Orange Cosmos",
"block.biomesoplenty.origin_grass_block": "Origin Grass Block",
"block.biomesoplenty.origin_leaves": "Origin Leaves",
"block.biomesoplenty.origin_sapling": "Origin Sapling",
"block.biomesoplenty.palm_button": "Palm Button",

21
src/main/resources/assets/biomesoplenty/models/block/origin_grass_block.json Normal file
View file

@ -0,0 +1,21 @@
{ "parent": "block/block",
"textures": {
"particle": "minecraft:block/dirt",
"bottom": "minecraft:block/dirt",
"top": "biomesoplenty:block/origin_grass_block_top",
"side": "biomesoplenty:block/origin_grass_block_side"
},
"elements": [
{ "from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
}
}
]
}

9
src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json Normal file
View file

@ -0,0 +1,9 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"top": "biomesoplenty:block/origin_grass_block_top",
"bottom": "minecraft:block/dirt",
"side": "biomesoplenty:block/origin_grass_block_snow",
"particle": "minecraft:block/dirt"
}
}

3
src/main/resources/assets/biomesoplenty/models/item/origin_grass_block.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "biomesoplenty:block/origin_grass_block"
}

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 645 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 294 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 727 B

BIN
src/main/resources/assets/biomesoplenty/textures/block/origin_leaves.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 768 B

BIN
src/main/resources/assets/biomesoplenty/textures/block/origin_sapling.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 487 B

After

Width:  |  Height:  |  Size: 403 B

BIN
src/main/resources/assets/biomesoplenty/textures/block/rose.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 249 B

43
src/main/resources/data/biomesoplenty/loot_tables/blocks/origin_grass_block.json Normal file
View file

@ -0,0 +1,43 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "biomesoplenty:origin_grass_block"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "minecraft:dirt"
}
]
}
]
}
]
}

6
src/main/resources/data/forge/tags/blocks/dirt.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"biomesoplenty:origin_grass_block"
]
}

6
src/main/resources/data/minecraft/tags/blocks/bamboo_plantable_on.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"biomesoplenty:origin_grass_block"
]
}

3
src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json
View file

@ -3,6 +3,7 @@
"values": [
"biomesoplenty:white_sand",
"biomesoplenty:toadstool",
"biomesoplenty:glowshroom"
"biomesoplenty:glowshroom",
"biomesoplenty:origin_grass_block"
]
}

6
src/main/resources/data/minecraft/tags/blocks/valid_spawn.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"biomesoplenty:origin_grass_block"
]
}