forked from Benimatic/twilightforest
-
Notifications
You must be signed in to change notification settings - Fork 201
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.21.x' into no-build/l10n
- Loading branch information
Showing
37 changed files
with
443 additions
and
53 deletions.
There are no files selected for viewing
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,23 @@ | ||
| name: Azure security for Pull Requests | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - '*' | ||
|
|
||
| jobs: | ||
| validate: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| permissions: | ||
| pull-requests: read | ||
|
|
||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Prevent file change | ||
| uses: xalvarez/prevent-file-change-action@v1 | ||
| with: | ||
| githubToken: ${{ secrets.GITHUB_TOKEN }} | ||
| pattern: .*\azure-pipelines.yml |
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
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
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
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
44 changes: 44 additions & 0 deletions
44
src/generated/resources/data/twilightforest/worldgen/configured_feature/dense_ferns.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,44 @@ | ||
| { | ||
| "type": "minecraft:random_patch", | ||
| "config": { | ||
| "feature": { | ||
| "feature": { | ||
| "type": "minecraft:simple_block", | ||
| "config": { | ||
| "to_place": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:fern" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "placement": [ | ||
| { | ||
| "type": "minecraft:block_predicate_filter", | ||
| "predicate": { | ||
| "type": "minecraft:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "minecraft:matching_blocks", | ||
| "blocks": "minecraft:air" | ||
| }, | ||
| { | ||
| "type": "minecraft:matching_block_tag", | ||
| "offset": [ | ||
| 0, | ||
| -1, | ||
| 0 | ||
| ], | ||
| "tag": "minecraft:dirt" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "tries": 64, | ||
| "xz_spread": 7, | ||
| "y_spread": 3 | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...enerated/resources/data/twilightforest/worldgen/configured_feature/dense_large_ferns.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,47 @@ | ||
| { | ||
| "type": "minecraft:random_patch", | ||
| "config": { | ||
| "feature": { | ||
| "feature": { | ||
| "type": "minecraft:simple_block", | ||
| "config": { | ||
| "to_place": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:large_fern", | ||
| "Properties": { | ||
| "half": "lower" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "placement": [ | ||
| { | ||
| "type": "minecraft:block_predicate_filter", | ||
| "predicate": { | ||
| "type": "minecraft:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "minecraft:matching_blocks", | ||
| "blocks": "minecraft:air" | ||
| }, | ||
| { | ||
| "type": "minecraft:matching_block_tag", | ||
| "offset": [ | ||
| 0, | ||
| -1, | ||
| 0 | ||
| ], | ||
| "tag": "minecraft:dirt" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "tries": 64, | ||
| "xz_spread": 7, | ||
| "y_spread": 3 | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletions
4
...ted/resources/data/twilightforest/worldgen/configured_feature/enchanted_forest_vines.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,4 @@ | ||
| { | ||
| "type": "twilightforest:enchanted_forest_vines", | ||
| "config": {} | ||
| } |
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
31 changes: 31 additions & 0 deletions
31
src/generated/resources/data/twilightforest/worldgen/placed_feature/dense_ferns.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,31 @@ | ||
| { | ||
| "feature": "twilightforest:dense_ferns", | ||
| "placement": [ | ||
| { | ||
| "type": "minecraft:count", | ||
| "count": { | ||
| "type": "minecraft:weighted_list", | ||
| "distribution": [ | ||
| { | ||
| "data": 3, | ||
| "weight": 1 | ||
| }, | ||
| { | ||
| "data": 4, | ||
| "weight": 1 | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "minecraft:in_square" | ||
| }, | ||
| { | ||
| "type": "minecraft:heightmap", | ||
| "heightmap": "WORLD_SURFACE_WG" | ||
| }, | ||
| { | ||
| "type": "minecraft:biome" | ||
| } | ||
| ] | ||
| } |
19 changes: 19 additions & 0 deletions
19
src/generated/resources/data/twilightforest/worldgen/placed_feature/dense_large_ferns.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,19 @@ | ||
| { | ||
| "feature": "twilightforest:dense_large_ferns", | ||
| "placement": [ | ||
| { | ||
| "type": "minecraft:count", | ||
| "count": 2 | ||
| }, | ||
| { | ||
| "type": "minecraft:in_square" | ||
| }, | ||
| { | ||
| "type": "minecraft:heightmap", | ||
| "heightmap": "WORLD_SURFACE_WG" | ||
| }, | ||
| { | ||
| "type": "minecraft:biome" | ||
| } | ||
| ] | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/generated/resources/data/twilightforest/worldgen/placed_feature/dense_water_lake.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,25 @@ | ||
| { | ||
| "feature": "twilightforest:water_lake", | ||
| "placement": [ | ||
| { | ||
| "type": "minecraft:rarity_filter", | ||
| "chance": 4 | ||
| }, | ||
| { | ||
| "type": "minecraft:in_square" | ||
| }, | ||
| { | ||
| "type": "minecraft:heightmap", | ||
| "heightmap": "OCEAN_FLOOR" | ||
| }, | ||
| { | ||
| "type": "twilightforest:no_structure", | ||
| "additional_clearance": 0, | ||
| "occupies_surface": true, | ||
| "occupies_underground": true | ||
| }, | ||
| { | ||
| "type": "minecraft:biome" | ||
| } | ||
| ] | ||
| } |
9 changes: 9 additions & 0 deletions
9
...nerated/resources/data/twilightforest/worldgen/placed_feature/enchanted_forest_vines.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,9 @@ | ||
| { | ||
| "feature": "twilightforest:enchanted_forest_vines", | ||
| "placement": [ | ||
| { | ||
| "type": "minecraft:heightmap", | ||
| "heightmap": "MOTION_BLOCKING" | ||
| } | ||
| ] | ||
| } |
4 changes: 4 additions & 0 deletions
4
src/generated/resources/data/twilightforest/worldgen/placed_feature/snow_under_trees.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
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.