shade caffeine

build.gradle.kts

@@ -108,6 +108,8 @@ dependencies {
 
     modRuntimeOnly("me.djtheredstoner:DevAuth-${if (platform.isFabric) "fabric" else if (platform.isLegacyForge) "forge-legacy" else "forge-latest"}:1.1.2")
 
+    shade("com.github.ben-manes.caffeine:caffeine:2.9.3")
+
     // If we are building for legacy forge, includes the launch wrapper with `shade` as we configured earlier.
     if (platform.isLegacyForge) {
         compileOnly("org.spongepowered:mixin:0.7.11-SNAPSHOT")
@@ -182,6 +184,8 @@ tasks {
         archiveClassifier.set("dev") // TODO: machete gets confused by the `dev` prefix.
         configurations = listOf(shade)
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+        relocate("com.github.benmanes", "org.polyfrost.hytils.libs")
     }
 
     remapJar {

src/main/java/org/polyfrost/hytils/config/HytilsConfig.java

@@ -30,7 +30,6 @@
 import org.apache.commons.io.FileUtils;
 import org.polyfrost.polyui.utils.ColorUtils;
 
-import java.awt.Color;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -46,7 +45,7 @@ public class HytilsConfig extends Config {
     @Switch(
         title = "Auto Start",
         description = "Join Hypixel immediately once the client has loaded to the main menu.",
-        category = "General", subcategory = "Automatic", size = 2
+        category = "General", subcategory = "Automatic"
     )
     public static boolean autoStart;
 
@@ -67,7 +66,7 @@ public class HytilsConfig extends Config {
     @Info(
         text = "Auto Queue will require you to interact with the game in a way to prevent abuse.",
         category = "General", subcategory = "Automatic",
-        type = InfoType.WARNING, size = 2
+        type = InfoType.WARNING
     )
     private static boolean autoQueueInfo;
 
@@ -563,8 +562,7 @@ public class HytilsConfig extends Config {
 
     @Text(
         title = "AutoWB Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage1 = "Welcome Back!";
 
@@ -576,64 +574,55 @@ public class HytilsConfig extends Config {
 
     @Text(
         title = "First Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage2 = "Welcome back... General %player%";
 
     @Text(
         title = "Second Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage3 = "WB!";
 
     @Text(
         title = "Third Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage4 = "Greetings! %player%";
 
     @Text(
         title = "Fourth Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage5 = "Thanks for coming back to hell >:)";
 
     @Text(
         title = "Fifth Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage6 = "Its nice having you here today %player%";
 
     @Text(
         title = "Sixth Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage7 = "Yooooooooo Mr. %player%";
 
     @Text(
         title = "Seventh Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage8 = "Welcome back Padawan %player%";
 
     @Text(
         title = "Eighth Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage9 = "Welcome Back! <3";
 
     @Text(
         title = "Ninth Random Message",
-        category = "Chat", subcategory = "AutoWB",
-        size = 2
+        category = "Chat", subcategory = "AutoWB"
     )
     public static String autoWBMessage10 = "Thanks for coming to my TED talk.";
 
@@ -808,7 +797,7 @@ public class HytilsConfig extends Config {
     @Switch(
         title = "Colored Beds",
         description = "Make beds a different color depending on the team they are on.",
-        category = "Game", subcategory = "BedWars", size = 2
+        category = "Game", subcategory = "BedWars"
     )
     public static boolean coloredBeds = true;
 

src/main/java/org/polyfrost/hytils/handlers/cache/HeightHandler.java

@@ -18,13 +18,13 @@
 
 package org.polyfrost.hytils.handlers.cache;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import net.hypixel.data.type.GameType;
 import org.polyfrost.oneconfig.api.event.v1.events.HypixelLocationEvent;
 import org.polyfrost.oneconfig.api.event.v1.events.WorldLoadEvent;
 import org.polyfrost.oneconfig.api.event.v1.invoke.EventHandler;
 import org.polyfrost.oneconfig.api.hypixel.v0.HypixelAPI;
-import org.polyfrost.oneconfig.libs.caffeine.cache.Cache;
-import org.polyfrost.oneconfig.libs.caffeine.cache.Caffeine;
 import org.polyfrost.oneconfig.utils.v1.Multithreading;
 import org.polyfrost.oneconfig.utils.v1.NetworkUtils;
 import org.polyfrost.hytils.HytilsReborn;

src/main/java/org/polyfrost/hytils/hooks/LineSeparatorEnhancements.java

@@ -18,8 +18,8 @@
 
 package org.polyfrost.hytils.hooks;
 
-import org.polyfrost.oneconfig.libs.caffeine.cache.Cache;
-import org.polyfrost.oneconfig.libs.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import org.polyfrost.hytils.HytilsReborn;
 import org.polyfrost.hytils.config.HytilsConfig;
 import net.minecraft.client.Minecraft;

src/main/java/org/polyfrost/hytils/util/DarkColorUtils.java

@@ -18,6 +18,8 @@
 
 package org.polyfrost.hytils.util;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import org.polyfrost.hytils.HytilsReborn;
 import org.polyfrost.hytils.config.HytilsConfig;
 import org.polyfrost.polyui.utils.ColorUtils;