Removed minecraft package bc it's unnecessary

This commit is contained in:
2026-03-07 23:02:20 +01:00
parent 799d914dba
commit c74f20230d
40 changed files with 184 additions and 165 deletions
@@ -1,67 +1,68 @@
package org.saturnclient.ui;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.minecraft.bindings.SaturnItemStack;
import org.saturnclient.common.minecraft.bindings.SaturnSprite;
import org.saturnclient.common.minecraft.render.IMatrixStack;
import org.saturnclient.common.bindings.SaturnIdentifier;
import org.saturnclient.common.bindings.SaturnItemStack;
import org.saturnclient.common.bindings.SaturnSprite;
import org.saturnclient.common.render.IMatrixStack;
public interface RenderScope {
public IMatrixStack getMatrixStack();
public IMatrixStack getMatrixStack();
public void setOpacity(float alpha);
public void setOpacity(float alpha);
public int getColor(int color);
public int getColor(int color);
public void drawRect(int x, int y, int width, int height, int color);
public void drawRect(int x, int y, int width, int height, int color);
public void drawText(String text, int x, int y, int font, int color);
public void drawText(String text, int x, int y, int font, int color);
public void drawText(float scale, String text, int x, int y, int font, int color);
public void drawText(float scale, String text, int x, int y, int font, int color);
public void drawRoundedRectangle(int x, int y, int width, int height, int radius, int color);
public void drawRoundedRectangle(int x, int y, int width, int height, int radius, int color);
public int getScaledWindowWidth();
public int getScaledWindowWidth();
public int getScaledWindowHeight();
public int getScaledWindowHeight();
/* Saturn common sprites */
public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, int color);
/* Saturn common sprites */
public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height,
int color);
public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height);
public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height);
public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height,
int regionWith,
int regionHeight, int textureWidth, int textureHeight);
public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height,
int regionWith,
int regionHeight, int textureWidth, int textureHeight);
public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height,
int regionWidth,
int regionHeight, int textureWidth, int textureHeight, int color);
public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height,
int regionWidth,
int regionHeight, int textureWidth, int textureHeight, int color);
public void enableScissor(int x1, int y1, int x2, int y2);
public void enableScissor(int x1, int y1, int x2, int y2);
public void disableScissor();
public void disableScissor();
public boolean scissorContains(int x, int y);
public boolean scissorContains(int x, int y);
public void draw();
public void draw();
public void drawItem(SaturnItemStack item, int x, int y);
public void drawItem(SaturnItemStack item, int x, int y);
public void drawItem(SaturnItemStack stack, int x, int y, int seed);
public void drawItem(SaturnItemStack stack, int x, int y, int seed);
public void drawItem(SaturnItemStack stack, int x, int y, int seed, int z);
public void drawItem(SaturnItemStack stack, int x, int y, int seed, int z);
public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y);
public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y);
public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y, int seed);
public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y, int seed);
public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height);
public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height);
public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height, int color);
public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height, int color);
public void fill(int x1, int y1, int x2, int y2, int color);
public void fill(int x1, int y1, int x2, int y2, int color);
public void fill(int x1, int y1, int x2, int y2, int z, int color);
public void fill(int x1, int y1, int x2, int y2, int z, int color);
public void drawBorder(int x, int y, int width, int height, int color);
public void drawBorder(int x, int y, int width, int height, int color);
}
@@ -1,6 +1,6 @@
package org.saturnclient.ui.components;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.bindings.SaturnIdentifier;
import org.saturnclient.config.Theme;
import org.saturnclient.ui.Element;
import org.saturnclient.ui.ElementContext;
@@ -1,7 +1,7 @@
package org.saturnclient.ui.components;
import org.saturnclient.modules.Module;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.config.Theme;
import org.saturnclient.ui.Element;
import org.saturnclient.ui.ElementContext;
@@ -1,7 +1,7 @@
package org.saturnclient.ui.components;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.common.bindings.SaturnIdentifier;
import org.saturnclient.config.Config;
import org.saturnclient.config.Theme;
import org.saturnclient.ui.Element;
@@ -1,6 +1,6 @@
package org.saturnclient.ui.components.inputs;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.config.Theme;
import org.saturnclient.config.manager.Key;
import org.saturnclient.config.manager.Property;
@@ -1,6 +1,6 @@
package org.saturnclient.ui.elements;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.bindings.SaturnIdentifier;
import org.saturnclient.config.Theme;
import org.saturnclient.ui.Element;
import org.saturnclient.ui.ElementContext;
@@ -1,8 +1,8 @@
package org.saturnclient.ui.elements;
import org.saturnclient.common.minecraft.IMinecraftClient;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.IMinecraftClient;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.common.bindings.SaturnIdentifier;
import org.saturnclient.ui.Element;
import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui.RenderScope;
@@ -1,6 +1,6 @@
package org.saturnclient.ui.elements;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.bindings.SaturnIdentifier;
import org.saturnclient.config.Theme;
import org.saturnclient.ui.Element;
import org.saturnclient.ui.ElementContext;
@@ -1,6 +1,6 @@
package org.saturnclient.ui.elements;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.bindings.SaturnIdentifier;
import org.saturnclient.config.Theme;
import org.saturnclient.ui.Element;
import org.saturnclient.ui.ElementContext;
@@ -1,7 +1,7 @@
package org.saturnclient.ui.resources;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.common.bindings.SaturnIdentifier;
public class Fonts {
public static final SaturnIdentifier INTER = SaturnIdentifier.of("saturnclient", "inter");
@@ -10,9 +10,9 @@ import java.util.List;
import com.kitfox.svg.SVGDiagram;
import com.kitfox.svg.SVGUniverse;
import org.saturnclient.common.minecraft.IMinecraftClient;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.IMinecraftClient;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.common.bindings.SaturnIdentifier;
public class SvgTexture {
@@ -1,80 +1,84 @@
package org.saturnclient.ui.resources;
import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
import org.saturnclient.common.bindings.SaturnIdentifier;
public class Textures {
public static final SaturnIdentifier CROSSHAIR_RANGE = new SaturnIdentifier("saturnclient",
"textures/gui/hud/crosshair_range.png");
public static final SaturnIdentifier COSMETICS = new SaturnIdentifier("saturnclient",
"textures/gui/components/cosmetics.png");
public static final SaturnIdentifier HUD_ICON = new SaturnIdentifier("saturnclient",
"textures/gui/components/hud.png");
public static final SaturnIdentifier SEARCH = new SaturnIdentifier("saturnclient",
"textures/gui/components/search.png");
public static final SaturnIdentifier CLOSE = new SaturnIdentifier("saturnclient",
"textures/gui/components/close.png");
public static final SaturnIdentifier MODS_TAB = new SaturnIdentifier("saturnclient",
"textures/gui/components/mods_tab.png");
public static final SaturnIdentifier SETTINGS = new SaturnIdentifier("saturnclient",
"textures/gui/components/settings.png");
public static final SaturnIdentifier CLOAK = new SaturnIdentifier("saturnclient",
"textures/gui/components/cloak.png");
public static final SaturnIdentifier HAT = new SaturnIdentifier("saturnclient", "textures/gui/components/hat.png");
public static final SaturnIdentifier RESET = new SaturnIdentifier("saturnclient",
"textures/gui/components/reset.png");
public static final SaturnIdentifier TOGGLE_INDICATOR = new SaturnIdentifier("saturnclient",
"textures/gui/components/toggle_indicator.png");
public static final SaturnIdentifier LEFT = new SaturnIdentifier("saturnclient",
"textures/gui/components/left.png");
public static final SaturnIdentifier RIGHT = new SaturnIdentifier("saturnclient",
"textures/gui/components/right.png");
public static final SaturnIdentifier STORE = new SaturnIdentifier("saturnclient",
"textures/gui/components/store.png");
public static final SaturnIdentifier COINS = new SaturnIdentifier("saturnclient",
"textures/gui/components/coins.png");
public static final SaturnIdentifier SHIRT = new SaturnIdentifier("saturnclient",
"textures/gui/components/shirt.png");
public static final SaturnIdentifier CIRCLE_X = new SaturnIdentifier("saturnclient",
"textures/gui/components/circle_x.png");
public static final SaturnIdentifier INFO = new SaturnIdentifier("saturnclient",
"textures/gui/components/info.png");
public static final SaturnIdentifier CHECK = new SaturnIdentifier("saturnclient",
"textures/gui/components/check.png");
public static final SaturnIdentifier CROSSHAIR_RANGE = new SaturnIdentifier("saturnclient",
"textures/gui/hud/crosshair_range.png");
public static final SaturnIdentifier COSMETICS = new SaturnIdentifier("saturnclient",
"textures/gui/components/cosmetics.png");
public static final SaturnIdentifier HUD_ICON = new SaturnIdentifier("saturnclient",
"textures/gui/components/hud.png");
public static final SaturnIdentifier SEARCH = new SaturnIdentifier("saturnclient",
"textures/gui/components/search.png");
public static final SaturnIdentifier CLOSE = new SaturnIdentifier("saturnclient",
"textures/gui/components/close.png");
public static final SaturnIdentifier MODS_TAB = new SaturnIdentifier("saturnclient",
"textures/gui/components/mods_tab.png");
public static final SaturnIdentifier SETTINGS = new SaturnIdentifier("saturnclient",
"textures/gui/components/settings.png");
public static final SaturnIdentifier CLOAK = new SaturnIdentifier("saturnclient",
"textures/gui/components/cloak.png");
public static final SaturnIdentifier HAT = new SaturnIdentifier("saturnclient",
"textures/gui/components/hat.png");
public static final SaturnIdentifier RESET = new SaturnIdentifier("saturnclient",
"textures/gui/components/reset.png");
public static final SaturnIdentifier TOGGLE_INDICATOR = new SaturnIdentifier("saturnclient",
"textures/gui/components/toggle_indicator.png");
public static final SaturnIdentifier LEFT = new SaturnIdentifier("saturnclient",
"textures/gui/components/left.png");
public static final SaturnIdentifier RIGHT = new SaturnIdentifier("saturnclient",
"textures/gui/components/right.png");
public static final SaturnIdentifier STORE = new SaturnIdentifier("saturnclient",
"textures/gui/components/store.png");
public static final SaturnIdentifier COINS = new SaturnIdentifier("saturnclient",
"textures/gui/components/coins.png");
public static final SaturnIdentifier SHIRT = new SaturnIdentifier("saturnclient",
"textures/gui/components/shirt.png");
public static final SaturnIdentifier CIRCLE_X = new SaturnIdentifier("saturnclient",
"textures/gui/components/circle_x.png");
public static final SaturnIdentifier INFO = new SaturnIdentifier("saturnclient",
"textures/gui/components/info.png");
public static final SaturnIdentifier CHECK = new SaturnIdentifier("saturnclient",
"textures/gui/components/check.png");
public static final SaturnIdentifier LOGO = new SaturnIdentifier("saturnclient", "textures/logo/logo.png");
public static final SaturnIdentifier REALISTIC_LOGO = new SaturnIdentifier("saturnclient",
"textures/logo/realistic.png");
public static final SaturnIdentifier LOGO_TEXT = new SaturnIdentifier("saturnclient", "textures/logo/text.png");
public static final SaturnIdentifier LOGO_TEXT_BIG = new SaturnIdentifier("saturnclient",
"textures/logo/text_big.png");
public static final SaturnIdentifier SPLASH = new SaturnIdentifier("saturnclient", "textures/gui/splash.png");
public static final SaturnIdentifier LOGO = new SaturnIdentifier("saturnclient", "textures/logo/logo.png");
public static final SaturnIdentifier REALISTIC_LOGO = new SaturnIdentifier("saturnclient",
"textures/logo/realistic.png");
public static final SaturnIdentifier LOGO_TEXT = new SaturnIdentifier("saturnclient", "textures/logo/text.png");
public static final SaturnIdentifier LOGO_TEXT_BIG = new SaturnIdentifier("saturnclient",
"textures/logo/text_big.png");
public static final SaturnIdentifier SPLASH = new SaturnIdentifier("saturnclient", "textures/gui/splash.png");
// Widgets
public static final SaturnIdentifier BUTTON_BORDER = new SaturnIdentifier("saturnclient", "button_border");
public static final SaturnIdentifier BUTTON = new SaturnIdentifier("saturnclient", "button");
public static final SaturnIdentifier BUTTON_OP = new SaturnIdentifier("saturnclient", "button_op");
public static final SaturnIdentifier SETTINGS_BG = new SaturnIdentifier("saturnclient", "settings_bg");
public static final SaturnIdentifier RECT = new SaturnIdentifier("saturnclient", "rect");
public static final SaturnIdentifier RECT_BORDER = new SaturnIdentifier("saturnclient", "rect_border");
public static final SaturnIdentifier MOD = new SaturnIdentifier("saturnclient", "textures/gui/components/mod.png");
public static final SaturnIdentifier MOD_BG = new SaturnIdentifier("saturnclient",
"textures/gui/components/mod_bg.png");
// Widgets
public static final SaturnIdentifier BUTTON_BORDER = new SaturnIdentifier("saturnclient", "button_border");
public static final SaturnIdentifier BUTTON = new SaturnIdentifier("saturnclient", "button");
public static final SaturnIdentifier BUTTON_OP = new SaturnIdentifier("saturnclient", "button_op");
public static final SaturnIdentifier SETTINGS_BG = new SaturnIdentifier("saturnclient", "settings_bg");
public static final SaturnIdentifier RECT = new SaturnIdentifier("saturnclient", "rect");
public static final SaturnIdentifier RECT_BORDER = new SaturnIdentifier("saturnclient", "rect_border");
public static final SaturnIdentifier MOD = new SaturnIdentifier("saturnclient",
"textures/gui/components/mod.png");
public static final SaturnIdentifier MOD_BG = new SaturnIdentifier("saturnclient",
"textures/gui/components/mod_bg.png");
public static SaturnIdentifier getCloakPreview(String cloak) {
return new SaturnIdentifier("saturnclient",
"textures/gui/cloak/" + (cloak.isEmpty() ? "none" : cloak) + ".png");
}
public static SaturnIdentifier getCloakPreview(String cloak) {
return new SaturnIdentifier("saturnclient",
"textures/gui/cloak/" + (cloak.isEmpty() ? "none" : cloak) + ".png");
}
public static SaturnIdentifier getHatPreview(String hat) {
return new SaturnIdentifier("saturnclient", "textures/gui/hat/" + (hat.isEmpty() ? "none" : hat) + ".png");
}
public static SaturnIdentifier getHatPreview(String hat) {
return new SaturnIdentifier("saturnclient",
"textures/gui/hat/" + (hat.isEmpty() ? "none" : hat) + ".png");
}
public static SaturnIdentifier getEmotePreview(String emote) {
return new SaturnIdentifier("saturnclient", "textures/gui/emote/" + (emote == null ? "none" : emote) + ".png");
}
public static SaturnIdentifier getEmotePreview(String emote) {
return new SaturnIdentifier("saturnclient",
"textures/gui/emote/" + (emote == null ? "none" : emote) + ".png");
}
public static SaturnIdentifier getModIcon(String modId) {
return new SaturnIdentifier("saturnclient", "textures/gui/mod/" + modId + ".svg");
}
public static SaturnIdentifier getModIcon(String modId) {
return new SaturnIdentifier("saturnclient", "textures/gui/mod/" + modId + ".svg");
}
}
@@ -2,7 +2,7 @@ package org.saturnclient.ui.screens;
import org.saturnclient.cosmetics.Emotes;
import org.saturnclient.client.ServiceClient;
import org.saturnclient.common.minecraft.bindings.SaturnClientBindings;
import org.saturnclient.common.bindings.SaturnClientBindings;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.config.Config;
import org.saturnclient.ui.SaturnScreen;
@@ -4,7 +4,7 @@ import org.saturnclient.modules.HudMod;
import org.saturnclient.modules.ModDimensions;
import org.saturnclient.modules.ModManager;
import org.saturnclient.modules.Module;
import org.saturnclient.common.minecraft.render.IMatrixStack;
import org.saturnclient.common.render.IMatrixStack;
import org.saturnclient.config.manager.ConfigManager;
import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui.SaturnScreen;
@@ -1,6 +1,6 @@
package org.saturnclient.ui.screens;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.config.Config;
import org.saturnclient.ui.SaturnScreen;
@@ -1,7 +1,7 @@
package org.saturnclient.ui.screens;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.minecraft.MinecraftProvider.MinecraftScreen;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.common.MinecraftProvider.MinecraftScreen;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.config.Config;
import org.saturnclient.ui.SaturnScreen;
@@ -1,8 +1,7 @@
package org.saturnclient.ui.screens.cosmetics;
import org.saturnclient.client.player.SaturnPlayer;
// import org.saturnclient.cosmetics.cloak.Cloaks;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui.anim.Fade;
@@ -1,7 +1,7 @@
package org.saturnclient.ui.screens.cosmetics;
import org.saturnclient.client.player.SaturnPlayer;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.cosmetics.Hats;
import org.saturnclient.ui.SaturnScreen;
@@ -3,7 +3,7 @@ package org.saturnclient.ui.screens.store;
// import org.saturnclient.cosmetics.cloak.Cloaks;
import org.saturnclient.client.ServiceClient;
import org.saturnclient.client.player.SaturnPlayer;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.config.Theme;
import org.saturnclient.ui.SaturnScreen;
@@ -2,7 +2,7 @@ package org.saturnclient.ui.screens.store;
import org.saturnclient.client.ServiceClient;
import org.saturnclient.client.player.SaturnPlayer;
import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.common.MinecraftProvider;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.config.Theme;
import org.saturnclient.cosmetics.Hats;