Skip to content

Commit 5f99bc4

Browse files
gensokyo-kenkengensokyo-kenken
committed
バグ修正、一部イベントの名前空間変更
1 parent 50a9a1b commit 5f99bc4

10 files changed

Lines changed: 44 additions & 33 deletions

File tree

‎TCMB(B)/animation_controllers/tcmb_item_controller.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"run":{
1212
"on_entry":[
13-
"/execute as @p at @s run scriptevent tcmb_mobile_item:notch_power",
13+
"/execute as @p at @s run scriptevent tcmb_mobile_items:notch_power",
1414
"@s delete"
1515
]
1616
}
@@ -25,7 +25,7 @@
2525
},
2626
"run":{
2727
"on_entry":[
28-
"/execute as @p at @s run scriptevent tcmb_mobile_item:notch_neutral",
28+
"/execute as @p at @s run scriptevent tcmb_mobile_items:notch_neutral",
2929
"@s delete"
3030
]
3131
}
@@ -40,7 +40,7 @@
4040
},
4141
"run":{
4242
"on_entry":[
43-
"/execute as @p at @s run scriptevent tcmb_mobile_item:notch_break",
43+
"/execute as @p at @s run scriptevent tcmb_mobile_items:notch_break",
4444
"@s delete"
4545
]
4646
}
@@ -55,7 +55,7 @@
5555
},
5656
"run":{
5757
"on_entry":[
58-
"/execute as @p at @s run scriptevent tcmb_mobile_item:notch_eb",
58+
"/execute as @p at @s run scriptevent tcmb_mobile_items:notch_eb",
5959
"@s delete"
6060
]
6161
}

