Motschen/Decorative
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/Decorative.git synced 2025-12-17 21:35:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decorative 3.0.0 - QoL Update

Browse Source
This commit is contained in:
Motschen
2020-10-09 20:40:04 +02:00
parent c5ee6aeabb
commit 7a250c257f
69 changed files with 1788 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/assets/decorative/blockstates/acacia_log_with_axe.json
View File

@@ -1,8 +1,5 @@
{
"variants": {
"facing=south": { "model": "decorative:block/acacia_log_with_axe" },
"facing=west": { "model": "decorative:block/acacia_log_with_axe", "y": 90 },
"facing=north": { "model": "decorative:block/acacia_log_with_axe", "y": 180 },
"facing=east": { "model": "decorative:block/acacia_log_with_axe", "y": 270 }
"": { "model": "block/acacia_log" }
}
}

5
src/main/resources/assets/decorative/blockstates/birch_log_with_axe.json
View File

@@ -1,8 +1,5 @@
{
"variants": {
"facing=south": { "model": "decorative:block/birch_log_with_axe" },
"facing=west": { "model": "decorative:block/birch_log_with_axe", "y": 90 },
"facing=north": { "model": "decorative:block/birch_log_with_axe", "y": 180 },
"facing=east": { "model": "decorative:block/birch_log_with_axe", "y": 270 }
"": { "model": "block/birch_log" }
}
}

3
src/main/resources/assets/decorative/blockstates/ceilingfan.json
View File

@@ -1,6 +1,5 @@
{
"variants": {
"lit=true": { "model": "decorative:block/ceilingfan_activated" },
"lit=false": { "model": "decorative:block/ceilingfan" }
"": { "model": "decorative:block/ceilingfan" }
}
}

5
src/main/resources/assets/decorative/blockstates/dark_oak_log_with_axe.json
View File

@@ -1,8 +1,5 @@
{
"variants": {
"facing=south": { "model": "decorative:block/dark_oak_log_with_axe" },
"facing=west": { "model": "decorative:block/dark_oak_log_with_axe", "y": 90 },
"facing=north": { "model": "decorative:block/dark_oak_log_with_axe", "y": 180 },
"facing=east": { "model": "decorative:block/dark_oak_log_with_axe", "y": 270 }
"": { "model": "block/dark_oak_log" }
}
}

5
src/main/resources/assets/decorative/blockstates/jungle_log_with_axe.json
View File

@@ -1,8 +1,5 @@
{
"variants": {
"facing=south": { "model": "decorative:block/jungle_log_with_axe" },
"facing=west": { "model": "decorative:block/jungle_log_with_axe", "y": 90 },
"facing=north": { "model": "decorative:block/jungle_log_with_axe", "y": 180 },
"facing=east": { "model": "decorative:block/jungle_log_with_axe", "y": 270 }
"": { "model": "block/jungle_log" }
}
}

5
src/main/resources/assets/decorative/blockstates/oak_log_with_axe.json
View File

@@ -1,8 +1,5 @@
{
"variants": {
"facing=south": { "model": "decorative:block/oak_log_with_axe" },
"facing=west": { "model": "decorative:block/oak_log_with_axe", "y": 90 },
"facing=north": { "model": "decorative:block/oak_log_with_axe", "y": 180 },
"facing=east": { "model": "decorative:block/oak_log_with_axe", "y": 270 }
"": { "model": "block/oak_log" }
}
}

8
src/main/resources/assets/decorative/blockstates/pennant_chain.json Normal file
View File

@@ -0,0 +1,8 @@
{
"variants": {
"facing=south": { "model": "decorative:block/pennant_chain", "uvlock": true },
"facing=west": { "model": "decorative:block/pennant_chain", "uvlock": true, "y": 90 },
"facing=north": { "model": "decorative:block/pennant_chain", "uvlock": true, "y": 180 },
"facing=east": { "model": "decorative:block/pennant_chain", "uvlock": true, "y": 270 }
}
}

5
src/main/resources/assets/decorative/blockstates/spruce_log_with_axe.json
View File

