Skip to content

Commit 2942182

Browse files
authored
Fix Sodium 0.8.13 (#944)
Updates sodium compatibility to use the newest version for 1.21.1 Notes - This changes the minimum sodium version to `0.8.13-alpha.2` - Fixes #47 - Fixes #535 - Fixes #878
1 parent aa1b558 commit 2942182

18 files changed

Lines changed: 89 additions & 600 deletions

buildSrc/src/main/groovy/multiloader-common.gradle

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,22 @@ repositories {
8888
maven {
8989
url = "https://maven.ryanhcode.dev/releases"
9090
}
91+
92+
exclusiveContent { // Sodium
93+
forRepository {
94+
maven {
95+
name "CaffeineMC"
96+
url "https://maven.caffeinemc.net/releases" // or /snapshots
97+
}
98+
}
99+
filter {
100+
includeGroup("net.caffeinemc")
101+
}
102+
}
91103
}
92104

93105
dependencies {
94-
compileOnly "maven.modrinth:lithium:mc1.21.1-0.15.3-neoforge"
95-
compileOnly "maven.modrinth:sodium:$sodium_version"
106+
compileOnly "net.caffeinemc:sodium-neoforge-mod:$sodium_version"
96107
compileOnly "maven.modrinth:iris:$iris_version"
97108
compileOnly "maven.modrinth:distanthorizons:$distant_horizons_version"
98109
compileOnly("cc.tweaked:cc-tweaked-$minecraft_version-forge:$cc_tweaked_version")
@@ -169,6 +180,7 @@ processResources {
169180
'credits' : credits,
170181
'java_version' : java_version,
171182
'veil_version' : veil_version,
183+
'sodium_version' : sodium_version,
172184
'sable_companion_version' : sable_companion_version
173185
]
174186

common/src/main/java/dev/ryanhcode/sable/mixin/sublevel_render/impl/sodium/SodiumWorldRendererMixin.java

Lines changed: 46 additions & 205 deletions
Large diffs are not rendered by default.

common/src/main/java/dev/ryanhcode/sable/mixinterface/sublevel_render/sodium/DefaultChunkRendererExtension.java

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

common/src/main/java/dev/ryanhcode/sable/mixinterface/sublevel_render/sodium/OcclusionCullerExtension.java

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

common/src/main/java/dev/ryanhcode/sable/mixinterface/sublevel_render/sodium/RenderSectionManagerExtension.java

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

common/src/main/java/dev/ryanhcode/sable/mixinterface/sublevel_render/sodium/SodiumWorldRendererExtension.java

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

common/src/main/java/dev/ryanhcode/sable/sublevel/render/SubLevelRenderData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ public interface SubLevelRenderData extends Closeable {
4848
*/
4949
void compileSections(PrioritizeChunkUpdates chunkUpdates, final RenderRegionCache renderRegionCache, Camera camera);
5050

51+
int getVisibleSectionCount();
52+
5153
default Matrix4f getTransformation(final double camX, final double camY, final double camZ) {
5254
return this.getTransformation(camX, camY, camZ, new Matrix4f());
5355
}

common/src/main/java/dev/ryanhcode/sable/sublevel/render/dispatcher/SodiumSubLevelRenderDispatcher.java

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

common/src/main/java/dev/ryanhcode/sable/sublevel/render/fancy/FancySubLevelRenderData.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ public void compileSections(final PrioritizeChunkUpdates chunkUpdates, final Ren
183183
this.dirtyRenderSections.clear();
184184
}
185185

186+
@Override
187+
public int getVisibleSectionCount() {
188+
return this.allRenderSections.size();
189+
}
190+
186191
@Override
187192
public ClientSubLevel getSubLevel() {
188193
return this.subLevel;

common/src/main/java/dev/ryanhcode/sable/sublevel/render/sodium/SodiumSubLevelRenderData.java

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

0 commit comments

Comments
 (0)