Skip to content

Commit 3882144

Browse files
znepbznepb
committed
fix: misc train stuffs fixes
1 parent 8724083 commit 3882144

File tree

16 files changed

+124
-137
lines changed

16 files changed

+124
-137
lines changed

‎src/client/java/me/znepb/roadworks/mixin/DebugScreenMixin.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.znepb.roadworks.mixin;
22

33
import me.znepb.roadworks.RoadworksRegistry;
4+
import me.znepb.roadworks.attachment.ActivatableAttachment;
45
import me.znepb.roadworks.attachment.LinkableAttachment;
56
import me.znepb.roadworks.container.PostContainerBlockEntity;
67
import me.znepb.roadworks.train.CrossingGateAttachment;
@@ -46,10 +47,14 @@ public void getRightText(CallbackInfoReturnable<List<String>> cir) {
4647
}
4748
}
4849

50+
if(attachment instanceof ActivatableAttachment) {
51+
value.add("Active: " + ((ActivatableAttachment) attachment).isActive());
52+
}
53+
4954
if(attachment instanceof CrossingGateAttachment) {
5055
value.add("Gate progress: " + ((CrossingGateAttachment) attachment).getProgress());
51-
value.add("Active: " + ((CrossingGateAttachment) attachment).isActive());
5256
value.add("In motion: " + ((CrossingGateAttachment) attachment).isInMotion());
57+
value.add("Extensions: " + ((CrossingGateAttachment) attachment).getExtensionCount());
5358
}
5459
}
5560
}

