Skip to content

Commit 54b62d6

Browse files
committed
port to 26.1 snapshot and bug fix
1 parent bcea771 commit 54b62d6

24 files changed

Lines changed: 1190 additions & 3838 deletions

build.gradle

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'java-library'
33
id 'maven-publish'
44
id 'idea'
5-
id 'net.neoforged.moddev' version '2.0.121'
5+
id 'net.neoforged.moddev' version '2.0.137'
66
}
77

88
version = mod_version
@@ -21,21 +21,12 @@ base {
2121
archivesName = mod_id
2222
}
2323

24-
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
24+
java.toolchain.languageVersion = JavaLanguageVersion.of(25)
2525

2626
sourceSets {
2727
main {
2828
java.srcDir 'src/main/java'
2929
}
30-
java22 {
31-
java.srcDir 'src/java22'
32-
compileClasspath += sourceSets.main.output + sourceSets.main.compileClasspath
33-
runtimeClasspath += sourceSets.main.output + sourceSets.main.runtimeClasspath
34-
}
35-
}
36-
37-
tasks.withType(JavaCompile).configureEach {
38-
options.release = 21
3930
}
4031

4132
tasks.named('compileJava', JavaCompile) {
@@ -44,28 +35,6 @@ tasks.named('compileJava', JavaCompile) {
4435
]
4536
}
4637

47-
tasks.register('compileJava22', JavaCompile) {
48-
javaCompiler = javaToolchains.compilerFor {
49-
languageVersion = JavaLanguageVersion.of(22)
50-
}
51-
source = sourceSets.java22.java
52-
classpath = sourceSets.main.output + sourceSets.java22.compileClasspath
53-
destinationDirectory = layout.buildDirectory.dir('classes-java22')
54-
options.release = 22
55-
}
56-
57-
tasks.named('jar', Jar) {
58-
dependsOn tasks.named('compileJava22')
59-
manifest {
60-
attributes(
61-
'Multi-Release': 'true'
62-
)
63-
}
64-
from(tasks.named('compileJava22')) {
65-
into 'META-INF/versions/22'
66-
}
67-
}
68-
6938
neoForge {
7039
version = project.neo_version
7140

@@ -140,30 +109,15 @@ dependencies {
140109
// compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
141110
// runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
142111

143-
implementation("cn.ussshenzhou:t88:+") {
144-
exclude group: "curse.maven", module: "irisshaders-455508"
145-
exclude group: "org.sinytra.forgified-fabric-api", module: "fabric-renderer-api-v1"
146-
exclude group: "org.sinytra.forgified-fabric-api", module: "fabric-api-base"
147-
exclude group: "org.sinytra.forgified-fabric-api", module: "fabric-rendering-data-attachment-v1"
148-
exclude group: "org.sinytra.forgified-fabric-api", module: "fabric-block-view-api-v2"
149-
}
150-
annotationProcessor("cn.ussshenzhou:t88:+") {
151-
exclude group: "curse.maven", module: "irisshaders-455508"
152-
exclude group: "org.sinytra.forgified-fabric-api", module: "fabric-renderer-api-v1"
153-
exclude group: "org.sinytra.forgified-fabric-api", module: "fabric-api-base"
154-
exclude group: "org.sinytra.forgified-fabric-api", module: "fabric-rendering-data-attachment-v1"
155-
exclude group: "org.sinytra.forgified-fabric-api", module: "fabric-block-view-api-v2"
156-
}
112+
implementation(annotationProcessor("cn.ussshenzhou:t88:26.+"))
113+
157114
implementation 'io.github.jaredmdobson:concentus:1.0.2'
158-
additionalRuntimeClasspath 'io.github.jaredmdobson:concentus:1.0.2'
159115
jarJar 'io.github.jaredmdobson:concentus:1.0.2'
160116

161-
compileOnly(group: "dev.onvoid.webrtc", name: "webrtc-java", version: "0.14.0")
162-
additionalRuntimeClasspath(group: "dev.onvoid.webrtc", name: "webrtc-java", version: "0.14.0")
117+
implementation(group: "dev.onvoid.webrtc", name: "webrtc-java", version: "0.14.0")
163118
jarJar(group: "dev.onvoid.webrtc", name: "webrtc-java", version: "0.14.0")
164119

165120
implementation group: "dev.onvoid.webrtc", name: "webrtc-java", version: "0.14.0", classifier: "windows-x86_64"
166-
additionalRuntimeClasspath group: "dev.onvoid.webrtc", name: "webrtc-java", version: "0.14.0", classifier: "windows-x86_64"
167121
jarJar(group: "dev.onvoid.webrtc", name: "webrtc-java", version: "0.14.0", classifier: "windows-x86_64")
168122
// Example mod dependency using a mod jar from ./libs with a flat dir repository
169123
// This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar

gradle.properties

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,27 @@ org.gradle.parallel=true
55
org.gradle.caching=true
66
org.gradle.configuration-cache=true
77

8-
org.gradle.java.installations.fromEnv=JAVA_HOME,JAVA22_HOME
9-
org.gradle.java.installations.auto-download=false
8+
systemProp.http.proxyHost=127.0.0.1
9+
systemProp.http.proxyPort=12000
10+
systemProp.https.proxyHost=127.0.0.1
11+
systemProp.https.proxyPort=12000
1012

13+
parchment_minecraft_version=1.21.10
14+
parchment_mappings_version=2025.10.12
1115
## Environment Properties
1216
# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
1317
# The Minecraft version must agree with the Neo version to get a valid artifact
14-
minecraft_version=1.21.8
18+
minecraft_version=26.1-snapshot-4
1519
# The Minecraft version range can use any release version of Minecraft as bounds.
1620
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
1721
# as they do not follow standard versioning conventions.
18-
minecraft_version_range=[1.21.7,1.22)
22+
minecraft_version_range=[26.1-snapshot-4,)
1923
# The Neo version must agree with the Minecraft version to get a valid artifact
20-
neo_version=21.8.32
24+
neo_version=26.1.0.0-alpha.8+snapshot-4
2125
# The Neo version range can use any version of Neo as bounds
22-
neo_version_range=[21,)
26+
neo_version_range=[26,)
2327
# The loader version range can only use the major version of FML as bounds
2428
loader_version_range=[4,)
25-
parchment_minecraft_version=1.21.8
26-
parchment_mappings_version=2025.09.14
2729
## Mod Properties
2830
# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
2931
# Must match the String constant located in the main mod class annotated with @Mod.
@@ -33,7 +35,7 @@ mod_name=Channel
3335
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
3436
mod_license=GNU GPL 3.0
3537
# The mod version. See https://semver.org/
36-
mod_version=0.1.0
38+
mod_version=26.1-0
3739
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
3840
# This should match the base package used for the mod sources.
3941
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

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.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ 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
}

0 commit comments

Comments
 (0)