Rename RenderTrains to MainRenderer

fabric/build.gradle

@@ -18,7 +18,7 @@ dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
     mappings "net.fabricmc:yarn:${yarn_version}:v2"
-    modImplementation "org.mtr:MTR-fabric:${rootProject.mtr_version}+${rootProject.minecraft_version}"
+    modImplementation "org.mtr:MTR-fabric:${rootProject.mtr_version}+${rootProject.minecraft_version}-server"
     modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
     modApi "com.terraformersmc:modmenu:${mod_menu_version}"

fabric/src/main/java/com/lx862/jcm/mod/block/JCMPIDSBlock.java

@@ -4,7 +4,6 @@
 import com.lx862.jcm.mod.block.entity.PIDSBlockEntity;
 import com.lx862.jcm.mod.network.gui.PIDSGUIPacket;
 import com.lx862.jcm.mod.registry.Networking;
-import com.lx862.jcm.mod.util.JCMUtil;
 import org.mtr.mapping.holder.*;
 import org.mtr.mapping.mapper.BlockWithEntity;
 import org.mtr.mod.block.IBlock;

fabric/src/main/java/com/lx862/jcm/mod/block/KCREmergencyStopSign.java

@@ -2,7 +2,10 @@
 
 import com.lx862.jcm.mod.block.base.WallAttachedBlock;
 import com.lx862.jcm.mod.data.BlockProperties;
-import com.lx862.jcm.mod.util.*;
+import com.lx862.jcm.mod.util.BlockUtil;
+import com.lx862.jcm.mod.util.TextCategory;
+import com.lx862.jcm.mod.util.TextUtil;
+import com.lx862.jcm.mod.util.VoxelUtil;
 import org.mtr.mapping.holder.*;
 import org.mtr.mapping.tool.HolderBase;
 import org.mtr.mod.block.IBlock;

fabric/src/main/java/com/lx862/jcm/mod/block/KCRStationNameSignBlock.java

@@ -3,7 +3,10 @@
 import com.lx862.jcm.mod.block.base.CeilingAttachedDirectionalBlock;
 import com.lx862.jcm.mod.block.entity.KCRStationNameSignBlockEntity;
 import com.lx862.jcm.mod.data.BlockProperties;
-import com.lx862.jcm.mod.util.*;
+import com.lx862.jcm.mod.util.BlockUtil;
+import com.lx862.jcm.mod.util.TextCategory;
+import com.lx862.jcm.mod.util.TextUtil;
+import com.lx862.jcm.mod.util.VoxelUtil;
 import org.mtr.mapping.holder.*;
 import org.mtr.mapping.mapper.BlockEntityExtension;
 import org.mtr.mapping.mapper.BlockWithEntity;

fabric/src/main/java/com/lx862/jcm/mod/block/OperatorButtonBlock.java

@@ -2,7 +2,10 @@
 
 import com.lx862.jcm.mod.block.base.WallAttachedBlock;
 import com.lx862.jcm.mod.data.BlockProperties;
-import com.lx862.jcm.mod.util.*;
+import com.lx862.jcm.mod.util.BlockUtil;
+import com.lx862.jcm.mod.util.TextCategory;
+import com.lx862.jcm.mod.util.TextUtil;
+import com.lx862.jcm.mod.util.VoxelUtil;
 import org.mtr.mapping.holder.*;
 import org.mtr.mapping.tool.HolderBase;
 import org.mtr.mod.Items;

fabric/src/main/java/com/lx862/jcm/mod/block/SpotLampBlock.java

@@ -10,8 +10,6 @@
 
 import java.util.List;
 