@@ -1,8 +1,5 @@
{
"variants": {
"facing=south": { "model": "decorative:block/spruce_log_with_axe" },
"facing=west": { "model": "decorative:block/spruce_log_with_axe", "y": 90 },
"facing=north": { "model": "decorative:block/spruce_log_with_axe", "y": 180 },
"facing=east": { "model": "decorative:block/spruce_log_with_axe", "y": 270 }
"": { "model": "block/spruce_log" }
}
}

81
src/main/resources/assets/decorative/models/block/ceilingfan.json
View File

@@ -2,10 +2,8 @@
"credit": "made by Motschen",
"parent": "block/block",
"textures": {
"2": "block/gray_concrete",
"3": "decorative:block/ceilingfannormal",
"5": "block/black_wool",
"particle": "decorative:block/ceilingfannormal"
"1": "block/gray_concrete",
"particle": "block/gray_concrete"
},
"elements": [
{
@@ -13,77 +11,12 @@
"from": [7, 6, 7],
"to": [9, 16, 9],
"faces": {
"north": {"uv": [0, 0, 2, 6], "texture": "#2"},
"east": {"uv": [0, 0, 2, 6], "texture": "#2"},
"south": {"uv": [0, 0, 2, 6], "texture": "#2"},
"west": {"uv": [0, 0, 2, 6], "texture": "#2"},
"up": {"uv": [0, 0, 2, 2], "texture": "#2"}
"north": {"uv": [0, 0, 2, 6], "texture": "#1"},
"east": {"uv": [0, 0, 2, 6], "texture": "#1"},
"south": {"uv": [0, 0, 2, 6], "texture": "#1"},
"west": {"uv": [0, 0, 2, 6], "texture": "#1"},
"up": {"uv": [0, 0, 2, 2], "texture": "#1"}
}
},
{
"from": [7, 4, 7],
"to": [9, 6, 9],
"faces": {
"north": {"uv": [0, 0, 2, 2], "texture": "#5"},
"east": {"uv": [0, 0, 2, 2], "texture": "#5"},
"south": {"uv": [0, 0, 2, 2], "texture": "#5"},
"west": {"uv": [0, 0, 2, 2], "texture": "#5"},
"down": {"uv": [0, 0, 2, 2], "texture": "#5"}
}
},
{
"from": [-3, 5, 7],
"to": [7, 6, 9],
"faces": {
"north": {"uv": [0, 0, 4, 4], "texture": "#3"},
"east": {"uv": [0, 0, 4, 4], "texture": "#3"},
"south": {"uv": [0, 0, 4, 4], "texture": "#3"},
"west": {"uv": [0, 0, 4, 4], "texture": "#3"},
"up": {"uv": [0, 0, 4, 4], "texture": "#3"},
"down": {"uv": [0, 0, 4, 4], "texture": "#3"}
}
},
{
"from": [9, 5, 7],
"to": [19, 6, 9],
"faces": {
"north": {"uv": [0, 0, 4, 4], "texture": "#3"},
"east": {"uv": [0, 0, 4, 4], "texture": "#3"},
"south": {"uv": [0, 0, 4, 4], "texture": "#3"},
"west": {"uv": [0, 0, 4, 4], "texture": "#3"},
"up": {"uv": [0, 0, 4, 4], "texture": "#3"},
"down": {"uv": [0, 0, 4, 4], "texture": "#3"}
}
},
{
"from": [7, 5, -3],
"to": [9, 6, 7],
"faces": {
"north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}
}
},
{
"from": [7, 5, 9],
"to": [9, 6, 19],
"faces": {
"north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}
}
}
],
"groups": [0, 1,
{
"name": "normal",
"children": [2, 3, 4, 5]
}
]
}

257
src/main/resources/assets/decorative/models/block/ceilingfan_activated.json
View File

