Skip to content

Commit 9081462

Browse files
Shadowbee27Shadowbee27
committed
Refactor Gradle, bump deps, remove generated data
Update Architectury Loom to 1.13-SNAPSHOT and bump dependency versions (otyacraft engine, lavalink). Lock Minecraft to 1.21.1 and compact fabric entrypoints. Fix .gitignore merge markers. Remove generated data files under fabric/src/main/generated. Refactor neoforge/build.gradle (shadowJar, sourcesJar and configuration cleanup) and tidy IamMusicPlayerDataGenerator formatting and providers
1 parent f0e7d68 commit 9081462

Some content is hidden

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

47 files changed

+111
-920
lines changed

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,5 @@ classes/
2020
.vscode
2121
.settings
2222
*.launch
23-
<<<<<<< HEAD
2423
*.factorypath
2524
.env
26-
=======
27-
>>>>>>> d280ea9d6dbd59ebb8265d858bbb1f575aeb0cf5

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "architectury-plugin" version "3.4-SNAPSHOT"
3-
id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
3+
id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
44
id 'org.jetbrains.changelog' version "2.0.0"
55
}
66

‎common/src/main/java/org/modsauce/impr/data/IamMusicPlayerDataGenerator.java‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
11
package org.modsauce.impr.data;
22

3+
import java.nio.file.Paths;
4+
import net.minecraft.data.PackOutput;
35
import org.modsauce.impr.data.advancements.IMPAdvancementProviderWrapper;
46
import org.modsauce.otyacraftenginerenewed.data.CrossDataGeneratorAccess;
57
import org.modsauce.otyacraftenginerenewed.data.provider.DataProviderWrapper;
68
import org.modsauce.otyacraftenginerenewed.data.provider.DirectCopyProviderWrapper;
7-
import net.minecraft.data.PackOutput;
8-
9-
import java.nio.file.Paths;
109

