-
-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #218 from mrsterner/1.5.1-1.20.1
the big
- Loading branch information
Showing
60 changed files
with
1,137 additions
and
190 deletions.
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/malum/forge/biome_modifier/blazing_quartz_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#malum:has_blazing_quartz", | ||
| "features": "malum:blazing_quartz_ore", | ||
| "step": "underground_ores" | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/malum/forge/biome_modifier/deepslate_quartz_geode.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#malum:has_quartz", | ||
| "features": "malum:deepslate_quartz_geode", | ||
| "step": "underground_decoration" | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/generated/resources/data/malum/forge/biome_modifier/natural_quartz_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#malum:has_soulstone", | ||
| "biomes": "#malum:has_quartz", | ||
| "features": "malum:ore_natural_quartz", | ||
| "step": "underground_ores" | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/malum/forge/biome_modifier/quartz_geode.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#malum:has_quartz", | ||
| "features": "malum:quartz_geode", | ||
| "step": "underground_decoration" | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/malum/forge/biome_modifier/rare_earth_geode.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#malum:has_rare_earths", | ||
| "features": "malum:rare_earth_geode", | ||
| "step": "underground_decoration" | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/malum/forge/biome_modifier/rare_runwood_tree.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#malum:has_rare_runewood", | ||
| "features": "malum:rare_runewood_tree", | ||
| "step": "vegetal_decoration" | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/malum/forge/biome_modifier/runwood_tree.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#malum:has_runewood", | ||
| "features": "malum:runewood_tree", | ||
| "step": "vegetal_decoration" | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/malum/tags/worldgen/biome/has_quartz.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "values": [ | ||
| "#minecraft:is_overworld" | ||
| ] | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/malum/tags/worldgen/biome/has_rare_earths.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "values": [ | ||
| "#minecraft:is_overworld" | ||
| ] | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/malum/tags/worldgen/biome/has_rare_runewood.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "values": [ | ||
| "#minecraft:is_forest" | ||
| ] | ||
| } |
4 changes: 3 additions & 1 deletion
4
src/generated/resources/data/malum/tags/worldgen/biome/has_runewood.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| { | ||
| "values": [ | ||
| "#minecraft:is_overworld" | ||
| "#forge:is_plains", | ||
| "#forge:is_mountain", | ||
| "#minecraft:is_hill" | ||
| ] | ||
| } |
18 changes: 18 additions & 0 deletions
18
src/generated/resources/data/malum/worldgen/configured_feature/blazing_quartz_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "type": "minecraft:ore", | ||
| "config": { | ||
| "discard_chance_on_air_exposure": 0.0, | ||
| "size": 14, | ||
| "targets": [ | ||
| { | ||
| "state": { | ||
| "Name": "malum:blazing_quartz_ore" | ||
| }, | ||
| "target": { | ||
| "predicate_type": "minecraft:tag_match", | ||
| "tag": "minecraft:base_stone_nether" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
src/generated/resources/data/malum/worldgen/configured_feature/cthonic_gold_geode.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| { | ||
| "type": "minecraft:geode", | ||
| "config": { | ||
| "blocks": { | ||
| "alternate_inner_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:raw_gold_block" | ||
| } | ||
| }, | ||
| "cannot_replace": "#minecraft:features_cannot_replace", | ||
| "filling_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:raw_gold_block" | ||
| } | ||
| }, | ||
| "inner_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:deepslate_gold_ore" | ||
| } | ||
| }, | ||
| "inner_placements": [ | ||
| { | ||
| "Name": "minecraft:deepslate_gold_ore" | ||
| } | ||
| ], | ||
| "invalid_blocks": "#minecraft:geode_invalid_blocks", | ||
| "middle_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:calcite" | ||
| } | ||
| }, | ||
| "outer_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:smooth_basalt" | ||
| } | ||
| } | ||
| }, | ||
| "crack": { | ||
| "base_crack_size": 2.0, | ||
| "crack_point_offset": 3, | ||
| "generate_crack_chance": 0.6000000238418579 | ||
| }, | ||
| "distribution_points": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 3, | ||
| "min_inclusive": 2 | ||
| } | ||
| }, | ||
| "invalid_blocks_threshold": 1, | ||
| "layers": { | ||
| "filling": 0.02, | ||
| "inner_layer": 0.2, | ||
| "middle_layer": 0.6, | ||
| "outer_layer": 1.4 | ||
| }, | ||
| "max_gen_offset": 16, | ||
| "min_gen_offset": -16, | ||
| "noise_multiplier": 0.1, | ||
| "outer_wall_distance": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 5, | ||
| "min_inclusive": 3 | ||
| } | ||
| }, | ||
| "placements_require_layer0_alternate": true, | ||
| "point_offset": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 1, | ||
| "min_inclusive": 0 | ||
| } | ||
| }, | ||
| "use_alternate_layer0_chance": 0.2, | ||
| "use_potential_placements_chance": 0.85 | ||
| } | ||
| } |
87 changes: 87 additions & 0 deletions
87
src/generated/resources/data/malum/worldgen/configured_feature/deepslate_quartz_geode.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| { | ||
| "type": "minecraft:geode", | ||
| "config": { | ||
| "blocks": { | ||
| "alternate_inner_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "malum:deepslate_quartz_ore" | ||
| } | ||
| }, | ||
| "cannot_replace": "#minecraft:features_cannot_replace", | ||
| "filling_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:air" | ||
| } | ||
| }, | ||
| "inner_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "malum:deepslate_quartz_ore" | ||
| } | ||
| }, | ||
| "inner_placements": [ | ||
| { | ||
| "Name": "malum:natural_quartz_cluster", | ||
| "Properties": { | ||
| "facing": "up", | ||
| "waterlogged": "false" | ||
| } | ||
| } | ||
| ], | ||
| "invalid_blocks": "#minecraft:geode_invalid_blocks", | ||
| "middle_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:calcite" | ||
| } | ||
| }, | ||
| "outer_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:smooth_basalt" | ||
| } | ||
| } | ||
| }, | ||
| "crack": { | ||
| "base_crack_size": 4.0, | ||
| "crack_point_offset": 3, | ||
| "generate_crack_chance": 1.0 | ||
| }, | ||
| "distribution_points": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 3, | ||
| "min_inclusive": 2 | ||
| } | ||
| }, | ||
| "invalid_blocks_threshold": 1, | ||
| "layers": { | ||
| "filling": 1.0, | ||
| "inner_layer": 1.4, | ||
| "middle_layer": 2.6, | ||
| "outer_layer": 4.2 | ||
| }, | ||
| "max_gen_offset": 16, | ||
| "min_gen_offset": -16, | ||
| "noise_multiplier": 0.1, | ||
| "outer_wall_distance": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 5, | ||
| "min_inclusive": 3 | ||
| } | ||
| }, | ||
| "placements_require_layer0_alternate": true, | ||
| "point_offset": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 1, | ||
| "min_inclusive": 0 | ||
| } | ||
| }, | ||
| "use_alternate_layer0_chance": 0.2, | ||
| "use_potential_placements_chance": 0.85 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
src/generated/resources/data/malum/worldgen/configured_feature/quartz_geode.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| { | ||
| "type": "minecraft:geode", | ||
| "config": { | ||
| "blocks": { | ||
| "alternate_inner_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "malum:natural_quartz_ore" | ||
| } | ||
| }, | ||
| "cannot_replace": "#minecraft:features_cannot_replace", | ||
| "filling_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:air" | ||
| } | ||
| }, | ||
| "inner_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "malum:natural_quartz_ore" | ||
| } | ||
| }, | ||
| "inner_placements": [ | ||
| { | ||
| "Name": "malum:natural_quartz_cluster", | ||
| "Properties": { | ||
| "facing": "up", | ||
| "waterlogged": "false" | ||
| } | ||
| } | ||
| ], | ||
| "invalid_blocks": "#minecraft:geode_invalid_blocks", | ||
| "middle_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:tuff" | ||
| } | ||
| }, | ||
| "outer_layer_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:smooth_basalt" | ||
| } | ||
| } | ||
| }, | ||
| "crack": { | ||
| "base_crack_size": 4.0, | ||
| "crack_point_offset": 3, | ||
| "generate_crack_chance": 1.0 | ||
| }, | ||
| "distribution_points": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 3, | ||
| "min_inclusive": 2 | ||
| } | ||
| }, | ||
| "invalid_blocks_threshold": 1, | ||
| "layers": { | ||
| "filling": 1.0, | ||
| "inner_layer": 1.2, | ||
| "middle_layer": 2.2, | ||
| "outer_layer": 2.8 | ||
| }, | ||
| "max_gen_offset": 16, | ||
| "min_gen_offset": -16, | ||
| "noise_multiplier": 0.1, | ||
| "outer_wall_distance": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 5, | ||
| "min_inclusive": 3 | ||
| } | ||
| }, | ||
| "placements_require_layer0_alternate": true, | ||
| "point_offset": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 1, | ||
| "min_inclusive": 0 | ||
| } | ||
| }, | ||
| "use_alternate_layer0_chance": 0.2, | ||
| "use_potential_placements_chance": 0.85 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.