@@ -1,257 +0,0 @@
{
"credit": "made by Motschen",
"parent": "block/block",
"textures": {
"1": "decorative:block/ceilingfan",
"2": "block/gray_concrete",
"5": "block/black_wool",
"particle": "decorative:block/ceilingfannormal"
},
"elements": [
{
"name": "Cube",
"from": [7, 6, 7],
"to": [9, 16, 9],
"faces": {
"north": {"uv": [0, 0, 2, 6], "texture": "#2"},
"east": {"uv": [0, 0, 2, 6], "texture": "#2"},
"south": {"uv": [0, 0, 2, 6], "texture": "#2"},
"west": {"uv": [0, 0, 2, 6], "texture": "#2"},
"up": {"uv": [0, 0, 2, 2], "texture": "#2"}
}
},
{
"from": [7, 4, 7],
"to": [9, 6, 9],
"faces": {
"north": {"uv": [0, 0, 2, 2], "texture": "#5"},
"east": {"uv": [0, 0, 2, 2], "texture": "#5"},
"south": {"uv": [0, 0, 2, 2], "texture": "#5"},
"west": {"uv": [0, 0, 2, 2], "texture": "#5"},
"down": {"uv": [0, 0, 2, 2], "texture": "#5"}
}
},
{
"from": [-3, 5, 7],
"to": [7, 6, 9],
"faces": {
"north": {"uv": [0, 0, 4, 4], "texture": "#1"},
"east": {"uv": [0, 0, 4, 4], "texture": "#1"},
"south": {"uv": [0, 0, 4, 4], "texture": "#1"},
"west": {"uv": [0, 0, 4, 4], "texture": "#1"},
"up": {"uv": [0, 0, 4, 4], "texture": "#1"},
"down": {"uv": [0, 0, 4, 4], "texture": "#1"}
}
},
{
"from": [9, 5, 7],
"to": [19, 6, 9],
"faces": {
"north": {"uv": [0, 0, 4, 4], "texture": "#1"},
"east": {"uv": [0, 0, 4, 4], "texture": "#1"},
"south": {"uv": [0, 0, 4, 4], "texture": "#1"},
"west": {"uv": [0, 0, 4, 4], "texture": "#1"},
"up": {"uv": [0, 0, 4, 4], "texture": "#1"},
"down": {"uv": [0, 0, 4, 4], "texture": "#1"}
}
},
{
"from": [7, 5, -3],
"to": [9, 6, 7],
"faces": {
"north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}
}
},
{
"from": [7, 5, 9],
"to": [9, 6, 19],
"faces": {
"north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}
}
},
{
"from": [6, 5, 1.5],
"to": [8, 6, 11.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [12, 0, 16, 4], "texture": "#1"},
"east": {"uv": [12, 0, 16, 4], "texture": "#1"},
"south": {"uv": [12, 0, 16, 4], "texture": "#1"},
"west": {"uv": [12, 0, 16, 4], "texture": "#1"},
"up": {"uv": [12, 0, 16, 4], "texture": "#1"},
"down": {"uv": [12, 0, 16, 4], "texture": "#1"}
}
},
{
"from": [6, 5, 11.5],
"to": [8, 6, 23.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [8, 0, 16, 4], "texture": "#1"},
"east": {"uv": [8, 0, 16, 4], "texture": "#1"},
"south": {"uv": [8, 0, 16, 4], "texture": "#1"},
"west": {"uv": [8, 0, 16, 4], "texture": "#1"},
"up": {"uv": [8, 0, 16, 4], "texture": "#1"},
"down": {"uv": [8, 0, 16, 4], "texture": "#1"}
}
},
{
"from": [-4, 5, 11.5],
"to": [6, 6, 13.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [8, 0, 16, 4], "texture": "#1"},
"east": {"uv": [8, 0, 16, 4], "texture": "#1"},
"south": {"uv": [8, 0, 16, 4], "texture": "#1"},
"west": {"uv": [8, 0, 16, 4], "texture": "#1"},
"up": {"uv": [8, 0, 16, 4], "texture": "#1"},
"down": {"uv": [8, 0, 16, 4], "texture": "#1"}
}
},
{
"from": [8, 5, 11.5],
"to": [18, 6, 13.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [8, 0, 16, 4], "texture": "#1"},
"east": {"uv": [8, 0, 16, 4], "texture": "#1"},
"south": {"uv": [8, 0, 16, 4], "texture": "#1"},
"west": {"uv": [8, 0, 16, 4], "texture": "#1"},
"up": {"uv": [8, 0, 16, 4], "texture": "#1"},
"down": {"uv": [8, 0, 16, 4], "texture": "#1"}
}
},
{
"from": [3, 5, 5],
"to": [5, 6, 15],
"rotation": {"angle": 45, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#1"},
"east": {"uv": [12, 12, 16, 16], "texture": "#1"},
"south": {"uv": [12, 12, 16, 16], "texture": "#1"},
"west": {"uv": [12, 12, 16, 16], "texture": "#1"},
"up": {"uv": [12, 12, 16, 16], "texture": "#1"},
"down": {"uv": [12, 12, 16, 16], "texture": "#1"}
}
},
{
"from": [3, 5, 15],
"to": [5, 6, 27],
"rotation": {"angle": 45, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#1"},
"east": {"uv": [12, 12, 16, 16], "texture": "#1"},
"south": {"uv": [12, 12, 16, 16], "texture": "#1"},
"west": {"uv": [12, 12, 16, 16], "texture": "#1"},
"up": {"uv": [12, 12, 16, 16], "texture": "#1"},
"down": {"uv": [12, 12, 16, 16], "texture": "#1"}
}
},
{
"from": [-7, 5, 15],
"to": [3, 6, 17],
"rotation": {"angle": 45, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#1"},
"east": {"uv": [12, 12, 16, 16], "texture": "#1"},
"south": {"uv": [12, 12, 16, 16], "texture": "#1"},
"west": {"uv": [12, 12, 16, 16], "texture": "#1"},
"up": {"uv": [12, 12, 16, 16], "texture": "#1"},
"down": {"uv": [12, 12, 16, 16], "texture": "#1"}
}
},
{
"from": [5, 5, 15],
"to": [15, 6, 17],
"rotation": {"angle": 45, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [12, 12, 16, 16], "texture": "#1"},
"east": {"uv": [12, 12, 16, 16], "texture": "#1"},
"south": {"uv": [12, 12, 16, 16], "texture": "#1"},
"west": {"uv": [12, 12, 16, 16], "texture": "#1"},
"up": {"uv": [12, 12, 16, 16], "texture": "#1"},
"down": {"uv": [12, 12, 16, 16], "texture": "#1"}
}
},
{
"from": [6.5, 5, -7.5],
"to": [8.5, 6, 2.5],
"rotation": {"angle": -22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [0, 12, 4, 16], "texture": "#1"},
"east": {"uv": [0, 12, 4, 16], "texture": "#1"},
"south": {"uv": [0, 12, 4, 16], "texture": "#1"},
"west": {"uv": [0, 12, 4, 16], "texture": "#1"},
"up": {"uv": [0, 12, 4, 16], "texture": "#1"},
"down": {"uv": [0, 12, 4, 16], "texture": "#1"}
}
},
{
"from": [6.5, 5, 2.5],
"to": [8.5, 6, 14.5],
"rotation": {"angle": -22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [0, 8, 4, 16], "texture": "#1"},
"east": {"uv": [0, 8, 4, 16], "texture": "#1"},
"south": {"uv": [0, 8, 4, 16], "texture": "#1"},
"west": {"uv": [0, 8, 4, 16], "texture": "#1"},
"up": {"uv": [0, 8, 4, 16], "texture": "#1"},
"down": {"uv": [0, 8, 4, 16], "texture": "#1"}
}
},
{
"from": [-3.5, 5, 2.5],
"to": [6.5, 6, 4.5],
"rotation": {"angle": -22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [0, 8, 4, 16], "texture": "#1"},
"east": {"uv": [0, 8, 4, 16], "texture": "#1"},
"south": {"uv": [0, 8, 4, 16], "texture": "#1"},
"west": {"uv": [0, 8, 4, 16], "texture": "#1"},
"up": {"uv": [0, 8, 4, 16], "texture": "#1"},
"down": {"uv": [0, 8, 4, 16], "texture": "#1"}
}
},
{
"from": [8.5, 5, 2.5],
"to": [18.5, 6, 4.5],
"rotation": {"angle": -22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]},
"faces": {
"north": {"uv": [0, 8, 4, 16], "texture": "#1"},
"east": {"uv": [0, 8, 4, 16], "texture": "#1"},
"south": {"uv": [0, 8, 4, 16], "texture": "#1"},
"west": {"uv": [0, 8, 4, 16], "texture": "#1"},
"up": {"uv": [0, 8, 4, 16], "texture": "#1"},
"down": {"uv": [0, 8, 4, 16], "texture": "#1"}
}
}
],
"groups": [0, 1,
{
"name": "normal",
"children": [2, 3, 4, 5]
},
{
"name": "rot1",
"children": [6, 7, 8, 9]
},
{
"name": "rot2",
"children": [10, 11, 12, 13]
},
{
"name": "rot3",
"children": [14, 15, 16, 17]
}
]
}

