diff --git a/src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java b/src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java index ddf431ea..a2161e3d 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java +++ b/src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java @@ -84,17 +84,6 @@ public abstract class MixinEntityRenderer implements EntityRendererHandler.IEnti //$$ } //#endif - // Moved to MixinFogRenderer in 1.13 - //#if MC<11400 - //$$ @Inject(method = "setupFog", at = @At("HEAD"), cancellable = true) - //$$ private void replayModRender_onSetupFog(int fogDistanceFlag, float partialTicks, CallbackInfo ci) { - //$$ if (replayModRender_handler == null) return; - //$$ if (replayModRender_handler.getSettings().getChromaKeyingColor() != null) { - //$$ ci.cancel(); - //$$ } - //$$ } - //#endif - @Inject(method = "renderHand", at = @At("HEAD"), cancellable = true) private void replayModRender_renderSpectatorHand( //#if MC>=11500 diff --git a/src/main/java/com/replaymod/render/mixin/MixinFogRenderer.java b/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java similarity index 87% rename from src/main/java/com/replaymod/render/mixin/MixinFogRenderer.java rename to src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java index 8249e6c8..48719c54 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinFogRenderer.java +++ b/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java @@ -1,4 +1,3 @@ -//#if MC>=11400 package com.replaymod.render.mixin; import com.replaymod.core.versions.MCVer; @@ -9,12 +8,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -//#if MC>=11400 -import net.minecraft.client.render.Camera; -//#endif - @Mixin(BackgroundRenderer.class) -public abstract class MixinFogRenderer { +public abstract class Mixin_ChromaKeyDisableFog { @Inject(method = "applyFog", at = @At("HEAD"), cancellable = true) private //#if MC>=11500 @@ -29,4 +24,3 @@ public abstract class MixinFogRenderer { } } } -//#endif diff --git a/src/main/resources/mixins.render.replaymod.json b/src/main/resources/mixins.render.replaymod.json index 3e47b65d..c22eb4f9 100644 --- a/src/main/resources/mixins.render.replaymod.json +++ b/src/main/resources/mixins.render.replaymod.json @@ -5,6 +5,7 @@ "server": [], "client": [ "Mixin_ChromaKeyColorSky", + "Mixin_ChromaKeyDisableFog", "Mixin_ChromaKeyForceSky", "Mixin_CubicRotation", "Mixin_SkipBlockOutlinesDuringRender", @@ -31,9 +32,6 @@ //#endif "MixinCamera", "MixinEntityRenderer", - //#if MC>=11400 - "MixinFogRenderer", - //#endif //#if MC>=10800 "MixinGlStateManager", //#endif diff --git a/versions/1.12.2/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java b/versions/1.12.2/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java new file mode 100644 index 00000000..e3c1e00c --- /dev/null +++ b/versions/1.12.2/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyDisableFog.java @@ -0,0 +1,19 @@ +package com.replaymod.render.mixin; + +import com.replaymod.render.hooks.EntityRendererHandler; +import net.minecraft.client.renderer.EntityRenderer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(EntityRenderer.class) +public abstract class Mixin_ChromaKeyDisableFog implements EntityRendererHandler.IEntityRenderer { + @Inject(method = "setupFog", at = @At("HEAD"), cancellable = true) + private void replayModRender_onSetupFog(int fogDistanceFlag, float partialTicks, CallbackInfo ci) { + EntityRendererHandler handler = replayModRender_getHandler(); + if (handler != null && handler.getSettings().getChromaKeyingColor() != null) { + ci.cancel(); + } + } +}