Skip to content

Commit b0df673

Browse files
Shadowbee27Shadowbee27
committed
Removed Unnecessary code, moved most versions to gradle.properties, removed publishing
1 parent 8dd6807 commit b0df673

12 files changed

+48
-298
lines changed

‎build.gradle‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ allprojects {
3939
apply plugin: "maven-publish"
4040

4141
repositories {
42+
mavenCentral()
4243
maven {
4344
url = "https://maven.felnull.dev/"
4445
}
@@ -52,13 +53,16 @@ allprojects {
5253
url = 'https://maven.blamejared.com'
5354
}
5455
maven {
55-
url "https://cursemaven.com"
56+
url = "https://cursemaven.com"
5657
}
5758
maven {
58-
url "https://maven.shedaniel.me/"
59+
url = "https://maven.shedaniel.me/"
5960
}
6061
maven {
61-
url "https://maven.lavalink.dev/releases"
62+
url = "https://maven.lavalink.dev/releases"
63+
}
64+
maven {
65+
url = "https://maven.terraformersmc.com/releases/"
6266
}
6367
}
6468

‎common/build.gradle‎

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,55 +13,21 @@ dependencies {
1313
// Remove the next line if you don't want to depend on the API
1414
modApi "dev.architectury:architectury:${rootProject.architectury_version}"
1515

16-
modApi "${rootProject.oe_repo_pre}dev.felnull:otyacraftengine:${rootProject.oe_version}"
17-
modApi "me.shedaniel.cloth:cloth-config:8.3.115"
16+
modApi "dev.felnull:otyacraftengine:${rootProject.oe_version}"
17+
modApi "me.shedaniel.cloth:cloth-config:${rootProject.cloth_config}"
1818

1919
implementation "dev.felnull:felnull-java-library:${rootProject.felnull_version}"
20-
/* implementation("com.github.walkyst:lavaplayer-fork:${rootProject.lava_version}") {
21-
exclude group: 'com.sedmelluq', module: 'lavaplayer-natives'
22-
}
23-
implementation 'com.github.sealedtx:java-youtube-downloader:3.1.0'*/
2420

25-
implementation("dev.arbjerg:lavaplayer:${rootProject.lava_version}") {
21+
implementation("dev.arbjerg:lavaplayer:${rootProject.lava_natives}") {
2622
exclude group: 'dev.arbjerg', module: 'lavaplayer-natives'
2723
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
2824
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
2925
}
30-
implementation('com.fasterxml.jackson.core:jackson-core:2.14.3')
31-
implementation('com.fasterxml.jackson.core:jackson-databind:2.14.3')
32-
implementation 'com.github.sealedtx:java-youtube-downloader:3.2.3'
26+
implementation "com.fasterxml.jackson.core:jackson-core:2.14.3"
27+
implementation "com.fasterxml.jackson.core:jackson-databind:2.14.3"
28+
implementation "com.github.sealedtx:java-youtube-downloader:${rootProject.ytdownloader}"
3329

34-
implementation 'dev.lavalink.youtube:v2:1.13.1'
30+
implementation "dev.lavalink.youtube:v2:${rootProject.youtube_src}"
3531

3632
implementation 'com.mpatric:mp3agic:0.9.1'
37-
}
38-
39-
publishing {
40-
publications {
41-
mavenCommon(MavenPublication) {
42-
artifactId = rootProject.archives_base_name
43-
from components.java
44-
pom {
45-
name = 'IamMusicPlayer'
46-
description = 'The ikisugi music player mod.'
47-
licenses {
48-
license {
49-
name = 'GNU Lesser General Public License v3.0'
50-
url = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
51-
}
52-
}
53-
developers {
54-
developer {
55-
id = 'MORIMORI0317'
56-
name = 'MORIMORI0317'
57-
}
58-
developer {
59-
id = 'FelNull'
60-
name = 'TeamFelNull'
61-
email = 'teamfelnull@felnull.dev'
62-
}
63-
}
64-
}
65-
}
66-
}
67-
}
33+
}

‎fabric/build.gradle‎

Lines changed: 8 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
plugins {
22
id "com.github.johnrengelman.shadow" version "7.1.2"
3-
id 'com.matthewprenger.cursegradle' version '1.4.0'
4-
id "com.modrinth.minotaur" version "2.4.4"
53
}
64

75
architectury {
@@ -45,11 +43,6 @@ configurations {
4543
implementation.extendsFrom shadowIn
4644
shadowCommon.extendsFrom shadowIn
4745
}
48-
repositories {
49-
maven { url "https://maven.terraformersmc.com/releases/" }//modmenu
50-
mavenCentral()
51-
maven { url "https://jitpack.io" } // For com.github.walkyst.JAADec-fork:jaadec-ext-aac & ibxm-fork:com.github.walkyst:ibxm-fork
52-
}
5346
dependencies {
5447
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
5548
modApi("net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}")
@@ -59,19 +52,14 @@ dependencies {
5952
common(project(path: ":common", configuration: "namedElements")) { transitive false }
6053
shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
6154

62-
modApi "${rootProject.oe_repo_pre}dev.felnull:otyacraftengine-fabric:${rootProject.oe_version}"
63-
modApi "com.terraformersmc:modmenu:4.0.6"
64-
modApi "me.shedaniel.cloth:cloth-config-fabric:8.3.115"
65-
modApi "me.shedaniel:RoughlyEnoughItems-fabric:9.1.528"
55+
modApi "dev.felnull:otyacraftengine-fabric:${rootProject.oe_version}"
56+
modApi "com.terraformersmc:modmenu:${rootProject.mod_menu}"
57+
modApi "me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config}"
58+
modApi "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei}"
6659
modApi "vazkii.patchouli:Patchouli:1.19.2-76-FABRIC"
67-
modApi "curse.maven:ctm-535489:3949790"
68-
69-
/* shadowIn("com.github.walkyst:lavaplayer-fork:${rootProject.lava_version}") {
70-
exclude group: 'com.github.walkyst', module: 'lavaplayer-natives-fork'
71-
}
72-
shadowIn 'com.github.sealedtx:java-youtube-downloader:3.1.0'*/
60+
modApi "curse.maven:ctm-535489:${rootProject.soundphysics_fabric}"
7361

74-
shadowIn("dev.arbjerg:lavaplayer:${rootProject.lava_version_youtube}") {
62+
shadowIn("dev.arbjerg:lavaplayer:${rootProject.lava_natives}") {
7563
exclude group: 'dev.arbjerg', module: 'lavaplayer-natives'
7664
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
7765
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
@@ -80,7 +68,7 @@ dependencies {
8068
shadowIn('com.fasterxml.jackson.core:jackson-databind:2.14.3')
8169
shadowIn "com.github.sealedtx:java-youtube-downloader:${rootProject.ytdownloader}"
8270

83-
shadowIn("dev.lavalink.youtube:v2:1.13.1")
71+
shadowIn("dev.lavalink.youtube:v2:${rootProject.youtube_src}")
8472

8573
shadowIn "dev.felnull:felnull-java-library:${rootProject.felnull_version}"
8674
shadowIn 'com.mpatric:mp3agic:0.9.1'
@@ -159,99 +147,4 @@ components.java {
159147
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
160148
skip()
161149
}
162-
}
163-
164-
publishing {
165-
publications {
166-
mavenFabric(MavenPublication) {
167-
artifactId = rootProject.archives_base_name + "-" + project.name
168-
from components.java
169-
pom {
170-
name = 'IamMusicPlayer'
171-
description = 'The ikisugi music player mod.'
172-
licenses {
173-
license {
174-
name = 'GNU Lesser General Public License v3.0'
175-
url = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
176-
}
177-
}
178-
developers {
179-
developer {
180-
id = 'MORIMORI0317'
181-
name = 'MORIMORI0317'
182-
}
183-
developer {
184-
id = 'FelNull'
185-
name = 'TeamFelNull'
186-
email = 'teamfelnull@felnull.dev'
187-
}
188-
}
189-
}
190-
}
191-
}
192-
}
193-
194-
curseforge {
195-
if (System.getenv('curesforgeapikey') != null && "${project.curesforge_id}" != '') {
196-
apiKey = System.getenv('curesforgeapikey')
197-
project {
198-
id = "${rootProject.curesforge_id}"
199-
200-
changelogType = 'markdown'
201-
changelog = file('../LATEST_CHANGELOG.md')
202-
203-
releaseType = "${rootProject.release_type}"
204-
addGameVersion "${rootProject.minecraft_version}"
205-
addGameVersion 'Java 17'
206-
addGameVersion "Fabric"
207-
addGameVersion "Quilt"
208-
209-
project.support_versions.split(",").each {
210-
String version -> addGameVersion version
211-
}
212-
213-
relations {
214-
requiredDependency "fabric-api"
215-
requiredDependency "cloth-config"
216-
requiredDependency "architectury-api"
217-
requiredDependency "otyacraft-engine"
218-
optionalDependency "patchouli-fabric"
219-
}
220-
221-
mainArtifact(file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.name}-mc${rootProject.minecraft_version}-${project.mod_version}.jar")) {
222-
displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Fabric"
223-
}
224-
225-
addArtifact(file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.name}-mc${rootProject.minecraft_version}-${project.mod_version}-sources.jar")) {
226-
displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Fabric-sources"
227-
}
228-
afterEvaluate {
229-
uploadTask.dependsOn("build")
230-
}
231-
}
232-
}
233-
options {
234-
forgeGradleIntegration = false
235-
}
236-
}
237-
238-
if (System.getenv('modrinthapikey') != null && "${modrinth_id}" != '') {
239-
modrinth {
240-
token = System.getenv('modrinthapikey')
241-
projectId = "${rootProject.modrinth_id}"
242-
versionName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Fabric"
243-
versionNumber = "${rootProject.minecraft_version}-${project.mod_version}-Fabric"
244-
versionType = "${project.release_type}"
245-
uploadFile = file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.name}-mc${rootProject.minecraft_version}-${project.mod_version}.jar")
246-
gameVersions = List.of(project.support_versions.split(","))
247-
loaders = ["fabric", "quilt"]
248-
dependencies {
249-
required.project("P7dR8mSH")//Fabric API
250-
required.project("9s6osm5g")//Cloth Config API
251-
required.project("lhGA9TYQ")//Architectury API
252-
required.project("iu3upNjC")//Otyacraft Engine
253-
optional.project("nU0bVIaL")//Patchouli
254-
}
255-
changelog = file('../LATEST_CHANGELOG.md').text
256-
}
257-
}
150+
}

‎fabric/src/main/generated/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2025-06-17T22:49:25.173099519 Tags for minecraft:item
1+
// 1.19.2 2025-06-18T14:23:54.355289709 Tags for minecraft:item
22
d2eb0460d1d9d60aff3395c79a1a358dbc9e6c6c data/c/tags/items/redstone_blocks.json
33
cfa612cb64f7e213d984ca4431202690f594df8a data/c/tags/items/ender_pearls.json
44
5f0f7ba3308b1e0bdf7a4b9f0befc505fcb9e035 data/iammusicplayer/tags/items/cassette_tape.json

‎fabric/src/main/generated/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2025-06-17T22:49:25.166458812 Tags for minecraft:block
1+
// 1.19.2 2025-06-18T14:23:54.336619845 Tags for minecraft:block
22
db0b88c8bef02c90221db48814029dc1c61ff839 data/minecraft/tags/blocks/mineable/pickaxe.json

‎fabric/src/main/generated/.cache/9859aa851328c5a5d8f6be1d456c4f94e21a88ab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2025-06-17T22:49:25.167888724 Input copy
1+
// 1.19.2 2025-06-18T14:23:54.345199926 Input copy
22
d7d7d3ce4fd879a7458586933ce9920d62bb33b3 data/iammusicplayer/patchouli_books/manual/en_us/entries/item_or_block_with_feature/music_manager.json
33
99d80f5311d460d8ea0a5e4d7ccf296877059c97 data/iammusicplayer/patchouli_books/manual/ja_jp/entries/item_or_block_with_feature/radio_antenna.json
44
da45482deb8ba0e0cbe77a4461137ae1fc5daae2 data/iammusicplayer/patchouli_books/manual/zh_CN/entries/how_to_listen/play_music.json

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2025-06-17T22:49:25.169353794 Recipes
1+
// 1.19.2 2025-06-18T14:23:54.350490344 Recipes
22
6ded6fbc212c0f5f4bc11d77110b4d67fbf172ec data/iammusicplayer/advancements/recipes/iammusicplayer.iammusicplayer/manual.json
33
0a8c4a4ea4a192ad4b125be85e78ee3aecfa3162 data/iammusicplayer/recipes/cassette_deck.json
44
c3dee08cead7e82b7dec059c1424e0f67afe9cf9 data/iammusicplayer/recipes/parabolic_antenna.json

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2025-06-17T22:49:25.172257725 Tags for minecraft:point_of_interest_type
1+
// 1.19.2 2025-06-18T14:23:54.351848054 Tags for minecraft:point_of_interest_type
22
cd3779246647c6fd5a083bf9adc06724fb3a682f data/minecraft/tags/point_of_interest_type/acquirable_job_site.json

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2025-06-17T22:49:25.17598765 Block Loot Tables
1+
// 1.19.2 2025-06-18T14:23:54.35816508 Block Loot Tables
22
d1e76f454a535f92e140a17cf335c4576e429f4d data/iammusicplayer/loot_tables/blocks/cassette_deck.json
33
ecad9a4b2c474ada1c504639afae1ae1527d1355 data/iammusicplayer/loot_tables/blocks/music_manager.json
44
66b14cc08aca3ed45a5dd30bb387ad74c3d1c3e5 data/iammusicplayer/loot_tables/blocks/boombox.json

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2025-06-17T22:49:25.174052989 Advancements
1+
// 1.19.2 2025-06-18T14:23:54.3570298 Advancements
22
5c934b02a1526feec86a727a07243d23227dbb27 data/iammusicplayer/advancements/iammusicplayer/root.json
33
9381531fc4d067550e4c49d6179c481ff6849ab3 data/iammusicplayer/advancements/iammusicplayer/listen_to_radio.json
44
a086ad729dc4f28cbe54d7f0885cf24b83013fb0 data/iammusicplayer/advancements/iammusicplayer/listen_to_kamesuta.json

0 commit comments

Comments
 (0)