From 4832304f91c8465b1355da106cb0626dbfd7b52f Mon Sep 17 00:00:00 2001
From: DJtheRedstoner <52044242+DJtheRedstoner@users.noreply.github.com>
Date: Thu, 13 Oct 2022 19:30:09 -0400
Subject: [PATCH] change: remove sky color optimization (#120)

This optimization broke sky color in certain conditions and as far as
I can tell gives no noticeable performance improvement.

Fixes #56, #59
---
 src/main/java/club/sk1er/patcher/Patcher.java |  3 +--
 .../mixins/bugfixes/WorldMixin_SkyColor.java  | 18 -------------
 .../patcher/util/world/WorldHandler.java      | 26 -------------------
 src/main/resources/patcher.mixins.json        |  1 -
 4 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 src/main/java/club/sk1er/patcher/mixins/bugfixes/WorldMixin_SkyColor.java
 delete mode 100644 src/main/java/club/sk1er/patcher/util/world/WorldHandler.java

diff --git a/src/main/java/club/sk1er/patcher/Patcher.java b/src/main/java/club/sk1er/patcher/Patcher.java
index 8964fcfdf..1939ad49b 100644
--- a/src/main/java/club/sk1er/patcher/Patcher.java
+++ b/src/main/java/club/sk1er/patcher/Patcher.java
@@ -29,7 +29,6 @@
 import club.sk1er.patcher.util.screenshot.AsyncScreenshots;
 import club.sk1er.patcher.util.status.ProtocolVersionDetector;
 import club.sk1er.patcher.util.world.SavesWatcher;
-import club.sk1er.patcher.util.world.WorldHandler;
 import club.sk1er.patcher.util.world.render.culling.EntityCulling;
 import club.sk1er.patcher.util.world.render.entity.EntityRendering;
 import club.sk1er.patcher.util.world.sound.SoundHandler;
@@ -143,7 +142,7 @@ public void onInit(FMLInitializationEvent event) {
             new OverlayHandler(), new EntityRendering(), new FovHandler(),
             new ChatHandler(), new GlanceRenderer(), new EntityCulling(),
             new ArmorStatusRenderer(), new PatcherMenuEditor(), new ImagePreview(),
-            new WorldHandler(), new TitleFix(), new LinuxKeybindFix(),
+            new TitleFix(), new LinuxKeybindFix(),
             new MetricsRenderer(), new HUDCaching(), new EntityRendererHook(),
             MinecraftHook.INSTANCE, ScreenshotPreview.INSTANCE,
             new MousePerspectiveKeybindHandler()
diff --git a/src/main/java/club/sk1er/patcher/mixins/bugfixes/WorldMixin_SkyColor.java b/src/main/java/club/sk1er/patcher/mixins/bugfixes/WorldMixin_SkyColor.java
deleted file mode 100644
index b8f6a36b4..000000000
--- a/src/main/java/club/sk1er/patcher/mixins/bugfixes/WorldMixin_SkyColor.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package club.sk1er.patcher.mixins.bugfixes;
-
-import club.sk1er.patcher.util.world.WorldHandler;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldProvider;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(World.class)
-public class WorldMixin_SkyColor {
-    @Redirect(method = "getSkyColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/WorldProvider;getSkyColor(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/util/Vec3;", remap = false))
-    private Vec3 patcher$staticFogColor(WorldProvider worldProvider, Entity cameraEntity, float partialTicks) {
-        return WorldHandler.skyColorVector;
-    }
-}
diff --git a/src/main/java/club/sk1er/patcher/util/world/WorldHandler.java b/src/main/java/club/sk1er/patcher/util/world/WorldHandler.java
deleted file mode 100644
index be67dc34f..000000000
--- a/src/main/java/club/sk1er/patcher/util/world/WorldHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package club.sk1er.patcher.util.world;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.Vec3;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-
-public class WorldHandler {
-
-    public static Vec3 skyColorVector = new Vec3(0.472549021244049, 0.652941197156906, 1);
-
-    @SubscribeEvent
-    public void tick(TickEvent.ClientTickEvent event) {
-        if (event.phase == TickEvent.Phase.END) {
-            final WorldClient world = Minecraft.getMinecraft().theWorld;
-            if (world != null) {
-                float celestialAngle = world.getCelestialAngle(0);
-                float modifiedAngle = MathHelper.cos(celestialAngle * (float) Math.PI * 2.0F) * 2.0F + 0.5F;
-                modifiedAngle = MathHelper.clamp_float(modifiedAngle, 0.0F, 1.0F);
-                skyColorVector = new Vec3(0.472549021244049 * modifiedAngle, 0.652941197156906 * modifiedAngle, 1 * modifiedAngle);
-            }
-        }
-    }
-}
diff --git a/src/main/resources/patcher.mixins.json b/src/main/resources/patcher.mixins.json
index 00b2fb6e0..a6efb0f5a 100644
--- a/src/main/resources/patcher.mixins.json
+++ b/src/main/resources/patcher.mixins.json
@@ -74,7 +74,6 @@
     "bugfixes.TileEntityRendererDispatcherMixin_EnableLighting",
     "bugfixes.TileEntitySkullRendererMixin_EnableBlending",
     "bugfixes.VertexBufferMixin_ResolveLockups",
-    "bugfixes.WorldMixin_SkyColor",
     "bugfixes.WorldMixin_SkyHeight",
     "bugfixes.crashes.EntityLivingBaseMixin_ResolveCrash",
     "bugfixes.crashes.GameSettingsMixin_ResolveCrash",