Skip to content

Commit 568129a

Browse files
authored
Merge pull request #31 from imreallybadatnames/26.1
26.1 port
2 parents 3161951 + 477a8e0 commit 568129a

44 files changed

Lines changed: 523 additions & 539 deletions

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
# Use these Java versions
13-
java: [21] # Current Java LTS & minimum supported by Minecraft
13+
java: [25] # Current Java LTS & minimum supported by Minecraft
1414
# Test on both Linux and Windows
1515
os: [ubuntu-latest, windows-latest]
1616

build.gradle

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version "${loom_version}"
2+
id 'net.fabricmc.fabric-loom' version "${loom_version}"
33
id 'maven-publish'
44
}
55

@@ -18,21 +18,20 @@ repositories {
1818
dependencies {
1919
// fabric
2020
minecraft "com.mojang:minecraft:${project.minecraft_version}"
21-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
22-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
21+
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
2322

2423
// dependencies
25-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
24+
implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
2625

2726
// mod compat
28-
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
29-
modCompileOnly "maven.modrinth:jade:${project.jade_version}"
27+
// compileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
28+
compileOnly "maven.modrinth:jade:${project.jade_version}"
3029
// https://maven4.bai.lol/mcp/mobius/waila/
31-
modCompileOnly "mcp.mobius.waila:wthit-api:fabric-${project.wthit_version}"
30+
compileOnly "mcp.mobius.waila:wthit-api:fabric-${project.wthit_version}"
3231

33-
// not yet updated
34-
// modImplementation("mezz.jei:jei-${minecraft_version}-fabric-api:${jei_version}")
35-
// modRuntimeOnly("mezz.jei:jei-${minecraft_version}-fabric:${jei_version}")
32+
// broken dependencies
33+
//compileOnly("mezz.jei:jei-${minecraft_version}-fabric-api:${jei_version}")
34+
//runtimeOnly("mezz.jei:jei-${minecraft_version}-fabric:${jei_version}")
3635
}
3736

3837
processResources {
@@ -53,7 +52,7 @@ processResources {
5352
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
5453
tasks.withType(JavaCompile) {
5554
options.encoding = "UTF-8"
56-
it.options.release = 21 // Minecraft 1.20.5 upwards uses Java 21.
55+
it.options.release = 25 // Minecraft 26.1 upwards uses Java 25.
5756
}
5857

5958
java {
@@ -69,7 +68,7 @@ base {
6968

7069
jar {
7170
from("LICENSE.md") {
72-
rename { "${it}_${project.archivesBaseName}"}
71+
rename { "${it}_${project.archives_base_name}"}
7372
}
7473
}
7574

18 Bytes
Binary file not shown.

gradle.properties

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
org.gradle.jvmargs = -Xmx2G
33

44
# Fabric Properties
5-
minecraft_version=1.21.6
6-
yarn_mappings=1.21.6+build.1
7-
loader_version=0.17.2
8-
loom_version=1.11-SNAPSHOT
5+
minecraft_version=26.1
6+
loader_version=0.18.6
7+
loom_version=1.15-SNAPSHOT
98

109
# Mod Properties
11-
mod_version=1.5.1+1.21.6
10+
mod_version=1.5.1+26.1
1211
maven_group=de.dafuqs
1312
archives_base_name = revelationary
1413

1514
# https://fabricmc.net/develop/
16-
fabric_api_version=0.128.2+1.21.6
15+
fabric_api_version=0.145.1+26.1
1716

18-
jade_version=19.3.2+fabric
19-
wthit_version=16.0.1
20-
rei_version=20.0.811
21-
# jei_version=19.21.0.247
17+
jade_version=26.0.4+fabric
18+
wthit_version=19.0.0
19+
#rei_version=20.0.811
20+
jei_version=29.2.0.20

gradle/wrapper/gradle-wrapper.jar

-10.3 KB
Binary file not shown.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
7+
zipStorePath=wrapper/dists

gradlew

Lines changed: 36 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 22 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)