From 4924dfda5da24f70af3f2a9d46c1ada2089e832b Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 26 Feb 2023 16:12:04 +0100 Subject: [PATCH] Bad merge - Fixed layout of netherite armour textures on this branch - Fixed elevator pulley magnet not rotating with the blockstate --- .../elevator/ElevatorPulleyRenderer.java | 13 +++++++++---- .../waterwheel/WaterWheelBlockEntity.java | 2 ++ .../models/armor/netherite_diving_layer_1.png | Bin 3909 -> 778 bytes .../models/armor/netherite_diving_layer_2.png | Bin 4748 -> 471 bytes 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyRenderer.java index 497d082e0..cc26290c6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/elevator/ElevatorPulleyRenderer.java @@ -39,7 +39,7 @@ public class ElevatorPulleyRenderer extends KineticBlockEntityRenderer .75f) { halfRope.centre() - .rotateY(180 + AngleHelper.horizontalAngle(blockState.getValue(ElevatorPulleyBlock.HORIZONTAL_FACING))) + .rotateY(blockStateAngle) .unCentre(); AbstractPulleyRenderer.renderAt(world, halfRope.shiftUVScrolling(beltShift, (float) beltScroll * spriteSize), f > .75f ? f - 1 : f, pos, ms, @@ -91,7 +96,7 @@ public class ElevatorPulleyRenderer extends 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 Tly?$n00000NkvXXu0mjffjFH1 diff --git a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png index 0f0443a9565b431d7fd4c2650e9b75264dc538db..a23c9e0e332f91fb7dbb2409657b294e6981ce86 100644 GIT binary patch delta 456 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 Z{sA^Tm|h^hy^a6?002ovPDHLkV1muXDMSDO