-
-
Notifications
You must be signed in to change notification settings - Fork 35
Create inner corner panel #247
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Thodor12
wants to merge
7
commits into
ldtteam:version/latest
Choose a base branch
from
Thodor12:feature/corner_panels
base: version/latest
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
768f5f2
Create corner panels (inner and outer)
Thodor12 5c0b075
Remove unnecessary textures
Thodor12 0976432
Fix panel not being waterloggable
Thodor12 6cf2bae
Remove outer corner panel
Thodor12 429901e
Fix size of dropped shingles
Thodor12 96970ea
Remove unnecessary change
Thodor12 1592c0c
Merge branch 'version/latest' into feature/corner_panels
Thodor12 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
302 changes: 302 additions & 0 deletions
302
src/datagen/generated/domum_ornamentum/assets/domum_ornamentum/blockstates/corner_panel.json
This file contains hidden or 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,302 @@ | ||
| { | ||
| "multipart": [ | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "x": 90, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "north", | ||
| "shape": "upper" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "north", | ||
| "shape": "center" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "x": 270, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "north", | ||
| "shape": "lower" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "x": 90, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "north", | ||
| "shape": "upper" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "north", | ||
| "shape": "center" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "x": 270, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "north", | ||
| "shape": "lower" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "x": 90, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "south", | ||
| "shape": "upper" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "south", | ||
| "shape": "center" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "x": 270, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "south", | ||
| "shape": "lower" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "x": 90, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "south", | ||
| "shape": "upper" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "south", | ||
| "shape": "center" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "x": 270, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "south", | ||
| "shape": "lower" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "x": 90, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "west", | ||
| "shape": "upper" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "west", | ||
| "shape": "center" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "x": 270, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "west", | ||
| "shape": "lower" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "x": 90, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "west", | ||
| "shape": "upper" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "west", | ||
| "shape": "center" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "x": 270, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "west", | ||
| "shape": "lower" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "x": 90 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "east", | ||
| "shape": "upper" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "east", | ||
| "shape": "center" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_inner", | ||
| "uvlock": true, | ||
| "x": 270 | ||
| }, | ||
| "when": { | ||
| "type": "inner", | ||
| "facing": "east", | ||
| "shape": "lower" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "x": 90 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "east", | ||
| "shape": "upper" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "east", | ||
| "shape": "center" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "domum_ornamentum:block/corner_panel/corner_panel_outer", | ||
| "uvlock": true, | ||
| "x": 270 | ||
| }, | ||
| "when": { | ||
| "type": "outer", | ||
| "facing": "east", | ||
| "shape": "lower" | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains hidden or 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
4 changes: 4 additions & 0 deletions
4
...omum_ornamentum/assets/domum_ornamentum/models/block/corner_panel/corner_panel_inner.json
This file contains hidden or 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 @@ | ||
| { | ||
| "parent": "domum_ornamentum:block/corner_panel/corner_panel_inner_spec", | ||
| "loader": "domum_ornamentum:materially_textured" | ||
| } |
4 changes: 4 additions & 0 deletions
4
...omum_ornamentum/assets/domum_ornamentum/models/block/corner_panel/corner_panel_outer.json
This file contains hidden or 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 @@ | ||
| { | ||
| "parent": "domum_ornamentum:block/corner_panel/corner_panel_outer_spec", | ||
|
Thodor12 marked this conversation as resolved.
Outdated
|
||
| "loader": "domum_ornamentum:materially_textured" | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.