Fix Sodium Compatibility

Fix ModelLoaderMixin
Bump Version

Author: FirstMegaGame4

build.gradle

@@ -1,8 +1,8 @@
 import com.mmodding.gradle.api.EnvironmentTarget
 
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
-	id 'com.mmodding.gradle' version '0.0.8'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'com.mmodding.gradle' version '0.0.9'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -9,14 +9,14 @@ yarn_mappings=1.21+build.2
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=0.0.7-alpha
+mod_version=0.0.8-alpha
 maven_group=com.mmodding.env.driven.assets
 archives_base_name=env_driven_assets
 
 # Dependencies
 fabric_version=0.100.1+1.21
-env_json_version=0.4.2
+env_json_version=0.4.3
 
 # Compatibilities
-sodium_version=mc1.21-0.5.9
+sodium_version=mc1.21-0.6.0-beta.1-fabric
 axiom_version=3.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

settings.gradle

@@ -16,7 +16,7 @@ pluginManagement {
 			url "https://maven.quiltmc.org/repository/release"
 		}
 		maven {
-			name "Fabric"
+			name "FabricMC"
 			url "https://maven.fabricmc.net/"
 		}
 		mavenCentral()

src/main/java/com/mmodding/env/driven/assets/client/EDAEnvJsonVisitors.java

@@ -11,7 +11,7 @@
 import com.mmodding.env.driven.assets.client.impl.sodium.SodiumBlockEnvJsonVisitor;
 import com.mmodding.env.driven.assets.mixin.client.ChunkRendererRegionAccessor;
 import com.mmodding.env.json.api.EnvJsonVisitor;
-import me.jellysquid.mods.sodium.client.world.WorldSlice;
+import net.caffeinemc.mods.sodium.client.world.LevelSlice;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.chunk.ChunkRendererRegion;
@@ -30,7 +30,7 @@ else if (view instanceof World world) {
 			return new BlockEnvJsonVisitor(world, pos);
 		}
 		else if (FabricLoader.getInstance().isModLoaded("sodium")) {
-			if (view instanceof WorldSlice slice) {
+			if (view instanceof LevelSlice slice) {
 				return new SodiumBlockEnvJsonVisitor(slice, pos);
 			}
 		}

src/main/java/com/mmodding/env/driven/assets/client/impl/sodium/SodiumBlockEnvJsonVisitor.java

@@ -8,7 +8,7 @@
 import com.mmodding.env.json.api.rule.VoidEnvJsonRule;
 import com.mmodding.env.json.api.rule.WaterEnvJsonRule;
 import it.unimi.dsi.fastutil.ints.Int2BooleanFunction;
-import me.jellysquid.mods.sodium.client.world.WorldSlice;
+import net.caffeinemc.mods.sodium.client.world.LevelSlice;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.util.math.BlockPos;
@@ -21,10 +21,10 @@
 @SuppressWarnings("resource")
 public class SodiumBlockEnvJsonVisitor implements EnvJsonVisitor {
 
-	private final WorldSlice slice;
+	private final LevelSlice slice;
 	private final BlockPos pos;
 
-	public SodiumBlockEnvJsonVisitor(WorldSlice slice, BlockPos pos) {
+	public SodiumBlockEnvJsonVisitor(LevelSlice slice, BlockPos pos) {
 		this.slice = slice;
 		this.pos = pos;
 	}

src/main/java/com/mmodding/env/driven/assets/mixin/client/ModelLoaderMixin.java

@@ -38,15 +38,15 @@ public abstract class ModelLoaderMixin implements ManagerContainer {
 
 	@Inject(method = "<init>", at = @At("TAIL"))
 	private void computeStatesIntoManager(BlockColors blockColors, Profiler profiler, Map<Identifier, JsonUnbakedModel> jsonUnbakedModels, Map<Identifier, List<BlockStatesLoader.SourceTrackedData>> blockStates, CallbackInfo ci) {
-		Registries.BLOCK.streamEntries().forEach(ref -> {
+		/* Registries.BLOCK.streamEntries().forEach(ref -> {
 			Identifier stateId = BlockStatesLoader.FINDER.toResourcePath(ref.registryKey().getValue());
 			blockStates.get(stateId).forEach(source -> {
 				JsonObjectDuckInterface ducked = (JsonObjectDuckInterface) source.data();
 				if (ducked.env_driven_assets$getEnvJson() != null) {
 					this.blockStateManager.appendBlock(ref.value(), ducked.env_driven_assets$getEnvJson());
 				}
 			});
-		});
+		}); */
 	}
 
 	@Override

src/main/java/com/mmodding/env/driven/assets/mixin/client/WorldSliceAccessor.java

@@ -1,13 +1,13 @@
 package com.mmodding.env.driven.assets.mixin.client;
 
-import me.jellysquid.mods.sodium.client.world.WorldSlice;
+import net.caffeinemc.mods.sodium.client.world.LevelSlice;
 import net.minecraft.client.world.ClientWorld;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(WorldSlice.class)
+@Mixin(LevelSlice.class)
 public interface WorldSliceAccessor {
 
-	@Accessor("world")
+	@Accessor("level")
 	ClientWorld env_driven_assets$getWorld();
 }