Merge pull request #86 from railcraft-reborn/relayer-undercutter

Relayer & Undercutter

build.gradle

@@ -68,6 +68,9 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
             property 'forge.enabledGameTestNamespaces', 'railcraft'
 
+            // Enables better hot reloading if using the JetBrains Runtime
+            jvmArgs '-XX:+AllowEnhancedClassRedefinition', '-XX:+IgnoreUnrecognizedVMOptions', '-XX:+AllowRedefinitionToAddDeleteMethods'
+
             args '--mixin', 'railcraft.mixins.json'
 
             mods {

src/api/java/mods/railcraft/api/track/TrackUtil.java

@@ -149,6 +149,14 @@ public static boolean isStraightTrackAt(BlockGetter level, BlockPos pos) {
         && RailShapeUtil.isStraight(getTrackDirection(level, pos));
   }
 
+  public static boolean isRailBlockAt(Level level, BlockPos pos) {
+    return isRail(level.getBlockState(pos).getBlock().asItem());
+  }
+
+  public static boolean isRail(Block block) {
+    return isRail(block.asItem());
+  }
+
   public static boolean isRail(ItemStack stack) {
     return isRail(stack.getItem());
   }

src/generated/resources/.cache/1d750ec2a0f8c1b78d162be28d4170af4e940cd2

@@ -1,11 +1,12 @@
-// 1.20.1	2023-08-05T11:43:30.385673	Block States: railcraft
+// 1.20.1	2023-08-24T18:38:41.22728	Block States: railcraft
 add6c7b9a50c93a0ccd9ba6e317c1464c29ff9f0 assets/railcraft/blockstates/abandoned_activator_track.json
 141e735829ad3c7798b22e3fcc73490d9a9602ac assets/railcraft/blockstates/abandoned_booster_track.json
 bf85af556cff4cd7c4421614b631bf7d67ad23fe assets/railcraft/blockstates/abandoned_buffer_stop_track.json
 853db38424cae89cca105319d72502345afb1bc8 assets/railcraft/blockstates/abandoned_control_track.json
 f947ed8a9d40b4f92ac0a284aa1665d3a019a739 assets/railcraft/blockstates/abandoned_coupler_track.json
 2bca35ff4be5097735ecc71072a1b3e446e1ba17 assets/railcraft/blockstates/abandoned_detector_track.json
 e5c23cac1d17c601a1a6b787d952c9104a258dac assets/railcraft/blockstates/abandoned_disembarking_track.json
+27473d0772fa228981ccdb72c9d87d85a1684178 assets/railcraft/blockstates/abandoned_dumping_track.json
 a86f7ab4187c227546872ad7d1e753463d1fb6fe assets/railcraft/blockstates/abandoned_embarking_track.json
 344dbeaa17d24c8f625490f6782774f9003fba3f assets/railcraft/blockstates/abandoned_gated_track.json
 2d59fc3f43511ac884f02fcac585b0fe9cc2a116 assets/railcraft/blockstates/abandoned_junction_track.json
@@ -84,6 +85,7 @@ e06bf6d60b861499faca5da2f917b49686553533 assets/railcraft/blockstates/electric_b
 9000bb9f916436464f8fd6ccbeb055b9f0d70a2a assets/railcraft/blockstates/electric_coupler_track.json
 8becff584ef1054a6fe6b701faf3cb3ea2b1fe49 assets/railcraft/blockstates/electric_detector_track.json
 7f376dc2ea446a824067a980509948751dbd2a15 assets/railcraft/blockstates/electric_disembarking_track.json
+fc57f2ed20f30e1cdb7371a577cb07fc3347afc7 assets/railcraft/blockstates/electric_dumping_track.json
 c94c0dc5cc0e0483ca8e0cd1cbf3e690595311d2 assets/railcraft/blockstates/electric_embarking_track.json
 b85bcd88c4c5a9b467b0a7576d50833616d73a48 assets/railcraft/blockstates/electric_gated_track.json
 4b5aa8baae49ea7e7d475271dfd68551e0fb5fa8 assets/railcraft/blockstates/electric_junction_track.json
@@ -156,6 +158,7 @@ b5507454d161f7bbeb4df92133b49b2ba59a9569 assets/railcraft/blockstates/iron_contr
 9b153febabb9ebbab4276ea78e1d4cf9d813d113 assets/railcraft/blockstates/iron_coupler_track.json
 d8f3d0adbbb51c71cb005a63359f61d3e108abb7 assets/railcraft/blockstates/iron_detector_track.json
 4477601e33ee3d21a4a51aa45d1aeca1c784475b assets/railcraft/blockstates/iron_disembarking_track.json
+354d70d9245d2489f1fdbbff405989d5ed5bcf03 assets/railcraft/blockstates/iron_dumping_track.json
 c0ddbefea98471bc7ab848832b780098c9131e68 assets/railcraft/blockstates/iron_embarking_track.json
 6e1a0d6bd347f26cec5530ab21d35abadc73281f assets/railcraft/blockstates/iron_gated_track.json
 3df75be54a7888ed73f12696479d0c074306d8a6 assets/railcraft/blockstates/iron_junction_track.json
@@ -260,6 +263,7 @@ aa28f147cfe940144735ccb7f4425d9bc947c8b1 assets/railcraft/blockstates/reinforced
 e9161fbb323c8087a2bdeced95acabaa9e5ac614 assets/railcraft/blockstates/reinforced_coupler_track.json
 4f5c817c8f8f98a68e207a6508aa50e73b9bfa8b assets/railcraft/blockstates/reinforced_detector_track.json
 2d42aeb54510059e8613dbab817af5a2096acd60 assets/railcraft/blockstates/reinforced_disembarking_track.json
+1b49ccf68edf8803e351b60dfc022eb039dff60d assets/railcraft/blockstates/reinforced_dumping_track.json
 ecd5ecb1221409f03b38f995e8fe7fa2b896d43d assets/railcraft/blockstates/reinforced_embarking_track.json
 fffee505017122f40521cc019d0f82394fa913d3 assets/railcraft/blockstates/reinforced_gated_track.json
 3006c39bf36cac6fd7af2a5cff3bcf14df50a963 assets/railcraft/blockstates/reinforced_junction_track.json
@@ -294,6 +298,7 @@ b080e5991639b33b30601ee3e173b61ab4ac64ab assets/railcraft/blockstates/saltpeter_
 ba7a976de87fd7e12d7e6c7b11730b50b189b241 assets/railcraft/blockstates/strap_iron_coupler_track.json
 6dd20de2b2be7679fec690a6e0e9cc75e6e881d5 assets/railcraft/blockstates/strap_iron_detector_track.json
 101d663d78f1444217dfa4ca6b1c3f174119d440 assets/railcraft/blockstates/strap_iron_disembarking_track.json
+f85ca661393c3345cb061bc40316844de36a8b2f assets/railcraft/blockstates/strap_iron_dumping_track.json
 8a0e198151b81612afcd035493afdedd1d7978d7 assets/railcraft/blockstates/strap_iron_embarking_track.json
 eb5421394e70ef4543bf4893616a3d097c3f1432 assets/railcraft/blockstates/strap_iron_gated_track.json
 9c6fc0036624f8d4f99e6e43cd8bde8ba6b07f79 assets/railcraft/blockstates/strap_iron_junction_track.json
@@ -550,6 +555,12 @@ d99d590c4719cd3689da9fdf7591bb7f86d744c1 assets/railcraft/models/block/disembark
 3745881ae7067a2fa33b04426cbc805a7aed3c67 assets/railcraft/models/block/dual_block_signal_inventory.json
 3c81cb6b2325ebc7fbbaccf692007ace3563888b assets/railcraft/models/block/dual_distant_signal_inventory.json
 ea6c9fef54f2bf048c0c2a9ea87f10fe42cebcc2 assets/railcraft/models/block/dual_token_signal_inventory.json
+fdc3a1224b3b322570a9c112f0d2f5259a93f277 assets/railcraft/models/block/dumping_track.json
+3ca536bf4aad3db3de33de085629218ced68b48c assets/railcraft/models/block/dumping_track_on.json
+29d8e203973d10c5335c76006c82cfc8f0c75481 assets/railcraft/models/block/dumping_track_on_raised_ne.json
+0d93eefddf8782b70845b17dc86bc8d0110a4503 assets/railcraft/models/block/dumping_track_on_raised_sw.json
+294ce3cb50c7634572210c556c178b7ff078f2b8 assets/railcraft/models/block/dumping_track_raised_ne.json
+551c28cc731a3dbde2756f956db7d78ccf809f1d assets/railcraft/models/block/dumping_track_raised_sw.json
 f01a398f06d9ca479553e6c555f9a25c20f57604 assets/railcraft/models/block/electric_junction_track.json
 fc041c16dcc1134ef1f49d0daaa5f4358069339d assets/railcraft/models/block/electric_track.json
 80148b57586068e46ec7081b0f3958889eda548d assets/railcraft/models/block/electric_track_corner.json
@@ -1136,6 +1147,7 @@ c7565ae0f04bb5fde44199f311ca26375f6939e7 assets/railcraft/models/item/abandoned_
 a520fa2bc683b43c12f0f8d428cb79eb6f6403bc assets/railcraft/models/item/abandoned_coupler_track.json
 959e2f808ea33f1b6bc5c84fd83a0cdd754e7023 assets/railcraft/models/item/abandoned_detector_track.json
 9214c830226cd52304151380869d96725890a8bb assets/railcraft/models/item/abandoned_disembarking_track.json
+555f91e9e3ec3ec5ac5bcad3a4fa725c9877fcd4 assets/railcraft/models/item/abandoned_dumping_track.json
 c55a9d70cf04814b05db08ed24e6af2b4fd43260 assets/railcraft/models/item/abandoned_embarking_track.json
 d4a10dfb4f11438506bcac5393c8566dba3c75f0 assets/railcraft/models/item/abandoned_gated_track.json
 b585b1de1c8370d80bf932de431dfdbbea6bc532 assets/railcraft/models/item/abandoned_junction_track.json
@@ -1211,6 +1223,7 @@ f9a4e8418736bb40506edd8e4453942196d54dbd assets/railcraft/models/item/electric_c
 f48056d270bda152166811f652b2b7587eb89253 assets/railcraft/models/item/electric_coupler_track.json
 a478745f757f8c13dd87729414311ac1535f2df7 assets/railcraft/models/item/electric_detector_track.json
 8481692ea985ce3a664905abb3221ac8ac38355a assets/railcraft/models/item/electric_disembarking_track.json
+19e045731f6b458da47b302c7ec822f1568bf833 assets/railcraft/models/item/electric_dumping_track.json
 ca8716d5f8a6952cfcaf2e23d2a10f9fc254bdfe assets/railcraft/models/item/electric_embarking_track.json
 64ca0aae3452ae0ad6de9f4ba4aa8f3ea7981b23 assets/railcraft/models/item/electric_gated_track.json
 ac62d47e68215294b66c0877738184d254ccccf6 assets/railcraft/models/item/electric_junction_track.json
@@ -1281,6 +1294,7 @@ d564e9cd640507fc5bb8ce065aa9d0b86145c6d9 assets/railcraft/models/item/high_speed
 482fc3461cbe5ca51b933721352632f614e730ac assets/railcraft/models/item/iron_coupler_track.json
 e72d7180da8869d737c331473858fb8ef3d10b10 assets/railcraft/models/item/iron_detector_track.json
 792d2bb0bf7a380fe58d99fbee31b44817d6bb8d assets/railcraft/models/item/iron_disembarking_track.json
+6358fd253f69300dfc7702187358790608d34d80 assets/railcraft/models/item/iron_dumping_track.json
 6f9f05413d041e769043da2fc0a245cd93e69fa4 assets/railcraft/models/item/iron_embarking_track.json
 41780f28bd7ea5fdca36a9f1b8c934f741a615f7 assets/railcraft/models/item/iron_gated_track.json
 85f056616802b265fe944a032dd137531079356e assets/railcraft/models/item/iron_junction_track.json
@@ -1385,6 +1399,7 @@ d4f4384c85bac945fd18f78267eb5ffad9388628 assets/railcraft/models/item/red_steel_
 da7961b3a293fa795de565d6c0e999dcbb9f997d assets/railcraft/models/item/reinforced_coupler_track.json
 3d9637cbf80c0d59ff8968d9542e13693e9dbbad assets/railcraft/models/item/reinforced_detector_track.json
 56c81e3345a57d25abf7a490409b78cc7713b9de assets/railcraft/models/item/reinforced_disembarking_track.json
+9aceb863ae2fe2bb98b13fb077a9b5133626c9f1 assets/railcraft/models/item/reinforced_dumping_track.json
 cff38e4faaf44949adc6b870a5d2a4c673ad9a0e assets/railcraft/models/item/reinforced_embarking_track.json
 92b4861cf93b4ef0ceec52f5f4b0a6f11b200642 assets/railcraft/models/item/reinforced_gated_track.json
 f7afdea4217c772528afe91d9d442237b8239b87 assets/railcraft/models/item/reinforced_junction_track.json
@@ -1419,6 +1434,7 @@ dea7aeb823cb9bd307823ec11403bca8b0b6d8da assets/railcraft/models/item/strap_iron
 72dab9f2898cb61f044cca6bb9b2ccf5afc2655b assets/railcraft/models/item/strap_iron_coupler_track.json
 b412ad175ee9ce230b58648da15f6f7f9db35dc4 assets/railcraft/models/item/strap_iron_detector_track.json
 f5b30eb7288725b228b51990bce85486bae33cbb assets/railcraft/models/item/strap_iron_disembarking_track.json
+3c6fd9c417d12a7a9f59cfcf47cf7c7ba81cf6c0 assets/railcraft/models/item/strap_iron_dumping_track.json
 7f93aa56d0e5f792bf914ca89a6b031d8cc629e5 assets/railcraft/models/item/strap_iron_embarking_track.json
 e47f1c324fc38dcf18ecfb19df82797ca54411d4 assets/railcraft/models/item/strap_iron_gated_track.json
 5460ac4666a517f0110f0d0d84854fe41217fc86 assets/railcraft/models/item/strap_iron_junction_track.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1,11 +1,12 @@
-// 1.20.1	2023-08-04T14:44:02.526791	Loot Tables
+// 1.20.1	2023-08-24T18:14:37.105363	Loot Tables
 2368bf4f9231f79e11c75fe244dd7a820a896d65 data/railcraft/loot_tables/blocks/abandoned_activator_track.json
 9097789b3b5eebaff6d62020fecf494c96348ac7 data/railcraft/loot_tables/blocks/abandoned_booster_track.json
 fbbe6fc8014502014e25452e15f95dc665234e15 data/railcraft/loot_tables/blocks/abandoned_buffer_stop_track.json
 6f12b55c8448dda14d9d7a5be34bb9b3eb1d2466 data/railcraft/loot_tables/blocks/abandoned_control_track.json
 153cb839c830b1fd34104ef223b2ef764fe9e367 data/railcraft/loot_tables/blocks/abandoned_coupler_track.json
 0c628f9d920c40297d6ede40061ce9635971db24 data/railcraft/loot_tables/blocks/abandoned_detector_track.json
 8a0637743994f33f65d67de3086c30e921dff31a data/railcraft/loot_tables/blocks/abandoned_disembarking_track.json
+e026ec8e617856832bf155e0b2ff01fa4961afa4 data/railcraft/loot_tables/blocks/abandoned_dumping_track.json
 df8e8cf44334a23275a6055247fc320e18842c95 data/railcraft/loot_tables/blocks/abandoned_embarking_track.json
 a457a42020d7a0242c8bb4cc1539ff34a2056756 data/railcraft/loot_tables/blocks/abandoned_gated_track.json
 4f22f7446094d29beb229becccd813b5033ab7d3 data/railcraft/loot_tables/blocks/abandoned_junction_track.json
@@ -83,6 +84,7 @@ e265c21661f256891b29bfbe769b970937ad3381 data/railcraft/loot_tables/blocks/dista
 7bba9189ae777bd36d67c847f570698e8875b72e data/railcraft/loot_tables/blocks/electric_coupler_track.json
 00103337b3d03a1df5cd2c55d8afc7f30319b4c2 data/railcraft/loot_tables/blocks/electric_detector_track.json
 b82650564e3b3958273449a3db433bf243dc7fce data/railcraft/loot_tables/blocks/electric_disembarking_track.json
+beb3328bebd9d75f6a0da28200b59a674b9101af data/railcraft/loot_tables/blocks/electric_dumping_track.json
 b49151fa5e1260308e0c4251b28bf287d86c4174 data/railcraft/loot_tables/blocks/electric_embarking_track.json
 eebfff86d513b0c40f3c3db0ccd3a5e196a8a34d data/railcraft/loot_tables/blocks/electric_gated_track.json
 b4635bc1786c26a2196f514b5a84ce984cc4cee7 data/railcraft/loot_tables/blocks/electric_junction_track.json
@@ -155,6 +157,7 @@ f76f2a2b4266ebe536d2ef2c2506dbb0701cba4e data/railcraft/loot_tables/blocks/iron_
 3dd677dd690d7a6e3e922794af8fb357d1f8d22b data/railcraft/loot_tables/blocks/iron_coupler_track.json
 b654eac17f4a6df8d4fbd3c18ef78c83ca9aac74 data/railcraft/loot_tables/blocks/iron_detector_track.json
 726726ac1a8c7bf6c30458bbda218ca5150b4185 data/railcraft/loot_tables/blocks/iron_disembarking_track.json
+491c1e39f74a328a27d89b5ad872da3bd6dfc0aa data/railcraft/loot_tables/blocks/iron_dumping_track.json
 bb09d1c9c7e1784ca54c6b95ee3eddf5fc07fbfa data/railcraft/loot_tables/blocks/iron_embarking_track.json
 a149c1b5c4a968478487fe672da65fcbed38fe56 data/railcraft/loot_tables/blocks/iron_gated_track.json
 271383536c28a1b0ff6a308b694895a4c1e59f20 data/railcraft/loot_tables/blocks/iron_junction_track.json
@@ -259,6 +262,7 @@ f7849caa4f86308f8cd7a8ead9d7981ceec5c5b4 data/railcraft/loot_tables/blocks/reinf
 b7aa7fb2e6240b1c7f7ec5966369ea336ddafa49 data/railcraft/loot_tables/blocks/reinforced_coupler_track.json
 cbd7f9c2e2c42a79e10be66f844da82d93dfece7 data/railcraft/loot_tables/blocks/reinforced_detector_track.json
 56e182a5b6abac65fc344ebe5f65d4fbeb8bf47b data/railcraft/loot_tables/blocks/reinforced_disembarking_track.json
+916664f45fc0447bd61b4b0037041266ac1f8f6d data/railcraft/loot_tables/blocks/reinforced_dumping_track.json
 578265d61ba4d0a08c26ecfcf7ac36993e9cd21d data/railcraft/loot_tables/blocks/reinforced_embarking_track.json
 27cfbd0fa76ac94b8f208ae1d519e573f9f683b9 data/railcraft/loot_tables/blocks/reinforced_gated_track.json
 4188483afea9a8dc58324651bde408f326a52329 data/railcraft/loot_tables/blocks/reinforced_junction_track.json
@@ -294,6 +298,7 @@ ee177a7aa23f11bbb3dfd58043a4a9e085414d86 data/railcraft/loot_tables/blocks/strap
 3d8c14759f63a1c4a7f8749d3a64ea7cb6ce72ca data/railcraft/loot_tables/blocks/strap_iron_coupler_track.json
 3bc973ee7608ca8b1e92252660488832b8698f7b data/railcraft/loot_tables/blocks/strap_iron_detector_track.json
 e3b5fe0f2c644be8e028da4b7eb7c3130114748e data/railcraft/loot_tables/blocks/strap_iron_disembarking_track.json
+f45acdd2bff2617f83538938c56ac2151e1941f7 data/railcraft/loot_tables/blocks/strap_iron_dumping_track.json
 0baca70045a72b705ee13e6fd83027314b788efa data/railcraft/loot_tables/blocks/strap_iron_embarking_track.json
 cf8af12e276d7e2e1f19e96940c6e9ebc3e4f180 data/railcraft/loot_tables/blocks/strap_iron_gated_track.json
 9e09bc4975af74a96d61e3c985864de76438efcd data/railcraft/loot_tables/blocks/strap_iron_junction_track.json