From cdb0ad210b7c984b9fcfbecae8a2a0ebf052eb9d Mon Sep 17 00:00:00 2001
From: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun, 7 May 2023 10:15:47 +0100
Subject: [PATCH] Fixed merge artifact

---
 .../create/content/logistics/trains/entity/BogeyStyle.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java
index c5667cd0d..2b3efc8d7 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java
+++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java
@@ -39,7 +39,7 @@ public class BogeyStyle {
 	public final CompoundTag defaultData;
 
 	public BogeyStyle(ResourceLocation name, ResourceLocation cycleGroup, Component displayName, ResourceLocation soundType, ParticleOptions contactParticle, ParticleOptions smokeParticle,
-					  CompoundTag defaultData, Map<BogeySizes.BogeySize, SizeData> sizes, Optional<CommonRenderer> commonRenderer) {
+					  CompoundTag defaultData, Map<BogeySizes.BogeySize, SizeData> sizes, Optional<Supplier<? extends CommonRenderer>> commonRenderer) {
 		this.name = name;
 		this.cycleGroup = cycleGroup;
 		this.displayName = displayName;