Fixed merge artifact

This commit is contained in:
Rabbitminers 2023-05-07 10:15:47 +01:00
parent 457d5f33ed
commit cdb0ad210b

View File

@ -39,7 +39,7 @@ public class BogeyStyle {
public final CompoundTag defaultData; public final CompoundTag defaultData;
public BogeyStyle(ResourceLocation name, ResourceLocation cycleGroup, Component displayName, ResourceLocation soundType, ParticleOptions contactParticle, ParticleOptions smokeParticle, 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.name = name;
this.cycleGroup = cycleGroup; this.cycleGroup = cycleGroup;
this.displayName = displayName; this.displayName = displayName;