Add back SIL PIDS

So you're telling me, spare time exists? :O

Close #11

CHANGELOG.md

@@ -13,6 +13,7 @@
 **Fixes:**
 - Fix JCM-provided fonts showing up as a square in unsupported languages. (Now fallback to Minecraft font)
 - Fix PIDS Route No. only appearing in the first language.
+- Added back South Island Variants of RV PIDS
 
 **Download:**  
 You can download this release on [Modrinth](https://modrinth.com/mod/jcm) or [GitHub](https://github.com/DistrictOfJoban/Joban-Client-Mod/releases)

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

@@ -27,6 +27,6 @@ public BlockState getPlacementState2(ItemPlacementContext ctx) {
 
     @Override
     public boolean blockIsAllowed(Block block) {
-        return block.data instanceof RVPIDSBlock || block.data instanceof RVPIDSPole;
+        return block.data instanceof JCMPIDSBlock || block.data instanceof RVPIDSPole;
     }
 }

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

@@ -0,0 +1,25 @@
+package com.lx862.jcm.mod.block;
+
+import com.lx862.jcm.mod.block.entity.RVPIDSSIL1BlockEntity;
+import org.mtr.mapping.holder.*;
+import org.mtr.mapping.mapper.BlockEntityExtension;
+import org.mtr.mod.block.IBlock;
+
+public class RVPIDSSIL1Block extends JCMPIDSBlock {
+
+    public RVPIDSSIL1Block(BlockSettings settings) {
+        super(settings);
+    }
+
+    @Override
+    public VoxelShape getOutlineShape2(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        VoxelShape vx1 = IBlock.getVoxelShapeByDirection(0, -2, 0, 16, 9, 16, IBlock.getStatePropertySafe(state, FACING));
+        VoxelShape vx2 = IBlock.getVoxelShapeByDirection(7.5, 9, 8.5, 8.5, 16, 9.5, IBlock.getStatePropertySafe(state, FACING));
+        return VoxelShapes.union(vx1, vx2);
+    }
+
+    @Override
+    public BlockEntityExtension createBlockEntity(BlockPos blockPos, BlockState blockState) {
+        return new RVPIDSSIL1BlockEntity(blockPos, blockState);
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.lx862.jcm.mod.block;
+
+import com.lx862.jcm.mod.block.entity.RVPIDSSIL2BlockEntity;
+import org.mtr.mapping.holder.*;
+import org.mtr.mapping.mapper.BlockEntityExtension;
+import org.mtr.mod.block.IBlock;
+
+public class RVPIDSSIL2Block extends JCMPIDSBlock {
+
+    public RVPIDSSIL2Block(BlockSettings settings) {
+        super(settings);
+    }
+
+    @Override
+    public VoxelShape getOutlineShape2(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        VoxelShape vx1 = IBlock.getVoxelShapeByDirection(0, -2, 0, 16, 9, 16, IBlock.getStatePropertySafe(state, FACING));
+        VoxelShape vx2 = IBlock.getVoxelShapeByDirection(7.5, 9, 8.5, 8.5, 16, 9.5, IBlock.getStatePropertySafe(state, FACING));
+        return VoxelShapes.union(vx1, vx2);
+    }
+
+    @Override
+    public BlockEntityExtension createBlockEntity(BlockPos blockPos, BlockState blockState) {
+        return new RVPIDSSIL2BlockEntity(blockPos, blockState);
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.lx862.jcm.mod.block.entity;
+
+import com.lx862.jcm.mod.registry.BlockEntities;
+import org.mtr.mapping.holder.BlockPos;
+import org.mtr.mapping.holder.BlockState;
+
+public class RVPIDSSIL1BlockEntity extends PIDSBlockEntity {
+
+    public RVPIDSSIL1BlockEntity(BlockPos blockPos, BlockState blockState) {
+        super(BlockEntities.RV_PIDS_SIL_1.get(), blockPos, blockState);
+    }
+
+    @Override
+    public String getDefaultPresetId() {
+        return "rv_pids";
+    }
+
+    @Override
+    public int getRowAmount() {
+        return 4;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.lx862.jcm.mod.block.entity;
+
+import com.lx862.jcm.mod.registry.BlockEntities;
+import org.mtr.mapping.holder.BlockPos;
+import org.mtr.mapping.holder.BlockState;
+
+public class RVPIDSSIL2BlockEntity extends PIDSBlockEntity {
+
+    public RVPIDSSIL2BlockEntity(BlockPos blockPos, BlockState blockState) {
+        super(BlockEntities.RV_PIDS_SIL_2.get(), blockPos, blockState);
+    }
+
+    @Override
+    public String getDefaultPresetId() {
+        return "rv_pids";
+    }
+
+    @Override
+    public int getRowAmount() {
+        return 4;
+    }
+}

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

@@ -24,6 +24,9 @@ public final class BlockEntities {
     public static final BlockEntityTypeRegistryObject<PIDS1ABlockEntity> PIDS_1A = JCMRegistry.registerBlockEntity("pids_4", PIDS1ABlockEntity::new, Blocks.PIDS_1A);
     public static final BlockEntityTypeRegistryObject<LCDPIDSBlockEntity> LCD_PIDS = JCMRegistry.registerBlockEntity("pids_4a", LCDPIDSBlockEntity::new, Blocks.LCD_PIDS);
     public static final BlockEntityTypeRegistryObject<RVPIDSBlockEntity> RV_PIDS = JCMRegistry.registerBlockEntity("pids_5", RVPIDSBlockEntity::new, Blocks.RV_PIDS);
+    public static final BlockEntityTypeRegistryObject<RVPIDSSIL1BlockEntity> RV_PIDS_SIL_1 = JCMRegistry.registerBlockEntity("pids_rv_sil", RVPIDSSIL1BlockEntity::new, Blocks.RV_PIDS_SIL_1);
+    public static final BlockEntityTypeRegistryObject<RVPIDSSIL2BlockEntity> RV_PIDS_SIL_2 = JCMRegistry.registerBlockEntity("pids_rv_sil_2", RVPIDSSIL2BlockEntity::new, Blocks.RV_PIDS_SIL_2);
+
     public static final BlockEntityTypeRegistryObject<StationNameStandingBlockEntity> STATION_NAME_STANDING = JCMRegistry.registerBlockEntity("station_name_tall_stand", StationNameStandingBlockEntity::new, Blocks.STATION_NAME_STANDING);
 
     public static void register() {

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

@@ -20,8 +20,10 @@ public static void registerClient() {
         JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.SIGNAL_LIGHT_BLUE, (dispatcher) -> new StaticSignalLightRenderer(dispatcher, 0xFF0000FF, true));
         JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.SIGNAL_LIGHT_GREEN, (dispatcher) -> new StaticSignalLightRenderer(dispatcher, 0xFF00FF00, false));
         JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.PIDS_1A, (dispatcher) -> new RenderPIDS<>(dispatcher, 1, 9.75F, 6, 8.85F, 30, true, 1));
-        JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.RV_PIDS, RVPIDSRenderer::new);
         JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.LCD_PIDS, LCDPIDSRenderer::new);
+        JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.RV_PIDS, RVPIDSRenderer::new);
+        JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.RV_PIDS_SIL_1, RVPIDSSILRenderer::new);
+        JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.RV_PIDS_SIL_2, RVPIDSSILRenderer::new);
         JCMRegistryClient.registerBlockEntityRenderer(BlockEntities.STATION_NAME_STANDING, StationNameStandingRenderer::new);
     }
 }

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