‎src/client/kotlin/me/znepb/roadworks/render/attachments/CrossingGateAttachmentRenderer.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ import org.joml.Vector3d
1414
class CrossingGateAttachmentRenderer : AttachmentRenderer<CrossingGateAttachment> {
1515
companion object {
1616
val HINGE = RoadworksMain.ModId("block/crossing_arm_hinge")
17-
val GATE_ARM = RoadworksMain.ModId("block/crossing_gate_arm_extension")
17+
val GATE_ARM = RoadworksMain.ModId("block/crossing_gate_arm")
1818
}
1919

20-
2120
override fun render(
2221
attachment: CrossingGateAttachment,
2322
blockEntity: AttachmentContainerBlockEntity,

‎src/main/generated/.cache/6fe4d677fbb7b44f14903d96301f1a75bf6b5ac7‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.20.1 2025-02-09T23:55:42.8428079 Roadworks/Language (en_us)
2-
3b586695f0127d407aa4fcb65300c35028dca239 assets\roadworks\lang\en_us.json
1+
// 1.20.1 2025-02-11T17:28:23.5679981 Roadworks/Language (en_us)
2+
ea209ebca6eb6b0d7743ef8d0215416a6df7af5a assets\roadworks\lang\en_us.json

‎src/main/generated/.cache/b04aec471b8c80daca32233710909329a8febd71‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// 1.20.1 2025-02-09T23:55:42.8418073 Roadworks/Tags for minecraft:block
1+
// 1.20.1 2025-02-11T17:28:23.5679981 Roadworks/Tags for minecraft:block
22
d3aacdd06358cd6ffd273e2db8516b719fc0deb2 data\roadworks\tags\blocks\standalone_markings.json
33
b007ad12c3c45db36f651fa35b4b78b2ae28ad59 data\roadworks\tags\blocks\marking.json

‎src/main/generated/.cache/d9c50af9b8cfa8a81402aa75c3c441ce883c3523‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2025-02-09T23:55:42.8378075 Roadworks/Model Definitions
1+
// 1.20.1 2025-02-11T17:28:23.5620007 Roadworks/Model Definitions
22
8342f8ba46d3f722dfb56f742e5daf49f4fab226 assets\roadworks\models\block\marking_white_infill.json
33
0476eefd0ae91fa40d125aaff968660c569d8436 assets\roadworks\blockstates\marking_yellow_turn_offset_center_in.json
44
1fd37bb3b7f834e2354f5e374e050becce306f55 assets\roadworks\models\item\marking_yellow_t_center_short.json
@@ -8,17 +8,17 @@ e2fd395ae3c1600a12d33075d0cb02df2254dd22 assets\roadworks\models\item\bollard_th
88
2317a4077db8a4bf6beca90cbe14b60aada71e43 assets\roadworks\models\item\sign_editor.json
99
5c0b31126ede1bc6190adb2dd96d37e97c511009 assets\roadworks\models\item\marking_white_left_straight_turn_arrows.json
1010
0574f8a90bb4300179582ce1ea9792fd3df5ed22 assets\roadworks\blockstates\marking_yellow_l_thin_short_right.json
11-
8f8386b1ff266f15fddd5b7e8cc659267e4bdb64 assets\roadworks\models\item\marking_white_edge_thick.json
1211
67ba4b0a019048f19618894d6295f4098987532e assets\roadworks\models\item\marking_white_t_right_short.json
12+
8f8386b1ff266f15fddd5b7e8cc659267e4bdb64 assets\roadworks\models\item\marking_white_edge_thick.json
1313
a1631b6517a837955b4da2971f93cce1478c00ce assets\roadworks\models\block\marking_yellow_turn_offset_in_center_r.json
1414
57a56a8bc0f8e01ce95558f85dfb5560a8136187 assets\roadworks\models\block\marking_white_stub_medium_edge_right.json
1515
c5a7d66240d76b4f101c061a1c4a3fc64f635ac5 assets\roadworks\models\item\marking_yellow_center.json
1616
3fe34b59983f2e663c1821a4cf9c5367f2f3958f assets\roadworks\blockstates\marking_yellow_l_left.json
1717
d51a9aa0a8d87df55ae1ffa316eaaa8e0a954103 assets\roadworks\blockstates\marking_yellow_t_left_short.json
1818
f3ee097b18b26c79eabacd4d1b93ced97bc40677 assets\roadworks\blockstates\marking_white_t_right_short.json
19+
c3a39581135785147a74821504475a26004ff740 assets\roadworks\blockstates\marking_yellow_t_center.json
1920
91354fb83da3604bf7dd33bfc3b02b2887fda36d assets\roadworks\models\item\marking_yellow_turn_inside.json
2021
68aecc3bc72fa9122327598eba7774348b8ba17b assets\roadworks\models\item\marking_white_edge.json
21-
c3a39581135785147a74821504475a26004ff740 assets\roadworks\blockstates\marking_yellow_t_center.json
2222
57eaba59e06a693c68f874d82f5c20dd63147f4a assets\roadworks\models\block\signal_red_straight_off.json
2323
3f291ef5a853991cf36d4c0b793129713fa90f42 assets\roadworks\models\block\marking_yellow_offset_center.json
2424
fa3eac961d532ae82a288eabf20f3f1e9e8a93a5 assets\roadworks\models\block\marking_white_edge_dash.json
@@ -53,20 +53,20 @@ daa3d266fed5eacedd6a839ec4ef50e7a738bbca assets\roadworks\models\block\marking_w
5353
b2eacde25dd48c88713c0679aa3b942b143be21c assets\roadworks\models\block\signal_green_left_off.json
5454
d43512c081174fcaca78a3bd0b49702b245d41e2 assets\roadworks\models\item\marking_white_t_left_short.json
5555
0c377f699149662ae749b143130810d5d6566523 assets\roadworks\models\item\marking_white_l_left.json
56-
f0e39f868d72dfddf7fd64f610258b6299f25e05 assets\roadworks\blockstates\marking_yellow_stub_short_center.json
5756
e76eecdb678340b7951532fcf82a5a31d8978147 assets\roadworks\blockstates\marking_white_center_dash.json
57+
f0e39f868d72dfddf7fd64f610258b6299f25e05 assets\roadworks\blockstates\marking_yellow_stub_short_center.json
5858
1345d5c3192f7dead930a671279faf171ef23380 assets\roadworks\models\block\marking_yellow_l_thin_short_left.json
5959
5cecd31d5e9102b045248daa349dd9c6bee6cb91 assets\roadworks\blockstates\marking_yellow_stub_medium_edge_right.json
6060
4b5ce26a9d03fcbd9a71f5c791d1a3d853afbd78 assets\roadworks\blockstates\marking_yellow_l_thin_right.json
6161
cc527d048482e5a5a0200e02de47b9867a02109a assets\roadworks\blockstates\marking_yellow_turn_offset_in_center_r.json
62-
0f9e1b2bebcaad93a3d0e8679ff6ad31f56b8536 assets\roadworks\blockstates\marking_white_t_center_long.json
6362
ef83e3c2d7ed8fb617c762142f47c949d41a197c assets\roadworks\models\block\marking_white_t_right.json
63+
0f9e1b2bebcaad93a3d0e8679ff6ad31f56b8536 assets\roadworks\blockstates\marking_white_t_center_long.json
6464
7b8fc3c6bd08d8a9ff76187da7e8833f48525991 assets\roadworks\models\item\marking_white_zebra_crossing.json
6565
7f367e1d19f41e95485213c8e192f18857f1d79f assets\roadworks\models\block\marking_white_u_turn_arrow.json
6666
f3c8ffc3516992d91f89d360054389e85580b04d assets\roadworks\models\item\road_sign_warning.json
6767
cd51a9435e5b50711c263a868b2d68c71085350f assets\roadworks\models\item\marking_white_l_thin_short_left.json
68-
a65966062215a78cff6bfc7c3d769524ec2e9439 assets\roadworks\blockstates\drum.json
6968
a095d5021ae5f601a552a9920fd3a7e6944d1530 assets\roadworks\blockstates\marking_white_t_left_short.json
69+
a65966062215a78cff6bfc7c3d769524ec2e9439 assets\roadworks\blockstates\drum.json
7070
c3e6d6bda1c178c35ab6344f0e7aed3b0ef7f15c assets\roadworks\blockstates\marking_white_l_thin_short_right.json
7171
ab18f595fc067f7e493feec80f6984a649d4fd2b assets\roadworks\models\item\marking_white_straight_arrow.json
7272
f5ed0f9c9054c18b2cdd06590b91a290ad3cb2e4 assets\roadworks\blockstates\marking_yellow_turn_outside.json
@@ -81,8 +81,8 @@ b40294e48ebf0cf928f44bb171f5f434cd9fba0c assets\roadworks\models\block\marking_y
8181
dc4448961b65f047776bbf3505e212e3fd54809a assets\roadworks\models\block\signal_dont_walk_off.json
8282
5445245bb9f99807387f9a37db98f9ce004d774f assets\roadworks\blockstates\marking_white_l_thin_right.json
8383
b6354f44d8632c63049118945db1ecbf159082b2 assets\roadworks\blockstates\marking_yellow_double_center_turn.json
84-
e382fc24164ecdb2c1a52e0905614e376411dff7 assets\roadworks\blockstates\marking_white_stub_medium_edge_left.json
8584
edba7c0796037800dd497b921675b15e0b0dde4f assets\roadworks\blockstates\marking_white_t_left_long.json
85+
e382fc24164ecdb2c1a52e0905614e376411dff7 assets\roadworks\blockstates\marking_white_stub_medium_edge_left.json
8686
bf6d155a0e983ddd2bcd63d00be02b0c9983bd5a assets\roadworks\blockstates\marking_yellow_stub_medium_center.json
8787
c916efc29bd5daa9cc3c31a0fd80a470b24e3569 assets\roadworks\models\block\marking_yellow_infill.json
8888
1b60ae079a888d374d742ddabd34e385b4216c18 assets\roadworks\models\item\marking_yellow_l_left.json
@@ -106,8 +106,8 @@ b4a2bb96c02f0125d9b9984d63a12aeec01c83de assets\roadworks\models\block\marking_y
106106
c1f428431db5b1a6c9aa6e34e66b62abfab9f6a1 assets\roadworks\blockstates\marking_yellow_edge_dash.json
107107
c85c2af30e33c6b641c5e86f44cc8ea0491e16b4 assets\roadworks\blockstates\bollard_thin.json
108108
579686d0bcca2a5851068627c6c81a8495e7d8ae assets\roadworks\blockstates\marking_yellow_t_right_short.json
109-
1a6af49920fd20705158a95133540b0b12daccbe assets\roadworks\blockstates\marking_white_center_thick.json
110109
7a7d987634ecff0dbb4904f08c60faff9ae57d25 assets\roadworks\models\item\marking_yellow_stub_short_center.json
110+
1a6af49920fd20705158a95133540b0b12daccbe assets\roadworks\blockstates\marking_white_center_thick.json
111111
d2c5ca2cd7e7bad4ea908298bd96b0283611e3f0 assets\roadworks\models\item\traffic_cone.json
112112
81882f779d2a23d094675ec0b564ce55fe069db0 assets\roadworks\models\block\marking_yellow_center_dash.json
113113
a6a9fb2872f7559ea52b4f4baf5f69bddb3c1798 assets\roadworks\models\item\marking_yellow_stub_medium_edge_right.json
@@ -141,8 +141,8 @@ bbd6b7a3675a36a636ebb172abbc28f23a725026 assets\roadworks\models\block\signal_gr
141141
d10d4a0645533fc19a937b0ab205737650e314f7 assets\roadworks\models\item\marking_white_u_turn_arrow.json
142142
e053a00bfae3415adac9b61243f9a973fa3f81d0 assets\roadworks\models\block\marking_white_only.json
143143
668cab2945f3d15d9226f94c5e40191bbf0844f6 assets\roadworks\models\item\marking_yellow_turn_offset_center_out.json
144-
93d2c54cf57602989a2a3a8085669a0cc6726fb4 assets\roadworks\blockstates\marking_white_stub_long_edge_left.json
145144
91afbc4e6141429665825d4688614a70a0a60ae3 assets\roadworks\blockstates\marking_white_l_thin_short_left.json
145+
93d2c54cf57602989a2a3a8085669a0cc6726fb4 assets\roadworks\blockstates\marking_white_stub_long_edge_left.json
146146
bbd394a1a4ca289c4d5ca9ba0f19922dfe41c44a assets\roadworks\models\block\marking_yellow_double_center_turn.json
147147
73e7fa6756f5eb17fc1fb7a8af46173e4520b823 assets\roadworks\models\item\marking_white_stub_long_center.json
148148
10da533658b31d762a18e22687e8df9f28fc53f7 assets\roadworks\models\item\marking_white_stub_medium_center.json
@@ -226,8 +226,8 @@ ea3f0aea02ada46b83e60ae56f8d55c7a0cae051 assets\roadworks\models\block\marking_w
226226
59d574fa7273cf3752a29a934ad855c9b7691061 assets\roadworks\blockstates\marking_yellow_turn_center.json
227227
dfa18452d4c56e86d9ba9f0c4f5a8630da6db2ee assets\roadworks\models\block\traffic_cabinet.json
228228
e8899855bde0123dbb33bcc7103bb77117c51e4b assets\roadworks\models\item\marking_white_t_right_long.json
229-
3de97cd9362d7d25c9ad168b46f6d00ced1ad0d9 assets\roadworks\blockstates\marking_yellow_t_left.json
230229
1cf3cf451a98843bb838c27d2b36992bd277a3b6 assets\roadworks\models\item\marking_white_l_thin_short_right.json
230+
3de97cd9362d7d25c9ad168b46f6d00ced1ad0d9 assets\roadworks\blockstates\marking_yellow_t_left.json
231231
93698611bad00c971f37da615b674c34b17b19f8 assets\roadworks\models\item\marking_yellow_turn_center.json
232232
e71b2e08be35f2594a171b1bb8101380807dcdda assets\roadworks\models\block\marking_white_yield.json
233233
10020aca118981ef67e293d5e071bbcda34b3d52 assets\roadworks\models\item\marking_yellow_t_right_long.json

‎src/main/generated/assets/roadworks/lang/en_us.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,14 @@
125125
"itemGroup.roadworks.main": "Roadworks",
126126
"sign.roadworks.3_way_intersection": "3-Way Intersection Sign Right",
127127
"sign.roadworks.3_way_intersection_alt": "3-Way Intersection Sign Left",
128+
"sign.roadworks.3_way_intersection_rail_left": "3-Way Intersection Sign Left w/ Rail",
129+
"sign.roadworks.3_way_intersection_rail_right": "3-Way Intersection Sign Right w/ Rail",
130+
"sign.roadworks.3_way_intersection_rail_t": "3-Way Intersection Sign T w/ Rail",
128131
"sign.roadworks.3_way_intersection_t": "3-Way Intersection Sign T",
129132
"sign.roadworks.4_way": "Supplemental 4-way Sign",
130133
"sign.roadworks.4_way_intersection": "4-Way Intersection Sign",
134+
"sign.roadworks.4_way_intersection_rail_left": "4-Way Intersection Sign w/ Rail left",
135+
"sign.roadworks.4_way_intersection_rail_right": "4-Way Intersection Sign w/ Rail Right",
131136
"sign.roadworks.ahead": "Supplemental Ahead Sign",
132137
"sign.roadworks.chevron_left": "Chevron Left Sign",
133138
"sign.roadworks.chevron_right": "Chevron Right Sign",
@@ -143,6 +148,8 @@
143148
"sign.roadworks.one_way_left": "One Way Sign (Left)",
144149
"sign.roadworks.one_way_right": "One Way Sign (Right)",
145150
"sign.roadworks.pedestrian": "Pedestrian Sign",
151+
"sign.roadworks.rail_intersection_diag": "Diagonal Rail Intersection Sign",
152+
"sign.roadworks.rail_intersection_diag_alt": "Diagonal Rail Intersection Sign Alternate",
146153
"sign.roadworks.railroad": "Railroad Crossing Sign",
147154
"sign.roadworks.right_lane_ends": "Right Lane Ends Sign",
148155
"sign.roadworks.right_lane_ends_construction": "Right Lane Ends Construction Sign",

‎src/main/kotlin/me/znepb/roadworks/attachment/ActivatableAttachment.kt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package me.znepb.roadworks.attachment
2+
3+
import me.znepb.roadworks.container.AttachmentContainerBlockEntity
4+
import net.minecraft.nbt.NbtCompound
5+
6+
abstract class ActivatableAttachment(type: AttachmentType<*>, container: AttachmentContainerBlockEntity) : LinkableAttachment(type, container) {
7+
private var isActivated = false
8+
9+
override fun readNBT(nbt: NbtCompound) {
10+
this.isActivated = nbt.getBoolean("active")
11+
super.readNBT(nbt)
12+
13+
}
14+
15+
override fun writeNBT(nbt: NbtCompound) {
16+
super.writeNBT(nbt)
17+
nbt.putBoolean("active", isActivated)
18+
}
19+
20+
fun isActive() = isActivated
21+
fun activate() = setActive(true)
22+
fun deactivate() = setActive(false)
23+
open fun setActive(active: Boolean) {
24+
isActivated = active
25+
this.markDirty()
26+
}
27+
}

‎src/main/kotlin/me/znepb/roadworks/cabinet/TrafficCabinetBlockEntity.kt‎

Lines changed: 17 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package me.znepb.roadworks.cabinet
22

33
import me.znepb.roadworks.RoadworksRegistry
4+
import me.znepb.roadworks.attachment.ActivatableAttachment
45
import me.znepb.roadworks.attachment.Attachment
56
import me.znepb.roadworks.attachment.LinkableAttachment
6-
import me.znepb.roadworks.container.PostContainerBlockEntity
7+
import me.znepb.roadworks.container.AttachmentContainerBlockEntity
78
import me.znepb.roadworks.signal.AbstractSignalAttachment
89
import me.znepb.roadworks.signal.SignalLight
910
import me.znepb.roadworks.signal.SignalType
10-
import me.znepb.roadworks.train.CrossingGateAttachment
1111
import me.znepb.roadworks.train.TrainBellAttachment
1212
import me.znepb.roadworks.util.MiscUtils.blockPosFromNbtIntArray
1313
import me.znepb.roadworks.util.MiscUtils.blockPosToNbtIntArray
@@ -31,11 +31,11 @@ class TrafficCabinetBlockEntity(
3131
private val idTypeCache = HashMap<Int, String>()
3232

3333
private var signalSetQueue = HashMap<Int, HashMap<SignalLight, Boolean>>()
34-
private var bellActivationQueue = HashMap<Int, Boolean>()
35-
private var crossingGateQueue = HashMap<Int, Boolean>()
34+
private var activatableQueue = HashMap<Int, Boolean>()
3635

3736
fun getTotalDevices() = connections.getAmount()
3837
fun getConnections() = connections
38+
3939
fun getTypeOfId(id: Int): String? {
4040
return idTypeCache[id]
4141
}
@@ -46,14 +46,15 @@ class TrafficCabinetBlockEntity(
4646

4747
fun addDevice(pos: BlockPos, uuid: UUID): Int? {
4848
val blockEntity = this.world?.getBlockEntity(pos)
49-
if(blockEntity is PostContainerBlockEntity) {
49+
if(blockEntity is AttachmentContainerBlockEntity) {
5050
val attachment = blockEntity.getAttachment(uuid)
5151
if(attachment is AbstractSignalAttachment) {
5252
return addSignal(attachment)
53-
} else if(attachment is TrainBellAttachment) {
54-
return addTrainBell(attachment)
55-
} else if(attachment is CrossingGateAttachment) {
56-
return addCrossingGate(attachment)
53+
} else if(attachment is ActivatableAttachment) {
54+
val newAttachment = connections.add(attachment.container.pos, attachment.id)
55+
idTypeCache[newAttachment.getId()] = attachment.getLinkType()
56+
this.markDirty()
57+
return newAttachment.getId()
5758
}
5859
}
5960
return null
@@ -69,20 +70,6 @@ class TrafficCabinetBlockEntity(
6970
return newSignal.getId()
7071
}
7172

72-
private fun addTrainBell(attachment: TrainBellAttachment): Int {
73-
val newBell = connections.add(attachment.container.pos, attachment.id)
74-
idTypeCache[newBell.getId()] = attachment.getLinkType()
75-
this.markDirty()
76-
return newBell.getId()
77-
}
78-
79-
private fun addCrossingGate(attachment: CrossingGateAttachment): Int {
80-
val newCrossingGate = connections.add(attachment.container.pos, attachment.id)
81-
idTypeCache[newCrossingGate.getId()] = attachment.getLinkType()
82-
this.markDirty()
83-
return newCrossingGate.getId()
84-
}
85-
8673
fun addButton(pos: BlockPos, uuid: UUID): Int? {
8774
TODO("Update for new traffic system")
8875
//val blockEntity = this.world?.getBlockEntity(pos)
@@ -135,12 +122,8 @@ class TrafficCabinetBlockEntity(
135122
idQueue[signalLight] = value
136123
}
137124

138-
fun queueTrainBellSet(id: Int, activated: Boolean) {
139-
bellActivationQueue[id] = activated
140-
}
141-
142-
fun queueCrossingArmSet(id: Int, activated: Boolean) {
143-
crossingGateQueue[id] = activated
125+
fun queueActivatable(id: Int, activated: Boolean) {
126+
activatableQueue[id] = activated
144127
}
145128

146129
fun onTick(world: World, pos: BlockPos, state: BlockState) {
@@ -163,32 +146,18 @@ class TrafficCabinetBlockEntity(
163146
}
164147
}
165148

166-
if(bellActivationQueue.isNotEmpty()) {
167-
bellActivationQueue.forEach {
168-
val id = it.key
169-
val value = it.value
170-
val connection = connections.get(id)
171-
val attachment = this.world?.let { it1 -> connection?.getAttachment(it1) }
172-
173-
if(attachment is TrainBellAttachment) {
174-
attachment.setActive(value)
175-
}
176-
}
177-
bellActivationQueue = HashMap()
178-
}
179-
180-
if(crossingGateQueue.isNotEmpty()) {
181-
crossingGateQueue.forEach {
149+
if(activatableQueue.isNotEmpty()) {
150+
activatableQueue.forEach {
182151
val id = it.key
183152
val value = it.value
184153
val connection = connections.get(id)
185154
val attachment = this.world?.let { it1 -> connection?.getAttachment(it1) }
186155

187-
if(attachment is CrossingGateAttachment) {
156+
if(attachment is ActivatableAttachment) {
188157
attachment.setActive(value)
189158
}
190159
}
191-
crossingGateQueue = HashMap()
160+
activatableQueue = HashMap()
192161
}
193162

194163
this.connections.getAll().forEach {
@@ -220,7 +189,7 @@ class TrafficCabinetBlockEntity(
220189

221190
fun getAttachment(world: BlockView): Attachment? {
222191
val be = world.getBlockEntity(this.pos)
223-
if(be is PostContainerBlockEntity) {
192+
if(be is AttachmentContainerBlockEntity) {
224193
return be.getAttachment(this.uuid)
225194
}
226195
return null

0 commit comments

Comments
 (0)