Skip to content

Commit c90f742

Browse files
Shadowbee27Shadowbee27
authored
Merge branch '1.20.1' into dev-1.20.1
2 parents 7f163b4 + 96dda43 commit c90f742

14 files changed

+159
-83
lines changed

‎.github/ISSUE_TEMPLATE/bug.yaml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Bug Report
2+
description: Something is not working right
3+
title: "[Bug]: "
4+
labels: ["bug"]
5+
assignees:
6+
- Mooo0042
7+
- Shadowbee27
8+
9+
body:
10+
- type: checkboxes
11+
attributes:
12+
label: Already reported ? *
13+
description: Before opening a new bug report, please take a moment to search through the current open and closed issues to check if it already exists.
14+
options:
15+
- label: I have searched the existing open and closed issues.
16+
required: true
17+
18+
- type: dropdown
19+
id: type
20+
attributes:
21+
label: Regression?
22+
description: "Regression means that something used to work but no longer does."
23+
options:
24+
- "Yes"
25+
- "No"
26+
- "Not sure"
27+
validations:
28+
required: true
29+
30+
- type: dropdown
31+
id: modversion
32+
attributes:
33+
label: Mod Version
34+
description: "The version of the Mod youre using."
35+
options:
36+
- "3.22.0-alpha.7"
37+
- "3.22.0-alpha.6"
38+
- "3.22.0-alpha.5"
39+
- "Other"
40+
validations:
41+
required: true
42+
43+
- type: dropdown
44+
id: modloader
45+
attributes:
46+
label: Mod Loader
47+
options:
48+
- "Forge"
49+
- "Neo Forge"
50+
- "Fabric"
51+
- "Quilt"
52+
validations:
53+
required: true
54+
55+
- type: textarea
56+
id: desc
57+
attributes:
58+
label: Description
59+
description: "What went wrong? What exactly happened?"
60+
validations:
61+
required: true
62+
63+
- type: textarea
64+
id: repro
65+
attributes:
66+
label: How to Reproduce
67+
description: "How can someone else reproduce the issue?"
68+
validations:
69+
required: true
70+
71+
- type: textarea
72+
id: other
73+
attributes:
74+
label: Logs (pls use https://mclo.gs/), Images or Videos and the other Mods you added
75+
description: "Anything that can help. If you are using an existing Modpack you can provide the Link to it."

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ etc..
4343

4444
# Attention
4545

46-
Please note than none of us knows how to code Java
46+
Please note than none of us is a experienced Java developer

‎common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ publishing {
6767
}
6868
}
6969
}
70-
*/
70+
*/

‎common/src/main/java/dev/felnull/imp/client/lava/LavaNativeManager.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,5 +711,4 @@ public void shutdown() {
711711
Thread.currentThread().interrupt();
712712
downloadExecutor.shutdownNow();
713713
}
714-
}
715714
}

‎fabric/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ shadowJar {
124124

125125
relocate 'ibxm', 'dev.felnull.imp.include.ibxm'
126126
relocate 'net.sourceforge.jaad', 'dev.felnull.imp.include.net.sourceforge.jaad'
127+
relocate 'org.mozilla.javascript', 'dev.felnull.imp.include.org.mozilla.javascript'
127128
relocate 'org.mozilla.classfile', 'dev.felnull.imp.include.org.mozilla.classfile'
128129
relocate 'dev.lavalink.youtube', 'dev.felnull.imp.include.dev.lavalink.youtube'
129130
}
@@ -264,4 +265,4 @@ if (System.getenv('modrinthapikey') != null && "${modrinth_id}" != '') {
264265
changelog = file('../LATEST_CHANGELOG.md').text
265266
}
266267
}
267-
*/
268+
*/

‎fabric/src/main/generated/.cache/242e62880ff1a0fe6c13adf2e622e389e9e7e14a‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.20.1 2025-08-12T22:40:29.581874332 Iam Music Player/Tags for minecraft:point_of_interest_type
2-
cd3779246647c6fd5a083bf9adc06724fb3a682f data/minecraft/tags/point_of_interest_type/acquirable_job_site.json
1+
// 1.20.1 2025-07-31T08:46:26.1247065 Iam Music Player/Tags for minecraft:point_of_interest_type
2+
cd3779246647c6fd5a083bf9adc06724fb3a682f data\minecraft\tags\point_of_interest_type\acquirable_job_site.json

