-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: LocusAzzurro <[email protected]>
- Loading branch information
1 parent
8673cbf
commit 65d5dc0
Showing
12 changed files
with
510 additions
and
2 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
64 changes: 64 additions & 0 deletions
64
src/generated/resources/assets/ultramarine/blockstates/white_marble_railing_slant.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,64 @@ | ||
| { | ||
| "variants": { | ||
| "facing=north,shifted=false,waterlogged=false": { | ||
| "model": "ultramarine:block/white_marble_railing_slant_shifted" | ||
| }, | ||
| "facing=south,shifted=false,waterlogged=false": { | ||
| "model": "ultramarine:block/white_marble_railing_slant_shifted", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,shifted=false,waterlogged=false": { | ||
| "model": "ultramarine:block/white_marble_railing_slant_shifted", | ||
| "y": 270 | ||
| }, | ||
| "facing=east,shifted=false,waterlogged=false": { | ||
| "model": "ultramarine:block/white_marble_railing_slant_shifted", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,shifted=true,waterlogged=false": { | ||
| "model": "ultramarine:block/white_marble_railing_slant" | ||
| }, | ||
| "facing=south,shifted=true,waterlogged=false": { | ||
| "model": "ultramarine:block/white_marble_railing_slant", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,shifted=true,waterlogged=false": { | ||
| "model": "ultramarine:block/white_marble_railing_slant", | ||
| "y": 270 | ||
| }, | ||
| "facing=east,shifted=true,waterlogged=false": { | ||
| "model": "ultramarine:block/white_marble_railing_slant", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,shifted=false,waterlogged=true": { | ||
| "model": "ultramarine:block/white_marble_railing_slant_shifted" | ||
| }, | ||
| "facing=south,shifted=false,waterlogged=true": { | ||
| "model": "ultramarine:block/white_marble_railing_slant_shifted", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,shifted=false,waterlogged=true": { | ||
| "model": "ultramarine:block/white_marble_railing_slant_shifted", | ||
| "y": 270 | ||
| }, | ||
| "facing=east,shifted=false,waterlogged=true": { | ||
| "model": "ultramarine:block/white_marble_railing_slant_shifted", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,shifted=true,waterlogged=true": { | ||
| "model": "ultramarine:block/white_marble_railing_slant" | ||
| }, | ||
| "facing=south,shifted=true,waterlogged=true": { | ||
| "model": "ultramarine:block/white_marble_railing_slant", | ||
| "y": 180 | ||
| }, | ||
| "facing=west,shifted=true,waterlogged=true": { | ||
| "model": "ultramarine:block/white_marble_railing_slant", | ||
| "y": 270 | ||
| }, | ||
| "facing=east,shifted=true,waterlogged=true": { | ||
| "model": "ultramarine:block/white_marble_railing_slant", | ||
| "y": 90 | ||
| } | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/ultramarine/models/item/white_marble_railing_slant.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,3 @@ | ||
| { | ||
| "parent": "ultramarine:block/white_marble_railing_slant" | ||
| } |
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
16 changes: 16 additions & 0 deletions
16
src/generated/resources/data/ultramarine/loot_tables/blocks/white_marble_railing_slant.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,16 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "name": "white_marble_railing_slant", | ||
| "rolls": 1.0, | ||
| "bonus_rolls": 0.0, | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "name": "ultramarine:white_marble_railing_slant" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
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
28 changes: 28 additions & 0 deletions
28
src/main/java/com/voxelutopia/ultramarine/world/block/RailingSlant.java
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,28 @@ | ||
| package com.voxelutopia.ultramarine.world.block; | ||
|
|
||
| import com.voxelutopia.ultramarine.world.block.state.ModBlockStateProperties; | ||
| import net.minecraft.core.Direction; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.level.block.state.StateDefinition; | ||
| import net.minecraft.world.level.block.state.properties.BlockStateProperties; | ||
| import net.minecraft.world.level.block.state.properties.BooleanProperty; | ||
|
|
||
| public class RailingSlant extends SideAxialBlock{ | ||
|
|
||
| public static final BooleanProperty SHIFTED = ModBlockStateProperties.SHIFTED; | ||
| public RailingSlant(BaseBlockProperty property, int thickness) { | ||
| super(property, thickness, 16, true); | ||
| BlockState state = this.stateDefinition.any() | ||
| .setValue(SHIFTED, Boolean.FALSE); | ||
| this.registerDefaultState(state); | ||
| } | ||
|
|
||
| @Override | ||
| protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> pBuilder) { | ||
| super.createBlockStateDefinition(pBuilder); | ||
| pBuilder.add(SHIFTED); | ||
| } | ||
|
|
||
|
|
||
| } |
190 changes: 190 additions & 0 deletions
190
src/main/resources/assets/ultramarine/models/block/white_marble_railing_slant.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,190 @@ | ||
| { | ||
| "credit": "Made with Blockbench", | ||
| "texture_size": [64, 64], | ||
| "textures": { | ||
| "6": "ultramarine:block/white_marble_railing_slant", | ||
| "particle": "block/quartz_block_bottom" | ||
| }, | ||
| "elements": [ | ||
| { | ||
| "from": [7.5, 18, 4], | ||
| "to": [8.5, 20, 6], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [9.5, 3.25, 9.75, 3.75], "texture": "#6"}, | ||
| "east": {"uv": [3, 8.75, 3.5, 9.25], "texture": "#6"}, | ||
| "south": {"uv": [6, 9, 6.25, 9.5], "texture": "#6"}, | ||
| "west": {"uv": [3.75, 8.75, 4.25, 9.25], "texture": "#6"}, | ||
| "up": {"uv": [4, 9.75, 3.5, 9.5], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [10, 4, 9.5, 4.25], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [7, 8, 0], | ||
| "to": [9, 18, 6], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [2.5, 6, 3, 8.5], "texture": "#6"}, | ||
| "east": {"uv": [5, 0, 6.5, 2.5], "texture": "#6"}, | ||
| "south": {"uv": [1.75, 6, 2.25, 8.5], "texture": "#6"}, | ||
| "west": {"uv": [5, 2.75, 6.5, 5.25], "texture": "#6"}, | ||
| "up": {"uv": [9.25, 3, 7.75, 2.5], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [9.25, 3.25, 7.75, 3.75], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [7, 21, 0], | ||
| "to": [9, 23, 6], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [5.25, 9, 5.75, 9.5], "texture": "#6"}, | ||
| "east": {"uv": [7.75, 4, 9.25, 4.5], "texture": "#6"}, | ||
| "south": {"uv": [4.5, 9, 5, 9.5], "texture": "#6"}, | ||
| "west": {"uv": [7.75, 4.75, 9.25, 5.25], "texture": "#6"}, | ||
| "up": {"uv": [9.25, 6, 7.75, 5.5], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [9.25, 6.25, 7.75, 6.75], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [7.25, 20, 3], | ||
| "to": [8.75, 21, 6], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [9.5, 5, 10, 5.25], "texture": "#6"}, | ||
| "east": {"uv": [1.5, 9.5, 2.25, 9.75], "texture": "#6"}, | ||
| "south": {"uv": [9.5, 4.5, 10, 4.75], "texture": "#6"}, | ||
| "west": {"uv": [9.5, 2.25, 10.25, 2.5], "texture": "#6"}, | ||
| "up": {"uv": [9.25, 9, 8.5, 8.5], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [0.75, 8.75, 0, 9.25], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [7.5, 10, 10], | ||
| "to": [8.5, 12, 12], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [9.5, 6.25, 9.75, 6.75], "texture": "#6"}, | ||
| "east": {"uv": [8.5, 9.25, 9, 9.75], "texture": "#6"}, | ||
| "south": {"uv": [9.5, 5.5, 9.75, 6], "texture": "#6"}, | ||
| "west": {"uv": [9.25, 9.25, 9.75, 9.75], "texture": "#6"}, | ||
| "up": {"uv": [7, 9.75, 6.5, 9.5], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [10, 7, 9.5, 7.25], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [7, 0, 10], | ||
| "to": [9, 10, 16], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [4, 6, 4.5, 8.5], "texture": "#6"}, | ||
| "east": {"uv": [5, 5.5, 6.5, 8], "texture": "#6"}, | ||
| "south": {"uv": [3.25, 6, 3.75, 8.5], "texture": "#6"}, | ||
| "west": {"uv": [0, 6, 1.5, 8.5], "texture": "#6"}, | ||
| "up": {"uv": [9.25, 7.5, 7.75, 7], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [9.25, 7.75, 7.75, 8.25], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [7, 13, 10], | ||
| "to": [9, 15, 16], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [0.75, 9.5, 1.25, 10], "texture": "#6"}, | ||
| "east": {"uv": [8, 0, 9.5, 0.5], "texture": "#6"}, | ||
| "south": {"uv": [0, 9.5, 0.5, 10], "texture": "#6"}, | ||
| "west": {"uv": [8, 0.75, 9.5, 1.25], "texture": "#6"}, | ||
| "up": {"uv": [9.5, 2, 8, 1.5], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [6.25, 8.25, 4.75, 8.75], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [7.25, 12, 10], | ||
| "to": [8.75, 13, 13], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [9.5, 7.5, 10, 7.75], "texture": "#6"}, | ||
| "east": {"uv": [2.5, 9.5, 3.25, 9.75], "texture": "#6"}, | ||
| "south": {"uv": [7.25, 9.5, 7.75, 9.75], "texture": "#6"}, | ||
| "west": {"uv": [9.5, 2.75, 10.25, 3], "texture": "#6"}, | ||
| "up": {"uv": [1.75, 9.25, 1, 8.75], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [2.75, 8.75, 2, 9.25], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [6, 0, 6], | ||
| "to": [10, 23, 10], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [3.75, 0, 4.75, 5.75], "texture": "#6"}, | ||
| "east": {"uv": [0, 0, 1, 5.75], "texture": "#6"}, | ||
| "south": {"uv": [1.25, 0, 2.25, 5.75], "texture": "#6"}, | ||
| "west": {"uv": [2.5, 0, 3.5, 5.75], "texture": "#6"}, | ||
| "up": {"uv": [7.75, 1, 6.75, 0], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [7.75, 1.25, 6.75, 2.25], "rotation": 270, "texture": "#6"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [6.5, 23, 6.5], | ||
| "to": [9.5, 28, 9.5], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [6.75, 7, 7.5, 8.25], "texture": "#6"}, | ||
| "east": {"uv": [6.75, 2.5, 7.5, 3.75], "texture": "#6"}, | ||
| "south": {"uv": [6.75, 4, 7.5, 5.25], "texture": "#6"}, | ||
| "west": {"uv": [6.75, 5.5, 7.5, 6.75], "texture": "#6"}, | ||
| "up": {"uv": [7.25, 9.25, 6.5, 8.5], "rotation": 90, "texture": "#6"}, | ||
| "down": {"uv": [8.25, 8.5, 7.5, 9.25], "rotation": 270, "texture": "#6"} | ||
| } | ||
| } | ||
| ], | ||
| "display": { | ||
| "thirdperson_righthand": { | ||
| "rotation": [75, 45, 0], | ||
| "translation": [0, 1.5, 0], | ||
| "scale": [0.375, 0.375, 0.375] | ||
| }, | ||
| "thirdperson_lefthand": { | ||
| "rotation": [75, 45, 0], | ||
| "translation": [0, 1.5, 0], | ||
| "scale": [0.375, 0.375, 0.375] | ||
| }, | ||
| "firstperson_righthand": { | ||
| "rotation": [0, 45, 0], | ||
| "scale": [0.4, 0.4, 0.4] | ||
| }, | ||
| "firstperson_lefthand": { | ||
| "rotation": [0, 225, 0], | ||
| "scale": [0.4, 0.4, 0.4] | ||
| }, | ||
| "ground": { | ||
| "translation": [0, 3, 0], | ||
| "scale": [0.25, 0.25, 0.25] | ||
| }, | ||
| "gui": { | ||
| "rotation": [30, -135, 0], | ||
| "translation": [0, -2, 0], | ||
| "scale": [0.5, 0.5, 0.5] | ||
| } | ||
| }, | ||
| "groups": [ | ||
| { | ||
| "name": "栏杆本体", | ||
| "origin": [0, 0, 0], | ||
| "color": 0, | ||
| "children": [ | ||
| 0, | ||
| 1, | ||
| 2, | ||
| 3, | ||
| { | ||
| "name": "栏杆本体", | ||
| "origin": [0, 0, 0], | ||
| "color": 0, | ||
| "children": [4, 5, 6, 7] | ||
| }, | ||
| 8, | ||
| 9 | ||
| ] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.