Skip to content

Commit ca5868b

Browse files
FlashyReeseFlashyReese
committed
Merge branch 'refs/heads/26.1.2/dev' into 26.1.2/stable
2 parents 27be769 + 38b9fff commit ca5868b

84 files changed

Lines changed: 2145 additions & 491 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.

‎.github/workflows/gradle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on: [pull_request, push]
44

55
jobs:
66
build:
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-24.04
88

99
steps:
1010
- name: Checkout Repository
1111
uses: actions/checkout@v6
1212
- name: Validate Gradle Wrapper
13-
uses: gradle/actions/wrapper-validation@v3
13+
uses: gradle/actions/wrapper-validation@v6
1414
- name: Set up JDK 25
1515
uses: actions/setup-java@v5
1616
with:

‎.github/workflows/publish.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v6
1515
- name: Validate Gradle Wrapper
16-
uses: gradle/actions/wrapper-validation@v3
16+
uses: gradle/actions/wrapper-validation@v6
1717
- name: Set up JDK 25
1818
uses: actions/setup-java@v5
1919
with:
@@ -40,7 +40,7 @@ jobs:
4040
version: '${{ github.event.release.tag_name }}+neoforge'
4141
version-type: release
4242

43-
game-versions: '26.1'
43+
game-versions: '26.2'
4444

4545
loaders: neoforge
4646

@@ -68,6 +68,8 @@ jobs:
6868
version: '${{ github.event.release.tag_name }}+fabric'
6969
version-type: release
7070

71+
game-versions: '26.2'
72+
7173
loaders: fabric
7274

7375
dependencies: |
@@ -78,4 +80,4 @@ jobs:
7880
7981
files: |
8082
fabric/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
81-
fabric/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
83+
fabric/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar

‎.github/workflows/self-hosted.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Checkout Repository
1212
uses: actions/checkout@v6
1313
- name: Validate Gradle Wrapper
14-
uses: gradle/actions/wrapper-validation@v3
14+
uses: gradle/actions/wrapper-validation@v6
1515
- name: Set up JDK 25
1616
uses: actions/setup-java@v5
1717
with:

‎build.gradle.kts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
plugins {
22
id("java")
3-
id("net.fabricmc.fabric-loom") version ("1.15.4") apply (false)
3+
id("net.fabricmc.fabric-loom") version ("1.17.11") apply (false)
44
}
55

6-
val MINECRAFT_VERSION by extra { "26.1.1" }
7-
val NEOFORGE_VERSION by extra { "26.1.1.2-beta" }
8-
val FABRIC_LOADER_VERSION by extra { "0.18.6" }
9-
val FABRIC_API_VERSION by extra { "0.145.3+26.1.1" }
6+
val MINECRAFT_VERSION by extra { "26.1.2" }
7+
val NEOFORGE_VERSION by extra { "26.1.2.76" }
8+
val FABRIC_LOADER_VERSION by extra { "0.19.3" }
9+
val FABRIC_API_VERSION by extra { "0.153.0+26.1.2" }
1010

1111
// https://semver.org/
1212
val MAVEN_GROUP by extra { "me.flashyreese.mods" }
1313
val ARCHIVE_NAME by extra { "sodium-extra" }
14-
val MOD_VERSION by extra { "0.8.7" }
15-
val SODIUM_VERSION by extra { "0.8.9+mc26.1.1" }
14+
val MOD_VERSION by extra { "0.9.0" }
15+
val SODIUM_VERSION by extra { "0.9.1-beta.2+mc26.1.2" }
1616

