diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 76e8cc790..97a95c228 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -582,7 +582,7 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json fcaad84ac4ebdb1e6d9301b77245ce855dbde503 assets/create/lang/en_ud.json -988c876b2f101c2b02a27f00090d0d1348c01cc3 assets/create/lang/en_us.json +03146c18c43580d65e41b94f3b9e1b3846768cc5 assets/create/lang/en_us.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index ad3504295..1e7252e07 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -2186,6 +2186,8 @@ "create.ponder.tag.redstone.description": "Components which help with redstone engineering", "create.ponder.tag.contraption_assembly": "Block Attachment Utility", "create.ponder.tag.contraption_assembly.description": "Tools and Components used to assemble structures moved as an animated Contraption", + "create.ponder.tag.recently_updated": "Recently Updated", + "create.ponder.tag.recently_updated.description": "Components that have been added or changed significantly in the latest versions of Create", "create.ponder.tag.fluids": "Fluid Manipulators", "create.ponder.tag.fluids.description": "Components which help relaying and making use of Fluids", "create.ponder.tag.decoration": "Aesthetics", diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java index 3962ca079..5084a0bce 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java @@ -24,8 +24,8 @@ public class BracketedKineticBlockEntityRenderer extends KineticBlockEntityRende } @Override - protected void renderSafe(BracketedKineticBlockEntity be, float partialTicks, PoseStack ms, MultiBufferSource buffer, - int light, int overlay) { + protected void renderSafe(BracketedKineticBlockEntity be, float partialTicks, PoseStack ms, + MultiBufferSource buffer, int light, int overlay) { if (Backend.canUseInstancing(be.getLevel())) return; @@ -39,17 +39,12 @@ public class BracketedKineticBlockEntityRenderer extends KineticBlockEntityRende // mesh properly Axis axis = getRotationAxisOf(be); - BlockPos pos = be.getBlockPos(); - Direction facing = Direction.fromAxisAndDirection(axis, AxisDirection.POSITIVE); renderRotatingBuffer(be, CachedBufferer.partialFacingVertical(AllPartialModels.SHAFTLESS_LARGE_COGWHEEL, be.getBlockState(), facing), ms, buffer.getBuffer(RenderType.solid()), light); - float offset = getShaftAngleOffset(axis, pos); - float time = AnimationTickHolder.getRenderTime(be.getLevel()); - float angle = ((time * be.getSpeed() * 3f / 10 + offset) % 360) / 180 * (float) Math.PI; - + float angle = getAngleForLargeCogShaft(be, axis); SuperByteBuffer shaft = CachedBufferer.partialFacingVertical(AllPartialModels.COGWHEEL_SHAFT, be.getBlockState(), facing); kineticRotationTransform(shaft, be, axis, angle, light); @@ -57,6 +52,14 @@ public class BracketedKineticBlockEntityRenderer extends KineticBlockEntityRende } + public static float getAngleForLargeCogShaft(SimpleKineticBlockEntity be, Axis axis) { + BlockPos pos = be.getBlockPos(); + float offset = getShaftAngleOffset(axis, pos); + float time = AnimationTickHolder.getRenderTime(be.getLevel()); + float angle = ((time * be.getSpeed() * 3f / 10 + offset) % 360) / 180 * (float) Math.PI; + return angle; + } + public static float getShaftAngleOffset(Axis axis, BlockPos pos) { float offset = 0; double d = (((axis == Axis.X) ? 0 : pos.getX()) + ((axis == Axis.Y) ? 0 : pos.getY()) diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java index 38ab029e7..f02553fc8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java @@ -14,6 +14,7 @@ import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticBlockEntity; import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance; import com.simibubi.create.content.contraptions.base.flwdata.RotatingData; +import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockEntityRenderer; import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.core.Direction; @@ -60,6 +61,8 @@ public class EncasedCogInstance extends KineticBlockEntityInstance