diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java index 8222541..89a05bd 100644 --- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java +++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java @@ -20,8 +20,9 @@ import org.saturnclient.saturnclient.SaturnClient; * Originally created by IIpho3nix and modified for Saturn Client by leo. */ public class Cloaks { - public static final String[] ALL_CLOAKS = { "glitch", "mercedes_flow", "crimson_mark", "bmw", "amg", "amg_petronas", "ferrari", "redbull" }; - private static final String[] ANIMATED_CLOAKS = { "glitch" }; + public static final String[] ALL_CLOAKS = { "glitch", "mercedes_flow", "crimson_mark", "bmw", "amg", "amg_petronas", + "ferrari", "redbull" }; + private static final String[] ANIMATED_CLOAKS = { "glitch", "redbull" }; private static final String CLOAKS_RESOURCE_PATH = "assets/saturnclient/textures/cloaks/"; public static final List availableCloaks = new ArrayList<>(); @@ -106,27 +107,24 @@ public class Cloaks { delays.add(gif.getDelay(i) * 10); } - // Register textures on main thread - SaturnClient.client.execute(() -> { - try { - List animatedFrames = new ArrayList<>(); - for (int i = 0; i < frameCount; i++) { - String frameId = fileName.replace(".gif", "") + "_frame_" + i; - Identifier frameIdentifier = Identifier.of(SaturnClient.MOD_ID, - "cloaks_" + frameId); - IdentifierUtils.registerBufferedImageTexture(frameIdentifier, - frames.get(i)); - animatedFrames.add(new AnimatedCloakData(frameIdentifier, delays.get(i))); - } - animatedCloaks.put(uuid, animatedFrames); - lastFrameTime.put(uuid, System.currentTimeMillis()); - SaturnClient.LOGGER.info( - "Loaded " + frames.size() + " frames for animated cloak: " + fileName); - } catch (Exception e) { - SaturnClient.LOGGER - .error("Failed to register animated cloak textures: " + fileName, e); + try { + List animatedFrames = new ArrayList<>(); + for (int i = 0; i < frameCount; i++) { + String frameId = fileName.replace(".gif", "") + "_frame_" + i; + Identifier frameIdentifier = Identifier.of(SaturnClient.MOD_ID, + "cloaks_" + frameId); + IdentifierUtils.registerBufferedImageTexture(frameIdentifier, + frames.get(i)); + animatedFrames.add(new AnimatedCloakData(frameIdentifier, delays.get(i))); } - }); + animatedCloaks.put(uuid, animatedFrames); + lastFrameTime.put(uuid, System.currentTimeMillis()); + SaturnClient.LOGGER.info( + "Loaded " + frames.size() + " frames for animated cloak: " + fileName); + } catch (Exception e) { + SaturnClient.LOGGER + .error("Failed to register animated cloak textures: " + fileName, e); + } } } catch (IOException e) { SaturnClient.LOGGER diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/redbull.gif b/src/main/resources/assets/saturnclient/textures/cloaks/redbull.gif new file mode 100644 index 0000000..50b9ab4 Binary files /dev/null and b/src/main/resources/assets/saturnclient/textures/cloaks/redbull.gif differ diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/redbull.png b/src/main/resources/assets/saturnclient/textures/cloaks/redbull.png index 1a1c1f4..94e3ce3 100644 Binary files a/src/main/resources/assets/saturnclient/textures/cloaks/redbull.png and b/src/main/resources/assets/saturnclient/textures/cloaks/redbull.png differ diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/redbull2.gif b/src/main/resources/assets/saturnclient/textures/cloaks/redbull2.gif new file mode 100644 index 0000000..c6b9926 Binary files /dev/null and b/src/main/resources/assets/saturnclient/textures/cloaks/redbull2.gif differ diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/redbull_white.gif b/src/main/resources/assets/saturnclient/textures/cloaks/redbull_white.gif new file mode 100644 index 0000000..4597e2a Binary files /dev/null and b/src/main/resources/assets/saturnclient/textures/cloaks/redbull_white.gif differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/mod.png b/src/main/resources/assets/saturnclient/textures/gui/components/mod.png deleted file mode 100644 index 7202acf..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/mod.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/mod_bg.png b/src/main/resources/assets/saturnclient/textures/gui/components/mod_bg.png deleted file mode 100644 index 464a3cf..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/mod_bg.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/toggle_bg.png b/src/main/resources/assets/saturnclient/textures/gui/components/toggle_bg.png deleted file mode 100644 index 733b8bc..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/toggle_bg.png and /dev/null differ diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/toggle_indicator.png b/src/main/resources/assets/saturnclient/textures/gui/components/toggle_indicator.png deleted file mode 100644 index 2a50191..0000000 Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/toggle_indicator.png and /dev/null differ