‎fabric/src/main/generated/.cache/9f68151435c459abdedfadd18226778a999524bd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2025-08-12T22:40:29.581220069 Iam Music Player/Block Loot Tables
2-
d1e76f454a535f92e140a17cf335c4576e429f4d data/iammusicplayer/loot_tables/blocks/cassette_deck.json
3-
ecad9a4b2c474ada1c504639afae1ae1527d1355 data/iammusicplayer/loot_tables/blocks/music_manager.json
4-
66b14cc08aca3ed45a5dd30bb387ad74c3d1c3e5 data/iammusicplayer/loot_tables/blocks/boombox.json
1+
// 1.20.1 2025-07-31T08:46:26.1208943 Iam Music Player/Block Loot Tables
2+
d1e76f454a535f92e140a17cf335c4576e429f4d data\iammusicplayer\loot_tables\blocks\cassette_deck.json
3+
66b14cc08aca3ed45a5dd30bb387ad74c3d1c3e5 data\iammusicplayer\loot_tables\blocks\boombox.json
4+
ecad9a4b2c474ada1c504639afae1ae1527d1355 data\iammusicplayer\loot_tables\blocks\music_manager.json

‎fabric/src/main/generated/.cache/a5ccffc3650bedf7bfe6bca525a36243b3f116d2‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// 1.20.1 2025-08-12T22:40:29.579011932 Iam Music Player/Tags for minecraft:item
2-
383b6896255a4c530bfa27e483d4a987fe0dae89 data/c/tags/items/stone.json
3-
989b799a247e595b14e76a145d6ff3566337b58f data/c/tags/items/iron_nuggets.json
4-
5f0f7ba3308b1e0bdf7a4b9f0befc505fcb9e035 data/iammusicplayer/tags/items/cassette_tape.json
5-
cfa612cb64f7e213d984ca4431202690f594df8a data/c/tags/items/ender_pearls.json
6-
d2eb0460d1d9d60aff3395c79a1a358dbc9e6c6c data/c/tags/items/redstone_blocks.json
1+
// 1.20.1 2025-07-31T08:46:26.0873339 Iam Music Player/Tags for minecraft:item
2+
989b799a247e595b14e76a145d6ff3566337b58f data\c\tags\items\iron_nuggets.json
3+
cfa612cb64f7e213d984ca4431202690f594df8a data\c\tags\items\ender_pearls.json
4+
5f0f7ba3308b1e0bdf7a4b9f0befc505fcb9e035 data\iammusicplayer\tags\items\cassette_tape.json
5+
d2eb0460d1d9d60aff3395c79a1a358dbc9e6c6c data\c\tags\items\redstone_blocks.json
6+
383b6896255a4c530bfa27e483d4a987fe0dae89 data\c\tags\items\stone.json