@@ -65,6 +65,8 @@ public final class Blocks {
     public static final BlockRegistryObject PIDS_1A = JCMRegistry.registerBlockItem("pids_1a", () -> new Block(new PIDS1ABlock()), ItemGroups.PIDS);
     public static final BlockRegistryObject LCD_PIDS = JCMRegistry.registerBlockItem("pids_lcd", () -> new Block(new LCDPIDSBlock(BlockHelper.createBlockSettings(false, state -> 8).strength(4.0f).nonOpaque())), ItemGroups.PIDS);
     public static final BlockRegistryObject RV_PIDS = JCMRegistry.registerBlockItem("pids_rv", () -> new Block(new RVPIDSBlock(BlockHelper.createBlockSettings(false, state -> 8).strength(4.0f).nonOpaque())), ItemGroups.PIDS);
+    public static final BlockRegistryObject RV_PIDS_SIL_1 = JCMRegistry.registerBlockItem("pids_rv_sil_1", () -> new Block(new RVPIDSSIL1Block(BlockHelper.createBlockSettings(false, state -> 8).strength(4.0f).nonOpaque())), ItemGroups.PIDS);
+    public static final BlockRegistryObject RV_PIDS_SIL_2 = JCMRegistry.registerBlockItem("pids_rv_sil_2", () -> new Block(new RVPIDSSIL2Block(BlockHelper.createBlockSettings(false, state -> 8).strength(4.0f).nonOpaque())), ItemGroups.PIDS);
     public static final BlockRegistryObject RV_PIDS_POLE = JCMRegistry.registerBlockItem("rv_pids_pole", () -> new Block(new RVPIDSPole(BlockHelper.createBlockSettings(false).strength(4.0f).nonOpaque())), ItemGroups.PIDS);
     public static final BlockRegistryObject RV_ENQUIRY_MACHINE = JCMRegistry.registerBlockItem("rv_enquiry_machine", () -> new Block(new RVEnquiryMachine(BlockHelper.createBlockSettings(false).strength(4.0f).nonOpaque())), ItemGroups.MAIN);
     public static final BlockRegistryObject TCL_EMG_STOP_BUTTON = JCMRegistry.registerBlockItem("tcl_emg_stop_button", () -> new Block(new TCLEmergencyButtonBlock(BlockHelper.createBlockSettings(false).strength(4.0f).nonOpaque())), ItemGroups.MAIN);
@@ -111,6 +113,8 @@ public static void registerClient() {
                 KCR_EMG_STOP_SIGN,
                 MTR_ENQUIRY_MACHINE,
                 RV_ENQUIRY_MACHINE,
+                RV_PIDS_SIL_1,
+                RV_PIDS_SIL_2,
                 SUBSIDY_MACHINE,
                 SPOT_LAMP,
                 HELPLINE_2,

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

@@ -0,0 +1,26 @@
+package com.lx862.jcm.mod.render.block;
+
+import com.lx862.jcm.mod.block.entity.PIDSBlockEntity;
+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.libraries.it.unimi.dsi.fastutil.objects.ObjectArrayList;
+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.GraphicsHolder;
+
+public class RVPIDSSILRenderer<T extends PIDSBlockEntity> extends PIDSRenderer<T> {
+    public RVPIDSSILRenderer(Argument dispatcher) {
+        super(dispatcher);
+    }
+
+    @Override
+    public void renderPIDS(PIDSBlockEntity blockEntity, PIDSPresetBase pidsPreset, GraphicsHolder graphicsHolder, World world, BlockState state, BlockPos pos, Direction facing, ObjectArrayList<ArrivalResponse> arrivals, float tickDelta, boolean[] rowHidden) {
+        graphicsHolder.translate(-0.21, -0.155, -0.650);
+        graphicsHolder.rotateXDegrees(22.5f);
+        graphicsHolder.scale(1/96F, 1/96F, 1/96F);
+        pidsPreset.render(blockEntity, graphicsHolder, world, blockEntity.getPos2(), facing, arrivals, rowHidden, tickDelta, 0, 0, 136, 76);
+    }
+}

fabric/src/main/java/com/lx862/jcm/mod/util/JCMUtil.java

@@ -54,6 +54,8 @@ public static Identifier getMigrationId(Identifier checkId) {
                     return Constants.id("operator_button");
                 case "pids_4":
                     return Constants.id("pids_lcd");
+                case "pids_rv_sil":
+                    return Constants.id("pids_rv_sil_1");
                 case "station_ceiling_1":
                     return Constants.id("station_ceiling_wrl");
                 case "station_ceiling_1_station_color":

fabric/src/main/resources/assets/jsblock/lang/en_us.json

@@ -43,8 +43,8 @@
   "block.jsblock.pids_1a": "Passenger Information Display System",
   "block.jsblock.pids_lcd": "Old Tsueng Kwan O Line PIDS",
   "block.jsblock.pids_rv": "Railway Vision PIDS",
-  "block.jsblock.pids_rv_sil": "Railway Vision PIDS (SIL, Ocean Park Station and Wong Chuk Hang Station Variant)",
-  "block.jsblock.pids_rv_sil_2": "Railway Vision PIDS (SIL, Admiralty Station and South Horizon Station Variant)",
+  "block.jsblock.pids_rv_sil_1": "Railway Vision PIDS (SIL, Ocean Park/Wong Chuk Hang Station Variant)",
+  "block.jsblock.pids_rv_sil_2": "Railway Vision PIDS (SIL, Admiralty/South Horizons Station Variant)",
   "block.jsblock.rv_enquiry_machine": "Railway Vision Enquiry Machine",
   "block.jsblock.rv_pids_pole": "Railway Vision PIDS Pole",
   "block.jsblock.signal_light_blue": "Signal Light (Blue, Top)",
@@ -152,4 +152,4 @@
   "item.jsblock.apg_glass_end_drl": "APG (Disneyland Resorts Line Variants)",
   "itemGroup.jsblock.main": "Joban Client Mod Blocks",
   "itemGroup.jsblock.pids": "Joban Client Mod Blocks - PIDS"
-}
+}

fabric/src/main/resources/assets/jsblock/lang/it_it.json

@@ -43,8 +43,8 @@
   "block.jsblock.pids_1a": "Sistema di Visualizzazione delle Informazioni Passeggere (PIDS)",
   "block.jsblock.pids_lcd": "PIDS Vecchia Linea Tsueng Kwan O",
   "block.jsblock.pids_rv": "PIDS della Railway Vision",
-  "block.jsblock.pids_rv_sil": "PIDS della Railway Vision (Variante SIL, Stazione Ocean Park e Stazione Wong Chuk Hang)",
-  "block.jsblock.pids_rv_sil_2": "PIDS della Railway Vision (Variante SIL, Stazione Admiralty e Stazione South Horizon)",
+  "block.jsblock.pids_rv_sil_1": "PIDS della Railway Vision (Variante SIL, Stazione Ocean Park e Stazione Wong Chuk Hang)",
+  "block.jsblock.pids_rv_sil_2": "PIDS della Railway Vision (Variante SIL, Stazione Admiralty e Stazione South Horizons)",
   "block.jsblock.rv_enquiry_machine": "Macchina di inchiesta Railway Vision",
   "block.jsblock.rv_pids_pole": "Palo per PIDS della Railway Vision",
   "block.jsblock.signal_light_blue": "Segnale a semaforo (Blu in alto)",
@@ -143,4 +143,4 @@
   "item.jsblock.apg_glass_end_drl": "APG (Variante Linea Disneyland Resorts)",
   "itemGroup.jsblock.main": "Blocchi Mod Joban Client",
   "itemGroup.jsblock.pids": "Blocchi Mod Joban Client - PIDS"
-}
+}

