-
Notifications
You must be signed in to change notification settings - Fork 6
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 #62 from emoticone11/1.18.2
Added vanilla grass/fern as custom blocks; a few minor texture fixes; various texture path refactors
- Loading branch information
Showing
3,078 changed files
with
9,947 additions
and
9,016 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
276 changes: 276 additions & 0 deletions
276
src/main/resources/assets/westerosblocks/blockstates/grass.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,276 @@ | ||
| { | ||
| "variants": { | ||
| "layers=5": [ | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer5_v1", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer5_v2", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer5_v3", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer5_v4", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer5_v5", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer5_v6", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer5_v7", | ||
| "weight": 25 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer5_v8", | ||
| "weight": 15 | ||
| } | ||
| ], | ||
| "layers=6": [ | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer6_v1", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer6_v2", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer6_v3", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer6_v4", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer6_v5", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer6_v6", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer6_v7", | ||
| "weight": 25 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer6_v8", | ||
| "weight": 15 | ||
| } | ||
| ], | ||
| "layers=3": [ | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer3_v1", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer3_v2", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer3_v3", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer3_v4", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer3_v5", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer3_v6", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer3_v7", | ||
| "weight": 25 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer3_v8", | ||
| "weight": 15 | ||
| } | ||
| ], | ||
| "layers=4": [ | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer4_v1", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer4_v2", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer4_v3", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer4_v4", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer4_v5", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer4_v6", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer4_v7", | ||
| "weight": 25 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer4_v8", | ||
| "weight": 15 | ||
| } | ||
| ], | ||
| "layers=7": [ | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer7_v1", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer7_v2", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer7_v3", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer7_v4", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer7_v5", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer7_v6", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer7_v7", | ||
| "weight": 25 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer7_v8", | ||
| "weight": 15 | ||
| } | ||
| ], | ||
| "layers=8": [ | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_v1", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_v2", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_v3", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_v4", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_v5", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_v6", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_v7", | ||
| "weight": 25 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_v8", | ||
| "weight": 15 | ||
| } | ||
| ], | ||
| "layers=1": [ | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer1_v1", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer1_v2", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer1_v3", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer1_v4", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer1_v5", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer1_v6", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer1_v7", | ||
| "weight": 25 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer1_v8", | ||
| "weight": 15 | ||
| } | ||
| ], | ||
| "layers=2": [ | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer2_v1", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer2_v2", | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer2_v3", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer2_v4", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer2_v5", | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer2_v6", | ||
| "weight": 15 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer2_v7", | ||
| "weight": 25 | ||
| }, | ||
| { | ||
| "model": "westerosblocks:block/generated/grass/base_layer2_v8", | ||
| "weight": 15 | ||
| } | ||
| ] | ||
| } | ||
| } |
Oops, something went wrong.