mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 16:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/mc1.16/dev' into mc1.16/creative-cake

Browse source
This commit is contained in:
PepperBell 2021-07-14 16:07:48 -07:00
commit 0088a5c404
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -16,7 +16,7 @@ cursegradle_version = 1.4.0
# dependency versions
registrate_version = 1.0.4
flywheel_version = 1.16-0.1.0.21
flywheel_version = 1.16-0.1.1.24
jei_version = 7.7.0.106
# curseforge information

4
src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java
View file

@ -117,10 +117,10 @@ public class DepotRenderer extends SafeTileEntityRenderer<DepotTileEntity> {
Vector3d positionVec = renderViewEntity.getPositionVec();
Vector3d vectorForOffset = itemPosition;
Vector3d diff = vectorForOffset.subtract(positionVec);
float yRot = (float) MathHelper.atan2(diff.z, -diff.x);
float yRot = (float) -MathHelper.atan2(diff.z, diff.x);
ms.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion((float) (yRot - Math.PI / 2)));
}
ms.translate(0, 3 / 32d, 1 / 16f);
ms.translate(0, 3 / 32d, -1 / 16f);
}
for (int i = 0; i <= count; i++) {

3
src/main/resources/assets/create/models/item/potato_cannon/item.json
View file

@ -1,6 +1,5 @@
{
"credit": "Made with Blockbench",
"parent": "create:item/potato_cannon/item",
"texture_size": [32, 32],
"textures": {
"1": "create:item/potato_cannon",
@ -12,7 +11,6 @@
"to": [9.5, 10, 6.5],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 7.6, 11]},
"faces": {
"north": {"uv": [7.5, 1, 9.5, 4], "texture": "#missing"},
"east": {"uv": [4, 2, 0, 3.5], "texture": "#1"},
"south": {"uv": [10, 6, 11.5, 7.5], "texture": "#1"},
"west": {"uv": [0, 2, 4, 3.5], "texture": "#1"},
@ -63,7 +61,6 @@
"to": [9, 6, 15.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7.6, 11]},
"faces": {
"north": {"uv": [13, 13, 15, 15], "texture": "#missing"},
"east": {"uv": [0.5, 10, 1, 11], "texture": "#1"},
"west": {"uv": [0.5, 10, 1, 11], "texture": "#1"},
"up": {"uv": [0.5, 10, 1, 10.25], "rotation": 90, "texture": "#1"},