Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Sodium 0.5 incompatibility #178

Merged
merged 11 commits into from
Aug 30, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
package dev.lambdaurora.lambdynlights;

import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.Version;
import net.fabricmc.loader.api.VersionParsingException;

/**
* Represents a utility class for compatibility.
Expand Down Expand Up @@ -47,4 +49,14 @@ public static boolean isSodium010Installed() {
return FabricLoader.getInstance().getModContainer("sodium").map(mod -> mod.getMetadata().getVersion().getFriendlyString().startsWith("0.1.0"))
.orElse(false);
}

public static boolean isSodium05XInstalled() {
return FabricLoader.getInstance().getModContainer("sodium").map(mod -> {
try {
return mod.getMetadata().getVersion().compareTo(Version.parse("0.5.0")) >= 0;
} catch (VersionParsingException e) {
throw new RuntimeException(e);
}
}).orElse(false);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ public LambDynLightsMixinPlugin() {
boolean ltrInstalled = LambDynLightsCompat.isLilTaterReloadedInstalled();
this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.ltr.LilTaterBlocksMixin", ltrInstalled);
this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.ltr.LilTaterBlockEntityMixin", ltrInstalled);

boolean sodium05XInstalled = LambDynLightsCompat.isSodium05XInstalled();
this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.sodium.LightDataAccessMixin", sodium05XInstalled);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package dev.lambdaurora.lambdynlights.mixin.sodium;

import dev.lambdaurora.lambdynlights.LambDynLights;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockRenderView;
import net.minecraft.world.LightType;
import org.spongepowered.asm.mixin.Dynamic;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;

@Pseudo
@Mixin(targets = "me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess", remap = false)
public class LightDataAccessMixin {
// In Sodium 0.5, LightDataAccess has replaced the Vanilla LightmapTextureManager,
// and no longer uses WorldRenderer#getLightmapCoordinates.
// Unfortunately, this breaks LambDynLights, and as a result is forced to mixin to Sodium.
@Dynamic
@Redirect(method = "compute", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/BlockRenderView;getLightLevel(Lnet/minecraft/world/LightType;Lnet/minecraft/util/math/BlockPos;)I", ordinal = 0, remap = true), remap = false)
private int lambdynlights$modifyBlockLight(BlockRenderView world, LightType type, BlockPos pos, int x, int y, int z) {
int original = world.getLightLevel(type, pos);

if (!world.getBlockState(pos).isOpaqueFullCube(world, pos) && LambDynLights.get().config.getDynamicLightsMode().isEnabled()) {
BluSpring marked this conversation as resolved.
Show resolved Hide resolved
int dynamic = (int) LambDynLights.get().getDynamicLightLevel(pos);
if (dynamic > original)
return dynamic;
}

return original;
}
}
5 changes: 3 additions & 2 deletions src/main/resources/lambdynlights.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
"BlockEntityTypeMixin",
"ClientWorldMixin",
"CommonWorldRendererMixin",
"EntityTypeMixin",
"DebugHudMixin",
"EntityRendererMixin",
"EntityTypeMixin",
"MinecraftClientMixin",
"VideoOptionsScreenMixin",
"WorldMixin",
"ltr.LilTaterBlockEntityMixin",
"ltr.LilTaterBlocksMixin"
"ltr.LilTaterBlocksMixin",
"sodium.LightDataAccessMixin"
],
"injectors": {
"defaultRequire": 1
Expand Down