‎fabric/src/main/generated/.cache/c70dcf8ef331de0aa7e7c7be919c1885f62bc474‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
// 1.20.1 2025-08-12T22:40:29.575477176 Iam Music Player/Input copy
2-
8449c5945a17a6d2c13b4454a7c42fb0a8c4b09e data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/manual.json
3-
11baf52eaaad75696d62841323afa8144f2f3ae5 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/cassette_tape.json
4-
bffc94466d6045828b9e2a76feb3e9110621ef38 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/parabolic_antenna.json
5-
99d80f5311d460d8ea0a5e4d7ccf296877059c97 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/radio_antenna.json
6-
de367de3f1448dca7171854c10f2725108c13ef5 data/iammusicplayer/patchouli_books/manual/zh_cn/categories/item_or_block_with_feature.json
7-
96c18964dede1136f3d499ca33aad7497415be55 data/iammusicplayer/patchouli_books/manual/ja_jp/categories/item_or_block_with_feature.json
8-
497311893d1b04dc658f195a4c01a6a4428c2375 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/cassette_tape.json
9-
e7110f255d17a436c7a36dc3c33b7fc3dc08b5d2 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/cassette_deck.json
10-
cc030fd5fedd9a43c4a2996e5e426a9952a0bde0 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/how_to_listen/add_playlist_and_music.json
11-
38fb121a24acaa8915948d2dc99a9b9c50b572d7 data/iammusicplayer/patchouli_books/manual/en_us/entries/how_to_listen/add_playlist_and_music.json
12-
7500c3564981646e061c67dbe61efebaa9fcf80d data/iammusicplayer/patchouli_books/manual/en_us/entries/how_to_listen/write_to_cassette_tape.json
13-
975d6c12234a2db6ff95dfc71ffee42e9770e46e data/iammusicplayer/patchouli_books/manual/zh_cn/categories/how_to_listen.json
14-
d7a1c40eda889f8855a174b06d65673fbbd17070 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/cassette_deck.json
15-
8cb67c0e0a13238176020f9b4126262c422f3b84 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/manual.json
16-
c1dd10e61eb9f6f96fb5393400a54205e6f05773 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/parabolic_antenna.json
17-
769aabd5ddf9ccea040fff8a8a77cff1a18c3bc3 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/manual.json
18-
ccabdd5a586120b2fd96a6c07c2aa8f751ed3d69 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/boombox.json
19-
5c3f20e25321abe29781615dde1d0043bf6e8d1c data/iammusicplayer/patchouli_books/manual/ja_jp/entries/how_to_listen/play_music.json
20-
8cb3f43ee7b0cd3e8d5245a8e9afea92e2443147 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/boombox.json
21-
0cf8f3950774175dd579f4d3e5c1a386dedbcc41 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/radio_antenna.json
22-
da45482deb8ba0e0cbe77a4461137ae1fc5daae2 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/how_to_listen/play_music.json
23-
787869ec7ba8a29152c14ac387aafe1da496f640 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/cassette_tape.json
24-
f834aaf350b5d0bf197f5916a6bd5fe872ee2ef9 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/how_to_listen/write_to_cassette_tape.json
25-
bc018e96e79419d68baac0501049c53a810039b8 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/boombox.json
26-
2c091b02c7eac5140fb38346c9a8ed67b6780cde data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/radio_antenna.json
27-
2a9406fcdf2677f1703cb7290dab72698923cb5c data/iammusicplayer/patchouli_books/manual/en_us/categories/how_to_listen.json
28-
cd09bac324f1ed677b278da7e54c1a3a232b22b6 data/iammusicplayer/patchouli_books/manual/en_us/entries/how_to_listen/play_music.json
29-
b89949b030199327685dbd54764c38cca3c17c80 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/music_manager.json
30-
1440df61b7ca82c8fec3ac5ab9ede068db7808ac data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/parabolic_antenna.json
31-
8d98bd72669cfd135a051c00237359585607a6a4 data/iammusicplayer/patchouli_books/manual/book.json
32-
f63972c542b725561cb78227716611c1899ce87c data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/cassette_deck.json
33-
c3bd7024366868a65a5c63c70421f0cda884ae57 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/music_manager.json
34-
751785b67c0fb022219d9307532535a3961b74ef data/iammusicplayer/patchouli_books/manual/en_us/categories/item_or_block_with_feature.json
35-
d7d7d3ce4fd879a7458586933ce9920d62bb33b3 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/music_manager.json
36-
4aefb51c56352696260640c1689cd00a082d190e data/iammusicplayer/patchouli_books/manual/ja_jp/categories/how_to_listen.json
37-
226a5b95497c6e74bc8aa4a55d4714c75f8c11cc data/iammusicplayer/patchouli_books/manual/ja_jp/entries/how_to_listen/write_to_cassette_tape.json
38-
376e14f01342caedab02ddf1cb49a86f37a786e8 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/how_to_listen/add_playlist_and_music.json
1+
// 1.20.1 2025-07-31T08:46:26.0660192 Iam Music Player/Input copy
2+
6da1d1223b16ddc2ec006ae8bb0f3bfd782277d4 data\iammusicplayer\patchouli_books\manual\en_us\entries\item_or_block_with_feature\parabolic_antenna.json
3+
f2c4c2684cb4fb529a4c02c3aed6e80412ceb6a5 data\iammusicplayer\patchouli_books\manual\zh_cn\entries\how_to_listen\play_music.json
4+
9cfc1ddd77ca0236703acbe97b6aeb02d2451708 data\iammusicplayer\patchouli_books\manual\zh_cn\entries\how_to_listen\write_to_cassette_tape.json
5+
b1cab678568521a13679d7c3f00160e3c84e7341 data\iammusicplayer\patchouli_books\manual\zh_cn\entries\item_or_block_with_feature\music_manager.json
6+
b1f005b2e5d366671d6770c04533a1947481c68d data\iammusicplayer\patchouli_books\manual\zh_cn\entries\item_or_block_with_feature\manual.json
7+
199c2d59dddd2f32d3e0d20f78bdd92b7ea2c4cd data\iammusicplayer\patchouli_books\manual\en_us\entries\how_to_listen\play_music.json
8+
ebe75dee053fd10704a652994e27cce5b73b1d30 data\iammusicplayer\patchouli_books\manual\zh_cn\categories\item_or_block_with_feature.json
9+
8305925232f887e1dcc85ccd065eb79811041b6f data\iammusicplayer\patchouli_books\manual\ja_jp\entries\item_or_block_with_feature\parabolic_antenna.json
10+
a1cbcc9422f18768b819ebe4ecab5d2451e4e066 data\iammusicplayer\patchouli_books\manual\en_us\entries\item_or_block_with_feature\radio_antenna.json
11+
c3f1da98b71eae32072669dd003066591ffa8791 data\iammusicplayer\patchouli_books\manual\en_us\categories\how_to_listen.json
12+
624004d47591b49ca691de41dbca1355e4d56087 data\iammusicplayer\patchouli_books\manual\en_us\entries\item_or_block_with_feature\manual.json
13+
f70c8812c9d1442ebab2e534b5a91c9ed62834f6 data\iammusicplayer\patchouli_books\manual\zh_cn\entries\item_or_block_with_feature\radio_antenna.json
14+
be1887fd35a6244f0bf5f7c5f57704f54b644633 data\iammusicplayer\patchouli_books\manual\en_us\entries\item_or_block_with_feature\cassette_deck.json
15+
7fb934e10902f9b60c72dc6b1f23acaac26283ec data\iammusicplayer\patchouli_books\manual\ja_jp\entries\item_or_block_with_feature\boombox.json
16+
4e97e7996473a3e2f574ca35ce0d6db9e0e591f1 data\iammusicplayer\patchouli_books\manual\ja_jp\entries\how_to_listen\write_to_cassette_tape.json
17+
f3a719fd8a948df1201b721da377b683d98afd2b data\iammusicplayer\patchouli_books\manual\ja_jp\entries\how_to_listen\add_playlist_and_music.json
18+
d3844905258be8f3f8c9fc1be26bc976df617d44 data\iammusicplayer\patchouli_books\manual\ja_jp\entries\item_or_block_with_feature\radio_antenna.json
19+
3dc16c2948cf7689df2d897bf890b00d38e2c55e data\iammusicplayer\patchouli_books\manual\ja_jp\categories\item_or_block_with_feature.json
20+
44c2c8637761ff6717f16043007e2fddf94dac7b data\iammusicplayer\patchouli_books\manual\ja_jp\entries\how_to_listen\play_music.json
21+
fee83ef9c3997b5c39fe6dd14f72c2374b431a09 data\iammusicplayer\patchouli_books\manual\ja_jp\categories\how_to_listen.json
22+
3d9d9bc94e22cdf0564acbf079d2b9e961ecd0fd data\iammusicplayer\patchouli_books\manual\ja_jp\entries\item_or_block_with_feature\cassette_deck.json
23+
0dc5414d4174847bac0f4ae9a4e2484b55838c7e data\iammusicplayer\patchouli_books\manual\en_us\categories\item_or_block_with_feature.json
24+
03cc2df54231e29b8bc574b03eb9f52f8b77c415 data\iammusicplayer\patchouli_books\manual\zh_cn\entries\item_or_block_with_feature\cassette_deck.json
25+
327ac3f2a98422860987a3de2ba5106fa91aef24 data\iammusicplayer\patchouli_books\manual\book.json
26+
f1d80efa688e6e9f13ed9cfc045641ef3bf9b577 data\iammusicplayer\patchouli_books\manual\zh_cn\entries\item_or_block_with_feature\boombox.json
27+
afb93281f2a8d954444a6c59eb3ae101472c599b data\iammusicplayer\patchouli_books\manual\ja_jp\entries\item_or_block_with_feature\music_manager.json
28+
7eee9ba7815d024567b81b27a3252dcd67272ed7 data\iammusicplayer\patchouli_books\manual\en_us\entries\item_or_block_with_feature\cassette_tape.json
29+
165349f4ef7bb525d4d577deca63d7270f9c4cd3 data\iammusicplayer\patchouli_books\manual\zh_cn\categories\how_to_listen.json
30+
9e1fea08ef48484991c703173536804c7d4264de data\iammusicplayer\patchouli_books\manual\ja_jp\entries\item_or_block_with_feature\cassette_tape.json
31+
beab5be2ae43d0f81b56f638b6a6e11c9444f036 data\iammusicplayer\patchouli_books\manual\ja_jp\entries\item_or_block_with_feature\manual.json
32+
5a859143575de4bda0c7577a5483f4a3e6260bd6 data\iammusicplayer\patchouli_books\manual\en_us\entries\item_or_block_with_feature\music_manager.json
33+
ffd6fc9715ad83fe0a4b563bf188b02c662fa319 data\iammusicplayer\patchouli_books\manual\en_us\entries\how_to_listen\write_to_cassette_tape.json
34+
f80525f741711ee16c0fdd256e9b55b38b47b2f1 data\iammusicplayer\patchouli_books\manual\en_us\entries\item_or_block_with_feature\boombox.json
35+
3a7aa2d69a17dba28abd14f144770cedaedfe4fd data\iammusicplayer\patchouli_books\manual\zh_cn\entries\how_to_listen\add_playlist_and_music.json
36+
e0765dfbfb4854dfdb621cefbe70e21e741ee028 data\iammusicplayer\patchouli_books\manual\zh_cn\entries\item_or_block_with_feature\cassette_tape.json
37+
aec99c5e5e5e0423d8b8ff741686da899968638b data\iammusicplayer\patchouli_books\manual\zh_cn\entries\item_or_block_with_feature\parabolic_antenna.json
38+
ad02476e5ddd08dd5313217dc1c5aba0669250e1 data\iammusicplayer\patchouli_books\manual\en_us\entries\how_to_listen\add_playlist_and_music.json