fabric/src/main/resources/assets/jsblock/lang/ja_jp.json

@@ -43,7 +43,7 @@
   "block.jsblock.pids_1a": "発車標",
   "block.jsblock.pids_lcd": "旧将軍澳線LCD発車標",
   "block.jsblock.pids_rv": "鉄路願景LCD発車標",
-  "block.jsblock.pids_rv_sil": "鉄路願景LCD発車標 (南港島線、海洋公園駅と黄竹坑駅)",
+  "block.jsblock.pids_rv_sil_1": "鉄路願景LCD発車標 (南港島線、海洋公園駅と黄竹坑駅)",
   "block.jsblock.pids_rv_sil_2": "鉄路願景LCD発車標 (南港島線、金鐘駅と海怡半島)",
   "block.jsblock.rv_enquiry_machine": "鉄路願景残高照会機",
   "block.jsblock.rv_pids_pole": "LCD発車標の柱",
@@ -144,4 +144,4 @@
   "item.jsblock.apg_glass_end_drl": "可動式ホーム柵 (迪士尼線仕様)",
   "itemGroup.jsblock.main": "Joban Client Mod Blocks",
   "itemGroup.jsblock.pids": "Joban Client Mod Blocks - 発車標"
-}
+}

fabric/src/main/resources/assets/jsblock/lang/zh_cn.json

