Merge remote-tracking branch 'origin/1.18/api' into 1.18/api

# Conflicts:
#	src/main/java/com/simibubi/create/content/logistics/trains/StandardBogeyRenderer.java

build.gradle

@@ -172,7 +172,7 @@ dependencies {
     // runtimeOnly fg.deobf("slimeknights.mantle:Mantle:1.16.5-1.6.115")
     // runtimeOnly fg.deobf("slimeknights.tconstruct:TConstruct:1.16.5-3.1.1.252")
     // runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3")
-    implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false }
+    // implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false }
 
     // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
     // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings

src/main/java/com/simibubi/create/AllBogeyStyles.java

@@ -28,21 +28,23 @@ import static com.simibubi.create.Create.LOGGER;
 
 public class AllBogeyStyles {
 	public static final Map<ResourceLocation, BogeyStyle> BOGEY_STYLES = new HashMap<>();
-	public static final Map<ResourceLocation, Map<ResourceLocation, BogeyStyle>> STYLE_GROUPS = new HashMap<>(); // each set of styles that should be cycled through
+	public static final Map<ResourceLocation, Map<ResourceLocation, BogeyStyle>> CYCLE_GROUPS = new HashMap<>(); // each set of styles that should be cycled through
 	private static final Map<ResourceLocation, BogeyStyle> EMPTY_GROUP = ImmutableMap.of();
 
 	public static Map<ResourceLocation, BogeyStyle> getCycleGroup(ResourceLocation cycleGroup) {
-		return STYLE_GROUPS.getOrDefault(cycleGroup, EMPTY_GROUP);
+		return CYCLE_GROUPS.getOrDefault(cycleGroup, EMPTY_GROUP);
 	}
 
-	public static BogeyStyle STANDARD = create("standard", "standard")
+	public static final String STANDARD_CYCLE_GROUP = "standard";
+
+	public static BogeyStyle STANDARD = create("standard", STANDARD_CYCLE_GROUP)
 			.commonRenderer(CommonStandardBogeyRenderer::new)
 			.displayName(Components.translatable("create.bogey.style.standard"))
 			.size(BogeySizes.SMALL, SmallStandardBogeyRenderer::new, AllBlocks.SMALL_BOGEY)
 			.size(BogeySizes.LARGE, LargeStandardBogeyRenderer::new, AllBlocks.LARGE_BOGEY)
 			.build();
 
-	public static BogeyStyleBuilder create(String name, String cycleGroup) {
+	private static BogeyStyleBuilder create(String name, String cycleGroup) {
 		return create(Create.asResource(name), Create.asResource(cycleGroup));
 	}
 
@@ -64,7 +66,7 @@ public class AllBogeyStyles {
 		protected CompoundTag defaultData = new CompoundTag();
 		protected ParticleOptions contactParticle = ParticleTypes.CRIT;
 		protected ParticleOptions smokeParticle = ParticleTypes.POOF;
-		protected Optional<CommonRenderer> commonRenderer = Optional.empty();
+		protected Optional<Supplier<? extends CommonRenderer>> commonRenderer = Optional.empty();
 
 		public BogeyStyleBuilder(ResourceLocation name, ResourceLocation cycleGroup) {
 			this.name = name;
@@ -94,7 +96,7 @@ public class AllBogeyStyles {
 
 		public BogeyStyleBuilder size(BogeySizes.BogeySize size, Supplier<? extends BogeyRenderer> renderer,
 									   ResourceLocation location) {
-			this.sizes.put(size, new BogeyStyle.SizeData(location, renderer.get()));
+			this.sizes.put(size, new BogeyStyle.SizeData(location, renderer, renderer.get()));
 			return this;
 		}
 
@@ -109,7 +111,7 @@ public class AllBogeyStyles {
 		}
 
 		public BogeyStyleBuilder commonRenderer(Supplier<? extends CommonRenderer> commonRenderer) {
-			this.commonRenderer = Optional.of(commonRenderer.get());
+			this.commonRenderer = Optional.of(commonRenderer);
 			return this;
 		}
 
@@ -117,7 +119,7 @@ public class AllBogeyStyles {
 			BogeyStyle entry =
 					new BogeyStyle(name, cycleGroup, displayName, soundType, contactParticle, smokeParticle, defaultData, sizes, commonRenderer);
 			BOGEY_STYLES.put(name, entry);
-			STYLE_GROUPS.computeIfAbsent(cycleGroup, l -> new HashMap<>()).put(name, entry);
+			CYCLE_GROUPS.computeIfAbsent(cycleGroup, l -> new HashMap<>()).put(name, entry);
 			return entry;
 		}
 	}

src/main/java/com/simibubi/create/content/logistics/trains/AbstractBogeyBlock.java

@@ -151,7 +151,7 @@ public abstract class AbstractBogeyBlock<T extends AbstractBogeyTileEntity> exte
 			style = getDefaultStyle();
 
 		final Optional<BogeyRenderer.CommonRenderer> commonRenderer
-				= style.getNewCommonRenderInstance();
+				= style.getInWorldCommonRenderInstance();
 		final BogeyRenderer renderer = style.getInWorldRenderInstance(this.getSize());
 		if (state != null) {
 			ms.translate(.5f, .5f, .5f);

src/main/java/com/simibubi/create/content/logistics/trains/BogeyRenderer.java

@@ -278,21 +278,10 @@ public abstract class BogeyRenderer {
 		return state.toString();
 	}
 
-	/**
-	 * Used for rendering in contraptions allowing for individual instances of models for each component
-	 *
-	 * @return new Instance of renderer
-	 */
-	public abstract BogeyRenderer createNewInstance();
-
-
 	public static abstract class CommonRenderer extends BogeyRenderer {
 		@Override
 		public BogeySizes.BogeySize getSize() {
 			return null;
 		}
-
-		@Override
-		public abstract CommonRenderer createNewInstance();
 	}
 }

src/main/java/com/simibubi/create/content/logistics/trains/StandardBogeyRenderer.java

@@ -30,11 +30,6 @@ public class StandardBogeyRenderer {
 					.setValue(ShaftBlock.AXIS, Direction.Axis.Z), 2);
 		}
 
-		@Override
-		public CommonStandardBogeyRenderer createNewInstance() {
-			return new CommonStandardBogeyRenderer();
-		}
-
 		@Override
 		public void render(CompoundTag bogeyData, float wheelAngle, PoseStack ms, int light, VertexConsumer vb, boolean inContraption) {
 			boolean inInstancedContraption = vb == null;
@@ -58,10 +53,6 @@ public class StandardBogeyRenderer {
 			createModelInstances(materialManager, BOGEY_FRAME);
 		}
 
-		@Override
-		public BogeyRenderer createNewInstance() {
-			return new SmallStandardBogeyRenderer();
-		}
 
 		@Override
 		public BogeySizes.BogeySize getSize() {
@@ -96,11 +87,6 @@ public class StandardBogeyRenderer {
 					.setValue(ShaftBlock.AXIS, Direction.Axis.X), 2);
 		}
 
-		@Override
-		public BogeyRenderer createNewInstance() {
-			return new LargeStandardBogeyRenderer();
-		}
-
 		@Override
 		public BogeySizes.BogeySize getSize() {
 			return BogeySizes.LARGE;

src/main/java/com/simibubi/create/content/logistics/trains/entity/BackupBogeyRenderer.java

@@ -19,9 +19,4 @@ public class BackupBogeyRenderer extends BogeyRenderer.CommonRenderer {
 	public void initialiseContraptionModelData(MaterialManager materialManager) {
 
 	}
-
-	@Override
-	public CommonRenderer createNewInstance() {
-		return new BackupBogeyRenderer();
-	}
 }

src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java

@@ -21,10 +21,13 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 
 public class BogeyStyle {
+	private final Optional<Supplier<? extends CommonRenderer>> commonRendererFactory;
+
 	public final ResourceLocation name;
 	public final ResourceLocation cycleGroup;
 	private final Optional<CommonRenderer> commonRenderer;
@@ -36,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;
@@ -46,7 +49,9 @@ public class BogeyStyle {
 		this.defaultData = defaultData;
 
 		this.sizes = sizes;
-		this.commonRenderer = commonRenderer;
+
+		this.commonRendererFactory = commonRenderer;
+		this.commonRenderer = commonRenderer.map(Supplier::get);
 	}
 
 	public Map<ResourceLocation, BogeyStyle> getCycleGroup() {
@@ -77,12 +82,12 @@ public class BogeyStyle {
 	}
 
 	public BogeyRenderer createRendererInstance(BogeySizes.BogeySize size) {
-		return this.getInWorldRenderInstance(size).createNewInstance();
+		return this.sizes.get(size).createRenderInstance();
 	}
 
 	public BogeyRenderer getInWorldRenderInstance(BogeySizes.BogeySize size) {
 		SizeData sizeData = this.sizes.get(size);
-		return sizeData != null ? sizeData.renderer() : BackupBogeyRenderer.INSTANCE;
+		return sizeData != null ? sizeData.getInWorldInstance() : BackupBogeyRenderer.INSTANCE;
 	}
 
 	public Optional<CommonRenderer> getInWorldCommonRenderInstance() {
@@ -90,13 +95,20 @@ public class BogeyStyle {
 	}
 
 	public Optional<CommonRenderer> getNewCommonRenderInstance() {
-		return this.getInWorldCommonRenderInstance().map(CommonRenderer::createNewInstance);
+		return this.commonRendererFactory.map(Supplier::get);
 	}
 
 	public BogeyInstance createInstance(CarriageBogey bogey, BogeySizes.BogeySize size, MaterialManager materialManager) {
 		return new BogeyInstance(bogey, this, size, materialManager);
 	}
 
-	public record SizeData(ResourceLocation block, BogeyRenderer renderer) {
+	public record SizeData(ResourceLocation block, Supplier<? extends BogeyRenderer> rendererFactory, BogeyRenderer instance) {
+		public BogeyRenderer createRenderInstance() {
+			return rendererFactory.get();
+		}
+
+		public BogeyRenderer getInWorldInstance() {
+			return instance;
+		}
 	}
 }

src/main/java/com/simibubi/create/content/logistics/trains/entity/Navigation.java

@@ -14,7 +14,6 @@ import java.util.UUID;
 
 import javax.annotation.Nullable;
 
-import com.railwayteam.railways.Railways;
 import com.simibubi.create.content.logistics.trains.TrackMaterial;
 
 import org.apache.commons.lang3.mutable.MutableDouble;