‎fabric/src/main/generated/.cache/ca6cb1014267935116a9edd63c3436e763319a1e‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// 1.20.1 2025-08-12T22:40:29.579645987 Iam Music Player/Advancements
2-
2b273340b0f8131f2134536b6accb1dd24220eeb data/iammusicplayer/advancements/iammusicplayer/listen_to_remote_music.json
3-
4d166ea47b916a98f12bbbcac7e6e37f81215d15 data/iammusicplayer/advancements/iammusicplayer/root.json
4-
6e5bebea72f1e439284b198e7eba669886961c16 data/iammusicplayer/advancements/iammusicplayer/write_cassette_tape.json
5-
27934b80b16b52a90e49a290d4361fe680be0be9 data/iammusicplayer/advancements/iammusicplayer/listen_to_music.json
6-
f082fbda589f26de2d97878f82bb7d0d44318282 data/iammusicplayer/advancements/iammusicplayer/listen_to_kamesuta.json
7-
06a5109f626b0e1dfd2342645d660d8c883bb184 data/iammusicplayer/advancements/iammusicplayer/listen_to_radio.json
8-
3b8c3c6d6933348f13ed489a0bb76224c7b09627 data/iammusicplayer/advancements/iammusicplayer/add_music.json
1+
// 1.20.1 2025-07-31T08:46:26.0963127 Iam Music Player/Advancements
2+
06a5109f626b0e1dfd2342645d660d8c883bb184 data\iammusicplayer\advancements\iammusicplayer\listen_to_radio.json
3+
4d166ea47b916a98f12bbbcac7e6e37f81215d15 data\iammusicplayer\advancements\iammusicplayer\root.json
4+
6e5bebea72f1e439284b198e7eba669886961c16 data\iammusicplayer\advancements\iammusicplayer\write_cassette_tape.json
5+
f082fbda589f26de2d97878f82bb7d0d44318282 data\iammusicplayer\advancements\iammusicplayer\listen_to_kamesuta.json
6+
2b273340b0f8131f2134536b6accb1dd24220eeb data\iammusicplayer\advancements\iammusicplayer\listen_to_remote_music.json
7+
3b8c3c6d6933348f13ed489a0bb76224c7b09627 data\iammusicplayer\advancements\iammusicplayer\add_music.json
8+
27934b80b16b52a90e49a290d4361fe680be0be9 data\iammusicplayer\advancements\iammusicplayer\listen_to_music.json

0 commit comments

Comments
 (0)