@@ -43,7 +43,7 @@
   "block.jsblock.pids_1a": "乘客资讯显示屏",
   "block.jsblock.pids_lcd": "乘客资讯显示屏",
   "block.jsblock.pids_rv": "铁路愿景乘客资讯显示屏",
-  "block.jsblock.pids_rv_sil": "铁路愿景乘客资讯显示屏 (南港岛线, 海洋公园站及黄竹坑站款式)",
+  "block.jsblock.pids_rv_sil_1": "铁路愿景乘客资讯显示屏 (南港岛线, 海洋公园站及黄竹坑站款式)",
   "block.jsblock.pids_rv_sil_2": "铁路愿景乘客资讯显示屏 (南港岛线, 金钟站及海怡半岛站款式)",
   "block.jsblock.rv_enquiry_machine": "铁路愿景八达通查阅器",
   "block.jsblock.rv_pids_pole": "铁路愿景乘客资讯显示屏柱",
@@ -144,4 +144,4 @@
   "item.jsblock.apg_glass_end_drl": "自动月台闸门 (迪士尼线)",
   "itemGroup.jsblock.main": "常磐装饰模组方块",
   "itemGroup.jsblock.pids": "常磐装饰模组方块 - 乘客资讯显示屏"
-}
+}

fabric/src/main/resources/assets/jsblock/lang/zh_hk.json