246
src/main/resources/assets/decorative/models/block/pennant_chain.json Normal file
View File

@@ -0,0 +1,246 @@
{
"credit": "made by Motschen",
"textures": {
"1": "block/black_concrete",
"2": "decorative:block/red_lamp_off",
"4": "decorative:block/green_lamp_off",
"particle": "block/black_concrete"
},
"elements": [
{
"from": [-8, 4.6, 8],
"to": [3, 5.6, 9],
"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [0, 0, 11, 1], "texture": "#1"},
"east": {"uv": [0, 0, 1, 1], "texture": "#1"},
"south": {"uv": [0, 0, 11, 1], "texture": "#1"},
"west": {"uv": [0, 0, 1, 1], "texture": "#1"},
"up": {"uv": [0, 0, 11, 1], "texture": "#1"},
"down": {"uv": [0, 0, 11, 1], "texture": "#1"}
}
},
{
"from": [13.1, 4.6, 8],
"to": [24.1, 5.6, 9],
"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [0, 0, 11, 1], "texture": "#1"},
"east": {"uv": [0, 0, 1, 1], "texture": "#1"},
"south": {"uv": [0, 0, 11, 1], "texture": "#1"},
"west": {"uv": [0, 0, 1, 1], "texture": "#1"},
"up": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#1"},
"down": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#1"}
}
},
{
"from": [0.5, 7.1, 8],
"to": [15.53, 8.1, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [0, 0, 15.03, 1], "texture": "#1"},
"east": {"uv": [0, 0, 1, 1], "texture": "#1"},
"south": {"uv": [0, 0, 15.03, 1], "texture": "#1"},
"west": {"uv": [0, 0, 1, 1], "texture": "#1"},
"up": {"uv": [0, 0, 15.03, 1], "rotation": 180, "texture": "#1"},
"down": {"uv": [0, 0, 15.03, 1], "rotation": 180, "texture": "#1"}
}
},
{
"from": [20, 24, 8],
"to": [21, 32, 9],
"rotation": {"angle": -45, "axis": "z", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"},
"east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"},
"south": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#1"},
"west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"},
"up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#1"},
"down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#1"}
}
},
{
"from": [-5, 24, 8],
"to": [-4, 32, 9],
"rotation": {"angle": 45, "axis": "z", "origin": [8, 12, 8]},
"faces": {
"north": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#1"},
"east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"},
"south": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"},
"west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"},
"up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#1"}
}
},
{
"from": [1, 4, 7],
"to": [4, 7, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 12, 8]},
"faces": {
"north": {"uv": [9, 9, 12, 12], "texture": "#2"},
"east": {"uv": [11, 10, 14, 13], "texture": "#2"},
"south": {"uv": [4, 2, 7, 5], "texture": "#2"},
"west": {"uv": [2, 3, 5, 6], "texture": "#2"},
"up": {"uv": [11, 11, 14, 14], "texture": "#2"},
"down": {"uv": [7, 4, 10, 7], "texture": "#2"}
}
},
{
"from": [6.5, 4, 7],
"to": [9.5, 7, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 8]},
"faces": {
"north": {"uv": [9, 9, 12, 12], "texture": "#4"},
"east": {"uv": [11, 10, 14, 13], "texture": "#4"},
"south": {"uv": [4, 2, 7, 5], "texture": "#4"},
"west": {"uv": [2, 3, 5, 6], "texture": "#4"},
"up": {"uv": [11, 11, 14, 14], "texture": "#4"},
"down": {"uv": [7, 4, 10, 7], "texture": "#4"}
}
},
{
"from": [12, 4, 7],
"to": [15, 7, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [20, 12, 8]},
"faces": {
"north": {"uv": [9, 9, 12, 12], "texture": "#2"},
"east": {"uv": [11, 10, 14, 13], "texture": "#2"},
"south": {"uv": [4, 2, 7, 5], "texture": "#2"},
"west": {"uv": [2, 3, 5, 6], "texture": "#2"},
"up": {"uv": [11, 11, 14, 14], "texture": "#2"},
"down": {"uv": [7, 4, 10, 7], "texture": "#2"}
}
},
{
"from": [15.5, 9, 7],
"to": [18.5, 12, 10],
"rotation": {"angle": 22.5, "axis": "z", "origin": [27, 14, 8]},
"faces": {
"north": {"uv": [9, 9, 12, 12], "texture": "#4"},
"east": {"uv": [11, 10, 14, 13], "texture": "#4"},
"south": {"uv": [4, 2, 7, 5], "texture": "#4"},
"west": {"uv": [2, 3, 5, 6], "texture": "#4"},
"up": {"uv": [11, 11, 14, 14], "texture": "#4"},
"down": {"uv": [7, 4, 10, 7], "texture": "#4"}
}
},
{
"from": [-2.5, 3, 7],
"to": [0.5, 6, 10],
"rotation": {"angle": -22.5, "axis": "z", "origin": [5, 12, 8]},
"faces": {
"north": {"uv": [9, 9, 12, 12], "texture": "#4"},
"east": {"uv": [11, 10, 14, 13], "texture": "#4"},
"south": {"uv": [4, 2, 7, 5], "texture": "#4"},
"west": {"uv": [2, 3, 5, 6], "texture": "#4"},
"up": {"uv": [11, 11, 14, 14], "texture": "#4"},
"down": {"uv": [7, 4, 10, 7], "texture": "#4"}
}
},
{
"from": [22, 10, 7],
"to": [25, 13, 10],
"rotation": {"angle": 22.5, "axis": "z", "origin": [30, 12, 8]},
"faces": {
"north": {"uv": [9, 9, 12, 12], "texture": "#2"},
"east": {"uv": [11, 10, 14, 13], "texture": "#2"},
"south": {"uv": [4, 2, 7, 5], "texture": "#2"},
"west": {"uv": [2, 3, 5, 6], "texture": "#2"},
"up": {"uv": [11, 11, 14, 14], "texture": "#2"},
"down": {"uv": [7, 4, 10, 7], "texture": "#2"}
}
},
{
"from": [-8, 7.5, 7],
"to": [-5, 10.5, 10],
"rotation": {"angle": -22.5, "axis": "z", "origin": [-7, 12, 8]},
"faces": {
"north": {"uv": [9, 9, 12, 12], "texture": "#2"},
"east": {"uv": [11, 10, 14, 13], "texture": "#2"},
"south": {"uv": [4, 2, 7, 5], "texture": "#2"},
"west": {"uv": [2, 3, 5, 6], "texture": "#2"},
"up": {"uv": [11, 11, 14, 14], "texture": "#2"},
"down": {"uv": [7, 4, 10, 7], "texture": "#2"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 1, 0],
"scale": [0.25, 0.25, 0.25]
},
"thirdperson_lefthand": {
"translation": [0, 1, 0],
"scale": [0.25, 0.25, 0.25]
},
"firstperson_righthand": {
"rotation": [0, -23, 0],
"translation": [-0.25, 1.75, 0],
"scale": [0.25, 0.25, 0.25]
},
"firstperson_lefthand": {
"rotation": [0, -23, 0],
"translation": [0, 2.25, 0],
"scale": [0.25, 0.25, 0.25]
},
"ground": {
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [25, -25, 0],
"translation": [0, -1.25, 0],
"scale": [0.32, 0.32, 0.32]
},
"head": {
"translation": [0, 7.5, 0],
"scale": [0.25, 0.25, 0.25]
},
"fixed": {
"translation": [0, 0, -0.5],
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [
{
"name": "hanginglights",
"origin": [8, 8, 8],
"children": [0, 1, 2, 3, 4,
{
"name": "light1",
"origin": [8, 8, 8],
"children": [5]
},
{
"name": "light2",
"origin": [8, 8, 8],
"children": [6]
},
{
"name": "light1",
"origin": [8, 8, 8],
"children": [7]
},
{
"name": "light2",
"origin": [8, 8, 8],
"children": [8]
},
{
"name": "light2",
"origin": [8, 8, 8],
"children": [9]
},
{
"name": "light1",
"origin": [8, 8, 8],
"children": [10]
},
{
"name": "light1",
"origin": [8, 8, 8],
"children": [11]
}
]
}
]
}

88
src/main/resources/assets/decorative/models/item/ceilingfan.json
View File

@@ -1,3 +1,89 @@
{
"parent": "decorative:block/ceilingfan"
"credit": "made by Motschen",
"parent": "block/block",
"textures": {
"2": "block/gray_concrete",
"3": "decorative:block/ceilingfan",
"5": "block/black_wool",
"particle": "decorative:block/ceilingfan"
},
"elements": [
{
"name": "Cube",
"from": [7, 6, 7],
"to": [9, 16, 9],
"faces": {
"north": {"uv": [0, 0, 2, 6], "texture": "#2"},
"east": {"uv": [0, 0, 2, 6], "texture": "#2"},
"south": {"uv": [0, 0, 2, 6], "texture": "#2"},
"west": {"uv": [0, 0, 2, 6], "texture": "#2"},
"up": {"uv": [0, 0, 2, 2], "texture": "#2"}
}
},
{
"from": [7, 4, 7],
"to": [9, 6, 9],
"faces": {
"north": {"uv": [0, 0, 2, 2], "texture": "#5"},
"east": {"uv": [0, 0, 2, 2], "texture": "#5"},
"south": {"uv": [0, 0, 2, 2], "texture": "#5"},
"west": {"uv": [0, 0, 2, 2], "texture": "#5"},
"down": {"uv": [0, 0, 2, 2], "texture": "#5"}
}
},
{
"from": [-3, 5, 7],
"to": [7, 6, 9],
"faces": {
"north": {"uv": [0, 0, 4, 4], "texture": "#3"},
"east": {"uv": [0, 0, 4, 4], "texture": "#3"},
"south": {"uv": [0, 0, 4, 4], "texture": "#3"},
"west": {"uv": [0, 0, 4, 4], "texture": "#3"},
"up": {"uv": [0, 0, 4, 4], "texture": "#3"},
"down": {"uv": [0, 0, 4, 4], "texture": "#3"}
}
},
{
"from": [9, 5, 7],
"to": [19, 6, 9],
"faces": {
"north": {"uv": [0, 0, 4, 4], "texture": "#3"},
"east": {"uv": [0, 0, 4, 4], "texture": "#3"},
"south": {"uv": [0, 0, 4, 4], "texture": "#3"},
"west": {"uv": [0, 0, 4, 4], "texture": "#3"},
"up": {"uv": [0, 0, 4, 4], "texture": "#3"},
"down": {"uv": [0, 0, 4, 4], "texture": "#3"}
}
},
{
"from": [7, 5, -3],
"to": [9, 6, 7],
"faces": {
"north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}
}
},
{
"from": [7, 5, 9],
"to": [9, 6, 19],
"faces": {
"north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"},
"down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}
}
}
],
"groups": [0, 1,
{
"name": "normal",
"children": [2, 3, 4, 5]
}
]
}

10
src/main/resources/assets/decorative/sounds.json Normal file
View File

@@ -0,0 +1,10 @@
{
"ceiling_fan.ambient": {
"sounds": [
{
"name": "decorative:block/ceiling_fan_ambient",
"stream": false
}
]
}
}

BIN
src/main/resources/assets/decorative/sounds/block/ceiling_fan_ambient.ogg Normal file
View File

Binary file not shown.

BIN
src/main/resources/assets/decorative/textures/block/ceilingfan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 176 B

5
src/main/resources/assets/decorative/textures/block/ceilingfan.png.mcmeta
View File

@@ -1,5 +0,0 @@
{
"animation": {
"frametime": 5
}
}

BIN
src/main/resources/assets/decorative/textures/block/ceilingfannormal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 139 B

2
src/main/resources/decorative.mixins.json
View File

@@ -3,7 +3,7 @@
"package": "eu.midnightdust.motschen.decorative.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
"DefaultBiomeFeaturesMixin"
"GenerationSettingsAccessorMixin"
],
"injectors": {
"defaultRequire": 1