1110
public class IamMusicPlayerDataGenerator {
12-
public static void init(CrossDataGeneratorAccess access) {
13-
access.addResourceInputFolders(Paths.get("../../resources"));
1411

15-
access.addProviderWrapper(IMPRecipeProviderWrapper::new);
16-
var btp = access.addProviderWrapper(IMPBlockTagProviderWrapper::new);
12+
public static void init(CrossDataGeneratorAccess access) {
13+
access.addResourceInputFolders(Paths.get("../../resources"));
14+
15+
//access.addProviderWrapper(IMPRecipeProviderWrapper::new);
16+
var btp = access.addProviderWrapper(IMPBlockTagProviderWrapper::new);
1717

18-
access.addProviderWrapper((DataProviderWrapper.LookupGeneratorAccessedFactory<DataProviderWrapper<?>>) (packOutput, lookup, generatorAccess) -> new IMPItemTagProviderWrapper(packOutput, lookup, generatorAccess, btp));
19-
access.addProviderWrapper(IMPPoiTypeTagProviderWrapper::new);
20-
access.addProviderWrapper(packOutput -> new DirectCopyProviderWrapper(packOutput, PackOutput.Target.DATA_PACK, "patchouli_books", access));
21-
access.addProviderWrapper(IMPBlockLootTableProviderWrapper::new);
22-
access.addProviderWrapper(IMPAdvancementProviderWrapper::new);
23-
}
18+
access.addProviderWrapper(
19+
(DataProviderWrapper.LookupGeneratorAccessedFactory<
20+
DataProviderWrapper<?>
21+
>) (packOutput, lookup, generatorAccess) ->
22+
new IMPItemTagProviderWrapper(packOutput, lookup, generatorAccess, btp)
23+
);
24+
access.addProviderWrapper(IMPPoiTypeTagProviderWrapper::new);
25+
access.addProviderWrapper(packOutput ->
26+
new DirectCopyProviderWrapper(
27+
packOutput,
28+
PackOutput.Target.DATA_PACK,
29+
"patchouli_books",
30+
access
31+
)
32+
);
33+
access.addProviderWrapper(IMPBlockLootTableProviderWrapper::new);
34+
access.addProviderWrapper(IMPAdvancementProviderWrapper::new);
35+
}
2436
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// 1.21.1 2025-11-12T17:07:40.09117348 Iam Music Player/Tags for minecraft:point_of_interest_type
2+
c5dbf836a03fe88716a49e1d3e467fa1e30914e0 data/minecraft/tags/point_of_interest_type/acquirable_job_site.json

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// 1.21.1 2025-11-12T17:07:40.091099431 Iam Music Player/Block Loot Tables
2+
f97f73a53cba457f04a01370edfd70d1ed20e21f data/iammusicplayer_renewed/loot_table/blocks/music_manager.json
3+
90f8fed76c3775680a2497c0b50e937f114905bf data/iammusicplayer_renewed/loot_table/blocks/cassette_deck.json
4+
7386361eb7d01365600c3881e6f82a56516cb304 data/iammusicplayer_renewed/loot_table/blocks/boombox.json

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// 1.21.1 2025-11-12T17:07:40.090930743 Iam Music Player/Tags for minecraft:item
2+
a600f08f3b82ea64e2da4220752cea0537967e95 data/c/tags/item/iron_nuggets.json
3+
aca4342942c8457824c43981822296d4dd9ac448 data/c/tags/item/stone.json
4+
8c4603792263de771b44aee19f8f9239b6210fdb data/c/tags/item/ender_pearls.json
5+
82a5ce9d51d09b093be2c4b1934357352e43f3b5 data/c/tags/item/redstone_blocks.json
6+
f8895ae9b2bd82ae11b73cd44a3b5579badc386a data/iammusicplayer_renewed/tags/item/cassette_tape.json

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// 1.21.1 2025-11-12T17:07:40.090324002 Iam Music Player/Input copy
2+
b89949b030199327685dbd54764c38cca3c17c80 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/music_manager.json
3+
ccabdd5a586120b2fd96a6c07c2aa8f751ed3d69 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/boombox.json
4+
cc030fd5fedd9a43c4a2996e5e426a9952a0bde0 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/how_to_listen/add_playlist_and_music.json
5+
975d6c12234a2db6ff95dfc71ffee42e9770e46e data/iammusicplayer/patchouli_books/manual/zh_cn/categories/how_to_listen.json
6+
bffc94466d6045828b9e2a76feb3e9110621ef38 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/parabolic_antenna.json
7+
8449c5945a17a6d2c13b4454a7c42fb0a8c4b09e data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/manual.json
8+
4aefb51c56352696260640c1689cd00a082d190e data/iammusicplayer/patchouli_books/manual/ja_jp/categories/how_to_listen.json
9+
1440df61b7ca82c8fec3ac5ab9ede068db7808ac data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/parabolic_antenna.json
10+
751785b67c0fb022219d9307532535a3961b74ef data/iammusicplayer/patchouli_books/manual/en_us/categories/item_or_block_with_feature.json
11+
7500c3564981646e061c67dbe61efebaa9fcf80d data/iammusicplayer/patchouli_books/manual/en_us/entries/how_to_listen/write_to_cassette_tape.json
12+
8cb67c0e0a13238176020f9b4126262c422f3b84 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/manual.json
13+
38fb121a24acaa8915948d2dc99a9b9c50b572d7 data/iammusicplayer/patchouli_books/manual/en_us/entries/how_to_listen/add_playlist_and_music.json
14+
769aabd5ddf9ccea040fff8a8a77cff1a18c3bc3 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/manual.json
15+
497311893d1b04dc658f195a4c01a6a4428c2375 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/cassette_tape.json
16+
c1dd10e61eb9f6f96fb5393400a54205e6f05773 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/parabolic_antenna.json
17+
11baf52eaaad75696d62841323afa8144f2f3ae5 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/cassette_tape.json
18+
787869ec7ba8a29152c14ac387aafe1da496f640 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/cassette_tape.json
19+
da45482deb8ba0e0cbe77a4461137ae1fc5daae2 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/how_to_listen/play_music.json
20+
96c18964dede1136f3d499ca33aad7497415be55 data/iammusicplayer/patchouli_books/manual/ja_jp/categories/item_or_block_with_feature.json
21+
f63972c542b725561cb78227716611c1899ce87c data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/cassette_deck.json
22+
f834aaf350b5d0bf197f5916a6bd5fe872ee2ef9 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/how_to_listen/write_to_cassette_tape.json
23+
c3bd7024366868a65a5c63c70421f0cda884ae57 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/music_manager.json
24+
cd09bac324f1ed677b278da7e54c1a3a232b22b6 data/iammusicplayer/patchouli_books/manual/en_us/entries/how_to_listen/play_music.json
25+
8cb3f43ee7b0cd3e8d5245a8e9afea92e2443147 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/boombox.json
26+
d7a1c40eda889f8855a174b06d65673fbbd17070 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/cassette_deck.json
27+
5c3f20e25321abe29781615dde1d0043bf6e8d1c data/iammusicplayer/patchouli_books/manual/ja_jp/entries/how_to_listen/play_music.json
28+
d7d7d3ce4fd879a7458586933ce9920d62bb33b3 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/music_manager.json
29+
99d80f5311d460d8ea0a5e4d7ccf296877059c97 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/radio_antenna.json
30+
bc018e96e79419d68baac0501049c53a810039b8 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/boombox.json
31+
de367de3f1448dca7171854c10f2725108c13ef5 data/iammusicplayer/patchouli_books/manual/zh_cn/categories/item_or_block_with_feature.json
32+
0cf8f3950774175dd579f4d3e5c1a386dedbcc41 data/iammusicplayer/patchouli_books/manual/zh_cn/entries/item_or_block_with_feature/radio_antenna.json
33+
2a9406fcdf2677f1703cb7290dab72698923cb5c data/iammusicplayer/patchouli_books/manual/en_us/categories/how_to_listen.json
34+
e7110f255d17a436c7a36dc3c33b7fc3dc08b5d2 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/cassette_deck.json
35+
376e14f01342caedab02ddf1cb49a86f37a786e8 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/how_to_listen/add_playlist_and_music.json
36+
226a5b95497c6e74bc8aa4a55d4714c75f8c11cc data/iammusicplayer/patchouli_books/manual/ja_jp/entries/how_to_listen/write_to_cassette_tape.json
37+
2c091b02c7eac5140fb38346c9a8ed67b6780cde data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/radio_antenna.json
38+
8d98bd72669cfd135a051c00237359585607a6a4 data/iammusicplayer/patchouli_books/manual/book.json

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// 1.21.1 2025-11-12T17:07:40.091025202 Iam Music Player/Advancements

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// 1.21.1 2025-11-12T17:07:40.090847875 Iam Music Player/Tags for minecraft:block
2+
227fc29b7ee3e1d25e2407c4ddf671ffa8e2073e data/minecraft/tags/block/mineable/pickaxe.json

fabric/src/main/generated/data/c/tags/items/ender_pearls.json renamed to fabric/src/main/generated/data/c/tags/item/ender_pearls.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"replace": false,
32
"values": [
43
"minecraft:ender_pearl"
54
]

0 commit comments

Comments
 (0)