@@ -43,8 +43,8 @@
   "block.jsblock.pids_1a": "乘客資訊顯示屏",
   "block.jsblock.pids_lcd": "乘客資訊顯示屏",
   "block.jsblock.pids_rv": "鐵路願景乘客資訊顯示屏",
-  "block.jsblock.pids_rv_sil": "鐵路願景乘客資訊顯示屏 (南港島綫, 海洋公園站及黃竹坑站款式)",
-  "block.jsblock.pids_rv_sil_2": "鐵路願景乘客資訊顯示屏 (南港島綫, 金鐘站及海怡半島站款式)",
+  "block.jsblock.pids_rv_sil_1": "鐵路願景乘客資訊顯示屏 (南港島綫, 海洋公園及黃竹坑站款式)",
+  "block.jsblock.pids_rv_sil_2": "鐵路願景乘客資訊顯示屏 (南港島綫, 金鐘及海怡半島站款式)",
   "block.jsblock.rv_enquiry_machine": "鐵路願景八達通查閱器",
   "block.jsblock.rv_pids_pole": "鐵路願景乘客資訊顯示屏柱",
   "block.jsblock.signal_light_blue": "信號燈 (藍色在上)",
@@ -144,4 +144,4 @@
   "item.jsblock.apg_glass_end_drl": "自動月台閘門 (迪士尼綫)",
   "itemGroup.jsblock.main": "常磐裝飾模組方塊",
   "itemGroup.jsblock.pids": "常磐裝飾模組方塊 - 乘客資訊顯示屏"
-}
+}

fabric/src/main/resources/assets/jsblock/lang/zh_tw.json

@@ -43,8 +43,8 @@
   "block.jsblock.pids_1a": "乘客資訊顯示屏",
   "block.jsblock.pids_lcd": "乘客資訊顯示屏",
   "block.jsblock.pids_rv": "鐵路願景乘客資訊顯示屏",
-  "block.jsblock.pids_rv_sil": "鐵路願景乘客資訊顯示屏 (南港島綫, 海洋公園站及黃竹坑站款式)",
-  "block.jsblock.pids_rv_sil_2": "鐵路願景乘客資訊顯示屏 (南港島綫, 金鐘站及海怡半島站款式)",
+  "block.jsblock.pids_rv_sil_1": "鐵路願景乘客資訊顯示屏 (南港島綫, 海洋公園及黃竹坑站款式)",
+  "block.jsblock.pids_rv_sil_2": "鐵路願景乘客資訊顯示屏 (南港島綫, 金鐘及海怡半島站款式)",
   "block.jsblock.rv_enquiry_machine": "鐵路願景八達通查閱器",
   "block.jsblock.rv_pids_pole": "鐵路願景乘客資訊顯示屏柱",
   "block.jsblock.signal_light_blue": "信號燈 (藍色在上)",
