generated from QuiltMC/quilt-template-mod
-
Notifications
You must be signed in to change notification settings - Fork 8
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 #32 from falkreon/1.19
Lit, Hangable Lanterns
- Loading branch information
Showing
7 changed files
with
248 additions
and
32 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
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
27 changes: 27 additions & 0 deletions
27
src/main/java/io/github/debuggyteam/architecture_extensions/util/VoxelHelper.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,27 @@ | ||
| package io.github.debuggyteam.architecture_extensions.util; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import net.minecraft.util.shape.VoxelShape; | ||
|
|
||
| public class VoxelHelper { | ||
| public static boolean testVoxel(VoxelShape shape, int x, int y, int z) { | ||
|
|
||
| List<Boolean> hits = new ArrayList<>(); | ||
| shape.forEachBox((x1, y1, z1, x2, y2, z2) -> { | ||
| int x1i = (int) (x1 * 16); | ||
| int y1i = (int) (y1 * 16); | ||
| int z1i = (int) (z1 * 16); | ||
| int x2i = (int) (x2 * 16); | ||
| int y2i = (int) (y2 * 16); | ||
| int z2i = (int) (z2 * 16); | ||
|
|
||
| if (x >= x1i && y >= y1i && z >= z1i && x < x2i && y < y2i && z < z2i) { | ||
| hits.add(Boolean.valueOf(true)); | ||
| } | ||
| }); | ||
|
|
||
| return !hits.isEmpty(); | ||
| } | ||
| } |
15 changes: 12 additions & 3 deletions
15
.../resources/assets/architecture_extensions/templates/blockstate/template_post_lantern.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,7 +1,16 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "{model}" | ||
| } | ||
| "hanging=false,waterlogged=false": { | ||
| "model": "{model}" | ||
| }, | ||
| "hanging=false,waterlogged=true": { | ||
| "model": "{model}" | ||
| }, | ||
| "hanging=true,waterlogged=false": { | ||
| "model": "{model}_hanging" | ||
| }, | ||
| "hanging=true,waterlogged=true": { | ||
| "model": "{model}_hanging" | ||
| } | ||
| } | ||
| } |
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
139 changes: 139 additions & 0 deletions
139
...s/assets/architecture_extensions/templates/model/block/template_post_lantern_hanging.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,139 @@ | ||
| { | ||
| "credit": "Made with Blockbench by Cart3r, edited by Falkreon.", | ||
| "textures": { | ||
| "lantern_texture": "block/lantern", | ||
| "particle": "#texture" | ||
| }, | ||
| "elements": [ | ||
| { | ||
| "from": [5, 9, 5], | ||
| "to": [11, 10, 11], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [5, 14, 11, 15], "texture": "#texture"}, | ||
| "east": {"uv": [5, 14, 11, 15], "texture": "#texture"}, | ||
| "south": {"uv": [5, 14, 11, 15], "texture": "#texture"}, | ||
| "west": {"uv": [5, 14, 11, 15], "texture": "#texture"}, | ||
| "down": {"uv": [0, 10, 6, 16], "texture": "#texture"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [4, 14, 4], | ||
| "to": [12, 15, 12], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [4, 10, 12, 11], "texture": "#texture"}, | ||
| "east": {"uv": [4, 10, 12, 11], "texture": "#texture"}, | ||
| "south": {"uv": [4, 10, 12, 11], "texture": "#texture"}, | ||
| "west": {"uv": [4, 10, 12, 11], "texture": "#texture"}, | ||
| "up": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#texture"}, | ||
| "down": {"uv": [4, 4, 12, 12], "rotation": 270, "texture": "#texture"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [6, 15, 6], | ||
| "to": [10, 16, 10], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [6, 9, 10, 10], "texture": "#texture"}, | ||
| "east": {"uv": [6, 9, 10, 10], "texture": "#texture"}, | ||
| "south": {"uv": [6, 9, 10, 10], "texture": "#texture"}, | ||
| "west": {"uv": [6, 9, 10, 10], "texture": "#texture"}, | ||
| "up": {"uv": [6, 6, 10, 10], "rotation": 90, "texture": "#texture"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [5, 10, 6], | ||
| "to": [11, 14, 10], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "east": {"uv": [1, 4, 5, 8], "texture": "#lantern_texture"}, | ||
| "west": {"uv": [1, 4, 5, 8], "texture": "#lantern_texture"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [6, 10, 5], | ||
| "to": [10, 14, 11], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [1, 4, 5, 8], "texture": "#lantern_texture"}, | ||
| "south": {"uv": [1, 4, 5, 8], "texture": "#lantern_texture"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [5, 10, 5], | ||
| "to": [6, 14, 6], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [1, 1, 2, 5], "texture": "#texture"}, | ||
| "west": {"uv": [1, 1, 2, 5], "texture": "#texture"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [5, 10, 10], | ||
| "to": [6, 14, 11], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "south": {"uv": [1, 1, 2, 5], "texture": "#texture"}, | ||
| "west": {"uv": [1, 1, 2, 5], "texture": "#texture"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [10, 10, 10], | ||
| "to": [11, 14, 11], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "east": {"uv": [1, 1, 2, 5], "texture": "#texture"}, | ||
| "south": {"uv": [1, 1, 2, 5], "texture": "#texture"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [10, 10, 5], | ||
| "to": [11, 14, 6], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [1, 1, 2, 5], "texture": "#texture"}, | ||
| "east": {"uv": [1, 1, 2, 5], "texture": "#texture"} | ||
| } | ||
| } | ||
| ], | ||
| "display": { | ||
| "thirdperson_righthand": { | ||
| "rotation": [75, 45, 0], | ||
| "translation": [0, 2.5, 1.25], | ||
| "scale": [0.375, 0.375, 0.375] | ||
| }, | ||
| "thirdperson_lefthand": { | ||
| "rotation": [75, 45, 0], | ||
| "translation": [0, 2.5, 0], | ||
| "scale": [0.375, 0.375, 0.375] | ||
| }, | ||
| "firstperson_righthand": { | ||
| "rotation": [0, 45, 0], | ||
| "translation": [1.5, 4.25, 0], | ||
| "scale": [0.4, 0.4, 0.4] | ||
| }, | ||
| "firstperson_lefthand": { | ||
| "rotation": [0, 45, 0], | ||
| "translation": [1.5, 4.25, 0], | ||
| "scale": [0.4, 0.4, 0.4] | ||
| }, | ||
| "ground": { | ||
| "translation": [0, 3, 0], | ||
| "scale": [0.38672, 0.38672, 0.38672] | ||
| }, | ||
| "gui": { | ||
| "rotation": [30, 225, 0], | ||
| "translation": [0, 2.25, 0], | ||
| "scale": [0.79102, 0.79102, 0.79102] | ||
| }, | ||
| "head": { | ||
| "translation": [0, 14.25, 0], | ||
| "scale": [2.60547, 2.60547, 2.60547] | ||
| }, | ||
| "fixed": { | ||
| "translation": [0, 2.5, 0], | ||
| "scale": [0.5, 0.5, 0.5] | ||
| } | ||
| } | ||
| } |