Merge branch '1.19/dev' into 1.20/dev

# Conflicts:
#	common/src/main/java/com/railwayteam/railways/mixin/compat/sodium/MixinBlockOcclusionCache.java

Author: IThundxr

common/src/main/java/com/railwayteam/railways/Railways.java

@@ -1,4 +1,4 @@
-package com.railwayteam.railways;
+  package com.railwayteam.railways;
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.railwayteam.railways.base.data.CRTagGen;
@@ -82,10 +82,6 @@ public static void init() {
     registerCommands(CRCommands::register);
     CRPackets.PACKETS.registerC2SListener();
 
-    if (Mods.isModLoaded("embeddium", null)) {
-      LOGGER.info("there is a brick about to fall through your roof at terminal velocity");
-    }
-
     if (Utils.isDevEnv() && !Mods.BYG.isLoaded && !Mods.SODIUM.isLoaded) // force all mixins to load in dev
       MixinEnvironment.getCurrentEnvironment().audit();
   }

common/src/main/java/com/railwayteam/railways/content/smokestack/block/AbstractSmokeStackBlock.java

@@ -76,6 +76,8 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 
     @Override
     public ItemStack getCloneItemStack(BlockGetter level, BlockPos pos, BlockState state) {
+        if (this instanceof DieselSmokeStackBlock)
+            return super.getCloneItemStack(level, pos, state);
         return CRBlocks.SMOKESTACK_GROUP.get(variant).get(state.getValue(STYLE)).asStack();
     }
 

common/src/main/java/com/railwayteam/railways/content/smokestack/block/renderer/DieselSmokeStackRenderer.java

@@ -6,6 +6,7 @@
 import com.railwayteam.railways.registry.CRBlockPartials;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
 import com.simibubi.create.foundation.render.CachedBufferer;
+import com.simibubi.create.foundation.render.SuperByteBuffer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -17,15 +18,20 @@ public DieselSmokeStackRenderer(BlockEntityRendererProvider.Context context) {
     }
 
     @Override
-    protected void renderSafe(DieselSmokeStackBlockEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) {
-        super.renderSafe(te, partialTicks, ms, buffer, light, overlay);
-        Direction dir = te.getBlockState().getValue(DieselSmokeStackBlock.FACING);
-        CachedBufferer.partial(CRBlockPartials.DIESEL_STACK_FAN, te.getBlockState())
-            .translate(0.5, 0.5, 0.5)
+    protected void renderSafe(DieselSmokeStackBlockEntity be, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) {
+        super.renderSafe(be, partialTicks, ms, buffer, light, overlay);
+        Direction dir = be.getBlockState().getValue(DieselSmokeStackBlock.FACING);
+
+        SuperByteBuffer byteBuffer = CachedBufferer.partial(CRBlockPartials.DIESEL_STACK_FAN, be.getBlockState());
+
+        byteBuffer.light(light);
+
+        byteBuffer.translate(0.5, 0.5, 0.5)
             .rotateX(dir == Direction.DOWN ? 180 : dir.getAxis().isHorizontal() ? 90 : 0)
             .rotateZ(dir.getAxis().isVertical() ? 0 : ((int) dir.toYRot()) % 360)
-            .rotateY(te.getFanRotation(te.getRpm(partialTicks)))
-            .translate(-0.5, -0.5, -0.5)
-            .renderInto(ms, buffer.getBuffer(RenderType.cutout()));
+            .rotateY(be.getFanRotation(be.getRpm(partialTicks)))
+            .translate(-0.5, -0.5, -0.5);
+
+        byteBuffer.renderInto(ms, buffer.getBuffer(RenderType.cutout()));
     }
 }

common/src/main/java/com/railwayteam/railways/mixin/MixinCarriageContraptionEntity.java

