Skip to content

Commit f1a313a

Browse files
committed
updated resources to use gradle properties instead of manually edit
1 parent 1052b65 commit f1a313a

File tree

5 files changed

+77
-58
lines changed

5 files changed

+77
-58
lines changed

build.gradle

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1+
import groovy.json.JsonOutput
2+
13
plugins {
24
id 'java'
35
id 'idea'
4-
id "com.matthewprenger.cursegradle"
5-
66
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
77
id 'org.spongepowered.mixin' version '0.7.+'
88
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
9-
id 'com.github.johnrengelman.shadow' version '7.1.2'
109
}
1110

1211
version = "${minecraft_version}_v${mod_version}"
1312
group = "me.srrapero720"
1413
archivesBaseName = String.valueOf(mod_id)
1514

16-
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
15+
java {
16+
targetCompatibility = sourceCompatibility = JavaVersion.VERSION_17
17+
}
1718

1819
minecraft {
1920
mappings channel: 'parchment', version: "${mappings_version}-${minecraft_version}"
@@ -94,41 +95,55 @@ repositories {
9495

9596
dependencies {
9697
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
97-
annotationProcessor 'org.spongepowered:mixin:0.8.3:processor'
98+
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
9899

99100
implementation fg.deobf("curse.maven:embeddium-908741:4819807")
100101
//runtimeOnly fg.deobf("curse.maven:oculus-581495:3770744")
101102
runtimeOnly fg.deobf("curse.maven:create-328085:4625534")
102103
//runtimeOnly fg.deobf("curse.maven:flywheel-486392:3737402")
103-
104104
//implementation fg.deobf("curse.maven:jei-238222:3758750")
105105
}
106106

107107
jar {
108108
manifest {
109109
attributes([
110-
"Specification-Title": "${mod_id}",
111-
"Specification-Vendor": "vice",
112-
"Specification-Version": "1",
113-
"Implementation-Title": project.name,
114-
"Implementation-Version": "${version}",
115-
"Implementation-Vendor" :"vice",
110+
"Specification-Title": "${modid}",
111+
"Specification-Vendor": "${modauthor}",
112+
"Specification-Version": "${modversion}",
113+
"Implementation-Title": "${modname}",
114+
"Implementation-Version": "${modversion}",
115+
"Implementation-Vendor" : "${modauthor}",
116116
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
117-
"MixinConfigs": "${mod_id}.mixins.json"
117+
"MixinConfigs": "${modid}.mixins.json"
118118
])
119119
}
120120
}
121121

122+
// Process target resources with mod info
123+
processResources {
124+
filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
125+
def combinedMap = [:]
126+
combinedMap.putAll(rootProject.properties)
127+
combinedMap.putAll([
128+
modauthorlist: JsonOutput.toJson(modauthor.trim().replaceAll(" ", "").split(","))
129+
])
130+
131+
expand(combinedMap)
132+
}
133+
}
134+
122135
jar.finalizedBy('reobfJar')
123136

124-
task sourcesJar(type: Jar) {
137+
tasks.processResources.outputs.upToDateWhen { false }
138+
tasks.register('sourcesJar', Jar) {
125139
from sourceSets.main.allSource
126140
archiveBaseName.set(project.archivesBaseName)
127141
archiveVersion.set("${project.version}")
128142
archiveClassifier.set('sources')
129143
}
130144

131-
task javadocJar(type: Jar, dependsOn: javadoc) {
145+
tasks.register('javadocJar', Jar) {
146+
dependsOn javadoc
132147
from javadoc.destinationDir
133148
archiveClassifier.set('javadoc')
134149
}

gradle.properties

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,33 @@
33
org.gradle.jvmargs = -Xmx3G
44
org.gradle.daemon = false
55

6-
# mod version info
7-
mod_id=embeddium_extras
8-
forge_version=47.0.19
9-
mappings_version=2023.09.03
10-
minecraft_version=1.20.1
11-
mod_version=1.5.0
12-
mappings_channel=parchment
6+
#########################
7+
#### Mod properties ####
8+
#######################
9+
modid=embeddium_extras
10+
modname=Embeddium Extras
11+
modversion=1.0.0
12+
modauthor=SrRapero720
13+
modcredits=TeamDeusVult is the original author
14+
modlicense=All-Rights-Reserved
15+
modgroup=me.srrrapero720.waterframes
16+
mod_description=Is just a mod to show media\nin your game has a paint, tv. #DisplayIt #ProjectIt #ShowIt #BeatIt
1317

14-
# build dependency versions
15-
forgegradle_version=6.+
16-
mixingradle_version=0.7-SNAPSHOT
17-
shadow_version=6.1.0
18-
cursegradle_version=1.4.0
18+
#####################
19+
#### Enviroment ####
20+
###################
21+
mcversion=1.20.1
22+
mcrange=[1.20.1,)
23+
fgversion=47.2.1
24+
fgrange=[47,)
25+
mappingsch=parchment
26+
mappings_version=2023.09.03
1927

20-
# dependency versions
21-
registrate_version=1.0.10
28+
#######################
29+
#### Dependencies ####
30+
#####################
31+
embeddiumversion=4819807
32+
embeddiumrange=[0.2.5,)
2233

2334
# github information
24-
github_project=TeamDeusVult/MagnesiumExtras
35+
github_project=SrRapero720/EmbeddiumExtras

src/main/java/me/srrapero720/embeddium_extras/mixins/BorderlessFullscreen/WindowMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import org.spongepowered.asm.mixin.injection.Redirect;
88
import me.srrapero720.embeddium_extras.config.EmbeddiumExtrasConfig;
99

10-
@Mixin({Window.class})
10+
@Mixin(Window.class)
1111
public class WindowMixin {
12-
@Redirect(method = {"setMode"}, at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSetWindowMonitor(JJIIIII)V"))
12+
@Redirect(method = "setMode", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSetWindowMonitor(JJIIIII)V"))
1313
private void glfwSetWindowMonitor(long window, long monitor, int xpos, int ypos, int width, int height, int refreshRate) {
1414
if (!EmbeddiumExtrasConfig.ConfigSpec.isLoaded()) {
1515
GLFW.glfwSetWindowMonitor(window, monitor, xpos, ypos, width, height, refreshRate);
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
modLoader="javafml" #mandatory
22
loaderVersion="[47,)"
3-
license="WTFPL"
3+
license="${modlicense}"
4+
issueTrackerURL="https://github.com/${github_project}/issues"
45
[[mods]]
5-
modId="embeddium_extras"
6-
version="${file.jarVersion}"
7-
displayName="Embeddium Extras"
8-
logoFile="icon.png" #optional
9-
authors="SrRapero720" #optional
10-
credits="TeamDeusVult is the original author"
11-
description='''
12-
Adds Extra Settings to Embeddium.
13-
'''
14-
[[dependencies.embeddium_extras]]
6+
modId="${modid}"
7+
version="${modversion}"
8+
displayName="${modname}"
9+
logoFile="icon.png" #optional
10+
authors="${modauthor}" #optional
11+
credits="${modcredits}"
12+
displayURL="https://legacy.curseforge.com/minecraft/mc-mods/embeddium-plus"
13+
description='''${mod_description}'''
14+
[[dependencies.${modid}]]
1515
modId="forge"
1616
mandatory=true
17-
versionRange="[41,)"
17+
versionRange="${fgrange}"
1818
ordering="NONE"
19-
side="BOTH"
20-
[[dependencies.embeddium_extras]]
19+
side="CLIENT"
20+
[[dependencies.${modid}]]
2121
modId="minecraft"
2222
mandatory=true
23-
versionRange="[1.19,)"
23+
versionRange="${mcrange}"
2424
ordering="NONE"
25-
side="BOTH"
26-
[[dependencies.embeddium_extras]]
25+
side="CLIENT"
26+
[[dependencies.${modid}]]
2727
modId="embeddium"
2828
mandatory=true
29-
versionRange="[0.2.6,)"
29+
versionRange="${embeddiumrange}"
3030
ordering="AFTER"
31-
side="BOTH"
31+
side="CLIENT"

src/main/resources/pack.mcmeta

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)