diff --git a/src/main/java/com/simibubi/create/AllBogeyStyles.java b/src/main/java/com/simibubi/create/AllBogeyStyles.java index f6a0dce87..9789bd25b 100644 --- a/src/main/java/com/simibubi/create/AllBogeyStyles.java +++ b/src/main/java/com/simibubi/create/AllBogeyStyles.java @@ -89,7 +89,7 @@ public class AllBogeyStyles { } public BogeyStyleBuilder size(BogeySizes.BogeySize size, Supplier renderer, - BlockEntry blockEntry) { + BlockEntry> blockEntry) { this.size(size, renderer, blockEntry.getId()); return this; } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java index 93beae627..3f86c660c 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java @@ -145,7 +145,7 @@ public abstract class AbstractBogeyBlock exte } @OnlyIn(Dist.CLIENT) - public void render(@Nullable BlockState state, boolean upsideDown, float wheelAngle, PoseStack ms, float partialTicks, + public void render(@Nullable BlockState state, float wheelAngle, PoseStack ms, float partialTicks, MultiBufferSource buffers, int light, int overlay, BogeyStyle style, CompoundTag bogeyData) { if (style == null) style = getDefaultStyle(); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/BogeyTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/BogeyTileEntityRenderer.java index ee8795ddd..fb96b989b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/BogeyTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/BogeyTileEntityRenderer.java @@ -20,7 +20,7 @@ public class BogeyTileEntityRenderer extends SafeTileEnti if (te instanceof AbstractBogeyTileEntity sbte) { float angle = sbte.getVirtualAngle(partialTicks); if (blockState.getBlock() instanceof AbstractBogeyBlock bogey) - bogey.render(blockState, bogey.isUpsideDown(blockState), angle, ms, partialTicks, buffer, light, overlay, sbte.getStyle(), sbte.getBogeyData()); + bogey.render(blockState, angle, ms, partialTicks, buffer, light, overlay, sbte.getStyle(), sbte.getBogeyData()); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java index 53469f4fb..02b219074 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java @@ -67,7 +67,7 @@ public class CarriageContraptionEntityRenderer extends ContraptionEntityRenderer int light = getBogeyLightCoords(entity, bogey, partialTicks); - bogey.type.render(null, bogey.isUpsideDown(), bogey.wheelAngle.getValue(partialTicks), ms, partialTicks, buffers, light, + bogey.type.render(null, bogey.wheelAngle.getValue(partialTicks), ms, partialTicks, buffers, light, overlay, bogey.getStyle(), bogey.bogeyData); ms.popPose(); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/AbstractBogeyTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/AbstractBogeyTileEntity.java index e7e8c4e8b..297f15936 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/AbstractBogeyTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/AbstractBogeyTileEntity.java @@ -104,7 +104,7 @@ public abstract class AbstractBogeyTileEntity extends CachedRenderBBTileEntity { public void animate(float distanceMoved) { BlockState blockState = getBlockState(); - if (!(blockState.getBlock() instanceof AbstractBogeyBlock type)) + if (!(blockState.getBlock() instanceof AbstractBogeyBlock type)) return; double angleDiff = 360 * distanceMoved / (Math.PI * 2 * type.getWheelRadius()); double newWheelAngle = (virtualAnimation.getValue() - angleDiff) % 360;