Skip to content

Commit e0d4629

Browse files
ProgrammerLPProgrammerLP
committed
added ungarian flirt door and warsaw tram door
1 parent 71c297d commit e0d4629

39 files changed

+1112
-13
lines changed

‎common/src/main/java/net/adeptstack/registry/ModBlockEntities.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public class ModBlockEntities {
1717
ModBlocks.DOOR_FLIRT_VIAS, ModBlocks.DOOR_ICE_MODERN, ModBlocks.DOOR_ICE_MODERN_TOP,
1818
ModBlocks.DOOR_ELEV_GLASS, ModBlocks.DOOR_ELEV_METAL, ModBlocks.DOOR_LONDON_1973_STOCK,
1919
ModBlocks.DOOR_LONDON_S7_STOCK, ModBlocks.DOOR_LONDON_OVERGROUND, ModBlocks.DOOR_LONDON_EL,
20-
ModBlocks.DOOR_ANDESITE_ALLOY, ModBlocks.DOOR_ANDESITE_ALLOY_WINDOW)
20+
ModBlocks.DOOR_ANDESITE_ALLOY, ModBlocks.DOOR_ANDESITE_ALLOY_WINDOW, ModBlocks.DOOR_UNGARIAN_FLIRT,
21+
ModBlocks.DOOR_WARSAW_TRAM)
2122
.register();
2223

2324
public static void register() {}