-import static com.lx862.jcm.mod.util.JCMUtil.playerHoldingBrush;
-
 public class SpotLampBlock extends VerticallyAttachedBlock {
     public static final BooleanProperty LIT = BlockProperties.POWERED;
 

fabric/src/main/java/com/lx862/jcm/mod/block/StaticSignalLightBlockGreen.java

@@ -1,7 +1,7 @@
 package com.lx862.jcm.mod.block;
 
 import com.lx862.jcm.mod.block.entity.StaticSignalLightBlockEntity;
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.BlockSettings;
 
 public class StaticSignalLightBlockGreen extends StaticSignalLightBlock {
     public StaticSignalLightBlockGreen(BlockSettings settings) {

fabric/src/main/java/com/lx862/jcm/mod/block/SubsidyMachineBlock.java

@@ -6,7 +6,10 @@
 import com.lx862.jcm.mod.data.JCMServerStats;
 import com.lx862.jcm.mod.network.gui.SubsidyMachineGUIPacket;
 import com.lx862.jcm.mod.registry.Networking;
-import com.lx862.jcm.mod.util.*;
+import com.lx862.jcm.mod.util.BlockUtil;
+import com.lx862.jcm.mod.util.TextCategory;
+import com.lx862.jcm.mod.util.TextUtil;
+import com.lx862.jcm.mod.util.VoxelUtil;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 import org.mtr.mapping.holder.*;
 import org.mtr.mapping.mapper.BlockEntityExtension;

fabric/src/main/java/com/lx862/jcm/mod/block/base/JCMBlock.java

@@ -1,7 +1,6 @@
 package com.lx862.jcm.mod.block.base;
 
 import com.lx862.jcm.mod.util.BlockUtil;
-import com.lx862.jcm.mod.util.JCMUtil;
 import org.mtr.mapping.holder.*;
 import org.mtr.mapping.mapper.BlockExtension;
 

fabric/src/main/java/com/lx862/jcm/mod/block/base/PoleBlock.java

@@ -1,6 +1,9 @@
 package com.lx862.jcm.mod.block.base;
 
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.Block;
+import org.mtr.mapping.holder.BlockSettings;
+import org.mtr.mapping.holder.BlockState;
+import org.mtr.mapping.holder.ItemPlacementContext;
 
 public abstract class PoleBlock extends SlabExtendableBlock {
     public PoleBlock(BlockSettings settings) {

fabric/src/main/java/com/lx862/jcm/mod/block/base/SlabExtendableBlock.java

@@ -1,7 +1,6 @@
 package com.lx862.jcm.mod.block.base;
 
 import com.lx862.jcm.mod.data.BlockProperties;
-import com.lx862.jcm.mod.util.BlockUtil;
 import org.mtr.mapping.holder.*;
 import org.mtr.mapping.mapper.SlabBlockExtension;
 import org.mtr.mapping.tool.HolderBase;

fabric/src/main/java/com/lx862/jcm/mod/block/behavior/EnquiryMachineBehavior.java

@@ -1,7 +1,10 @@
 package com.lx862.jcm.mod.block.behavior;
 
 import com.lx862.jcm.mod.util.TextUtil;
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.PlayerEntity;
+import org.mtr.mapping.holder.SoundCategory;
+import org.mtr.mapping.holder.Text;
+import org.mtr.mapping.holder.World;
 import org.mtr.mod.SoundEvents;
 import org.mtr.mod.data.TicketSystem;
 

fabric/src/main/java/com/lx862/jcm/mod/block/entity/AutoIronDoorBlockEntity.java

@@ -4,7 +4,6 @@
 import com.lx862.jcm.mod.registry.BlockEntities;
 import com.lx862.jcm.mod.util.BlockUtil;
 import org.mtr.mapping.holder.*;
-import org.mtr.mapping.mapper.AbstractSoundInstanceExtension;
 import org.mtr.mapping.mapper.MinecraftServerHelper;
 import org.mtr.mapping.mapper.SoundHelper;
 

fabric/src/main/java/com/lx862/jcm/mod/block/entity/FareSaverBlockEntity.java

@@ -1,7 +1,9 @@
 package com.lx862.jcm.mod.block.entity;
 
 import com.lx862.jcm.mod.registry.BlockEntities;
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.BlockPos;
+import org.mtr.mapping.holder.BlockState;
+import org.mtr.mapping.holder.CompoundTag;
 
 public class FareSaverBlockEntity extends JCMBlockEntityBase {
     private String prefix = "$";

fabric/src/main/java/com/lx862/jcm/mod/block/entity/SoundLooperBlockEntity.java

@@ -3,7 +3,6 @@
 import com.lx862.jcm.mod.data.JCMServerStats;
 import com.lx862.jcm.mod.registry.BlockEntities;
 import org.mtr.mapping.holder.*;
-import org.mtr.mapping.mapper.AbstractSoundInstanceExtension;
 import org.mtr.mapping.mapper.MinecraftServerHelper;
 import org.mtr.mapping.mapper.SoundHelper;
 

fabric/src/main/java/com/lx862/jcm/mod/data/pids/PIDSManager.java

@@ -1,11 +1,11 @@
 package com.lx862.jcm.mod.data.pids;
 
 import com.google.gson.JsonObject;
-import com.lx862.jcm.mod.Constants;
-import com.lx862.jcm.mod.data.pids.preset.*;
+import com.lx862.jcm.mod.data.pids.preset.CustomComponentPIDSPreset;
+import com.lx862.jcm.mod.data.pids.preset.JsonPIDSPreset;
+import com.lx862.jcm.mod.data.pids.preset.PIDSPresetBase;
 import com.lx862.jcm.mod.util.JCMLogger;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import org.mtr.mapping.holder.Identifier;
 
 import java.util.List;
 import java.util.stream.Collectors;

fabric/src/main/java/com/lx862/jcm/mod/data/pids/preset/CustomComponentPIDSPreset.java

@@ -6,9 +6,6 @@
 import com.lx862.jcm.mod.Constants;
 import com.lx862.jcm.mod.block.entity.PIDSBlockEntity;
 import com.lx862.jcm.mod.data.pids.preset.components.base.PIDSComponent;
-import com.lx862.jcm.mod.data.pids.preset.components.base.TextComponent;
-import com.lx862.jcm.mod.data.pids.preset.components.base.TextureComponent;
-import com.lx862.jcm.mod.render.text.TextRenderingManager;
 import com.lx862.jcm.mod.util.JCMLogger;
 import org.mtr.core.operation.ArrivalResponse;
 import org.mtr.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;

fabric/src/main/java/com/lx862/jcm/mod/data/pids/preset/JsonPIDSPreset.java

@@ -10,8 +10,8 @@
 import com.lx862.jcm.mod.data.pids.preset.components.base.PIDSComponent;
 import com.lx862.jcm.mod.data.pids.preset.components.base.TextComponent;
 import com.lx862.jcm.mod.render.RenderHelper;
-import com.lx862.jcm.mod.render.text.TextOverflowMode;
 import com.lx862.jcm.mod.render.text.TextAlignment;
+import com.lx862.jcm.mod.render.text.TextOverflowMode;
 import com.lx862.jcm.mod.resources.mcmeta.McMetaManager;
 import com.lx862.jcm.mod.util.JCMLogger;
 import org.mtr.core.operation.ArrivalResponse;

fabric/src/main/java/com/lx862/jcm/mod/data/pids/preset/PIDSContext.java

@@ -1,7 +1,6 @@
 package com.lx862.jcm.mod.data.pids.preset;
 
 import org.mtr.core.operation.ArrivalResponse;
-import org.mtr.core.operation.ArrivalsResponse;
 import org.mtr.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.mtr.mapping.holder.BlockPos;
 import org.mtr.mapping.holder.World;

fabric/src/main/java/com/lx862/jcm/mod/data/pids/preset/PIDSPresetBase.java

@@ -5,7 +5,6 @@
 import com.lx862.jcm.mod.render.RenderHelper;
 import com.lx862.jcm.mod.render.text.TextRenderingManager;
 import org.mtr.core.operation.ArrivalResponse;
-import org.mtr.core.operation.ArrivalsResponse;
 import org.mtr.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.mtr.mapping.holder.BlockPos;
 import org.mtr.mapping.holder.Direction;

fabric/src/main/java/com/lx862/jcm/mod/data/pids/preset/components/PlatformComponent.java

@@ -5,8 +5,8 @@
 import com.lx862.jcm.mod.data.pids.preset.PIDSContext;
 import com.lx862.jcm.mod.data.pids.preset.components.base.PIDSComponent;
 import com.lx862.jcm.mod.data.pids.preset.components.base.TextComponent;
-import com.lx862.jcm.mod.render.text.TextOverflowMode;
 import com.lx862.jcm.mod.render.text.TextAlignment;
+import com.lx862.jcm.mod.render.text.TextOverflowMode;
 import org.mtr.core.operation.ArrivalResponse;
 import org.mtr.core.tool.Utilities;
 import org.mtr.mapping.holder.Direction;

fabric/src/main/java/com/lx862/jcm/mod/network/gui/SoundLooperGUIPacket.java

@@ -1,6 +1,6 @@
 package com.lx862.jcm.mod.network.gui;
 
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.BlockPos;
 import org.mtr.mapping.registry.PacketHandler;
 import org.mtr.mapping.tool.PacketBufferReceiver;
 import org.mtr.mapping.tool.PacketBufferSender;

fabric/src/main/java/com/lx862/jcm/mod/registry/JCMRegistry.java

@@ -1,7 +1,10 @@
 package com.lx862.jcm.mod.registry;
 
 import com.lx862.jcm.mod.Constants;
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.Block;
+import org.mtr.mapping.holder.BlockPos;
+import org.mtr.mapping.holder.BlockState;
+import org.mtr.mapping.holder.ItemSettings;
 import org.mtr.mapping.mapper.BlockEntityExtension;
 import org.mtr.mapping.registry.*;
 import org.mtr.mapping.tool.PacketBufferReceiver;

fabric/src/main/java/com/lx862/jcm/mod/registry/JCMRegistryClient.java

@@ -1,10 +1,12 @@
 package com.lx862.jcm.mod.registry;
 
 import com.lx862.jcm.mod.Constants;
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.RenderLayer;
 import org.mtr.mapping.mapper.BlockEntityExtension;
 import org.mtr.mapping.mapper.BlockEntityRenderer;
-import org.mtr.mapping.registry.*;
+import org.mtr.mapping.registry.BlockEntityTypeRegistryObject;
+import org.mtr.mapping.registry.BlockRegistryObject;
+import org.mtr.mapping.registry.RegistryClient;
 import org.mtr.mod.InitClient;
 
 import java.util.function.Function;

fabric/src/main/java/com/lx862/jcm/mod/render/IDrawingJoban.java

@@ -3,8 +3,12 @@
 import com.lx862.jcm.mod.JCMClient;
 import org.mtr.libraries.it.unimi.dsi.fastutil.booleans.BooleanArrayList;
 import org.mtr.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.mtr.mapping.holder.*;
-import org.mtr.mapping.mapper.*;
+import org.mtr.mapping.holder.Identifier;
+import org.mtr.mapping.holder.LightmapTextureManager;
+import org.mtr.mapping.holder.OrderedText;
+import org.mtr.mapping.holder.Style;
+import org.mtr.mapping.mapper.GraphicsHolder;
+import org.mtr.mapping.mapper.TextHelper;
 import org.mtr.mod.data.IGui;
 
 import javax.annotation.Nullable;

fabric/src/main/java/com/lx862/jcm/mod/render/block/DepartureTimerRenderer.java

@@ -7,7 +7,6 @@
 import com.lx862.jcm.mod.util.BlockUtil;
 import org.mtr.core.data.Platform;
 import org.mtr.core.operation.ArrivalResponse;
-import org.mtr.core.operation.ArrivalsResponse;
 import org.mtr.core.tool.Utilities;
 import org.mtr.libraries.it.unimi.dsi.fastutil.longs.LongImmutableList;
 import org.mtr.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;
@@ -17,7 +16,6 @@
 import org.mtr.mapping.holder.World;
 import org.mtr.mapping.mapper.GraphicsHolder;
 import org.mtr.mod.InitClient;
-import org.mtr.mod.data.ArrivalsCache;
 import org.mtr.mod.data.ArrivalsCacheClient;
 
 import java.util.ArrayList;

fabric/src/main/java/com/lx862/jcm/mod/render/block/JCMBlockEntityRenderer.java

@@ -5,7 +5,10 @@
 import com.lx862.jcm.mod.render.RenderHelper;
 import com.lx862.jcm.mod.util.BlockUtil;
 import com.lx862.jcm.mod.util.JCMLogger;
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.BlockPos;
+import org.mtr.mapping.holder.BlockState;
+import org.mtr.mapping.holder.Direction;
+import org.mtr.mapping.holder.World;
 import org.mtr.mapping.mapper.BlockEntityExtension;
 import org.mtr.mapping.mapper.BlockEntityRenderer;
 import org.mtr.mapping.mapper.GraphicsHolder;

fabric/src/main/java/com/lx862/jcm/mod/render/block/KCRStationNameSignRenderer.java

@@ -6,7 +6,10 @@
 import com.lx862.jcm.mod.util.BlockUtil;
 import com.lx862.jcm.mod.util.TextUtil;
 import org.mtr.core.data.Station;
-import org.mtr.mapping.holder.*;
+import org.mtr.mapping.holder.BlockPos;
+import org.mtr.mapping.holder.BlockState;
+import org.mtr.mapping.holder.Identifier;
+import org.mtr.mapping.holder.World;
 import org.mtr.mapping.mapper.GraphicsHolder;
 import org.mtr.mod.InitClient;
 import org.mtr.mod.data.IGui;

fabric/src/main/java/com/lx862/jcm/mod/render/block/LCDPIDSRenderer.java

@@ -4,7 +4,6 @@
 import com.lx862.jcm.mod.block.entity.PIDSBlockEntity;
 import com.lx862.jcm.mod.data.pids.preset.PIDSPresetBase;
 import org.mtr.core.operation.ArrivalResponse;
-import org.mtr.core.operation.ArrivalsResponse;
 import org.mtr.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.mtr.mapping.holder.BlockPos;
 import org.mtr.mapping.holder.BlockState;

fabric/src/main/java/com/lx862/jcm/mod/render/block/PIDSRenderer.java

@@ -6,7 +6,6 @@
 import com.lx862.jcm.mod.data.pids.preset.PIDSPresetBase;
 import com.lx862.jcm.mod.util.BlockUtil;
 import org.mtr.core.operation.ArrivalResponse;
-import org.mtr.core.operation.ArrivalsResponse;
 import org.mtr.libraries.it.unimi.dsi.fastutil.longs.LongArrayList;
 import org.mtr.libraries.it.unimi.dsi.fastutil.longs.LongImmutableList;
 import org.mtr.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;
@@ -16,7 +15,6 @@
 import org.mtr.mapping.holder.World;
 import org.mtr.mapping.mapper.GraphicsHolder;
 import org.mtr.mod.InitClient;
-import org.mtr.mod.data.ArrivalsCache;
 import org.mtr.mod.data.ArrivalsCacheClient;
 
 public abstract class PIDSRenderer<T extends PIDSBlockEntity> extends JCMBlockEntityRenderer<T> {

fabric/src/main/java/com/lx862/jcm/mod/render/block/RVPIDSRenderer.java

@@ -4,7 +4,6 @@
 import com.lx862.jcm.mod.block.entity.RVPIDSBlockEntity;
 import com.lx862.jcm.mod.data.pids.preset.PIDSPresetBase;
 import org.mtr.core.operation.ArrivalResponse;
-import org.mtr.core.operation.ArrivalsResponse;
 import org.mtr.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.mtr.mapping.holder.BlockPos;
 import org.mtr.mapping.holder.BlockState;

fabric/src/main/java/com/lx862/jcm/mod/render/block/RenderDRLAPGDoor.java

@@ -1,16 +1,16 @@
 package com.lx862.jcm.mod.render.block;
 
 import com.lx862.jcm.mod.block.entity.APGDoorDRLBlockEntity;
-import org.mtr.mapping.mapper.BlockEntityRenderer;
-
 import org.mtr.mapping.holder.*;
+import org.mtr.mapping.mapper.BlockEntityRenderer;
 import org.mtr.mapping.mapper.EntityModelExtension;
 import org.mtr.mapping.mapper.GraphicsHolder;
 import org.mtr.mapping.mapper.ModelPartExtension;
 import org.mtr.mod.Init;
 import org.mtr.mod.block.*;
 import org.mtr.mod.data.IGui;
-import org.mtr.mod.render.RenderTrains;
+import org.mtr.mod.render.MainRenderer;
+import org.mtr.mod.render.QueuedRenderLayer;
 import org.mtr.mod.render.StoredMatrixTransformations;
 
 /**
@@ -54,7 +54,7 @@ public void render(T entity, float tickDelta, GraphicsHolder graphicsHolder, int
                 if (half) {
                     final Block block = world.getBlockState(blockPos.offset(side ? facing.rotateYClockwise() : facing.rotateYCounterclockwise())).getBlock();
                     if (block.data instanceof BlockAPGGlass || block.data instanceof BlockAPGGlassEnd) {
-                        RenderTrains.scheduleRender(new Identifier(String.format("mtr:textures/block/apg_door_light_%s.png", open > 0 ? "on" : "off")), false, open > 0 ? RenderTrains.QueuedRenderLayer.LIGHT_TRANSLUCENT : RenderTrains.QueuedRenderLayer.EXTERIOR, (graphicsHolderNew, offset) -> {
+                        MainRenderer.scheduleRender(new Identifier(String.format("mtr:textures/block/apg_door_light_%s.png", open > 0 ? "on" : "off")), false, open > 0 ? QueuedRenderLayer.LIGHT_TRANSLUCENT : QueuedRenderLayer.EXTERIOR, (graphicsHolderNew, offset) -> {
                             storedMatrixTransformationsLight.transform(graphicsHolderNew, offset);
                             graphicsHolderNew.translate(side ? -0.515625 : 0.515625, 0, 0);
                             graphicsHolderNew.scale(0.5F, 1, 1);
@@ -70,13 +70,13 @@ public void render(T entity, float tickDelta, GraphicsHolder graphicsHolder, int
 
         switch (type) {
             case 2:
-                RenderTrains.scheduleRender(new Identifier(String.format("jsblock:textures/block/psdapg/drlapg/apg_door_%s_%s.png", half ? "top" : "bottom", side ? "right" : "left")), false, RenderTrains.QueuedRenderLayer.EXTERIOR, (graphicsHolderNew, offset) -> {
+                MainRenderer.scheduleRender(new Identifier(String.format("jsblock:textures/block/psdapg/drlapg/apg_door_%s_%s.png", half ? "top" : "bottom", side ? "right" : "left")), false, QueuedRenderLayer.EXTERIOR, (graphicsHolderNew, offset) -> {
                     storedMatrixTransformations.transform(graphicsHolderNew, offset);
                     (half ? MODEL_APG_TOP : MODEL_APG_BOTTOM).render(graphicsHolderNew, light, overlay, 1, 1, 1, 1);
                     graphicsHolderNew.pop();
                 });
                 if (half && !unlocked) {
-                    RenderTrains.scheduleRender(new Identifier(Init.MOD_ID, "textures/block/sign/door_not_in_use.png"), false, RenderTrains.QueuedRenderLayer.EXTERIOR, (graphicsHolderNew, offset) -> {
+                    MainRenderer.scheduleRender(new Identifier(Init.MOD_ID, "textures/block/sign/door_not_in_use.png"), false, QueuedRenderLayer.EXTERIOR, (graphicsHolderNew, offset) -> {
                         storedMatrixTransformations.transform(graphicsHolderNew, offset);
                         MODEL_APG_DOOR_LOCKED.render(graphicsHolderNew, light, overlay, 1, 1, 1, 1);
                         graphicsHolderNew.pop();

fabric/src/main/java/com/lx862/jcm/mod/render/block/SignalBlockInvertedRenderer.java

@@ -6,8 +6,9 @@
 import org.mtr.mapping.mapper.GraphicsHolder;
 import org.mtr.mod.block.BlockSignalBase;
 import org.mtr.mod.client.IDrawing;
+import org.mtr.mod.render.MainRenderer;
+import org.mtr.mod.render.QueuedRenderLayer;
 import org.mtr.mod.render.RenderSignalLight2Aspect;
-import org.mtr.mod.render.RenderTrains;
 import org.mtr.mod.render.StoredMatrixTransformations;
 
 public class SignalBlockInvertedRenderer<T extends BlockSignalBase.BlockEntityBase> extends RenderSignalLight2Aspect<T> {
@@ -25,7 +26,7 @@ protected void render(StoredMatrixTransformations t, BlockSignalBase.BlockEntity
 
         float y = (occupiedAspect > 0) == redOnTop ? 0.4375F : 0.0625F;
 
-        RenderTrains.scheduleRender(new Identifier("mtr", "textures/block/white.png"), false, RenderTrains.QueuedRenderLayer.LIGHT, (graphicsHolder, offset) -> {
+        MainRenderer.scheduleRender(new Identifier("mtr", "textures/block/white.png"), false, QueuedRenderLayer.LIGHT, (graphicsHolder, offset) -> {
             t.transform(graphicsHolder, offset);
             IDrawing.drawTexture(graphicsHolder, -0.125F, y, -0.19375F, 0.125F, y + 0.25F, -0.19375F, Direction.UP, occupiedAspect > 0 ? proceedColor : 0xFFFF0000, GraphicsHolder.getDefaultLight());
             graphicsHolder.pop();