1717
allprojects {
1818
apply(plugin = "java")
@@ -26,6 +26,8 @@ tasks.withType<JavaCompile> {
2626
}
2727

2828
subprojects {
29+
val modVersion = createVersionString()
30+
2931
apply(plugin = "maven-publish")
3032

3133
repositories {
@@ -44,11 +46,11 @@ subprojects {
4446

4547
tasks.processResources {
4648
filesMatching("META-INF/neoforge.mods.toml") {
47-
expand(mapOf("version" to createVersionString()))
49+
expand(mapOf("version" to modVersion))
4850
}
4951
}
5052

51-
version = createVersionString()
53+
version = modVersion
5254
group = "me.flashyreese.mods"
5355

5456
tasks.withType<JavaCompile> {

‎common/build.gradle.kts‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import net.fabricmc.loom.task.AbstractRemapJarTask
33
plugins {
44
id("java")
55
id("idea")
6-
id("net.fabricmc.fabric-loom") version "1.15.4"
6+
id("net.fabricmc.fabric-loom") version "1.17.11"
77
}
88

99
val MINECRAFT_VERSION: String by rootProject.extra
@@ -14,10 +14,11 @@ val FABRIC_API_VERSION: String by rootProject.extra
1414
val SODIUM_VERSION: String by rootProject.extra
1515

1616
dependencies {
17-
minecraft(group = "com.mojang", name = "minecraft", version = MINECRAFT_VERSION)
18-
compileOnly("io.github.llamalad7:mixinextras-common:0.5.0")
19-
annotationProcessor("io.github.llamalad7:mixinextras-common:0.5.0")
20-
compileOnly("net.fabricmc:sponge-mixin:0.13.2+mixin.0.8.5")
17+
minecraft("com.mojang:minecraft:$MINECRAFT_VERSION")
18+
compileOnly("net.fabricmc:fabric-loader:$FABRIC_LOADER_VERSION")
19+
compileOnly("io.github.llamalad7:mixinextras-common:0.5.4")
20+
annotationProcessor("io.github.llamalad7:mixinextras-common:0.5.4")
21+
compileOnly("net.fabricmc:sponge-mixin:0.17.3+mixin.0.8.7")
2122

2223
fun addDependentFabricModule(name: String) {
2324
val module = fabricApi.module(name, FABRIC_API_VERSION)
@@ -40,11 +41,6 @@ tasks.named("compileJava") {
4041
}
4142

4243
loom {
43-
mixin {
44-
useLegacyMixinAp = false
45-
//defaultRefmapName = "${rootProject.name}.refmap.json"
46-
}
47-
4844
accessWidenerPath = file("src/main/resources/${rootProject.name}.accesswidener")
4945
}
5046

@@ -74,4 +70,4 @@ publishing {
7470
}
7571
}
7672
}
77-
}
73+
}

‎common/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package me.flashyreese.mods.sodiumextra.client;
22

3+
import me.flashyreese.mods.sodiumextra.client.config.SodiumExtraConfigKeys;
34
import me.flashyreese.mods.sodiumextra.client.config.SodiumExtraGameOptions;
5+
import me.flashyreese.mods.sodiumextra.client.gui.FullscreenResolutionConfirmation;
46
import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraDebugEntryCoords;
57
import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraDebugEntryFps;
68
import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraDebugEntryLightUpdates;
@@ -84,14 +86,31 @@ public static CaffeineConfig mixinConfig() {
8486
}
8587

8688
private static SodiumExtraGameOptions loadConfig() {
87-
return SodiumExtraGameOptions.load(PlatformRuntimeInformation.getInstance().getConfigDirectory().resolve("sodium-extra-options.json").toFile());
89+
return SodiumExtraGameOptions.load(PlatformRuntimeInformation.getInstance().getConfigDirectory().resolve(SodiumExtraConfigKeys.FILE_NAME).toFile());
90+
}
91+
92+
public static void armWaylandFullscreenResolutionRecovery() {
93+
SodiumExtraGameOptions options = options();
94+
if (!options.extraSettings.waylandFullscreenResolutionRecoveryPending) {
95+
options.extraSettings.waylandFullscreenResolutionRecoveryPending = true;
96+
options.writeChanges();
97+
}
98+
}
99+
100+
public static void disarmWaylandFullscreenResolutionRecovery() {
101+
SodiumExtraGameOptions options = options();
102+
if (options.extraSettings.waylandFullscreenResolutionRecoveryPending) {
103+
options.extraSettings.waylandFullscreenResolutionRecoveryPending = false;
104+
options.writeChanges();
105+
}
88106
}
89107

90108
public static void onTick(Minecraft client) {
91109
if (hud == null) {
92110
hud = new SodiumExtraHud();
93111
}
94112
hud.onStartTick(client);
113+
FullscreenResolutionConfirmation.tick(client);
95114
}
96115

97116
public static void onHudRender(GuiGraphicsExtractor guiGraphics, DeltaTracker deltaTracker) {

‎common/src/main/java/me/flashyreese/mods/sodiumextra/client/config/FogTypeConfig.java‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)