Skip to content

Commit 04a85f1

Browse files
committed
fix: better preprocessor structure
1 parent 8dc3f8e commit 04a85f1

File tree

14 files changed

+8
-107
lines changed

14 files changed

+8
-107
lines changed

common.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,14 @@ processResources {
6262
inputs.property "version", simple_version
6363
inputs.property "minecraft_requirement_version", project.minecraft_requirement_version
6464
inputs.property "carpet_requirement_version", project.carpet_requirement_version
65+
inputs.property "loader_requirement_version", project.loader_requirement_version
6566

6667
filesMatching("fabric.mod.json") {
6768
def valueMap = [
6869
"version": simple_version,
6970
"carpet_requirement_version": project.carpet_requirement_version,
7071
"minecraft_requirement_version": project.minecraft_requirement_version,
72+
"loader_requirement_version": project.loader_requirement_version,
7173
]
7274
expand valueMap
7375
}
@@ -80,7 +82,7 @@ tasks.withType(JavaCompile).configureEach {
8082

8183

8284
loom {
83-
accessWidenerPath.set(file("src/main/resources/opt-carpet-addition.accesswidener"))
85+
accessWidenerPath.set(file("opt-carpet-addition.accesswidener"))
8486

8587
runConfigs.all {
8688
// to make sure it generates all "Minecraft Client (:subproject_name)" applications

gradle.properties

+4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
# Gradle Configurations
12
org.gradle.jvmargs=-Xmx3g
23
org.gradle.parallel=true
34

5+
# Fabric Configurations
46
loader_version=0.15.6
7+
loader_requirement_version=>=0.15
58

9+
# Mod Metadata
610
mod_version=1.6.0
711
maven_group=io.github.optijava
812
archives_base_name=opt-carpet-addition

versions/1.19.3/src/main/resources/fabric.mod.json src/main/resources/fabric.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
],
2525
"accessWidener": "opt-carpet-addition.accesswidener",
2626
"depends": {
27-
"fabricloader": "*",
27+
"fabricloader": "${loader_requirement_version}",
2828
"minecraft": "${minecraft_requirement_version}",
2929
"fabric": "*",
3030
"carpet": "${carpet_requirement_version}"
Binary file not shown.

versions/1.17.1/src/main/resources/fabric.mod.json

-35
This file was deleted.
Binary file not shown.

versions/1.18.2/src/main/resources/fabric.mod.json

-35
This file was deleted.
Binary file not shown.
Binary file not shown.

versions/1.20.1/src/main/resources/fabric.mod.json

-35
This file was deleted.

0 commit comments

Comments
 (0)