Skip to content

Commit 0fe65b1

Browse files
HexeptionHexeption
committed
Update to Minecraft 1.21.1
1 parent 30d8d3c commit 0fe65b1

File tree

25 files changed

+340
-346
lines changed

25 files changed

+340
-346
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/checkout@v4
8-
- name: Set up JDK 17
8+
- name: Set up JDK 21
99
uses: actions/setup-java@v4
1010
with:
11-
java-version: '17'
11+
java-version: '21'
1212
distribution: 'temurin'
1313
- uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
1414
- run: chmod +x ./gradlew

‎build.gradle‎

Lines changed: 86 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
plugins {
22
id 'java-library'
3-
id 'eclipse'
4-
id 'idea'
53
id 'maven-publish'
6-
id 'net.neoforged.gradle.userdev' version '7.0.142'
4+
id 'net.neoforged.moddev' version '2.0.80'
5+
id 'idea'
76
id 'net.darkhax.curseforgegradle' version '1.1.15'
87
id "com.modrinth.minotaur" version "2.+"
98
}
109

10+
tasks.named('wrapper', Wrapper).configure {
11+
distributionType = Wrapper.DistributionType.BIN
12+
}
13+
1114
def env = System.getenv()
1215
if (env.GITHUB_RUN_NUMBER) {
13-
mod_version = '1.20.4-1.0.0' + "." + "${env.GITHUB_RUN_NUMBER}"
16+
mod_version = '1.21.1-1.0.0' + "." + "${env.GITHUB_RUN_NUMBER}"
1417
}
1518

