From 323f0fa0870cac9d8e802805bf0dbe7f9996d607 Mon Sep 17 00:00:00 2001
From: EnZaXD <florian.michael07@gmail.com>
Date: Sun, 7 Jul 2024 18:03:35 +0200
Subject: [PATCH] Remove minimize-cooldown config option (#4009)

---
 .../viaversion/api/configuration/ViaVersionConfig.java     | 7 -------
 .../viaversion/configuration/AbstractViaConfig.java        | 7 -------
 .../v1_8to1_9/rewriter/EntityPacketRewriter1_9.java        | 2 --
 common/src/main/resources/assets/viaversion/config.yml     | 2 --
 4 files changed, 18 deletions(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java b/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
index 28086be93..c80f9729d 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/configuration/ViaVersionConfig.java
@@ -292,13 +292,6 @@ public interface ViaVersionConfig extends Config {
      */
     boolean isDisable1_13AutoComplete();
 
-    /**
-     * Tries to minimize cooldown animation.
-     *
-     * @return true if enabled
-     */
-    boolean isMinimizeCooldown();
-
     /**
      * Enable the serverside blockconnections for 1.13+ clients
      *
diff --git a/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java b/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
index 9ed664068..03408928a 100644
--- a/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
+++ b/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
@@ -72,7 +72,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
     private String reloadDisconnectMessage;
     private boolean suppressConversionWarnings;
     private boolean disable1_13TabComplete;
-    private boolean minimizeCooldown;
     private boolean teamColourFix;
     private boolean serversideBlockConnections;
     private boolean reduceBlockStorageMemory;
@@ -134,7 +133,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
         blockedProtocolVersions = loadBlockedProtocolVersions();
         blockedDisconnectMessage = getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
         reloadDisconnectMessage = getString("reload-disconnect-msg", "Server reload, please rejoin!");
-        minimizeCooldown = getBoolean("minimize-cooldown", true);
         teamColourFix = getBoolean("team-colour-fix", true);
         suppressConversionWarnings = getBoolean("suppress-conversion-warnings", false);
         disable1_13TabComplete = getBoolean("disable-1_13-auto-complete", false);
@@ -403,11 +401,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
         return reloadDisconnectMessage;
     }
 
-    @Override
-    public boolean isMinimizeCooldown() {
-        return minimizeCooldown;
-    }
-
     @Override
     public boolean is1_13TeamColourFix() {
         return teamColourFix;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/EntityPacketRewriter1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/EntityPacketRewriter1_9.java
index 7bc40a354..9b920a444 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/EntityPacketRewriter1_9.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/EntityPacketRewriter1_9.java
@@ -278,8 +278,6 @@ public class EntityPacketRewriter1_9 extends EntityRewriter<ClientboundPackets1_
             public void register() {
                 map(Types.VAR_INT);
                 handler(wrapper -> {
-                    if (!Via.getConfig().isMinimizeCooldown()) return;
-
                     EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class);
                     if (wrapper.get(Types.VAR_INT, 0) != tracker.getProvidedEntityId()) {
                         return;
diff --git a/common/src/main/resources/assets/viaversion/config.yml b/common/src/main/resources/assets/viaversion/config.yml
index a618669cf..d0c1f476f 100644
--- a/common/src/main/resources/assets/viaversion/config.yml
+++ b/common/src/main/resources/assets/viaversion/config.yml
@@ -205,7 +205,5 @@ replace-pistons: false
 replacement-piston-id: 0
 # Fix 1.9+ clients not rendering the far away chunks and improve chunk rendering when moving fast (Increases network usage and decreases client fps slightly)
 chunk-border-fix: false
-# Minimize the cooldown animation in 1.8 servers
-minimize-cooldown: true
 # Allows 1.9+ left-handedness (main hand) on 1.8 servers
 left-handed-handling: true