‎TCMB(B)/animations/tcmb_animation.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"loop": true,
77
"timeline": {
88
"0.0": [
9-
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb:speed down",
9+
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb_minecart_engine:speed down",
1010
"/function train_connect",
1111
"/playanimation @e[tag=body,r=1] eb eb 32767",
1212
"@s tasc_remove",
@@ -22,7 +22,7 @@
2222
"loop": true,
2323
"timeline": {
2424
"0.0": [
25-
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb:speed down",
25+
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb_minecart_engine:speed down",
2626
"/function train_connect",
2727
"/playanimation @e[tag=body,r=1] b7 b7 32767"
2828
]
@@ -33,7 +33,7 @@
3333
"loop": true,
3434
"timeline": {
3535
"0.0": [
36-
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb:speed down",
36+
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb_minecart_engine:speed down",
3737
"/function train_connect",
3838
"/playanimation @e[tag=body,r=1] b6 b6 32767"
3939
]
@@ -44,7 +44,7 @@
4444
"loop": true,
4545
"timeline": {
4646
"0.0": [
47-
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb:speed down",
47+
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb_minecart_engine:speed down",
4848
"/function train_connect",
4949
"/playanimation @e[tag=body,r=1] b5 b5 32767"
5050
]
@@ -55,7 +55,7 @@
5555
"loop": true,
5656
"timeline": {
5757
"0.0": [
58-
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb:speed down",
58+
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb_minecart_engine:speed down",
5959
"/function train_connect",
6060
"/playanimation @e[tag=body,r=1] b4 b4 32767"
6161
]
@@ -66,7 +66,7 @@
6666
"loop": true,
6767
"timeline": {
6868
"0.0": [
69-
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb:speed down",
69+
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb_minecart_engine:speed down",
7070
"/function train_connect",
7171
"/playanimation @e[tag=body,r=1] b3 b3 32767"
7272
]
@@ -77,7 +77,7 @@
7777
"loop": true,
7878
"timeline": {
7979
"0.0": [
80-
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb:speed down",
80+
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb_minecart_engine:speed down",
8181
"/function train_connect",
8282
"/playanimation @e[tag=body,r=1] b2 b2 32767"
8383
]
@@ -88,7 +88,7 @@
8888
"loop": true,
8989
"timeline": {
9090
"0.0": [
91-
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb:speed down",
91+
"/execute if entity @s[tag=!tc_child] run scriptevent tcmb_minecart_engine:speed down",
9292
"/function train_connect",
9393
"/playanimation @e[tag=body,r=1] b1 b1 32767"
9494
]
@@ -109,7 +109,7 @@
109109
"loop": true,
110110
"timeline": {
111111
"0.0": [
112-
"/scriptevent tcmb:speed up",
112+
"/scriptevent tcmb_minecart_engine:speed up",
113113
"/playanimation @e[tag=body,r=1] p1 p1 32767"
114114
]
115115
}
@@ -119,7 +119,7 @@
119119
"loop": true,
120120
"timeline": {
121121
"0.0": [
122-
"/scriptevent tcmb:speed up",
122+
"/scriptevent tcmb_minecart_engine:speed up",
123123
"/playanimation @e[tag=body,r=1] p2 p2 32767"
124124
]
125125
}
@@ -129,7 +129,7 @@
129129
"loop": true,
130130
"timeline": {
131131
"0.0": [
132-
"/scriptevent tcmb:speed up",
132+
"/scriptevent tcmb_minecart_engine:speed up",
133133
"/playanimation @e[tag=body,r=1] p3 p3 32767"
134134
]
135135
}
@@ -139,7 +139,7 @@
139139
"loop": true,
140140
"timeline": {
141141
"0.0": [
142-
"/scriptevent tcmb:speed up",
142+
"/scriptevent tcmb_minecart_engine:speed up",
143143
"/playanimation @e[tag=body,r=1] p4 p4 32767"
144144
]
145145
}

‎TCMB(B)/functions/speed_down.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scriptevent tcmb:speed down
1+
scriptevent tcmb_minecart_engine:speed down

‎TCMB(B)/functions/speed_up.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scriptevent tcmb:speed up
1+
scriptevent tcmb_minecart_engine:speed up

‎TCMB(B)/scripts/engine.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ system.afterEvents.scriptEventReceive.subscribe(ev => {
560560
player.runCommandAsync('scriptevent tcmb:work_control ' + JSON.stringify(work_req));
561561
}
562562
break;
563-
case 'tcmb:speed':
563+
case 'tcmb_minecart_engine:speed':
564564
{
565565
if (ev.sourceType != 'Entity')
566566
return;

‎TCMB(B)/scripts/main.js‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -735,20 +735,22 @@ system.afterEvents.scriptEventReceive.subscribe((event) => {
735735
evdata.send();
736736
}
737737
break;
738-
case "tcmb_mobile_items:notch_break": {
739-
if (working.has(event.sourceEntity.id)) {
740-
train = working.get(event.sourceEntity.id);
741-
isworking = true;
742-
}
743-
else {
744-
train = dimension.getEntities(event_train_query)[0];
745-
isworking = false;
738+
case "tcmb_mobile_items:notch_break":
739+
{
740+
if (working.has(event.sourceEntity.id)) {
741+
train = working.get(event.sourceEntity.id);
742+
isworking = true;
743+
}
744+
else {
745+
train = dimension.getEntities(event_train_query)[0];
746+
isworking = false;
747+
}
748+
if (typeof train == "undefined")
749+
return;
750+
let evdata = new Event('notchBefore', { operation: 'break' }, train, player, isworking);
751+
evdata.send();
746752
}
747-
if (typeof train == "undefined")
748-
return;
749-
let evdata = new Event('notchBefore', { operation: 'break' }, train, player, isworking);
750-
evdata.send();
751-
}
753+
break;
752754
case "tcmb_mobile_items:notch_eb":
753755
{
754756
if (working.has(event.sourceEntity.id)) {

‎TCMB(R)/texts/en_US.lang‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ item.tcmb:notch_power.name=Acceleration(P)
55
item.tcmb:notch_neutral.name=Coasting(N)
66
item.tcmb:notch_break.name=Deceleration(B)
77
item.tcmb:notch_eb.name=Emergency Brake(EB)
8+
item.spawn_egg.entity.tcmb:notch_power.name=Acceleration(P)
9+
item.spawn_egg.entity.tcmb:notch_neutral.name=Coasting(N)
10+
item.spawn_egg.entity.tcmb:notch_break.name=Deceleration(B)
11+
item.spawn_egg.entity.tcmb:notch_eb.name=Emergency Brake(EB)
812
item.tcmb:delete_train.name=Delete the car
913
item.tcmb:ride.name=Ride
1014
item.tcmb:direction.name=Reversal of direction

‎TCMB(R)/texts/ja_JP.lang‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ item.tcmb:notch_power.name=加速(P)
55
item.tcmb:notch_neutral.name=切(N)
66
item.tcmb:notch_break.name=減速(B)
77
item.tcmb:notch_eb.name=非常ブレーキ(EB)
8+
item.spawn_egg.entity.tcmb:notch_power.name=加速(P)
9+
item.spawn_egg.entity.tcmb:notch_neutral.name=切(N)
10+
item.spawn_egg.entity.tcmb:notch_break.name=減速(B)
11+
item.spawn_egg.entity.tcmb:notch_eb.name=非常ブレーキ(EB)
812
item.tcmb:delete_train.name=車両を消す
913
item.tcmb:ride.name=乗車
1014
item.tcmb:direction.name=進行方向反転

‎ts/engine.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ system.afterEvents.scriptEventReceive.subscribe( ev =>{
531531

532532
}
533533
break;
534-
case 'tcmb:speed':{
534+
case 'tcmb_minecart_engine:speed':{
535535
if(ev.sourceType != 'Entity') return;
536536
if(ev.sourceEntity.typeId != 'tcmb:tcmb_car') return;
537537
if(!ev.sourceEntity.isValid()) return;

‎ts/main.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,7 @@ system.afterEvents.scriptEventReceive.subscribe((event)=>{
660660
let evdata = new Event('notchBefore', {operation: 'break'}, train, player, isworking);
661661
evdata.send();
662662
}
663+
break;
663664
case "tcmb_mobile_items:notch_eb":{
664665
if(working.has(event.sourceEntity.id)){
665666
train = working.get(event.sourceEntity.id);

0 commit comments

Comments
 (0)