Skip to content

Commit 51e455b

Browse files
gentlegiantJGCgentlegiantJGC
committed
Set conditionalMode on command blocks
This does not seem to be used by the game itself but if it isn't present in mcstructure files the game will treat them as unconditional
1 parent df1a101 commit 51e455b

File tree

223 files changed

+1993
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+1993
-1
lines changed

‎PyMCTranslate/build_number.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
372
1+
375

‎PyMCTranslate/json/versions/bedrock_1_10_0/block/blockstate/to_universal/minecraft/vanilla/chain_command_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
}
6464
]
6565
},
66+
"conditionalMode": {
67+
"type": "byte",
68+
"functions": []
69+
},
6670
"conditionMet": {
6771
"type": "byte",
6872
"functions": [

‎PyMCTranslate/json/versions/bedrock_1_10_0/block/blockstate/to_universal/minecraft/vanilla/command_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
}
6464
]
6565
},
66+
"conditionalMode": {
67+
"type": "byte",
68+
"functions": []
69+
},
6670
"conditionMet": {
6771
"type": "byte",
6872
"functions": [

‎PyMCTranslate/json/versions/bedrock_1_10_0/block/blockstate/to_universal/minecraft/vanilla/repeating_command_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
}
6464
]
6565
},
66+
"conditionalMode": {
67+
"type": "byte",
68+
"functions": []
69+
},
6670
"conditionMet": {
6771
"type": "byte",
6872
"functions": [

‎PyMCTranslate/json/versions/bedrock_1_10_0/block/numerical/from_universal/universal_minecraft/vanilla/command_block.json‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,15 @@
7171
]
7272
}
7373
}
74+
},
75+
{
76+
"function": "new_nbt",
77+
"options": [
78+
{
79+
"key": "conditionalMode",
80+
"value": "0b"
81+
}
82+
]
7483
}
7584
],
7685
"\"true\"": [
@@ -128,6 +137,15 @@
128137
]
129138
}
130139
}
140+
},
141+
{
142+
"function": "new_nbt",
143+
"options": [
144+
{
145+
"key": "conditionalMode",
146+
"value": "1b"
147+
}
148+
]
131149
}
132150
]
133151
}
@@ -198,6 +216,15 @@
198216
]
199217
}
200218
}
219+
},
220+
{
221+
"function": "new_nbt",
222+
"options": [
223+
{
224+
"key": "conditionalMode",
225+
"value": "0b"
226+
}
227+
]
201228
}
202229
],
203230
"\"true\"": [
@@ -255,6 +282,15 @@
255282
]
256283
}
257284
}
285+
},
286+
{
287+
"function": "new_nbt",
288+
"options": [
289+
{
290+
"key": "conditionalMode",
291+
"value": "1b"
292+
}
293+
]
258294
}
259295
]
260296
}
@@ -325,6 +361,15 @@
325361
]
326362
}
327363
}
364+
},
365+
{
366+
"function": "new_nbt",
367+
"options": [
368+
{
369+
"key": "conditionalMode",
370+
"value": "0b"
371+
}
372+
]
328373
}
329374
],
330375
"\"true\"": [
@@ -382,6 +427,15 @@
382427
]
383428
}
384429
}
430+
},
431+
{
432+
"function": "new_nbt",
433+
"options": [
434+
{
435+
"key": "conditionalMode",
436+
"value": "1b"
437+
}
438+
]
385439
}
386440
]
387441
}

‎PyMCTranslate/json/versions/bedrock_1_10_0/block/numerical/to_universal/minecraft/vanilla/chain_command_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@
211211
}
212212
]
213213
},
214+
"conditionalMode": {
215+
"type": "byte",
216+
"functions": []
217+
},
214218
"conditionMet": {
215219
"type": "byte",
216220
"functions": [

‎PyMCTranslate/json/versions/bedrock_1_10_0/block/numerical/to_universal/minecraft/vanilla/command_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@
211211
}
212212
]
213213
},
214+
"conditionalMode": {
215+
"type": "byte",
216+
"functions": []
217+
},
214218
"conditionMet": {
215219
"type": "byte",
216220
"functions": [

‎PyMCTranslate/json/versions/bedrock_1_10_0/block/numerical/to_universal/minecraft/vanilla/repeating_command_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@
211211
}
212212
]
213213
},
214+
"conditionalMode": {
215+
"type": "byte",
216+
"functions": []
217+
},
214218
"conditionMet": {
215219
"type": "byte",
216220
"functions": [

‎PyMCTranslate/json/versions/bedrock_1_11_0/block/blockstate/to_universal/minecraft/vanilla/chain_command_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
}
6464
]
6565
},
66+
"conditionalMode": {
67+
"type": "byte",
68+
"functions": []
69+
},
6670
"conditionMet": {
6771
"type": "byte",
6872
"functions": [

‎PyMCTranslate/json/versions/bedrock_1_11_0/block/blockstate/to_universal/minecraft/vanilla/command_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
}
6464
]
6565
},
66+
"conditionalMode": {
67+
"type": "byte",
68+
"functions": []
69+
},
6670
"conditionMet": {
6771
"type": "byte",
6872
"functions": [

0 commit comments

Comments
 (0)