Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Gcat101/reignited-utilities
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gcat101
Gcat101 committed Aug 25, 2023
2 parents 76af207 + 40f01da commit 2e38180
Show file tree
Hide file tree
Showing 7 changed files with 332 additions and 2 deletions.
7 changes: 7 additions & 0 deletions src/generated/resources/assets/reignitedutilities/blockstates/manual_mill.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "reignitedutilities:block/manual_mill"
}
}
}
34 changes: 33 additions & 1 deletion src/generated/resources/assets/reignitedutilities/models/item/manual_mill.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
{
"parent": "reignitedutilities:block/manual_mill"
"parent": "reignitedutilities:block/manual_mill",
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
"rotation": [ 75, 45, 0 ],
"translation": [ 0, 2.5, 0],
"scale": [ 0.375, 0.375, 0.375 ]
},
"firstperson_righthand": {
"rotation": [ 0, 45, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 225, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
}
}
34 changes: 33 additions & 1 deletion src/generated/resources/assets/reignitedutilities/models/item/slightly_larger_chest.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
{
"parent": "reignitedutilities:block/slightly_larger_chest"
"parent": "reignitedutilities:block/slightly_larger_chest",
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.625, 0.625, 0.625 ]
},
"ground": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 3, 0],
"scale":[ 0.25, 0.25, 0.25 ]
},
"fixed": {
"rotation": [ 0, 0, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.5, 0.5, 0.5 ]
},
"thirdperson_righthand": {
"rotation": [ 75, 45, 0 ],
"translation": [ 0, 2.5, 0],
"scale": [ 0.375, 0.375, 0.375 ]
},
"firstperson_righthand": {
"rotation": [ 0, 45, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 225, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
}
}
19 changes: 19 additions & 0 deletions src/main/resources/assets/reignitedutilities/blockstates/slightly_larger_chest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "reignitedutilities:block/slightly_larger_chest",
"y": 90
},
"facing=north": {
"model": "reignitedutilities:block/slightly_larger_chest"
},
"facing=south": {
"model": "reignitedutilities:block/slightly_larger_chest",
"y": 180
},
"facing=west": {
"model": "reignitedutilities:block/slightly_larger_chest",
"y": 270
}
}
}
219 changes: 219 additions & 0 deletions src/main/resources/assets/reignitedutilities/models/block/manual_mill.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"elements": [
{
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [4, 0, 8, 2], "texture": "#missing"},
"east": {"uv": [4, 2, 8, 4], "texture": "#missing"},
"south": {"uv": [4, 4, 8, 6], "texture": "#missing"},
"west": {"uv": [4, 6, 8, 8], "texture": "#missing"},
"up": {"uv": [4, 4, 0, 0], "texture": "#missing"},
"down": {"uv": [4, 4, 0, 8], "texture": "#missing"}
}
},
{
"from": [6, 8, 6],
"to": [10, 12, 10],
"faces": {
"north": {"uv": [0, 8, 1, 9], "texture": "#missing"},
"east": {"uv": [8, 0, 9, 1], "texture": "#missing"},
"south": {"uv": [1, 8, 2, 9], "texture": "#missing"},
"west": {"uv": [8, 1, 9, 2], "texture": "#missing"},
"up": {"uv": [3, 9, 2, 8], "texture": "#missing"},
"down": {"uv": [9, 2, 8, 3], "texture": "#missing"}
}
},
{
"from": [12, 8, 7],
"to": [15, 12, 9],
"faces": {
"north": {"uv": [3.75, 8, 4.5, 9], "texture": "#missing"},
"east": {"uv": [7.5, 8.75, 8, 9.75], "texture": "#missing"},
"south": {"uv": [8, 4, 8.75, 5], "texture": "#missing"},
"west": {"uv": [8, 8.75, 8.5, 9.75], "texture": "#missing"},
"up": {"uv": [6.75, 9.5, 6, 9], "texture": "#missing"},
"down": {"uv": [7.5, 9, 6.75, 9.5], "texture": "#missing"}
}
},
{
"from": [12, 9, 6],
"to": [15, 11, 10],
"faces": {
"north": {"uv": [4.5, 9, 5.25, 9.5], "texture": "#missing"},
"east": {"uv": [8.75, 5.5, 9.75, 6], "texture": "#missing"},
"south": {"uv": [5.25, 9, 6, 9.5], "texture": "#missing"},
"west": {"uv": [8.75, 6, 9.75, 6.5], "texture": "#missing"},
"up": {"uv": [3.75, 9, 3, 8], "texture": "#missing"},
"down": {"uv": [8.75, 3, 8, 4], "texture": "#missing"}
}
},
{
"from": [7, 9, 4],
"to": [9, 11, 6],
"faces": {
"north": {"uv": [3.75, 9.5, 4.25, 10], "texture": "#missing"},
"east": {"uv": [4.25, 9.5, 4.75, 10], "texture": "#missing"},
"south": {"uv": [4.75, 9.5, 5.25, 10], "texture": "#missing"},
"west": {"uv": [5.25, 9.5, 5.75, 10], "texture": "#missing"},
"up": {"uv": [6.25, 10, 5.75, 9.5], "texture": "#missing"},
"down": {"uv": [6.75, 9.5, 6.25, 10], "texture": "#missing"}
}
},
{
"from": [4, 9, 7],
"to": [6, 11, 9],
"faces": {
"north": {"uv": [1, 10, 1.5, 10.5], "texture": "#missing"},
"east": {"uv": [10, 1, 10.5, 1.5], "texture": "#missing"},
"south": {"uv": [1.5, 10, 2, 10.5], "texture": "#missing"},
"west": {"uv": [10, 1.5, 10.5, 2], "texture": "#missing"},
"up": {"uv": [2.5, 10.5, 2, 10], "texture": "#missing"},
"down": {"uv": [10.5, 2.5, 10, 3], "texture": "#missing"}
}
},
{
"from": [7, 9, 10],
"to": [9, 11, 12],
"faces": {
"north": {"uv": [6.75, 9.5, 7.25, 10], "texture": "#missing"},
"east": {"uv": [9.5, 9.25, 10, 9.75], "texture": "#missing"},
"south": {"uv": [9.75, 3.75, 10.25, 4.25], "texture": "#missing"},
"west": {"uv": [9.75, 4.25, 10.25, 4.75], "texture": "#missing"},
"up": {"uv": [10.25, 5.25, 9.75, 4.75], "texture": "#missing"},
"down": {"uv": [10.25, 5.25, 9.75, 5.75], "texture": "#missing"}
}
},
{
"from": [10, 9, 7],
"to": [12, 11, 9],
"faces": {
"north": {"uv": [9.75, 5.75, 10.25, 6.25], "texture": "#missing"},
"east": {"uv": [9.75, 6.25, 10.25, 6.75], "texture": "#missing"},
"south": {"uv": [9.75, 6.75, 10.25, 7.25], "texture": "#missing"},
"west": {"uv": [7.25, 9.75, 7.75, 10.25], "texture": "#missing"},
"up": {"uv": [8.25, 10.25, 7.75, 9.75], "texture": "#missing"},
"down": {"uv": [8.75, 9.75, 8.25, 10.25], "texture": "#missing"}
}
},
{
"from": [10, 9, 7],
"to": [12, 11, 9],
"faces": {
"north": {"uv": [9.75, 8.5, 10.25, 9], "texture": "#missing"},
"east": {"uv": [9.5, 9.75, 10, 10.25], "texture": "#missing"},
"south": {"uv": [0, 10, 0.5, 10.5], "texture": "#missing"},
"west": {"uv": [10, 0, 10.5, 0.5], "texture": "#missing"},
"up": {"uv": [1, 10.5, 0.5, 10], "texture": "#missing"},
"down": {"uv": [10.5, 0.5, 10, 1], "texture": "#missing"}
}
},
{
"from": [1, 8, 7],
"to": [4, 12, 9],
"faces": {
"north": {"uv": [4.5, 8, 5.25, 9], "texture": "#missing"},
"east": {"uv": [8.5, 8.75, 9, 9.75], "texture": "#missing"},
"south": {"uv": [8, 5, 8.75, 6], "texture": "#missing"},
"west": {"uv": [0, 9, 0.5, 10], "texture": "#missing"},
"up": {"uv": [9.75, 7.5, 9, 7], "texture": "#missing"},
"down": {"uv": [9.75, 8.75, 9, 9.25], "texture": "#missing"}
}
},
{
"from": [1, 9, 6],
"to": [4, 11, 10],
"faces": {
"north": {"uv": [9.25, 7.5, 10, 8], "texture": "#missing"},
"east": {"uv": [8.75, 6.5, 9.75, 7], "texture": "#missing"},
"south": {"uv": [9.25, 8, 10, 8.5], "texture": "#missing"},
"west": {"uv": [9, 0, 10, 0.5], "texture": "#missing"},
"up": {"uv": [6, 9, 5.25, 8], "texture": "#missing"},
"down": {"uv": [6.75, 8, 6, 9], "texture": "#missing"}
}
},
{
"from": [7, 8, 1],
"to": [9, 12, 4],
"faces": {
"north": {"uv": [0.5, 9, 1, 10], "texture": "#missing"},
"east": {"uv": [8, 6, 8.75, 7], "texture": "#missing"},
"south": {"uv": [9, 0.5, 9.5, 1.5], "texture": "#missing"},
"west": {"uv": [6.75, 8, 7.5, 9], "texture": "#missing"},
"up": {"uv": [9.5, 10, 9, 9.25], "texture": "#missing"},
"down": {"uv": [10, 0.5, 9.5, 1.25], "texture": "#missing"}
}
},
{
"from": [6, 9, 1],
"to": [10, 11, 4],
"faces": {
"north": {"uv": [1, 9, 2, 9.5], "texture": "#missing"},
"east": {"uv": [1, 9.5, 1.75, 10], "texture": "#missing"},
"south": {"uv": [9, 1.5, 10, 2], "texture": "#missing"},
"west": {"uv": [9.5, 2, 10.25, 2.5], "texture": "#missing"},
"up": {"uv": [9, 7.75, 8, 7], "texture": "#missing"},
"down": {"uv": [8.5, 8, 7.5, 8.75], "texture": "#missing"}
}
},
{
"from": [7, 8, 12],
"to": [9, 12, 15],
"faces": {
"north": {"uv": [2, 9, 2.5, 10], "texture": "#missing"},
"east": {"uv": [8.5, 7.75, 9.25, 8.75], "texture": "#missing"},
"south": {"uv": [9, 2, 9.5, 3], "texture": "#missing"},
"west": {"uv": [8.75, 3, 9.5, 4], "texture": "#missing"},
"up": {"uv": [3, 10.25, 2.5, 9.5], "texture": "#missing"},
"down": {"uv": [10, 2.5, 9.5, 3.25], "texture": "#missing"}
}
},
{
"from": [6, 9, 12],
"to": [10, 11, 15],
"faces": {
"north": {"uv": [2.5, 9, 3.5, 9.5], "texture": "#missing"},
"east": {"uv": [3, 9.5, 3.75, 10], "texture": "#missing"},
"south": {"uv": [3.5, 9, 4.5, 9.5], "texture": "#missing"},
"west": {"uv": [9.5, 3.25, 10.25, 3.75], "texture": "#missing"},
"up": {"uv": [9.75, 4.75, 8.75, 4], "texture": "#missing"},
"down": {"uv": [9.75, 4.75, 8.75, 5.5], "texture": "#missing"}
}
}
],
"groups": [
0,
1,
{
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"children": [2, 3]
},
4,
5,
6,
7,
8,
{
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"children": [9, 10]
},
{
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"children": [11, 12]
},
{
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"children": [13, 14]
}
]
}
21 changes: 21 additions & 0 deletions src/main/resources/assets/reignitedutilities/models/block/slightly_larger_chest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "reignitedutilities:block/slightly_larger_chest",
"particle": "#0"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
"east": {"uv": [8, 0, 16, 8], "texture": "#0"},
"south": {"uv": [8, 0, 16, 8], "texture": "#0"},
"west": {"uv": [8, 0, 16, 8], "texture": "#0"},
"up": {"uv": [0, 8, 8, 16], "texture": "#0"},
"down": {"uv": [0, 8, 8, 16], "texture": "#0"}
}
}
]
}
Binary file added ...in/resources/assets/reignitedutilities/textures/block/slightly_larger_chest.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2e38180

Please sign in to comment.