Skip to content

Commit bcd35d3

Browse files
KneelawkKneelawk
committed
Update submodule to 0.7
1 parent 569ea49 commit bcd35d3

60 files changed

Lines changed: 559 additions & 125 deletions

File tree

Some content is hidden

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

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("dev.architectury.loom") apply false
2+
id("fabric-loom") apply false
33
id("com.kneelawk.submodule") apply false
44
id("com.kneelawk.mojmap") apply false
55
id("com.kneelawk.versioning") apply false

‎examples/multiblock-lamps/fabric/build.gradle.kts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ plugins {
3030

3131
submodule {
3232
setLibsDirectory()
33-
applyFabricLoaderDependency()
34-
applyFabricApiDependency()
35-
applyXplatConnection(":multiblock-lamps:xplat", "fabric")
33+
applyXplatConnection(":multiblock-lamps:xplat")
3634
generateRuns()
3735
}
3836

‎examples/multiblock-lamps/fabric/gradle.properties‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# MIT License
3+
#
4+
# Copyright (c) 2024 Cyan Kneelawk.
5+
#
6+
# Permission is hereby granted, free of charge, to any person obtaining a copy
7+
# of this software and associated documentation files (the "Software"), to deal
8+
# in the Software without restriction, including without limitation the rights
9+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
# copies of the Software, and to permit persons to whom the Software is
11+
# furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice shall be included in all
14+
# copies or substantial portions of the Software.
15+
#
16+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
# SOFTWARE.
23+
#
24+
#
25+
26+
submodule.platform = fabric
27+
mod_id = multiblock_lamps

‎examples/multiblock-lamps/fabric/src/main/resources/fabric.mod.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"schemaVersion": 1,
3-
"id": "multiblock_lamps",
3+
"id": "${mod_id}",
44
"version": "${version}",
55
"name": "Multiblock Lamps",
66
"description": "A simple GraphLib example mod that adds connected lamps.",
@@ -13,7 +13,7 @@
1313
"sources": "https://github.com/Kneelawk/GraphLib"
1414
},
1515
"license": "MIT",
16-
"icon": "assets/multiblock_lamps/icon-128.png",
16+
"icon": "assets/${mod_id}/icon-128.png",
1717
"environment": "*",
1818
"entrypoints": {
1919
"main": [

‎examples/multiblock-lamps/neoforge/build.gradle.kts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@ plugins {
3030

3131
submodule {
3232
setLibsDirectory()
33-
applyNeoforgeDependency()
34-
applyXplatConnection(":multiblock-lamps:xplat", "neoforge")
33+
applyXplatConnection(":multiblock-lamps:xplat")
3534
generateRuns()
3635
}
3736

3837
dependencies {
3938
// Codextra
4039
val codextra_version: String by project
41-
modRuntimeOnly("com.kneelawk.codextra:codextra-neoforge:$codextra_version")
40+
runtimeOnly("com.kneelawk.codextra:codextra-neoforge:$codextra_version")
4241

4342
// KModLib Overlay
4443
val kml_version: String by project
45-
modRuntimeOnly("com.kneelawk.kmodlib:kmodlib-overlay-neoforge:$kml_version")
44+
runtimeOnly("com.kneelawk.kmodlib:kmodlib-overlay-neoforge:$kml_version")
4645
}

‎examples/multiblock-lamps/neoforge/gradle.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# MIT License
33
#
4-
# Copyright (c) 2024 Kneelawk.
4+
# Copyright (c) 2024 Cyan Kneelawk.
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -23,4 +23,5 @@
2323
#
2424
#
2525

26-
loom.platform = neoforge
26+
submodule.platform = neoforge
27+
mod_id = multiblock_lamps

‎examples/multiblock-lamps/neoforge/src/main/resources/META-INF/neoforge.mods.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ loaderVersion = "[1,)"
33
license = "MIT"
44

55
[[mods]]
6-
modId = "multiblock_lamps"
6+
modId = "${mod_id}"
77
version = "${version}"
88
displayName = "Multiblock Lamps"
99
authors = "Kneelawk"
1010
description = "A simple GraphLib example mod that adds connected lamps."
11-
logoFile = "assets/multiblock_lamps/icon-128.png"
11+
logoFile = "assets/${mod_id}/icon-128.png"
1212

13-
[[dependencies.multiblock_lamps]]
13+
[[dependencies.${mod_id}]]
1414
modId = "neoforge"
1515
type = "REQUIRED"
1616
versionRange = "[20.4.148-beta,)"
1717
ordering = "NONE"
1818
side = "BOTH"
1919

20-
[[dependencies.multiblock_lamps]]
20+
[[dependencies.${mod_id}]]
2121
modId = "graphlib"
2222
type = "REQUIRED"
2323
versionRange = "[2-alpha,)"

‎examples/multiblock-lamps/xplat/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ plugins {
3030

3131
submodule {
3232
setRefmaps("multiblock-lamps")
33-
applyFabricLoaderDependency()
3433
xplatProjectDependency(":core")
3534
xplatProjectDependency(":debugrender")
3635
}

‎examples/multiblock-lamps/xplat/gradle.properties‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# MIT License
3+
#
4+
# Copyright (c) 2024 Cyan Kneelawk.
5+
#
6+
# Permission is hereby granted, free of charge, to any person obtaining a copy
7+
# of this software and associated documentation files (the "Software"), to deal
8+
# in the Software without restriction, including without limitation the rights
9+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
# copies of the Software, and to permit persons to whom the Software is
11+
# furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice shall be included in all
14+
# copies or substantial portions of the Software.
15+
#
16+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
# SOFTWARE.
23+
#
24+
#
25+
26+
submodule.platform = xplat
27+
mod_id = multiblock_lamps

‎gradle.properties‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ org.gradle.jvmargs = -Xmx4G
33
org.gradle.parallel = true
44

55
# Gradle Plugins
6-
architectury_loom_version = 1.6-SNAPSHOT
6+
loom_version = 1.7-SNAPSHOT
7+
moddev_version = 2.0.33-beta
78
versioning_version = 1.0.0
89
kpublish_version = 1.0.0
9-
submodule_version = 0.2.13
10+
submodule_version = 0.7.0
1011
remapcheck_version = 0.3.4
1112

1213
# Fabric Properties
1314
# check these on https://fabricmc.net/develop
14-
java_version = 21
15-
minecraft_version = 1.21
16-
parchment_mc_version = 1.20.6
17-
parchment_version = 2024.06.16
18-
yarn_version = 1
19-
fabric_loader_version = 0.15.11
20-
neoforge_version = 21.0.14-beta
15+
java_version=21
16+
minecraft_version = 1.21.1
17+
parchment_mc_version = 1.21
18+
parchment_version = 2024.07.28
19+
yarn_version = 3
20+
fabric_loader_version = 0.16.9
21+
neoforge_version = 21.1.84
2122

2223
# Mod Properties
2324
project_version = 2.0.99+1.21.local

0 commit comments

Comments
 (0)