Skip to content

Commit ba4195a

Browse files
committed
Share code between textile mod platforms
1 parent e7c2eaf commit ba4195a

30 files changed

+109
-330
lines changed

gradle/libs.versions.toml

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ forge = "1.20.4-49.0.30"
1111
neoforge = "21.0.0-beta"
1212

1313
quilt_loader = "0.25.0"
14-
quilt_standard_libraries = "8.0.0-alpha.12+1.20.4"
1514

1615
# Regular libraries
1716

@@ -42,7 +41,6 @@ forge = { module = "net.minecraftforge:forge", version.ref = "forge" }
4241
neoforge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
4342

4443
quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" }
45-
qsl_lifecycle_events = { module = "org.quiltmc.qsl.core:lifecycle_events", version.ref = "quilt_standard_libraries" }
4644

4745
# Regular libraries
4846

platforms/fabric/build.gradle

+15-14
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ plugins {
77
alias(libs.plugins.mod.publish.plugin)
88
}
99

10-
repositories {
11-
// ModMenu
12-
exclusiveContent {
13-
filter { includeGroup("com.terraformersmc") }
14-
forRepository { maven { url = "https://maven.terraformersmc.com/releases" } }
15-
}
16-
}
17-
1810
architectury {
1911
platformSetupLoomIde()
2012
fabric()
@@ -25,8 +17,16 @@ loom {
2517
}
2618

2719
configurations {
28-
common
29-
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
20+
common {
21+
canBeResolved = true
22+
canBeConsumed = false
23+
}
24+
// Files in this configuration will be bundled into your mod using the Shadow plugin.
25+
// Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
26+
shadowBundle {
27+
canBeResolved = true
28+
canBeConsumed = false
29+
}
3030
compileClasspath.extendsFrom common
3131
runtimeClasspath.extendsFrom common
3232
developmentFabric.extendsFrom common
@@ -38,17 +38,18 @@ dependencies {
3838
modImplementation(fabricApi.module("fabric-resource-loader-v0", libs.versions.fabric.api.get()))
3939
modImplementation(fabricApi.module("fabric-lifecycle-events-v1", libs.versions.fabric.api.get()))
4040

41-
modApi(libs.modmenu)
42-
4341
include(libs.battery)
4442

4543
common(project(path: ":platforms:common", configuration: "namedElements")) { transitive false }
46-
shadowCommon(project(path: ":platforms:common", configuration: "transformProductionFabric")) { transitive false }
44+
shadowBundle(project(path: ":platforms:common", configuration: "transformProductionFabric")) { transitive false }
45+
46+
common(project(path: ":platforms:textile", configuration: "namedElements")) { transitive false }
47+
shadowBundle(project(path: ":platforms:textile", configuration: "transformProductionFabric")) { transitive false }
4748
}
4849

4950
shadowJar {
5051
exclude "architectury.common.json"
51-
configurations = [project.configurations.shadowCommon]
52+
configurations = [project.configurations.shadowBundle]
5253
}
5354

5455
remapJar {

platforms/fabric/src/main/java/net/lostluma/dynamic_fps/impl/fabric/mixin/GuiMixin.java

-21
This file was deleted.

platforms/fabric/src/main/resources/META-INF/services/dynamic_fps.impl.service.ModCompat

-1
This file was deleted.

platforms/fabric/src/main/resources/META-INF/services/dynamic_fps.impl.service.Platform

-1
This file was deleted.

platforms/fabric/src/main/resources/dynamic_fps.mixins.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
"required": true,
33
"package": "net.lostluma.dynamic_fps.impl.fabric.mixin",
44
"minVersion": "0.8",
5-
"client": [
6-
"GuiMixin",
7-
"OptionsMixin"
8-
],
5+
"client": [],
96
"mixins": [],
107
"server": [],
118
"injectors": {

platforms/fabric/src/main/resources/fabric.mod.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
"environment": "client",
6262
"entrypoints": {
6363
"client": [
64-
"net.lostluma.dynamic_fps.impl.fabric.compat.FREX",
65-
"net.lostluma.dynamic_fps.impl.fabric.DynamicFPSFabricMod"
64+
"net.lostluma.dynamic_fps.impl.textile.compat.FREX",
65+
"net.lostluma.dynamic_fps.impl.textile.DynamicFPSTextileMod"
6666
],
6767
"modmenu": [
68-
"net.lostluma.dynamic_fps.impl.fabric.compat.ModMenu"
68+
"net.lostluma.dynamic_fps.impl.textile.compat.ModMenu"
6969
]
7070
},
7171
"depends": {
@@ -85,7 +85,8 @@
8585
},
8686
"mixins": [
8787
"dynamic_fps.mixins.json",
88-
"dynamic_fps-common.mixins.json"
88+
"dynamic_fps-common.mixins.json",
89+
"dynamic_fps-textile.mixins.json"
8990
],
9091
"accessWidener": "dynamic_fps.accesswidener"
9192
}

platforms/quilt/build.gradle

+19-17
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ plugins {
88
}
99

1010
repositories {
11-
// ModMenu
12-
exclusiveContent {
13-
filter { includeGroup("com.terraformersmc") }
14-
forRepository { maven { url = "https://maven.terraformersmc.com/releases" } }
15-
}
1611
maven { url = "https://maven.quiltmc.org/repository/release" }
1712
}
1813

@@ -26,29 +21,36 @@ loom {
2621
}
2722

2823
configurations {
29-
common
30-
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
31-
compileClasspath.extendsFrom common
32-
runtimeClasspath.extendsFrom common
33-
developmentQuilt.extendsFrom common
24+
common {
25+
canBeResolved = true
26+
canBeConsumed = false
27+
}
28+
// Files in this configuration will be bundled into your mod using the Shadow plugin.
29+
// Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
30+
shadowBundle {
31+
canBeResolved = true
32+
canBeConsumed = false
33+
}
34+
compileClasspath.extendsFrom common
35+
runtimeClasspath.extendsFrom common
36+
developmentFabric.extendsFrom common
3437
}
3538

3639
dependencies {
3740
modImplementation(libs.quilt.loader)
38-
modImplementation(libs.qsl.lifecycle.events)
39-
40-
modApi(libs.modmenu)
4141

4242
include(libs.battery)
4343

44-
common(project(path: ":platforms:common", configuration: "namedElements")) { transitive false }
45-
shadowCommon(project(path: ":platforms:common", configuration: "transformProductionQuilt")) { transitive false }
44+
common(project(path: ":platforms:common", configuration: "namedElements")) { transitive false }
45+
shadowBundle(project(path: ":platforms:common", configuration: "transformProductionQuilt")) { transitive false }
46+
47+
common(project(path: ":platforms:textile", configuration: "namedElements")) { transitive false }
48+
shadowBundle(project(path: ":platforms:textile", configuration: "transformProductionQuilt")) { transitive false }
4649
}
4750

4851
shadowJar {
4952
exclude "architectury.common.json"
50-
51-
configurations = [project.configurations.shadowCommon]
53+
configurations = [project.configurations.shadowBundle]
5254
}
5355

5456
remapJar {

platforms/quilt/src/main/java/net/lostluma/dynamic_fps/impl/quilt/DynamicFPSQuiltMod.java

-12
This file was deleted.

platforms/quilt/src/main/java/net/lostluma/dynamic_fps/impl/quilt/compat/FREX.java

-51
This file was deleted.

platforms/quilt/src/main/java/net/lostluma/dynamic_fps/impl/quilt/compat/ModMenu.java

-13
This file was deleted.

platforms/quilt/src/main/java/net/lostluma/dynamic_fps/impl/quilt/mixin/OptionsMixin.java

-39
This file was deleted.

platforms/quilt/src/main/java/net/lostluma/dynamic_fps/impl/quilt/service/QuiltModCompat.java

-50
This file was deleted.

0 commit comments

Comments
 (0)