Merge pull request #428 from Kai-Z-JP/void-marker

feat: add marker void(non-functional)
Kai-Z-JP · Jan 5, 2024 · b83c016 · b83c016
2 parents dbd14ef + 976383f
commit b83c016
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/jp/ngt/rtm/RTMBlock.java b/src/main/java/jp/ngt/rtm/RTMBlock.java
@@ -22,6 +22,7 @@ public final class RTMBlock {
     public static BlockMarker marker;
     public static BlockMarker markerSwitch;
     public static BlockMarker markerStraight;
+    public static BlockMarker markerVoid;
 
     public static Block fluorescent;
     public static Block ironPillar;
@@ -111,6 +112,7 @@ public static void init() {
         marker = (BlockMarker) (new BlockMarker(0)).setBlockName("rtm:marker").setBlockTextureName("rtm:marker_0").setHardness(1.0F).setResistance(5.0F).setCreativeTab(CreativeTabRTM.tabRailway);
         markerSwitch = (BlockMarker) (new BlockMarker(1)).setBlockName("rtm:markerSwitch").setBlockTextureName("rtm:marker_0").setHardness(1.0F).setResistance(5.0F).setCreativeTab(CreativeTabRTM.tabRailway);
         markerStraight = (BlockMarker) (new BlockMarker(10)).setBlockName("rtm:markerStraight").setBlockTextureName("rtm:marker_0").setHardness(1.0F).setResistance(5.0F).setCreativeTab(CreativeTabRTM.tabRailway);
+        markerVoid = (BlockMarker) (new BlockMarker(11)).setBlockName("rtm:markerVoid").setBlockTextureName("rtm:marker_0").setHardness(1.0F).setResistance(5.0F).setCreativeTab(CreativeTabRTM.tabRailway);
 
         fluorescent = (new BlockFluorescent()).setBlockName("rtm:fluorescent");
         ironPillar = (new BlockIronPillar()).setBlockName("rtm:ironPillar").setBlockTextureName("rtm:ironPillar").setCreativeTab(CreativeTabRTM.tabRailway);
@@ -167,6 +169,7 @@ public static void init() {
         RTMCore.registerRtmPrefixed(marker, ItemBlockCustomColor.class, "rtm:marker");
         RTMCore.registerRtmPrefixed(markerSwitch, ItemBlockCustomColor.class, "rtm:markerSwitch");
         RTMCore.registerRtmPrefixed(markerStraight, ItemBlockCustomColor.class, "rtm:markerStraight");
+        RTMCore.registerRtmPrefixed(markerVoid, ItemBlockCustomColor.class, "rtm:markerVoid");
 
         RTMCore.registerRtmPrefixed(fluorescent, "rtm:fluorescent");
         RTMCore.registerRtmPrefixed(ironPillar, "rtm:ironPillar");

diff --git a/src/main/java/jp/ngt/rtm/rail/BlockMarker.java b/src/main/java/jp/ngt/rtm/rail/BlockMarker.java
@@ -32,7 +32,7 @@
 
 public class BlockMarker extends BlockContainer {
     /**
-     * 0:normal, 1:switch, 10:straight
+     * 0:normal, 1:switch, 10:straight, 11: void
      */
     public final int markerType;
     @SideOnly(Side.CLIENT)
@@ -387,7 +387,7 @@ public RailProperty hasRail(EntityPlayer player, boolean par2) {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item par1, CreativeTabs tab, List list) {
-        if (this.markerType == 0 || this.markerType == 1 || this.markerType == 10) {
+        if (this.markerType == 0 || this.markerType == 1 || this.markerType == 10 || this.markerType == 11) {
             list.add(new ItemStack(par1, 1, 0));
         }
     }
@@ -400,7 +400,7 @@ public String getItemIconName() {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(int par1, int par2) {
-        int i = ((this.markerType == 0 || this.markerType == 1 || this.markerType == 10) ? 7 : 3);
+        int i = ((this.markerType == 0 || this.markerType == 1 || this.markerType == 10 || this.markerType == 11) ? 7 : 3);
         return this.icons[par2 & i];
     }
 
@@ -439,6 +439,8 @@ public int getRenderColor(int par1) {
                 }
             case 10:
                 return 0xEC008C;
+            case 11:
+                return 0xFFFFFF;
             default:
                 return 16777215;
         }

diff --git a/src/main/resources/assets/rtm/lang/en_US.lang b/src/main/resources/assets/rtm/lang/en_US.lang
@@ -3,6 +3,7 @@ tile.rtm:ironPillar.name=Iron Pillar
 tile.rtm:marker.name=Marker
 tile.rtm:markerSwitch.name=Marker Switch
 tile.rtm:markerStraight.name=Marker Straight
+tile.rtm:markerVoid.name=Marker Void
 tile.rtm:powerUnit.name=PowerUnit
 tile.rtm:trainWorkBench.0.name=RTM Workbench
 tile.rtm:trainWorkBench.1.name=Rail Workbench

diff --git a/src/main/resources/assets/rtm/lang/ja_JP.lang b/src/main/resources/assets/rtm/lang/ja_JP.lang
@@ -3,6 +3,7 @@ tile.rtm:ironPillar.name=鉄柱
 tile.rtm:marker.name=マーカー
 tile.rtm:markerSwitch.name=分岐用マーカー
 tile.rtm:markerStraight.name=直線用マーカー
+tile.rtm:markerVoid.name=虚無マーカー
 tile.rtm:powerUnit.name=電源装置
 tile.rtm:trainWorkBench.0.name=RTM専用作業台
 tile.rtm:trainWorkBench.1.name=レール用作業台