1619
version = mod_version
@@ -19,7 +22,7 @@ group = mod_group_id
1922
repositories {
2023
mavenLocal()
2124
maven {
22-
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage")
25+
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
2326
/* As of december 2021, GitHub packages requires authentication.
2427
The password below is a personal access token that has read access to the Refined Mods repos.
2528
It can be reused in other projects.
@@ -55,31 +58,77 @@ base {
5558
archivesName = mod_id + "-neoforge"
5659
}
5760

58-
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
61+
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
5962

60-
runs {
61-
configureEach {
62-
systemProperty 'forge.logging.markers', 'REGISTRIES'
63-
systemProperty 'forge.logging.console.level', 'debug'
63+
neoForge {
64+
// Specify the version of NeoForge to use.
65+
version = project.neo_version
6466

65-
modSource project.sourceSets.main
67+
parchment {
68+
mappingsVersion = project.parchment_mappings_version
69+
minecraftVersion = project.parchment_minecraft_version
6670
}
6771

68-
client {
69-
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
70-
}
72+
// This line is optional. Access Transformers are automatically detected
73+
// accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
7174

72-
server {
73-
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
74-
programArgument '--nogui'
75-
}
75+
// Default run configurations.
76+
// These can be tweaked, removed, or duplicated as needed.
77+
runs {
78+
client {
79+
client()
80+
81+
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
82+
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
83+
}
84+
85+
server {
86+
server()
87+
programArgument '--nogui'
88+
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
89+
}
7690

77-
gameTestServer {
78-
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
91+
// This run config launches GameTestServer and runs all registered gametests, then exits.
92+
// By default, the server will crash when no gametests are provided.
93+
// The gametest system is also enabled by default for other run configs under the /test command.
94+
gameTestServer {
95+
type = "gameTestServer"
96+
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
97+
}
98+
99+
data {
100+
data()
101+
102+
// example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
103+
// gameDirectory = project.file('run-data')
104+
105+
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
106+
programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
107+
}
108+
109+
// applies to all the run configs above
110+
configureEach {
111+
// Recommended logging data for a userdev environment
112+
// The markers can be added/remove as needed separated by commas.
113+
// "SCAN": For mods scan.
114+
// "REGISTRIES": For firing of registry events.
115+
// "REGISTRYDUMP": For getting the contents of all registries.
116+
systemProperty 'forge.logging.markers', 'REGISTRIES'
117+
118+
// Recommended logging level for the console
119+
// You can set various levels here.
120+
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
121+
logLevel = org.slf4j.event.Level.DEBUG
122+
}
79123
}
80124

81-
data {
82-
programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
125+
mods {
126+
// define mod <-> source bindings
127+
// these are used to tell the game which sources are for which mod
128+
// multi mod projects should define one per mod
129+
"${mod_id}" {
130+
sourceSet(sourceSets.main)
131+
}
83132
}
84133
}
85134

@@ -90,14 +139,13 @@ configurations {
90139
}
91140

92141
dependencies {
93-
implementation "net.neoforged:neoforge:${neo_version}"
94142
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
95-
runtimeOnly "mezz.jei:jei-1.20.6-neoforge:18.0.0.62"
96-
compileOnly "com.refinedmods:refinedstorage:1.13.0-beta.4"
97-
runtimeOnly "com.refinedmods:refinedstorage:1.13.0-beta.4"
143+
runtimeOnly "mezz.jei:jei-1.21.1-neoforge:19.21.0.247"
144+
compileOnly "com.refinedmods.refinedstorage:refinedstorage-neoforge:2.0.0-beta.2"
145+
runtimeOnly "com.refinedmods.refinedstorage:refinedstorage-neoforge:2.0.0-beta.2"
98146
}
99147

100-
tasks.withType(ProcessResources).configureEach {
148+
var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) {
101149
var replaceProperties = [
102150
minecraft_version : minecraft_version,
103151
minecraft_version_range: minecraft_version_range,
@@ -112,12 +160,16 @@ tasks.withType(ProcessResources).configureEach {
112160
mod_description : mod_description
113161
]
114162
inputs.properties replaceProperties
115-
116-
filesMatching(['META-INF/mods.toml']) {
117-
expand replaceProperties
118-
}
163+
expand replaceProperties
164+
from "src/main/templates"
165+
into "build/generated/sources/modMetadata"
119166
}
120167

168+
// Include the output of "generateModMetadata" as an input directory for the build
169+
// this works with both building through Gradle and the IDE.
170+
sourceSets.main.resources.srcDir generateModMetadata
171+
// To avoid having to run "generateModMetadata" manually, make it run on every project reload
172+
neoForge.ideSyncTask generateModMetadata
121173

122174
tasks.withType(JavaCompile).configureEach {
123175
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
@@ -140,7 +192,7 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
140192
mainFile.releaseType = 'release'
141193
mainFile.changelog = 'A changelog can be found at https://github.com/Hexeption/RSInfinityBooster'
142194
mainFile.changelogType = 'markdown'
143-
mainFile.gameVersions = ['1.20.4']
195+
mainFile.gameVersions = ['1.21.1']
144196
mainFile.addModLoader("neoforge")
145197
mainFile.displayName = "RSInfinityBooster ${version}"
146198

@@ -153,9 +205,9 @@ modrinth {
153205
versionName = "RSInfinityBooster $version"
154206
changelog = 'A changelog can be found at https://github.com/Hexeption/RSInfinityBooster'
155207
uploadFile = jar
156-
gameVersions = ["1.20.4"]
208+
gameVersions = ["1.21.1"]
157209
loaders = ["neoforge"]
158210
dependencies {
159-
required.version "refined-storage", "1.13.0-beta.4"
211+
required.version "refined-storage", "2.0.0-beta.2"
160212
}
161213
}

‎gradle.properties‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
org.gradle.jvmargs=-Xmx3G
2-
org.gradle.daemon=false
2+
org.gradle.daemon=true
3+
org.gradle.parallel=true
4+
org.gradle.caching=true
5+
org.gradle.configuration-cache=true
36

4-
neogradle.subsystems.parchment.minecraftVersion=1.20.4
5-
neogradle.subsystems.parchment.mappingsVersion=2024.02.25
7+
parchment_minecraft_version=1.21.1
8+
parchment_mappings_version=2024.11.17
69

7-
minecraft_version=1.20.4
8-
minecraft_version_range=[1.20.4,1.20.5)
10+
minecraft_version=1.21.1
11+
minecraft_version_range=[1.21.1]
912

10-
neo_version=20.4.214
11-
neo_version_range=[20.4,)
12-
13-
loader_version_range=[2,)
13+
neo_version=21.1.162
14+
neo_version_range=[21.1.162,)
15+
loader_version_range=[1,)
1416

1517
## Mod Properties
1618
mod_id=rsinfinitybooster

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎settings.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ pluginManagement {
77
}
88

99
plugins {
10-
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
10+
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
1111
}
1212

13+
1314
rootProject.name = 'RSInfinityBooster'

‎src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// 1.20.4 2024-06-14T11:16:36.245785 Recipes
2-
aedaf331f91fddd19ae07d655ea549e68211e331 data/rsinfinitybooster/advancements/recipes/misc/dimension_card.json
3-
764d5d2dca1b802f7b8f7f6aa83c177987aa6ab6 data/rsinfinitybooster/advancements/recipes/misc/infinity_card.json
4-
16b9bbee8df54b9848cf68b17d549d5b0750fdad data/rsinfinitybooster/recipes/dimension_card.json
5-
29fa2bfbea8c0e8627669f8d7309de2baacca212 data/rsinfinitybooster/recipes/infinity_card.json
1+
// 1.21.1 2025-04-24T16:16:50.805163 Recipes
2+
d7ba28aa2958c19e9076d98b1eb06fa2458b15d7 data/rsinfinitybooster/advancement/recipes/misc/dimension_card.json
3+
2d57cbb90868d7c7646846e32d63cd8b9293f334 data/rsinfinitybooster/advancement/recipes/misc/infinity_card.json
4+
08250236fdf7b9a766fe08c71efff28a79ed3ccb data/rsinfinitybooster/recipe/dimension_card.json
5+
cdec233cc9e6eee5caa9de3533a22093e05bcf2c data/rsinfinitybooster/recipe/infinity_card.json

src/generated/resources/data/rsinfinitybooster/advancements/recipes/misc/dimension_card.json renamed to src/generated/resources/data/rsinfinitybooster/advancement/recipes/misc/dimension_card.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-
"rsinfinitybooster:infinity_card"
10-
]
8+
"items": "rsinfinitybooster:infinity_card"
119
}
1210
]
1311
},

src/generated/resources/data/rsinfinitybooster/advancements/recipes/misc/infinity_card.json renamed to src/generated/resources/data/rsinfinitybooster/advancement/recipes/misc/infinity_card.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:netherite_ingot"
10-
]
8+
"items": "minecraft:netherite_ingot"
119
}
1210
]
1311
},

src/generated/resources/data/rsinfinitybooster/recipes/dimension_card.json renamed to src/generated/resources/data/rsinfinitybooster/recipe/dimension_card.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"RNR"
1919
],
2020
"result": {
21-
"item": "rsinfinitybooster:dimension_card"
21+
"count": 1,
22+
"id": "rsinfinitybooster:dimension_card"
2223
}
2324
}

src/generated/resources/data/rsinfinitybooster/recipes/infinity_card.json renamed to src/generated/resources/data/rsinfinitybooster/recipe/infinity_card.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"NNN"
2222
],
2323
"result": {
24-
"item": "rsinfinitybooster:infinity_card"
24+
"count": 1,
25+
"id": "rsinfinitybooster:infinity_card"
2526
}
2627
}

0 commit comments

Comments
 (0)