Skip to content

Commit

Permalink
Added Liquid Null fluid, Null Plants, and Null Leaves for the End Cor…
Browse files Browse the repository at this point in the history
…ruption. Added Obsidian Monoliths to the End Corruption. Increased amount of Dead Coral in the End Reef. Re-enabled shading for Unmapped End Stone.
  • Loading branch information
Forstride committed Jan 18, 2024
1 parent 64e3e5c commit eddf4d1
Show file tree
Hide file tree
Showing 81 changed files with 1,087 additions and 59 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-17T23:37:40.6783463 Registries
// 1.20.4 2024-01-18T17:57:05.9983205 Registries
bec08031dc5126119d3c7a1033703f8235bdf56e data/biomesoplenty/damage_type/bramble.json
41f8df67f585538edc9847b6754275d24b813e06 data/biomesoplenty/damage_type/fumarole.json
1db19ce8d33b8c131955b60ed830200bbee6a912 data/biomesoplenty/worldgen/biome/aspen_glade.json
Expand All @@ -13,7 +13,7 @@ d0c0bdd9fc7b09e7d046e35faea8cc6d752b468a data/biomesoplenty/worldgen/biome/crag.
401cb408a8b99f3fd8b696f9759d9f1f8a1a945e data/biomesoplenty/worldgen/biome/dead_forest.json
506de7d82a9bf0a7caea3390590dc9d1fa2028b0 data/biomesoplenty/worldgen/biome/dryland.json
d4a9226ceaef3cf4eed45892e027c1eabf9fcd72 data/biomesoplenty/worldgen/biome/dune_beach.json
463fa78747e5d99cd7ab9736825d7e524b10d3d3 data/biomesoplenty/worldgen/biome/end_corruption.json
e289a828bcaa9b7da333c3a5c968d7294e1f3f1e data/biomesoplenty/worldgen/biome/end_corruption.json
b3eae91d1d02cfda03e70a555aaaa1bc7028bd61 data/biomesoplenty/worldgen/biome/end_reef.json
761c7b7faba4848ea366e56bdf73f41fdea01277 data/biomesoplenty/worldgen/biome/end_wilds.json
a89d541384f1a879bb82d9c984d98c512474d27c data/biomesoplenty/worldgen/biome/erupting_inferno.json
Expand Down Expand Up @@ -202,11 +202,14 @@ bccd849ed1fd3f32daad2b1f705c30f834c20f96 data/biomesoplenty/worldgen/configured_
e6c40fcb31d153fc2379756e7f97f99cd816a51f data/biomesoplenty/worldgen/configured_feature/large_fumarole.json
a8aa7c8ae1c6881f8951d829a780767d266906cc data/biomesoplenty/worldgen/configured_feature/large_rose_quartz.json
863215c984d1e63a8021b3117febf08233b183d4 data/biomesoplenty/worldgen/configured_feature/lava_lake_volcano.json
bc7a09901e7f698ce8bfd34adbc13b3c22495df2 data/biomesoplenty/worldgen/configured_feature/liquid_null_lake.json
d8bd16e51de0100b1d889553f4db0a8bd0293ebe data/biomesoplenty/worldgen/configured_feature/liquid_null_spring.json
bedf4220d0a9a4c61aaaef6c2b228da620cc38cc data/biomesoplenty/worldgen/configured_feature/magic_tree.json
647617b685cbd6cdbb5b44aa89a28f06d9525d54 data/biomesoplenty/worldgen/configured_feature/mahogany_tree.json
6b40860f0e9a088d066a68e06f0f38529cc13c27 data/biomesoplenty/worldgen/configured_feature/mangrove_twiglet_tree.json
225cec36fb7e434d76ecbf6fae24646df1203c62 data/biomesoplenty/worldgen/configured_feature/maple_twiglet_tree.json
b5e4c509d7abd098aa93dadce54a8533dc692d63 data/biomesoplenty/worldgen/configured_feature/medium_glowshroom_cave.json
a6e83b4f1b4a43b5bcb4e5625095fbbde09a13f8 data/biomesoplenty/worldgen/configured_feature/monolith.json
172efe6d9b7c70c459409e0b454ffc27bd7c7735 data/biomesoplenty/worldgen/configured_feature/mossy_black_sand_splatter.json
d6d5e186672bad3ad86b6c611d6b2bd3d4aee3a3 data/biomesoplenty/worldgen/configured_feature/moss_splatter.json
397835a0d2b8cd9763552f0439633921e0620061 data/biomesoplenty/worldgen/configured_feature/mud_patch.json
Expand All @@ -216,8 +219,7 @@ d0604daa873d67e12bd3f0ce62d7994671c5b124 data/biomesoplenty/worldgen/configured_
2b93c838ff048ba3aa64c57c9beab7b299e41789 data/biomesoplenty/worldgen/configured_feature/nether_bone_spine.json
8983f10fea2f2b9edbab92a2c9c0332f32fccc3c data/biomesoplenty/worldgen/configured_feature/nether_bramble.json
f9a397d007b98bf36c83d256856fd0fcc45d3a37 data/biomesoplenty/worldgen/configured_feature/nether_vines.json
76fa38cb0a73a9f1330c2e773bfa3fe6187723db data/biomesoplenty/worldgen/configured_feature/null_lake.json
68b8cab5ece0e989c54a9bd1e173cdb125cb81a9 data/biomesoplenty/worldgen/configured_feature/null_tree.json
4a686687dedeb0b53d09db28c9f0a75e5ea2097f data/biomesoplenty/worldgen/configured_feature/null_tree.json
6141c480c606ffa99a495c76b5a9b59ffebfb789 data/biomesoplenty/worldgen/configured_feature/oak_bush.json
6227de33c6e00775d2282294f22bfe801c230003 data/biomesoplenty/worldgen/configured_feature/obsidian_splatter.json
003763f1fe56dd5a747789831f851173ffbf6af9 data/biomesoplenty/worldgen/configured_feature/orange_maple_leaf_piles.json
Expand All @@ -237,6 +239,7 @@ cd2b9f82f108fe30dd3a4a878bd7216a37c98091 data/biomesoplenty/worldgen/configured_
9ce350946f5b452811e9e7fad769936daab025d5 data/biomesoplenty/worldgen/configured_feature/patch_fern.json
4231cac3fcd37be7e55ca565003e3e73c3103a05 data/biomesoplenty/worldgen/configured_feature/patch_icy_iris.json
d264cc02cac93f5db4252b51762df378cb341dad data/biomesoplenty/worldgen/configured_feature/patch_lilac.json
ba2ea6e4b7a2c7e8be1a744c91300e6c26a5f9c9 data/biomesoplenty/worldgen/configured_feature/patch_null_plants.json
78d09a459d7fb81d6ad23d4ceff4fbf26b06dfe1 data/biomesoplenty/worldgen/configured_feature/patch_peony.json
62699a042159c9d077daf2ea12a1257303f1c467 data/biomesoplenty/worldgen/configured_feature/patch_reed.json
e044cfc0126d8f2a16bf8190eb8eaa72fdb07722 data/biomesoplenty/worldgen/configured_feature/patch_sea_oats.json
Expand Down Expand Up @@ -380,8 +383,8 @@ ea74748c10a9cb9224fc0be2822956acc94867a1 data/biomesoplenty/worldgen/placed_feat
5c6e712bb74bc268bb6659e0f73e7797fdb2d353 data/biomesoplenty/worldgen/placed_feature/cypress_tree.json
195481b0426113a9bcaf519cc9064cbebf8507b4 data/biomesoplenty/worldgen/placed_feature/cypress_tree_medium.json
4143fbe4921960b7c766593a0c0fb4bef8c2e88a data/biomesoplenty/worldgen/placed_feature/dark_oak_poplar_tree.json
182b69b5e50886817b6949fcfbc5d5dc912a700e data/biomesoplenty/worldgen/placed_feature/dead_coral.json
90a690dcffe75ce7e7378cd2184f781d514bacf7 data/biomesoplenty/worldgen/placed_feature/dead_coral_patch.json
b6ca8c211a9599137a450b896bb731d5fe53b22e data/biomesoplenty/worldgen/placed_feature/dead_coral.json
749831fc69e07bda04419d3acd11bf478e1bab38 data/biomesoplenty/worldgen/placed_feature/dead_coral_patch.json
491adc1fc84802b69d5bb5800507d773cb23e54b data/biomesoplenty/worldgen/placed_feature/dead_grass_45.json
cec9215a5d9f08511ddbddd59bec252ce4c4d204 data/biomesoplenty/worldgen/placed_feature/dead_tree_wasteland.json
57486a3dd4ba0cb77a463c588a2af146eb586b40 data/biomesoplenty/worldgen/placed_feature/dead_twiglet_tree.json
Expand Down Expand Up @@ -479,19 +482,21 @@ dbbf828549ff2cc7957b4251ecf155f77c5b7d4f data/biomesoplenty/worldgen/placed_feat
ad6f8ad60a22582d92a6dca5af350728836630fe data/biomesoplenty/worldgen/placed_feature/lake_water_marsh.json
6fbbbe5af62c957a12b7461e2749e45bc5823824 data/biomesoplenty/worldgen/placed_feature/large_fumarole.json
1b536969346c74b6c6fd27ee845685d8dc8d9108 data/biomesoplenty/worldgen/placed_feature/large_rose_quartz.json
02ce7623f135e7b78162289171b03229e55b8427 data/biomesoplenty/worldgen/placed_feature/liquid_null_lake.json
e0a1e57121c1e5e1fd42d3c67b0c4ecef0ee0f5e data/biomesoplenty/worldgen/placed_feature/liquid_null_spring.json
5e72df8af65151233e58ae82d70e3608d17d3247 data/biomesoplenty/worldgen/placed_feature/magic_tree.json
d4c78a6dce9de78cec8397ce50521d3cab7aa81a data/biomesoplenty/worldgen/placed_feature/mahogany_tree.json
310ad4881f726e29281bcf006b7925efad369979 data/biomesoplenty/worldgen/placed_feature/mangrove_twiglet_tree.json
b807943bef7f953103a7fbc886ac863ddd5fa40d data/biomesoplenty/worldgen/placed_feature/maple_twiglet_tree.json
6ed110fd6b332428a4bdf1553ca79df1a66483e0 data/biomesoplenty/worldgen/placed_feature/medium_glowshroom_cave.json
dd864a9d4fea09829d0fa7bd2085a8ea741c5327 data/biomesoplenty/worldgen/placed_feature/monolith.json
970ad165a8dd090681858d579f27dc1500800a6b data/biomesoplenty/worldgen/placed_feature/mossy_black_sand_splatter.json
d04d7ec12bdeab3c76c39218cea745e4e7ef5128 data/biomesoplenty/worldgen/placed_feature/moss_splatter.json
eaafc116edf17b5a3c48e7bdc68f62ba84fd2deb data/biomesoplenty/worldgen/placed_feature/mud_splatter.json
965e2c872a9ef8c889f4a9029d69aecfb21cd132 data/biomesoplenty/worldgen/placed_feature/mycelium_splatter.json
97840a5e6998b7403cf670f9700321ce266c1319 data/biomesoplenty/worldgen/placed_feature/nether_bone_spine.json
a0515b53a5b94f2ed1d7dbd87db0585612d83dda data/biomesoplenty/worldgen/placed_feature/nether_bramble.json
1a38b33f693e7e19b9e5975269ae2ab5cf1c2472 data/biomesoplenty/worldgen/placed_feature/nether_vines.json
f3b33fbd598ab935e868bab7a4875ee1380220b0 data/biomesoplenty/worldgen/placed_feature/null_lake.json
a3d701df3a8d022e81b0abe17a6f635938ae0d19 data/biomesoplenty/worldgen/placed_feature/null_tree.json
062fefe110d24798d1df521817e98394fe648a62 data/biomesoplenty/worldgen/placed_feature/oak_bush.json
2669995131b210204c99f3f718cae309ba9e822f data/biomesoplenty/worldgen/placed_feature/obsidian_splatter.json
Expand Down Expand Up @@ -534,6 +539,7 @@ c11bbeb0932cb9ff82ce1ae2062bf40f2134907e data/biomesoplenty/worldgen/placed_feat
dd23f88ba482687675b37c537e9df73544c6ae44 data/biomesoplenty/worldgen/placed_feature/patch_lily_pad_10.json
f2a67264c7a00a510d7db677307fafab2c3fffc8 data/biomesoplenty/worldgen/placed_feature/patch_lily_pad_15.json
aab6cc8efc04152d9709e7ad8cf89d6fcd0434d4 data/biomesoplenty/worldgen/placed_feature/patch_lily_pad_5.json
2ccb5b475131ac770894591e05b068a247f1200f data/biomesoplenty/worldgen/placed_feature/patch_null_plants.json
5dd332a3191505d0b066d097024ad6a56d524d4d data/biomesoplenty/worldgen/placed_feature/patch_peony.json
4b63940ce56480b7bc04a7751a0497c057d4ce7f data/biomesoplenty/worldgen/placed_feature/patch_reed_10.json
8007064c88cf57e447764ddeee34f3830f77ea20 data/biomesoplenty/worldgen/placed_feature/patch_reed_5.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
},
"features": [
[],
[],
[
"biomesoplenty:liquid_null_lake"
],
[
"biomesoplenty:anomaly"
],
Expand All @@ -34,11 +36,14 @@
[],
[],
[
"biomesoplenty:null_lake"
"biomesoplenty:monolith"
],
[
"biomesoplenty:liquid_null_spring"
],
[],
[
"biomesoplenty:trees_end_corruption"
"biomesoplenty:trees_end_corruption",
"biomesoplenty:patch_null_plants"
]
],
"has_precipitation": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"fluid": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "biomesoplenty:null_block"
"Name": "biomesoplenty:liquid_null",
"Properties": {
"level": "0"
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:spring_feature",
"config": {
"hole_count": 1,
"requires_block_below": false,
"rock_count": 4,
"state": {
"Name": "biomesoplenty:liquid_null",
"Properties": {
"falling": "true"
}
},
"valid_blocks": [
"minecraft:end_stone",
"biomesoplenty:null_end_stone",
"biomesoplenty:unmapped_end_stone"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "biomesoplenty:monolith",
"config": {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "biomesoplenty:null_block"
"Name": "biomesoplenty:null_leaves",
"Properties": {
"distance": "7",
"persistent": "false",
"waterlogged": "false"
}
}
},
"hanging_chance": 0.0,
Expand All @@ -36,7 +41,7 @@
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "biomesoplenty:null_end_stone"
"Name": "biomesoplenty:null_block"
}
},
"vine_provider": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "biomesoplenty:null_plant"
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 96,
"xz_spread": 7,
"y_spread": 3
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:count",
"count": 3
"count": 4
},
{
"type": "minecraft:in_square"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:count",
"count": 1
"count": 2
},
{
"type": "minecraft:in_square"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"feature": "biomesoplenty:null_lake",
"feature": "biomesoplenty:liquid_null_lake",
"placement": [
{
"type": "minecraft:rarity_filter",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"feature": "biomesoplenty:liquid_null_spring",
"placement": [
{
"type": "minecraft:count",
"count": 10
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:height_range",
"height": {
"type": "minecraft:uniform",
"max_inclusive": {
"below_top": 0
},
"min_inclusive": {
"above_bottom": 0
}
}
},
{
"type": "minecraft:biome"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"feature": "biomesoplenty:monolith",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 4
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "MOTION_BLOCKING"
},
{
"type": "minecraft:biome"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"feature": "biomesoplenty:patch_null_plants",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 2
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
},
{
"type": "minecraft:biome"
}
]
}
6 changes: 4 additions & 2 deletions common/src/main/java/biomesoplenty/api/block/BOPBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class BOPBlocks
public static Block EYEBULB;
public static Block HAIR;
public static Block PUS_BUBBLE;
public static Block BLOOD;

public static Block BRIMSTONE;
public static Block BRIMSTONE_BRICKS;
Expand All @@ -79,6 +80,9 @@ public class BOPBlocks
public static Block UNMAPPED_END_STONE;
public static Block NULL_END_STONE;
public static Block NULL_BLOCK;
public static Block NULL_LEAVES;
public static Block NULL_PLANT;
public static Block LIQUID_NULL;
public static Block ANOMALY;

public static Block TOADSTOOL;
Expand Down Expand Up @@ -408,8 +412,6 @@ public class BOPBlocks
public static Block BRAMBLE;
public static Block BRAMBLE_LEAVES;

public static Block BLOOD;

public static Block POTTED_ORIGIN_SAPLING;
public static Block POTTED_FLOWERING_OAK_SAPLING;
public static Block POTTED_SNOWBLOSSOM_SAPLING;
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/biomesoplenty/api/block/BOPFluids.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ public class BOPFluids
{
public static FlowingFluid FLOWING_BLOOD;
public static Fluid BLOOD;
public static FlowingFluid FLOWING_LIQUID_NULL;
public static Fluid LIQUID_NULL;
}
5 changes: 4 additions & 1 deletion common/src/main/java/biomesoplenty/api/item/BOPItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public class BOPItems
public static Item EYEBULB;
public static Item HAIR;
public static Item PUS_BUBBLE;

public static Item BLOOD;
public static Item BLOOD_BUCKET;

Expand Down Expand Up @@ -86,6 +85,10 @@ public class BOPItems
public static Item UNMAPPED_END_STONE;
public static Item NULL_END_STONE;
public static Item NULL_BLOCK;
public static Item NULL_LEAVES;
public static Item NULL_PLANT;
public static Item LIQUID_NULL;
public static Item LIQUID_NULL_BUCKET;
public static Item ANOMALY;

public static Item TOADSTOOL;
Expand Down
5 changes: 4 additions & 1 deletion common/src/main/java/biomesoplenty/biome/BOPEndBiomes.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ public static Biome endCorruption(HolderGetter<PlacedFeature> placedFeatureGette
BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
biomeBuilder.addFeature(GenerationStep.Decoration.SURFACE_STRUCTURES, EndPlacements.END_GATEWAY_RETURN);
biomeBuilder.addFeature(GenerationStep.Decoration.LOCAL_MODIFICATIONS, BOPEndPlacements.ANOMALY);
biomeBuilder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPEndPlacements.NULL_LAKE);
biomeBuilder.addFeature(GenerationStep.Decoration.LAKES, BOPEndPlacements.LIQUID_NULL_LAKE);
biomeBuilder.addFeature(GenerationStep.Decoration.FLUID_SPRINGS, BOPEndPlacements.LIQUID_NULL_SPRING);
biomeBuilder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, BOPEndPlacements.MONOLITH);
biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.TREES_END_CORRUPTION);
biomeBuilder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, BOPEndPlacements.PATCH_NULL_PLANTS);

return new Biome.BiomeBuilder()
.hasPrecipitation(false).temperature(0.5F).downfall(0.5F)
Expand Down
16 changes: 16 additions & 0 deletions common/src/main/java/biomesoplenty/block/LiquidNullBlock.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*******************************************************************************
* Copyright 2022, the Glitchfiend Team.
* All rights reserved.
******************************************************************************/
package biomesoplenty.block;

import net.minecraft.world.level.block.BucketPickup;
import net.minecraft.world.level.block.LiquidBlock;
import net.minecraft.world.level.material.FlowingFluid;

public class LiquidNullBlock extends LiquidBlock implements BucketPickup
{
public LiquidNullBlock(FlowingFluid p_54694_, Properties p_54695_) {
super(p_54694_, p_54695_);
}
}
Loading

0 comments on commit eddf4d1

Please sign in to comment.