‎common/src/main/java/net/adeptstack/registry/ModBlocks.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ public class ModBlocks {
102102
public static final BlockEntry<TrainSlidingDoorBlock> DOOR_FLIRT_VIAS =
103103
TrainUtilitiesBuilderTransformers.TrainSlidingDoor("flirt_vias", MapColor.TERRACOTTA_GRAY);
104104

105+
public static final BlockEntry<TrainSlidingDoorBlock> DOOR_UNGARIAN_FLIRT =
106+
TrainUtilitiesBuilderTransformers.TrainSlidingDoor("ungarian_flirt", MapColor.COLOR_YELLOW);
107+
105108
public static final BlockEntry<TrainSlidingDoorBlock> DOOR_SW_NYC =
106109
TrainUtilitiesBuilderTransformers.TrainSlidingDoor("sw_nyc", MapColor.METAL);
107110

@@ -132,6 +135,9 @@ public class ModBlocks {
132135
public static final BlockEntry<TrainSlidingDoorBlock> DOOR_LONDON_EL =
133136
TrainUtilitiesBuilderTransformers.TrainSlidingDoor("london_el", MapColor.COLOR_ORANGE);
134137

138+
public static final BlockEntry<TrainSlidingDoorBlock> DOOR_WARSAW_TRAM =
139+
TrainUtilitiesBuilderTransformers.TrainSlidingDoor("warsaw_tram", MapColor.COLOR_BLACK);
140+
135141
//MC Doors
136142
public static final BlockEntry<DoorBlock> DOOR_CIS_AMENDORF_1 =
137143
TrainUtilitiesBuilderTransformers.DefaultMinecraftDoor("cis_amendorf_1", MapColor.TERRACOTTA_GREEN);

‎common/src/main/java/net/adeptstack/registry/TrainUtilitiesBuilderTransformers.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,18 @@ public static TrainSlidingDoorProperties GetSlidingDoorProperties(String type) {
130130
else if (type == "ic2") {
131131
return new TrainSlidingDoorProperties(ModSounds.DOOR_IC2_OPEN.get(), ModSounds.DOOR_IC2_CLOSE.get(), .025f);
132132
}
133-
else if (type == "rrx") {
133+
else if (type == "rrx" || type == "goahead_desiro") {
134134
return new TrainSlidingDoorProperties(ModSounds.DOOR_RRX_OPEN.get(), ModSounds.DOOR_RRX_CLOSE.get(), .025f);
135135
}
136-
else if (type == "flirt" || type == "flirt_vias") {
136+
else if (type == "flirt" || type == "flirt_vias" || type == "ungarian_flirt") {
137137
return new TrainSlidingDoorProperties(ModSounds.DOOR_FLIRT_OPEN.get(), ModSounds.DOOR_FLIRT_CLOSE.get(), .025f);
138138
}
139-
else if (type == "sw_nyc") {
139+
else if (type == "sw_nyc" || type == "warsaw_tram") {
140140
return new TrainSlidingDoorProperties(ModSounds.DOOR_SW_NYC_OPEN.get(), ModSounds.DOOR_SW_NYC_CLOSE.get(), .035f);
141141
}
142142
else if (type == "pkp_ic_white" || type == "pkp_ic_blue") {
143143
return new TrainSlidingDoorProperties(ModSounds.DOOR_PKP_IC_OPEN.get(), ModSounds.DOOR_PKP_IC_CLOSE.get(), .025f);
144144
}
145-
else if (type == "goahead_desiro") {
146-
return new TrainSlidingDoorProperties(ModSounds.DOOR_RRX_OPEN.get(), ModSounds.DOOR_RRX_CLOSE.get(), .025f);
147-
}
148145
else if (type == "ic") {
149146
return new TrainSlidingDoorProperties(ModSounds.DOOR_IC_OPEN.get(), ModSounds.DOOR_IC_CLOSE.get(), .025f);
150147
}

‎common/src/main/resources/assets/trainutilities/blockstates/door_ungarian_flirt.json‎

Lines changed: 244 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,244 @@
1+
{
2+
"variants": {
3+
"facing=east,half=lower,hinge=left,open=false,visible=false": {
4+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom"
5+
},
6+
"facing=east,half=lower,hinge=left,open=false,visible=true": {
7+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom"
8+
},
9+
"facing=east,half=lower,hinge=left,open=true,visible=false": {
10+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
11+
"y": 90
12+
},
13+
"facing=east,half=lower,hinge=left,open=true,visible=true": {
14+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
15+
"y": 90
16+
},
17+
"facing=east,half=lower,hinge=right,open=false,visible=false": {
18+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom"
19+
},
20+
"facing=east,half=lower,hinge=right,open=false,visible=true": {
21+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom"
22+
},
23+
"facing=east,half=lower,hinge=right,open=true,visible=false": {
24+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
25+
"y": 270
26+
},
27+
"facing=east,half=lower,hinge=right,open=true,visible=true": {
28+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
29+
"y": 270
30+
},
31+
"facing=east,half=upper,hinge=left,open=false,visible=false": {
32+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top"
33+
},
34+
"facing=east,half=upper,hinge=left,open=false,visible=true": {
35+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top"
36+
},
37+
"facing=east,half=upper,hinge=left,open=true,visible=false": {
38+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
39+
"y": 90
40+
},
41+
"facing=east,half=upper,hinge=left,open=true,visible=true": {
42+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
43+
"y": 90
44+
},
45+
"facing=east,half=upper,hinge=right,open=false,visible=false": {
46+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top"
47+
},
48+
"facing=east,half=upper,hinge=right,open=false,visible=true": {
49+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top"
50+
},
51+
"facing=east,half=upper,hinge=right,open=true,visible=false": {
52+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
53+
"y": 270
54+
},
55+
"facing=east,half=upper,hinge=right,open=true,visible=true": {
56+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
57+
"y": 270
58+
},
59+
"facing=north,half=lower,hinge=left,open=false,visible=false": {
60+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
61+
"y": 270
62+
},
63+
"facing=north,half=lower,hinge=left,open=false,visible=true": {
64+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
65+
"y": 270
66+
},
67+
"facing=north,half=lower,hinge=left,open=true,visible=false": {
68+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom"
69+
},
70+
"facing=north,half=lower,hinge=left,open=true,visible=true": {
71+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom"
72+
},
73+
"facing=north,half=lower,hinge=right,open=false,visible=false": {
74+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
75+
"y": 270
76+
},
77+
"facing=north,half=lower,hinge=right,open=false,visible=true": {
78+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
79+
"y": 270
80+
},
81+
"facing=north,half=lower,hinge=right,open=true,visible=false": {
82+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
83+
"y": 180
84+
},
85+
"facing=north,half=lower,hinge=right,open=true,visible=true": {
86+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
87+
"y": 180
88+
},
89+
"facing=north,half=upper,hinge=left,open=false,visible=false": {
90+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
91+
"y": 270
92+
},
93+
"facing=north,half=upper,hinge=left,open=false,visible=true": {
94+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
95+
"y": 270
96+
},
97+
"facing=north,half=upper,hinge=left,open=true,visible=false": {
98+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top"
99+
},
100+
"facing=north,half=upper,hinge=left,open=true,visible=true": {
101+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top"
102+
},
103+
"facing=north,half=upper,hinge=right,open=false,visible=false": {
104+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
105+
"y": 270
106+
},
107+
"facing=north,half=upper,hinge=right,open=false,visible=true": {
108+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
109+
"y": 270
110+
},
111+
"facing=north,half=upper,hinge=right,open=true,visible=false": {
112+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
113+
"y": 180
114+
},
115+
"facing=north,half=upper,hinge=right,open=true,visible=true": {
116+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
117+
"y": 180
118+
},
119+
"facing=south,half=lower,hinge=left,open=false,visible=false": {
120+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
121+
"y": 90
122+
},
123+
"facing=south,half=lower,hinge=left,open=false,visible=true": {
124+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
125+
"y": 90
126+
},
127+
"facing=south,half=lower,hinge=left,open=true,visible=false": {
128+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
129+
"y": 180
130+
},
131+
"facing=south,half=lower,hinge=left,open=true,visible=true": {
132+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
133+
"y": 180
134+
},
135+
"facing=south,half=lower,hinge=right,open=false,visible=false": {
136+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
137+
"y": 90
138+
},
139+
"facing=south,half=lower,hinge=right,open=false,visible=true": {
140+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
141+
"y": 90
142+
},
143+
"facing=south,half=lower,hinge=right,open=true,visible=false": {
144+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom"
145+
},
146+
"facing=south,half=lower,hinge=right,open=true,visible=true": {
147+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom"
148+
},
149+
"facing=south,half=upper,hinge=left,open=false,visible=false": {
150+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
151+
"y": 90
152+
},
153+
"facing=south,half=upper,hinge=left,open=false,visible=true": {
154+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
155+
"y": 90
156+
},
157+
"facing=south,half=upper,hinge=left,open=true,visible=false": {
158+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
159+
"y": 180
160+
},
161+
"facing=south,half=upper,hinge=left,open=true,visible=true": {
162+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
163+
"y": 180
164+
},
165+
"facing=south,half=upper,hinge=right,open=false,visible=false": {
166+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
167+
"y": 90
168+
},
169+
"facing=south,half=upper,hinge=right,open=false,visible=true": {
170+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
171+
"y": 90
172+
},
173+
"facing=south,half=upper,hinge=right,open=true,visible=false": {
174+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top"
175+
},
176+
"facing=south,half=upper,hinge=right,open=true,visible=true": {
177+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top"
178+
},
179+
"facing=west,half=lower,hinge=left,open=false,visible=false": {
180+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
181+
"y": 180
182+
},
183+
"facing=west,half=lower,hinge=left,open=false,visible=true": {
184+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
185+
"y": 180
186+
},
187+
"facing=west,half=lower,hinge=left,open=true,visible=false": {
188+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
189+
"y": 270
190+
},
191+
"facing=west,half=lower,hinge=left,open=true,visible=true": {
192+
"model": "trainutilities:block/door_ungarian_flirt/left/block_bottom",
193+
"y": 270
194+
},
195+
"facing=west,half=lower,hinge=right,open=false,visible=false": {
196+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
197+
"y": 180
198+
},
199+
"facing=west,half=lower,hinge=right,open=false,visible=true": {
200+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
201+
"y": 180
202+
},
203+
"facing=west,half=lower,hinge=right,open=true,visible=false": {
204+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
205+
"y": 90
206+
},
207+
"facing=west,half=lower,hinge=right,open=true,visible=true": {
208+
"model": "trainutilities:block/door_ungarian_flirt/right/block_bottom",
209+
"y": 90
210+
},
211+
"facing=west,half=upper,hinge=left,open=false,visible=false": {
212+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
213+
"y": 180
214+
},
215+
"facing=west,half=upper,hinge=left,open=false,visible=true": {
216+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
217+
"y": 180
218+
},
219+
"facing=west,half=upper,hinge=left,open=true,visible=false": {
220+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
221+
"y": 270
222+
},
223+
"facing=west,half=upper,hinge=left,open=true,visible=true": {
224+
"model": "trainutilities:block/door_ungarian_flirt/left/block_top",
225+
"y": 270
226+
},
227+
"facing=west,half=upper,hinge=right,open=false,visible=false": {
228+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
229+
"y": 180
230+
},
231+
"facing=west,half=upper,hinge=right,open=false,visible=true": {
232+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
233+
"y": 180
234+
},
235+
"facing=west,half=upper,hinge=right,open=true,visible=false": {
236+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
237+
"y": 90
238+
},
239+
"facing=west,half=upper,hinge=right,open=true,visible=true": {
240+
"model": "trainutilities:block/door_ungarian_flirt/right/block_top",
241+
"y": 90
242+
}
243+
}
244+
}

0 commit comments

Comments
 (0)