@@ -208,7 +208,7 @@ private void setupBufferDistanceData(CallbackInfo ci) {
 
     @Inject(method = "control", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/trains/entity/Train;getCurrentStation()Lcom/simibubi/create/content/trains/station/GlobalStation;"))
     private void noBufferOverrun(BlockPos controlsLocalPos, Collection<Integer> heldControls, Player player,
-                                 CallbackInfoReturnable<Boolean> cir, @Local(name="targetSpeed") LocalIntRef targetSpeed) {
+                                 CallbackInfoReturnable<Boolean> cir, @Local(ordinal = 0) LocalIntRef targetSpeed) {
         if (((IBufferBlockedTrain) carriage.train).railways$isControlBlocked() && ((IBufferBlockedTrain) carriage.train).railways$getBlockedSign() == Mth.sign(targetSpeed.get())) {
             targetSpeed.set(0);
         }

common/src/main/java/com/railwayteam/railways/mixin/MixinContraption.java

@@ -16,7 +16,7 @@
 @Mixin(Contraption.class)
 public class MixinContraption {
     @Inject(method = "removeBlocksFromWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"))
-    private void applyPreTransformCallback(Level world, BlockPos offset, CallbackInfo ci, @Local(name="add") BlockPos add) {
+    private void applyPreTransformCallback(Level world, BlockPos offset, CallbackInfo ci, @Local(ordinal = 1) BlockPos add) {
         BlockEntity be = world.getBlockEntity(add);
         if (be instanceof IPreAssembleCallback preTransformCallback)
             preTransformCallback.railways$preAssemble();

common/src/main/java/com/railwayteam/railways/mixin/MixinNavigation.java

@@ -384,7 +384,7 @@ private void storeBufferSlowdown(MutableObject<Pair<UUID, Boolean>> trackingCros
 
     @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/trains/entity/Train;burnFuel()V"))
     private void applyBufferSlowdown(Level level, CallbackInfo ci,
-                                     @Local(name = "targetDistance") LocalDoubleRef targetDistance) {
+                                     @Local(ordinal = 5) LocalDoubleRef targetDistance) {
         if (railways$bufferDistance.get() < targetDistance.get())
             targetDistance.set(railways$bufferDistance.get());
         // reset buffer distance for next time

common/src/main/java/com/railwayteam/railways/mixin/MixinScheduleRuntime.java

@@ -1,7 +1,6 @@
 package com.railwayteam.railways.mixin;
 
 import com.llamalad7.mixinextras.sugar.Local;
-import com.railwayteam.railways.Railways;
 import com.railwayteam.railways.content.schedule.WaypointDestinationInstruction;
 import com.railwayteam.railways.mixin_interfaces.ICustomExecutableInstruction;
 import com.simibubi.create.content.trains.entity.Train;
@@ -46,7 +45,7 @@ private void startCustomInstruction(CallbackInfoReturnable<GlobalStation> cir) {
 
     @Inject(method = "tickConditions", at = @At("HEAD"), cancellable = true)
     private void tickWhenNoConditions(Level level, CallbackInfo ci) {
-        if (schedule.entries.get(currentEntry).conditions.size() == 0) {
+        if (schedule.entries.get(currentEntry).conditions.isEmpty()) {
             state = ScheduleRuntime.State.PRE_TRANSIT;
             currentEntry++;
             ci.cancel();
@@ -56,16 +55,15 @@ private void tickWhenNoConditions(Level level, CallbackInfo ci) {
     @Inject(method = "tick", at = @At(value = "FIELD", target = "Lcom/simibubi/create/content/trains/schedule/ScheduleRuntime;completed:Z", opcode = Opcodes.PUTFIELD, shift = At.Shift.AFTER))
     private void discardAutoSchedule(Level level, CallbackInfo ci) {
         if (isAutoSchedule) {
-            Railways.LOGGER.info("[DISCARD_SCHEDULE] on train {} called in MixinScheduleRuntime#discardAutoSchedule because a non-looping auto schedule was completed", this.train.name.getString());
             discardSchedule();
         }
     }
 
     // waypoint instructions have no conditions, and so are handled as 'invalid' by the vanilla code (https://github.com/Layers-of-Railways/Railway/issues/329)
     @Inject(method = "estimateStayDuration",
-        at = @At(value = "INVOKE_ASSIGN", target = "Ljava/util/List;get(I)Ljava/lang/Object;", shift = At.Shift.BY, by=2),
+        at = @At(value = "INVOKE_ASSIGN", target = "Ljava/util/List;get(I)Ljava/lang/Object;", shift = At.Shift.BY, by = 2),
         cancellable = true)
-    private void waypointsAreValid(int index, CallbackInfoReturnable<Integer> cir, @Local(name = "scheduleEntry") ScheduleEntry scheduleEntry) {
+    private void waypointsAreValid(int index, CallbackInfoReturnable<Integer> cir, @Local ScheduleEntry scheduleEntry) {
         if (scheduleEntry.instruction instanceof WaypointDestinationInstruction)
             cir.setReturnValue(0);
     }

common/src/main/java/com/railwayteam/railways/mixin/MixinStationBlockEntity.java

@@ -113,7 +113,7 @@ private Train returnOverridenTrain(GlobalStation instance) {
     }
 
     @Inject(method = "assemble", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;", ordinal = 0), require = 0)
-    private void allowAssemblingWithoutControls(UUID playerUUID, CallbackInfo ci, @Local(name="typeOfFirstBogey") AbstractBogeyBlock<?> typeOfFirstBogey, @Local(name="atLeastOneForwardControls") LocalBooleanRef atLeastOneForwardControls) {
+    private void allowAssemblingWithoutControls(UUID playerUUID, CallbackInfo ci, @Local AbstractBogeyBlock<?> typeOfFirstBogey, @Local(ordinal = 0) LocalBooleanRef atLeastOneForwardControls) {
         if (typeOfFirstBogey instanceof HandcarBlock) {
             atLeastOneForwardControls.set(true);
         }

common/src/main/java/com/railwayteam/railways/mixin/MixinTrackPlacement.java

@@ -49,16 +49,16 @@ else if (TrackMaterial.fromItem(stack.getItem()).trackType == CRTrackMaterials.C
     private static void placeGenericCrossing0(Level level, TrackPlacement.PlacementInfo info, BlockState state1,
                                              BlockState state2, BlockPos targetPos1, BlockPos targetPos2, boolean simulate,
                                              CallbackInfoReturnable<TrackPlacement.PlacementInfo> cir,
-                                             @Share("oldToPlace") LocalRef<BlockState> oldToPlace, @Local(name="toPlace") BlockState toPlace) {
+                                             @Share("oldToPlace") LocalRef<BlockState> oldToPlace, @Local(ordinal = 4) BlockState toPlace) {
         oldToPlace.set(toPlace);
     }
 
     @Inject(method = "placeTracks", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/simibubi/create/content/trains/track/ITrackBlock;overlay(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState;", shift = At.Shift.AFTER))
     private static void placeGenericCrossing(Level level, TrackPlacement.PlacementInfo info, BlockState state1,
                                              BlockState state2, BlockPos targetPos1, BlockPos targetPos2, boolean simulate,
                                              CallbackInfoReturnable<TrackPlacement.PlacementInfo> cir,
-                                             @Local(name="stateAtPos") BlockState stateAtPos,
-                                             @Local(name="toPlace") LocalRef<BlockState> toPlace,
+                                             @Local(ordinal = 3) BlockState stateAtPos,
+                                             @Local(ordinal = 4) LocalRef<BlockState> toPlace,
                                              @Share("oldToPlace") LocalRef<BlockState> oldToPlace,
                                              @Share("crossingData") LocalRef<@Nullable GenericCrossingData> crossingData) {
         crossingData.set(null);
@@ -83,7 +83,7 @@ private static void placeGenericCrossing(Level level, TrackPlacement.PlacementIn
     private static void maybePlaceCrossing(Level level, TrackPlacement.PlacementInfo info, BlockState state1,
                                            BlockState state2, BlockPos targetPos1, BlockPos targetPos2, boolean simulate,
                                            CallbackInfoReturnable<TrackPlacement.PlacementInfo> cir,
-                                           @Local(name="offsetPos") BlockPos offsetPos,
+                                           @Local(ordinal = 3) BlockPos offsetPos,
                                            @Share("crossingData") LocalRef<@Nullable GenericCrossingData> crossingDataRef) {
         @Nullable GenericCrossingData crossingData = crossingDataRef.get();
         if (crossingData != null && level.getBlockEntity(offsetPos) instanceof GenericCrossingBlockEntity genericCrossingBE) {

common/src/main/java/com/railwayteam/railways/mixin/MixinTrain.java

@@ -236,7 +236,9 @@ private static void readOccupiedCouplers(CompoundTag tag, Map<UUID, TrackGraph>
     }
 
     @Inject(method = "collideWithOtherTrains", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/trains/entity/Train;crash()V", ordinal = 0), cancellable = true)
-    private void railways$handcarCollision(Level level, Carriage carriage, CallbackInfo ci, @Local Train train, @Local(name = "v", ordinal = 0) Vec3 v) {
+    private void railways$handcarCollision(Level level, Carriage carriage, CallbackInfo ci, @Local(ordinal = 1) Train train, @Local Pair<Train, Vec3> collision) {
+        Vec3 v = collision.getSecond();
+
         // Self Train / Train that collided with the other one
         if (((IHandcarTrain) this).railways$isHandcar()) {
             if (!invalid) {

common/src/main/java/com/railwayteam/railways/mixin/client/MixinStationRenderer.java

@@ -23,7 +23,7 @@ public class MixinStationRenderer {
     @Inject(method = "renderSafe(Lcom/simibubi/create/content/trains/station/StationBlockEntity;FLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;II)V", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/foundation/render/CachedBufferer;partial(Lcom/jozufozu/flywheel/core/PartialModel;Lnet/minecraft/world/level/block/state/BlockState;)Lcom/simibubi/create/foundation/render/SuperByteBuffer;"))
     private void shiftAssemblyOverlayOnEncasedTracks(
         StationBlockEntity be, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay,
-        CallbackInfo ci, @Local(name = "currentPos") MutableBlockPos currentPos, @Local(name = "trackState") BlockState trackState) {
+        CallbackInfo ci, @Local BlockState trackState, @Local MutableBlockPos currentPos) {
         ms.pushPose();
 
         if (trackState.getBlock() instanceof TrackBlock trackBlock