Skip to content

Commit

Permalink
音の種類を修正、謎コードを削除
Browse files Browse the repository at this point in the history
  • Loading branch information
oasoobi committed Nov 1, 2024
1 parent 4c9a50d commit 14642f9
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 26 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
node_modules/
test/
6 changes: 3 additions & 3 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
21,
30
],
"uuid": "e02fe039-33f8-4e22-a1ac-bc3b450048b0",
"uuid": "fc863469-2162-461d-8ba8-2691c9197deb",
"version": [
1,
1,
Expand All @@ -18,7 +18,7 @@
"modules": [
{
"type": "data",
"uuid": "86505da1-403a-4c67-9191-f53829834064",
"uuid": "ac2e84bc-5ee0-4e06-a7b1-2473ca9a3a76",
"version": [
1,
0,
Expand All @@ -28,7 +28,7 @@
{
"type": "script",
"language": "javascript",
"uuid": "3e405959-1bef-4f22-8f1e-dd7e89a7c975",
"uuid": "4543713e-8261-47f1-8942-db4ea37598ce",
"entry": "scripts/main.js",
"version": [
1,
Expand Down
77 changes: 55 additions & 22 deletions scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ world.afterEvents.playerSpawn.subscribe(e => {
}
if (e.player.getDynamicProperty("show_click_count") == undefined) {
e.player.setDynamicProperty("show_click_count", DefaultConfig.show_click_count);
e.player.getComponent
}
}
})
Expand Down Expand Up @@ -118,6 +117,7 @@ const scales = {
const instruments2 = {
japanese: {

"_leaves": "ピアノ",
"note_block": "バス",
"bookshelf": "バス",
"oak": "バス",
Expand Down Expand Up @@ -148,7 +148,9 @@ const instruments2 = {
"bee_nest": "バス",
"beehive": "バス",

"amethyst_block": "バスドラム",

"soul_sand": "カウベル",
"concrete_powder": "スネアドラム",
"sand": "スネアドラム",
"gravel": "スネアドラム",
Expand All @@ -157,6 +159,10 @@ const instruments2 = {
"sea_lantern": "スティック",
"beacon": "スティック",

"infested_": "フルート",

"glowstone": "電子ピアノ",

"stone": "バスドラム",
"blackstone": "バスドラム",
"netherrack": "バスドラム",
Expand Down Expand Up @@ -185,6 +191,7 @@ const instruments2 = {
"deepslate_gold_ore": "バスドラム",
"deepslate_coal_ore": "バスドラム",
"deepslate_copper_ore": "バスドラム",
"raw_copper_block": "バスドラム", //added
"deepslate_lapis_ore": "バスドラム",
"deepslate_emerald_ore": "バスドラム",
"deepslate_redstone_ore": "バスドラム",
Expand Down Expand Up @@ -253,6 +260,7 @@ const instruments2 = {
"red_concrete": "バスドラム",
"black_concrete": "バスドラム",

"raw_gold_block": "バスドラム",
"gold_block": "ベル(グロッケンシュピール)",

"clay": "フルート",
Expand All @@ -266,21 +274,22 @@ const instruments2 = {

"bone_block": "木琴",

"raw_iron_block": "バスドラム",
"iron_block": "鉄琴",

"soul_sand": "カウベル",

"lit_pumpkin": "ピアノ",
"carved_pumpkin": "ピアノ",
"pumpkin": "ディジュリドゥ",
"carved_pumpkin": "ディジュリドゥ",

"emerald_block": "電子音",

"hay_block": "バンジョー",

"glow_stone": "電子ピアノ",
},

english: {
"_leaves": "piano",

"note_block": "Bass",
"bookshelf": "Bass",
"oak": "Bass",
Expand Down Expand Up @@ -310,15 +319,23 @@ const instruments2 = {
"composter": "Bass",
"bee_nest": "Bass",
"beehive": "Bass",


"amethyst_block": "Bass Durm",

"soul_sand": "Cow Bell",

"concrete_powder": "Snare Drum",
"sand": "Snare Drum",
"gravel": "Snare Drum",

"glass": "Clicks and Sticks",
"sea_lantern": "Clicks and Sticks",
"beacon": "Clicks and Sticks",


"infested_": "Flute",

"glow_stone": "Pling",

"stone": "Bass Drum",
"blackstone": "Bass Drum",
"netherrack": "Bass Drum",
Expand Down Expand Up @@ -347,6 +364,7 @@ const instruments2 = {
"deepslate_gold_ore": "Bass Drum",
"deepslate_coal_ore": "Bass Drum",
"deepslate_copper_ore": "Bass Drum",
"raw_copper_block": "Bass Drum",
"deepslate_lapis_ore": "Bass Drum",
"deepslate_emerald_ore": "Bass Drum",
"deepslate_redstone_ore": "Bass Drum",
Expand Down Expand Up @@ -414,34 +432,32 @@ const instruments2 = {
"green_concrete": "Bass Drum",
"red_concrete": "Bass Drum",
"black_concrete": "Bass Drum",


"raw_gold_block": "Bass Drum",
"gold_block": "Bells",

"clay": "Flute",
"honeycomb_block": "Flute",
"monster_egg": "Flute",
"infested": "Flute",

"packed_ice": "Chimes",

"wool": "Guitar",

"bone_block": "Xylophone",

"iron_block": "Iron Xylophone",

"soul_sand": "Cow Bell",

"lit_pumpkin": "Piano",
"carved_pumpkin": "Piano",

"pumpkin": "Didgeridoo",
"carved_pumpkin": "Didgeridoo",


"emerald_block": "Bit",

"hay_block": "Banjo",

"glow_stone": "Pling"
"hay_block": "Banjo"
}

}


Expand Down Expand Up @@ -531,7 +547,15 @@ system.afterEvents.scriptEventReceive.subscribe(e => {
sourceEntity.setDynamicProperty("show_instrument", res.formValues[2])
sourceEntity.setDynamicProperty("show_click_count", res.formValues[3])
}
sourceEntity.sendMessage("§e設定を変更しました。");

system.run(() => {
sourceEntity.getDynamicProperty("language");
if (sourceEntity.getDynamicProperty("language") == 1) {
sourceEntity.sendMessage("§e設定を変更しました。");
} else {
sourceEntity.sendMessage("§eThe settings have been changed.");
}
})
})
} else {
new ModalFormData()
Expand All @@ -556,8 +580,17 @@ system.afterEvents.scriptEventReceive.subscribe(e => {
sourceEntity.setDynamicProperty("show_instrument", res.formValues[2])
sourceEntity.setDynamicProperty("show_click_count", res.formValues[3])
}
sourceEntity.sendMessage("§eThe settings have been changed.");

system.run(() => {
sourceEntity.getDynamicProperty("language");
if (sourceEntity.getDynamicProperty("language") == 1) {
sourceEntity.sendMessage("§e設定を変更しました。");
} else {
sourceEntity.sendMessage("§eThe settings have been changed.");
}
})
})
}

}
})

0 comments on commit 14642f9

Please sign in to comment.