From 225cb6aa1ad951004bb96ffcba1a5897832fe5f2 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Wed, 17 Jan 2024 16:46:33 -0500 Subject: [PATCH] maybe fix https://github.com/architectury/architectury-mixin/issues/7 --- .../monorail/CustomTrackBlockOutline.java | 18 +++++++++--------- .../client/AccessorTrackBlockOutline.java | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/src/main/java/com/railwayteam/railways/content/custom_tracks/monorail/CustomTrackBlockOutline.java b/common/src/main/java/com/railwayteam/railways/content/custom_tracks/monorail/CustomTrackBlockOutline.java index b2d698b52..83052d750 100644 --- a/common/src/main/java/com/railwayteam/railways/content/custom_tracks/monorail/CustomTrackBlockOutline.java +++ b/common/src/main/java/com/railwayteam/railways/content/custom_tracks/monorail/CustomTrackBlockOutline.java @@ -28,9 +28,9 @@ public class CustomTrackBlockOutline { AllShapes.TRACK_ORTHO.get(Direction.EAST), CRShapes.MONORAIL_TRACK_ORTHO.get(Direction.EAST), AllShapes.TRACK_ORTHO.get(Direction.SOUTH), CRShapes.MONORAIL_TRACK_ORTHO.get(Direction.SOUTH), AllShapes.TRACK_CROSS, CRShapes.MONORAIL_TRACK_CROSS, - AccessorTrackBlockOutline.getLONG_ORTHO_OFFSET(), MONORAIL_LONG_ORTHO_OFFSET, - AccessorTrackBlockOutline.getLONG_ORTHO(), MONORAIL_LONG_ORTHO, - AccessorTrackBlockOutline.getLONG_CROSS(), MONORAIL_LONG_CROSS + AccessorTrackBlockOutline.getLongOrthoOffset(), MONORAIL_LONG_ORTHO_OFFSET, + AccessorTrackBlockOutline.getLongOrtho(), MONORAIL_LONG_ORTHO, + AccessorTrackBlockOutline.getLongCross(), MONORAIL_LONG_CROSS ); public static final Map TRACK_TO_NARROW = ImmutableMap.builder().putAll(Map.of( @@ -40,9 +40,9 @@ public class CustomTrackBlockOutline { AllShapes.TRACK_DIAG.get(Direction.EAST), CRShapes.NARROW_TRACK_DIAG.get(Direction.EAST), AllShapes.TRACK_DIAG.get(Direction.SOUTH), CRShapes.NARROW_TRACK_DIAG.get(Direction.SOUTH))).putAll(Map.of( AllShapes.TRACK_CROSS_DIAG, CRShapes.NARROW_TRACK_CROSS_DIAG, - AccessorTrackBlockOutline.getLONG_ORTHO_OFFSET(), NARROW_LONG_ORTHO_OFFSET, - AccessorTrackBlockOutline.getLONG_ORTHO(), NARROW_LONG_ORTHO, - AccessorTrackBlockOutline.getLONG_CROSS(), NARROW_LONG_CROSS + AccessorTrackBlockOutline.getLongOrthoOffset(), NARROW_LONG_ORTHO_OFFSET, + AccessorTrackBlockOutline.getLongOrtho(), NARROW_LONG_ORTHO, + AccessorTrackBlockOutline.getLongCross(), NARROW_LONG_CROSS )).build(); public static VoxelShape convert(Object o, TrackMaterial material) { @@ -53,11 +53,11 @@ public static VoxelShape convert(Object o, TrackMaterial material) { public static VoxelShape convert(VoxelShape trackShape, TrackMaterial material) { if (material == CRTrackMaterials.MONORAIL) { - if (trackShape.equals(AccessorTrackBlockOutline.getLONG_ORTHO_OFFSET())) { + if (trackShape.equals(AccessorTrackBlockOutline.getLongOrthoOffset())) { return MONORAIL_LONG_ORTHO_OFFSET; - } else if (trackShape.equals(AccessorTrackBlockOutline.getLONG_ORTHO())) { + } else if (trackShape.equals(AccessorTrackBlockOutline.getLongOrtho())) { return MONORAIL_LONG_ORTHO; - } else if (trackShape.equals(AccessorTrackBlockOutline.getLONG_CROSS())) { + } else if (trackShape.equals(AccessorTrackBlockOutline.getLongCross())) { return MONORAIL_LONG_CROSS; } return TRACK_TO_MONORAIL.getOrDefault(trackShape, trackShape); diff --git a/common/src/main/java/com/railwayteam/railways/mixin/client/AccessorTrackBlockOutline.java b/common/src/main/java/com/railwayteam/railways/mixin/client/AccessorTrackBlockOutline.java index a3fd6582b..0554a5325 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/client/AccessorTrackBlockOutline.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/client/AccessorTrackBlockOutline.java @@ -7,18 +7,18 @@ @Mixin(TrackBlockOutline.class) public interface AccessorTrackBlockOutline { - @Accessor - static VoxelShape getLONG_CROSS() { + @Accessor("LONG_CROSS") + static VoxelShape getLongCross() { throw new AssertionError(); } - @Accessor - static VoxelShape getLONG_ORTHO() { + @Accessor("LONG_ORTHO") + static VoxelShape getLongOrtho() { throw new AssertionError(); } - @Accessor - static VoxelShape getLONG_ORTHO_OFFSET() { + @Accessor("LONG_ORTHO_OFFSET") + static VoxelShape getLongOrthoOffset() { throw new AssertionError(); } }