@@ -144,4 +144,4 @@
   "item.jsblock.apg_glass_end_drl": "自動月台閘門 (迪士尼綫)",
   "itemGroup.jsblock.main": "常磐裝飾模組方塊",
   "itemGroup.jsblock.pids": "常磐裝飾模組方塊 - 乘客資訊顯示屏"
-}
+}

fabric/src/main/resources/assets/jsblock/models/block/pids_rv_sil_1.json

@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"textures": {
 		"1": "mtr:block/metal",
 		"2": "jsblock:block/pids_rv_sil_1",
@@ -33,9 +34,9 @@
 			}
 		},
 		{
-			"from": [-1.99382, -1.84886, 17],
-			"to": [18.00618, 12.15114, 17],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-9.49382, -3.84886, 0.5]},
+			"from": [-1.99382, -2.0489, 17],
+			"to": [18.00618, 12.1511, 17],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.00618, 5.0511, 17]},
 			"faces": {
 				"north": {"uv": [6.15385, 0, 12.30769, 4.27644], "texture": "#2"},
 				"east": {"uv": [0, 0, 0, 4.30769], "texture": "#2"},
@@ -97,6 +98,19 @@
 				"down": {"uv": [6.15385, 5.23077, 0, 10.46154], "texture": "#2"}
 			}
 		},
+		{
+			"from": [2.92256, -2.09073, 0],
+			"to": [13.07256, -2.09073, 17],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.99756, -2.09073, 8.5]},
+			"faces": {
+				"north": {"uv": [0, 0, 6.15385, 0], "texture": "#2"},
+				"east": {"uv": [0, 0, 5.23077, 0], "texture": "#2"},
+				"south": {"uv": [0, 0, 6.15385, 0], "texture": "#2"},
+				"west": {"uv": [0, 0, 5.23077, 0], "texture": "#2"},
+				"up": {"uv": [6.15385, 5.23077, 0, 0], "texture": "#2"},
+				"down": {"uv": [6.15385, 5.23077, 0, 10.46154], "texture": "#2"}
+			}
+		},
 		{
 			"from": [12.4, 4.05, 0],
 			"to": [12.9, 17.05, 12],

fabric/src/main/resources/assets/jsblock/models/block/pids_rv_sil_2.json

@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"textures": {
 		"1": "mtr:block/metal",
 		"2": "jsblock:block/pids_rv_sil_2",
@@ -33,9 +34,9 @@
 			}
 		},
 		{
-			"from": [-1.99382, -1.84886, 17],
-			"to": [18.00618, 12.15114, 17],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-9.49382, -3.84886, 0.5]},
+			"from": [-1.99382, -2.0489, 17],
+			"to": [18.00618, 12.1511, 17],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8.00618, 5.0511, 17]},
 			"faces": {
 				"north": {"uv": [6.15385, 0, 12.30769, 4.27644], "texture": "#2"},
 				"east": {"uv": [0, 0, 0, 4.30769], "texture": "#2"},
@@ -97,6 +98,19 @@
 				"down": {"uv": [6.15385, 5.23077, 0, 10.46154], "texture": "#2"}
 			}
 		},
+		{
+			"from": [2.9226, -2.0907, 0],
+			"to": [13.0726, -2.0907, 17],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7.9976, -2.0907, 8.5]},
+			"faces": {
+				"north": {"uv": [0, 0, 6.15385, 0], "texture": "#2"},
+				"east": {"uv": [0, 0, 5.23077, 0], "texture": "#2"},
+				"south": {"uv": [0, 0, 6.15385, 0], "texture": "#2"},
+				"west": {"uv": [0, 0, 5.23077, 0], "texture": "#2"},
+				"up": {"uv": [6.15385, 5.23077, 0, 0], "texture": "#2"},
+				"down": {"uv": [6.15385, 5.23077, 0, 10.46154], "texture": "#2"}
+			}
+		},
 		{
 			"from": [12.4, 4.05, 0],
 			"to": [12.9, 17.05, 12],

fabric/src/main/resources/assets/jsblock/models/item/rv_pids_pole.json

@@ -1,3 +1,6 @@
 {
-  "parent": "jsblock:block/rv_pids_pole"
-}
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "jsblock:item/rv_pids_pole"
+  }
+}