Skip to content

Commit 0ea3c77

Browse files
Technici4nTechnici4n
authored
1.21 Port (#113)
1 parent 10e781d commit 0ea3c77

File tree

105 files changed

+526
-645
lines changed

Some content is hidden

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

105 files changed

+526
-645
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
cache-read-only: ${{ github.ref != 'refs/heads/master' }}
2626

2727
- name: build
28-
run: ./gradlew build
28+
run: ./gradlew build --stacktrace
2929
- name: capture build artifacts
3030
uses: actions/upload-artifact@v2
3131
with:

‎build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id "com.modrinth.minotaur"
77
}
88

9-
archivesBaseName = project.archives_base_name
9+
def archivesBaseName = project.archives_base_name
1010
version = System.getenv("MOD_VERSION")
1111
? System.getenv("MOD_VERSION")
1212
: "0.0.0"
@@ -86,10 +86,11 @@ dependencies {
8686
}
8787

8888
processResources {
89-
inputs.property "version", project.version
89+
def version = project.version
90+
inputs.property "version", version
9091

91-
filesMatching("META-INF/mods.toml") {
92-
expand "version": project.version
92+
filesMatching("META-INF/neoforge.mods.toml") {
93+
expand "version": version
9394
}
9495
}
9596

@@ -158,7 +159,7 @@ tasks.withType(JavaCompile).configureEach {
158159

159160
jar {
160161
from("LICENSE") {
161-
rename { "${it}_${project.archivesBaseName}"}
162+
rename { "${it}_${archivesBaseName}"}
162163
}
163164
}
164165

@@ -257,9 +258,9 @@ if (System.getenv("CURSEFORGE_API_KEY") && !version.endsWith("-SNAPSHOT")) {
257258
changelogType = "markdown"
258259
delegate.changelog = changelog
259260

260-
addGameVersion "1.20.4"
261+
addGameVersion "1.21"
261262
addGameVersion "NeoForge"
262-
addGameVersion "Java 17"
263+
addGameVersion "Java 21"
263264

264265
mainArtifact(jar.archiveFile) {
265266
displayName = "Modern Dynamics v${version}"
@@ -283,7 +284,7 @@ if (System.getenv("MODRINTH_API_KEY") && !version.endsWith("-SNAPSHOT")) {
283284
delegate.changelog = changelog
284285
versionType = releaseChannel.toUpperCase()
285286
uploadFile = jar.archiveFile
286-
gameVersions = ["1.20.4"]
287+
gameVersions = ["1.21"]
287288
loaders = ["neoforge"]
288289
}
289290
}

‎settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
}
66
plugins {
77
id 'net.neoforged.moddev' version '0.1.105'
8-
id 'com.diffplug.spotless' version '5.14.0'
8+
id 'com.diffplug.spotless' version '6.25.0'
99
id 'com.matthewprenger.cursegradle' version '1.4.0'
1010
id "com.modrinth.minotaur" version "2.+"
1111
}

src/generated/resources/data/forge/tags/items/tools/wrench.json renamed to src/generated/resources/data/c/tags/item/tools/wrench.json

File renamed without changes.

src/generated/resources/data/moderndynamics/advancements/recipes/tools/wrench.json renamed to src/generated/resources/data/moderndynamics/advancement/recipes/tools/wrench.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"conditions": {
66
"items": [
77
{
8-
"items": [
9-
"minecraft:iron_ingot"
10-
]
8+
"items": "minecraft:iron_ingot"
119
}
1210
]
1311
},

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/attractor.json renamed to src/generated/resources/data/moderndynamics/advancement/recipes/transportation/attractor.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"conditions": {
66
"items": [
77
{
8-
"items": [
9-
"minecraft:ender_pearl"
10-
]
8+
"items": "minecraft:ender_pearl"
119
}
1210
]
1311
},

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/extractor.json renamed to src/generated/resources/data/moderndynamics/advancement/recipes/transportation/extractor.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"conditions": {
66
"items": [
77
{
8-
"items": [
9-
"minecraft:hopper"
10-
]
8+
"items": "minecraft:hopper"
119
}
1210
]
1311
},

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/filter.json renamed to src/generated/resources/data/moderndynamics/advancement/recipes/transportation/filter.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"conditions": {
66
"items": [
77
{
8-
"items": [
9-
"minecraft:lapis_lazuli"
10-
]
8+
"items": "minecraft:lapis_lazuli"
119
}
1210
]
1311
},

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/fluid_pipe.json renamed to src/generated/resources/data/moderndynamics/advancement/recipes/transportation/fluid_pipe.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"conditions": {
66
"items": [
77
{
8-
"items": [
9-
"minecraft:copper_ingot"
10-
]
8+
"items": "minecraft:copper_ingot"
119
}
1210
]
1311
},

src/generated/resources/data/moderndynamics/advancements/recipes/transportation/inhibitor.json renamed to src/generated/resources/data/moderndynamics/advancement/recipes/transportation/inhibitor.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"conditions": {
66
"items": [
77
{
8-
"items": [
9-
"moderndynamics:item_pipe"
10-
]
8+
"items": "moderndynamics:item_pipe"
119
}
1210
]
1311
},

0 commit comments

Comments
 (0)