diff --git a/common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java b/common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java index 5a8a06149..fc4938e28 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinVanillaFogCommon.java @@ -9,8 +9,8 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftCli import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import net.minecraft.client.Minecraft; import net.minecraft.client.Camera; -import net.minecraft.client.renderer.FogRenderer; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -51,11 +51,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; #else import net.minecraft.world.level.material.FogType; -import net.minecraft.client.renderer.fog.FogRenderer; -import net.minecraft.client.renderer.fog.FogData; - -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; #endif diff --git a/coreSubProjects b/coreSubProjects index 3ef8bd7e2..c4f4935fd 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 3ef8bd7e20af02d42ea4f470d67147257f6c617e +Subproject commit c4f4935fddb076296d9d30baaf0d5cec1e268090 diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java index 7136e5f4c..31fb7615a 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java @@ -135,7 +135,7 @@ public class MixinFogRenderer ) private void onSetRenderDistanceEnd(FogData instance, float value, Operation original) { - if (cancelFog()) + if (MixinVanillaFogCommon.cancelFog()) { instance.environmentalStart = A_REALLY_REALLY_BIG_VALUE; instance.environmentalEnd = A_EVEN_LARGER_VALUE; diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java index 7437d78a3..72aa56096 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java @@ -139,7 +139,7 @@ public class MixinFogRenderer ) private void onSetRenderDistanceEnd(FogData instance, float value, Operation original) { - if (cancelFog()) + if (MixinVanillaFogCommon.cancelFog()) { instance.environmentalStart = A_REALLY_REALLY_BIG_VALUE; instance.environmentalEnd = A_EVEN_LARGER_VALUE;