BIG UPDATE
This commit is contained in:
parent
a0fc9c3f8c
commit
ca2a57e181
6
pom.xml
6
pom.xml
|
|
@ -34,6 +34,12 @@
|
|||
<version>20230227</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.vecmath</groupId>
|
||||
<artifactId>vecmath</artifactId>
|
||||
<version>1.5.2</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.reflections</groupId>
|
||||
<artifactId>reflections</artifactId>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -187,8 +187,14 @@ import org.lwjgl.util.glu.GLU;
|
|||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.events.Event;
|
||||
import rip.athena.client.events.types.client.ClientTickEvent;
|
||||
import rip.athena.client.events.types.entity.PlayerInteractEvent;
|
||||
import rip.athena.client.events.types.input.KeyDownEvent;
|
||||
import rip.athena.client.events.types.input.KeyUpEvent;
|
||||
import rip.athena.client.events.types.input.MouseDownEvent;
|
||||
import rip.athena.client.events.types.input.MouseMoveEvent;
|
||||
import rip.athena.client.events.types.render.RenderEvent;
|
||||
import rip.athena.client.events.types.render.RenderType;
|
||||
import rip.athena.client.gui.menu.AthenaMenu;
|
||||
|
||||
public class Minecraft implements IThreadListener, IPlayerUsage
|
||||
{
|
||||
|
|
@ -315,7 +321,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage
|
|||
*/
|
||||
private long debugCrashKeyPressTime = -1L;
|
||||
private IReloadableResourceManager mcResourceManager;
|
||||
private final IMetadataSerializer metadataSerializer_ = new IMetadataSerializer();
|
||||
public final IMetadataSerializer metadataSerializer_ = new IMetadataSerializer();
|
||||
private final List<IResourcePack> defaultResourcePacks = Lists.<IResourcePack>newArrayList();
|
||||
private final DefaultResourcePack mcDefaultResourcePack;
|
||||
private ResourcePackRepository mcResourcePackRepository;
|
||||
|
|
@ -479,6 +485,8 @@ public class Minecraft implements IThreadListener, IPlayerUsage
|
|||
this.displayHeight = this.gameSettings.overrideHeight;
|
||||
}
|
||||
|
||||
Athena.INSTANCE.initClient();
|
||||
|
||||
logger.info("LWJGL Version: " + Sys.getVersion());
|
||||
this.setWindowIcon();
|
||||
this.setInitialDisplayMode();
|
||||
|
|
@ -565,15 +573,13 @@ public class Minecraft implements IThreadListener, IPlayerUsage
|
|||
this.checkGLError("Post startup");
|
||||
this.ingameGUI = new GuiIngame(this);
|
||||
|
||||
Athena.INSTANCE.initClient();
|
||||
|
||||
if (this.serverName != null)
|
||||
{
|
||||
this.displayGuiScreen(new GuiConnecting(new GuiMainMenu(), this, this.serverName, this.serverPort));
|
||||
this.displayGuiScreen(new GuiConnecting(new AthenaMenu(), this, this.serverName, this.serverPort));
|
||||
}
|
||||
else
|
||||
{
|
||||
this.displayGuiScreen(new GuiMainMenu());
|
||||
this.displayGuiScreen(new AthenaMenu());
|
||||
}
|
||||
|
||||
this.renderEngine.deleteTexture(this.mojangLogo);
|
||||
|
|
@ -908,6 +914,18 @@ public class Minecraft implements IThreadListener, IPlayerUsage
|
|||
GlStateManager.enableTexture2D();
|
||||
InputStream inputstream = null;
|
||||
|
||||
if(!Athena.INSTANCE.getEventBus().post(new RenderEvent(RenderType.SPLASH_SCREEN))) {
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
int j = 256;
|
||||
int k = 256;
|
||||
framebuffer.unbindFramebuffer();
|
||||
framebuffer.framebufferRender(scaledresolution.getScaledWidth() * i, scaledresolution.getScaledHeight() * i);
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.alphaFunc(516, 0.1F);
|
||||
this.updateDisplay();
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
inputstream = this.mcDefaultResourcePack.getInputStream(locationMojangPng);
|
||||
|
|
@ -977,14 +995,14 @@ public class Minecraft implements IThreadListener, IPlayerUsage
|
|||
|
||||
if (guiScreenIn == null && this.theWorld == null)
|
||||
{
|
||||
guiScreenIn = new GuiMainMenu();
|
||||
guiScreenIn = new AthenaMenu();
|
||||
}
|
||||
else if (guiScreenIn == null && this.thePlayer.getHealth() <= 0.0F)
|
||||
{
|
||||
guiScreenIn = new GuiGameOver();
|
||||
}
|
||||
|
||||
if (guiScreenIn instanceof GuiMainMenu)
|
||||
if (guiScreenIn instanceof AthenaMenu)
|
||||
{
|
||||
this.gameSettings.showDebugInfo = false;
|
||||
this.ingameGUI.getChatGUI().clearChatMessages();
|
||||
|
|
@ -1532,6 +1550,10 @@ public class Minecraft implements IThreadListener, IPlayerUsage
|
|||
|
||||
if (this.theWorld.getBlockState(blockpos).getBlock().getMaterial() != Material.air)
|
||||
{
|
||||
if(!Athena.INSTANCE.getEventBus().post(new PlayerInteractEvent(PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK, blockpos, this.theWorld))) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.playerController.clickBlock(blockpos, this.objectMouseOver.sideHit);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1825,11 +1847,19 @@ public class Minecraft implements IThreadListener, IPlayerUsage
|
|||
|
||||
while (Mouse.next())
|
||||
{
|
||||
if(!Athena.INSTANCE.getEventBus().post(new MouseMoveEvent())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
int i = Mouse.getEventButton();
|
||||
KeyBinding.setKeyBindState(i - 100, Mouse.getEventButtonState());
|
||||
|
||||
if (Mouse.getEventButtonState())
|
||||
{
|
||||
if(!Athena.INSTANCE.getEventBus().post(new MouseDownEvent(i))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (this.thePlayer.isSpectator() && i == 2)
|
||||
{
|
||||
this.ingameGUI.getSpectatorGui().func_175261_b();
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ public abstract class AbstractClientPlayer extends EntityPlayer
|
|||
return this.getPlayerInfo() != null;
|
||||
}
|
||||
|
||||
protected NetworkPlayerInfo getPlayerInfo()
|
||||
public NetworkPlayerInfo getPlayerInfo()
|
||||
{
|
||||
if (this.playerInfo == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ public class Gui
|
|||
* Draws a rectangle with a vertical gradient between the specified colors (ARGB format). Args : x1, y1, x2, y2,
|
||||
* topColor, bottomColor
|
||||
*/
|
||||
protected void drawGradientRect(int left, int top, int right, int bottom, int startColor, int endColor)
|
||||
public void drawGradientRect(int left, int top, int right, int bottom, int startColor, int endColor)
|
||||
{
|
||||
float f = (float)(startColor >> 24 & 255) / 255.0F;
|
||||
float f1 = (float)(startColor >> 16 & 255) / 255.0F;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,10 @@ import net.minecraft.client.audio.PositionedSoundRecord;
|
|||
import net.minecraft.client.audio.SoundHandler;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.utils.render.DrawUtils;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
public class GuiButton extends Gui
|
||||
{
|
||||
|
|
@ -87,11 +91,15 @@ public class GuiButton extends Gui
|
|||
GlStateManager.enableBlend();
|
||||
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
|
||||
GlStateManager.blendFunc(770, 771);
|
||||
this.drawTexturedModalRect(this.xPosition, this.yPosition, 0, 46 + i * 20, this.width / 2, this.height);
|
||||
this.drawTexturedModalRect(this.xPosition + this.width / 2, this.yPosition, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
|
||||
//this.drawTexturedModalRect(this.xPosition, this.yPosition, 0, 46 + i * 20, this.width / 2, this.height);
|
||||
//this.drawTexturedModalRect(this.xPosition + this.width / 2, this.yPosition, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
|
||||
this.mouseDragged(mc, mouseX, mouseY);
|
||||
int j = 14737632;
|
||||
|
||||
DrawUtils.drawRoundedRect(this.xPosition, this.yPosition, this.xPosition + this.width, this.yPosition + this.height, 4, hovered ? new Color(200,200,200,100).getRGB() : new Color(100,100,100,100).getRGB());
|
||||
DrawUtils.drawRoundedRect(this.xPosition + 1, this.yPosition + 1, (this.xPosition + this.width) - 1, (this.yPosition + this.height) - 1, 3, new Color(22, 24, 27,100).getRGB());
|
||||
|
||||
|
||||
if (!this.enabled)
|
||||
{
|
||||
j = 10526880;
|
||||
|
|
@ -101,7 +109,7 @@ public class GuiButton extends Gui
|
|||
j = 16777120;
|
||||
}
|
||||
|
||||
this.drawCenteredString(fontrenderer, this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height - 8) / 2, j);
|
||||
FontManager.baloo17.drawCenteredString(this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height - 12) / 2, -1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,8 @@ public class GuiIngame extends Gui
|
|||
this.mc.getTextureManager().bindTexture(icons);
|
||||
GlStateManager.enableBlend();
|
||||
|
||||
if (this.showCrosshair() && this.mc.gameSettings.thirdPersonView < 1)
|
||||
//if (this.showCrosshair() && this.mc.gameSettings.thirdPersonView < 1)
|
||||
if (this.showCrosshair() && Athena.INSTANCE.getEventBus().post(new RenderEvent(RenderType.CROSSHAIR, partialTicks)))
|
||||
{
|
||||
GlStateManager.tryBlendFuncSeparate(775, 769, 1, 0);
|
||||
GlStateManager.enableAlpha();
|
||||
|
|
|
|||
|
|
@ -86,6 +86,8 @@ import org.lwjgl.opengl.GL11;
|
|||
import org.lwjgl.opengl.GLContext;
|
||||
import org.lwjgl.util.glu.GLU;
|
||||
import org.lwjgl.util.glu.Project;
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.modules.impl.mods.Zoom;
|
||||
import shadersmod.client.Shaders;
|
||||
import shadersmod.client.ShadersRender;
|
||||
|
||||
|
|
@ -318,7 +320,7 @@ public class EntityRenderer implements IResourceManagerReloadListener
|
|||
}
|
||||
}
|
||||
|
||||
private void loadShader(ResourceLocation resourceLocationIn)
|
||||
public void loadShader(ResourceLocation resourceLocationIn)
|
||||
{
|
||||
if (OpenGlHelper.isFramebufferEnabled())
|
||||
{
|
||||
|
|
@ -623,15 +625,26 @@ public class EntityRenderer implements IResourceManagerReloadListener
|
|||
|
||||
if (flag)
|
||||
{
|
||||
Zoom zoom = (Zoom) Athena.INSTANCE.getModuleManager().get(Zoom.class);
|
||||
|
||||
if (!Config.zoomMode)
|
||||
{
|
||||
Config.zoomMode = true;
|
||||
this.mc.gameSettings.smoothCamera = true;
|
||||
if(zoom.isToggled()) {
|
||||
this.mc.gameSettings.smoothCamera = zoom.smoothZoom;
|
||||
}
|
||||
this.mc.renderGlobal.displayListEntitiesDirty = true;
|
||||
}
|
||||
|
||||
if (Config.zoomMode)
|
||||
{
|
||||
f /= 4.0F;
|
||||
|
||||
if(zoom.isToggled()) {
|
||||
f += zoom.scrollAmount;
|
||||
f = MathHelper.clamp_float(f, 2.75F, 110.0F);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (Config.zoomMode)
|
||||
|
|
|
|||
|
|
@ -184,10 +184,10 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
|
|||
private int renderEntitiesStartupCounter = 2;
|
||||
|
||||
/** Count entities total */
|
||||
private int countEntitiesTotal;
|
||||
public int countEntitiesTotal;
|
||||
|
||||
/** Count entities rendered */
|
||||
private int countEntitiesRendered;
|
||||
public int countEntitiesRendered;
|
||||
|
||||
/** Count entities hidden */
|
||||
private int countEntitiesHidden;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ import net.minecraft.scoreboard.Score;
|
|||
import net.minecraft.scoreboard.ScoreObjective;
|
||||
import net.minecraft.scoreboard.Scoreboard;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.events.types.render.RenderPlayerEvent;
|
||||
|
||||
public class RenderPlayer extends RendererLivingEntity<AbstractClientPlayer>
|
||||
{
|
||||
|
|
@ -54,6 +56,10 @@ public class RenderPlayer extends RendererLivingEntity<AbstractClientPlayer>
|
|||
*/
|
||||
public void doRender(AbstractClientPlayer entity, double x, double y, double z, float entityYaw, float partialTicks)
|
||||
{
|
||||
if(!Athena.INSTANCE.getEventBus().post(new RenderPlayerEvent(entity, x, y, z, partialTicks))) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!entity.isUser() || this.renderManager.livingPlayer == entity)
|
||||
{
|
||||
double d0 = y;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ public class SimpleReloadableResourceManager implements IReloadableResourceManag
|
|||
{
|
||||
private static final Logger logger = LogManager.getLogger();
|
||||
private static final Joiner joinerResourcePacks = Joiner.on(", ");
|
||||
private final Map<String, FallbackResourceManager> domainResourceManagers = Maps.<String, FallbackResourceManager>newHashMap();
|
||||
public static final Map<String, FallbackResourceManager> domainResourceManagers = Maps.<String, FallbackResourceManager>newHashMap();
|
||||
private final List<IResourceManagerReloadListener> reloadListeners = Lists.<IResourceManagerReloadListener>newArrayList();
|
||||
private final Set<String> setResourceDomains = Sets.<String>newLinkedHashSet();
|
||||
private final IMetadataSerializer rmMetadataSerializer;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ import net.minecraft.util.Vec3;
|
|||
import net.minecraft.world.Explosion;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
|
||||
public abstract class Entity implements ICommandSender
|
||||
{
|
||||
|
|
@ -233,6 +234,8 @@ public abstract class Entity implements ICommandSender
|
|||
/** The command result statistics for this Entity. */
|
||||
private final CommandResultStats cmdResultStats;
|
||||
|
||||
private net.minecraftforge.common.capabilities.CapabilityDispatcher capabilities;
|
||||
|
||||
public int getEntityId()
|
||||
{
|
||||
return this.entityId;
|
||||
|
|
@ -2792,4 +2795,17 @@ public abstract class Entity implements ICommandSender
|
|||
|
||||
EnchantmentHelper.applyArthropodEnchantments(entityLivingBaseIn, entityIn);
|
||||
}
|
||||
|
||||
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
|
||||
{
|
||||
if (getCapability(capability, facing) != null)
|
||||
return true;
|
||||
return capabilities == null ? false : capabilities.hasCapability(capability, facing);
|
||||
}
|
||||
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
|
||||
{
|
||||
return capabilities == null ? null : capabilities.getCapability(capability, facing);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,6 +74,9 @@ import net.minecraft.world.IInteractionObject;
|
|||
import net.minecraft.world.LockCode;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldSettings;
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.events.types.entity.PlayerInteractEvent;
|
||||
import rip.athena.client.events.types.entity.PlayerTickEvent;
|
||||
|
||||
@SuppressWarnings("incomplete-switch")
|
||||
public abstract class EntityPlayer extends EntityLivingBase
|
||||
|
|
@ -596,6 +599,8 @@ public abstract class EntityPlayer extends EntityLivingBase
|
|||
*/
|
||||
public void onLivingUpdate()
|
||||
{
|
||||
Athena.INSTANCE.getEventBus().post(new PlayerTickEvent(this));
|
||||
|
||||
if (this.flyToggleTimer > 0)
|
||||
{
|
||||
--this.flyToggleTimer;
|
||||
|
|
@ -2103,6 +2108,10 @@ public abstract class EntityPlayer extends EntityLivingBase
|
|||
{
|
||||
if (stack != this.itemInUse)
|
||||
{
|
||||
duration = Athena.INSTANCE.getEventBus().post(new PlayerInteractEvent(PlayerInteractEvent.Action.USE_ITEM, getPosition(), worldObj)) ? duration : -1;
|
||||
|
||||
if (duration <= 0) return;
|
||||
|
||||
this.itemInUse = stack;
|
||||
this.itemInUseCount = duration;
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,8 @@ import org.apache.logging.log4j.LogManager;
|
|||
import org.apache.logging.log4j.Logger;
|
||||
import org.apache.logging.log4j.Marker;
|
||||
import org.apache.logging.log4j.MarkerManager;
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.events.types.network.IngoingPacketEvent;
|
||||
|
||||
public class NetworkManager extends SimpleChannelInboundHandler<Packet>
|
||||
{
|
||||
|
|
@ -152,6 +154,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet>
|
|||
{
|
||||
try
|
||||
{
|
||||
if(!Athena.INSTANCE.getEventBus().post(new IngoingPacketEvent(p_channelRead0_2_))) {
|
||||
return;
|
||||
}
|
||||
|
||||
p_channelRead0_2_.processPacket(this.packetListener);
|
||||
}
|
||||
catch (ThreadQuickExitException var4)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
package net.minecraftforge.client.util;
|
||||
|
||||
public final class Constants {
|
||||
public static class NBT
|
||||
{
|
||||
public static final int TAG_END = 0;
|
||||
public static final int TAG_BYTE = 1;
|
||||
public static final int TAG_SHORT = 2;
|
||||
public static final int TAG_INT = 3;
|
||||
public static final int TAG_LONG = 4;
|
||||
public static final int TAG_FLOAT = 5;
|
||||
public static final int TAG_DOUBLE = 6;
|
||||
public static final int TAG_BYTE_ARRAY = 7;
|
||||
public static final int TAG_STRING = 8;
|
||||
public static final int TAG_LIST = 9;
|
||||
public static final int TAG_COMPOUND = 10;
|
||||
public static final int TAG_INT_ARRAY = 11;
|
||||
public static final int TAG_ANY_NUMERIC = 99;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,105 @@
|
|||
package net.minecraftforge.common.capabilities;
|
||||
|
||||
import com.google.common.base.Throwables;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import java.util.concurrent.Callable;
|
||||
|
||||
/**
|
||||
* This is the core holder object Capabilities.
|
||||
* Each capability will have ONE instance of this class,
|
||||
* and it will the the one passed into the ICapabilityProvider functions.
|
||||
*
|
||||
* The CapabilityManager is in charge of creating this class.
|
||||
*/
|
||||
public class Capability<T>
|
||||
{
|
||||
public static interface IStorage<T>
|
||||
{
|
||||
/**
|
||||
* Serialize the capability instance to a NBTTag.
|
||||
* This allows for a central implementation of saving the data.
|
||||
*
|
||||
* It is important to note that it is up to the API defining
|
||||
* the capability what requirements the 'instance' value must have.
|
||||
*
|
||||
* Due to the possibility of manipulating internal data, some
|
||||
* implementations MAY require that the 'instance' be an instance
|
||||
* of the 'default' implementation.
|
||||
*
|
||||
* Review the API docs for more info.
|
||||
*
|
||||
* @param capability The Capability being stored.
|
||||
* @param instance An instance of that capabilities interface.
|
||||
* @param side The side of the object the instance is associated with.
|
||||
* @return a NBT holding the data. Null if no data needs to be stored.
|
||||
*/
|
||||
NBTBase writeNBT(Capability<T> capability, T instance, EnumFacing side);
|
||||
|
||||
/**
|
||||
* Read the capability instance from a NBT tag.
|
||||
*
|
||||
* This allows for a central implementation of saving the data.
|
||||
*
|
||||
* It is important to note that it is up to the API defining
|
||||
* the capability what requirements the 'instance' value must have.
|
||||
*
|
||||
* Due to the possibility of manipulating internal data, some
|
||||
* implementations MAY require that the 'instance' be an instance
|
||||
* of the 'default' implementation.
|
||||
*
|
||||
* Review the API docs for more info. *
|
||||
*
|
||||
* @param capability The Capability being stored.
|
||||
* @param instance An instance of that capabilities interface.
|
||||
* @param side The side of the object the instance is associated with.
|
||||
* @param A NBT holding the data. Must not be null, as doesn't make sense to call this function with nothing to read...
|
||||
*/
|
||||
void readNBT(Capability<T> capability, T instance, EnumFacing side, NBTBase nbt);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The unique name of this capability, typically this is
|
||||
* the fully qualified class name for the target interface.
|
||||
*/
|
||||
public String getName() { return name; }
|
||||
/**
|
||||
* @return An instance of the default storage handler. You can safely use this store your default implementation in NBT.
|
||||
*/
|
||||
public IStorage<T> getStorage() { return storage; }
|
||||
|
||||
/**
|
||||
* A NEW instance of the default implementation.
|
||||
*
|
||||
* If it important to note that if you want to use the default storage
|
||||
* you may be required to use this exact implementation.
|
||||
* Refer to the owning API of the Capability in question.
|
||||
*
|
||||
* @return A NEW instance of the default implementation.
|
||||
*/
|
||||
public T getDefaultInstance()
|
||||
{
|
||||
try
|
||||
{
|
||||
return this.factory.call();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Throwables.propagate(e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// INTERNAL
|
||||
private final String name;
|
||||
private final IStorage<T> storage;
|
||||
private final Callable<? extends T> factory;
|
||||
|
||||
public Capability(String name, IStorage<T> iStorage, Callable<? extends T> factory)
|
||||
{
|
||||
this.name = name;
|
||||
this.storage = iStorage;
|
||||
this.factory = factory;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,114 @@
|
|||
package net.minecraftforge.common.capabilities;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* A high-speed implementation of a capability delegator.
|
||||
* This is used to wrap the results of the AttachCapabilitiesEvent.
|
||||
* It is HIGHLY recommended that you DO NOT use this approach unless
|
||||
* you MUST delegate to multiple providers instead just implement y
|
||||
* our handlers using normal if statements.
|
||||
*
|
||||
* Internally the handlers are baked into arrays for fast iteration.
|
||||
* The ResourceLocations will be used for the NBT Key when serializing.
|
||||
*/
|
||||
public final class CapabilityDispatcher implements INBTSerializable<NBTTagCompound>, ICapabilityProvider
|
||||
{
|
||||
private ICapabilityProvider[] caps;
|
||||
private INBTSerializable<NBTBase>[] writers;
|
||||
private String[] names;
|
||||
|
||||
public CapabilityDispatcher(Map<ResourceLocation, ICapabilityProvider> list)
|
||||
{
|
||||
this(list, null);
|
||||
}
|
||||
|
||||
public CapabilityDispatcher(Map<ResourceLocation, ICapabilityProvider> list, ICapabilityProvider parent)
|
||||
{
|
||||
List<ICapabilityProvider> lstCaps = Lists.newArrayList();
|
||||
List<INBTSerializable<NBTBase>> lstWriters = Lists.newArrayList();
|
||||
List<String> lstNames = Lists.newArrayList();
|
||||
|
||||
if (parent != null) // Parents go first!
|
||||
{
|
||||
lstCaps.add(parent);
|
||||
if (parent instanceof INBTSerializable)
|
||||
{
|
||||
lstWriters.add((INBTSerializable<NBTBase>)parent);
|
||||
lstNames.add("Parent");
|
||||
}
|
||||
}
|
||||
|
||||
for (Map.Entry<ResourceLocation, ICapabilityProvider> entry : list.entrySet())
|
||||
{
|
||||
ICapabilityProvider prov = entry.getValue();
|
||||
lstCaps.add(prov);
|
||||
if (prov instanceof INBTSerializable)
|
||||
{
|
||||
lstWriters.add((INBTSerializable<NBTBase>)prov);
|
||||
lstNames.add(entry.getKey().toString());
|
||||
}
|
||||
}
|
||||
|
||||
caps = lstCaps.toArray(new ICapabilityProvider[lstCaps.size()]);
|
||||
writers = lstWriters.toArray(new INBTSerializable[lstWriters.size()]);
|
||||
names = lstNames.toArray(new String[lstNames.size()]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
|
||||
{
|
||||
for (ICapabilityProvider cap : caps)
|
||||
{
|
||||
if (cap.hasCapability(capability, facing))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
|
||||
{
|
||||
for (ICapabilityProvider cap : caps)
|
||||
{
|
||||
T ret = cap.getCapability(capability, facing);
|
||||
if (ret != null)
|
||||
{
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound serializeNBT()
|
||||
{
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
for (int x = 0; x < writers.length; x++)
|
||||
{
|
||||
nbt.setTag(names[x], writers[x].serializeNBT());
|
||||
}
|
||||
return nbt;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deserializeNBT(NBTTagCompound nbt)
|
||||
{
|
||||
for (int x = 0; x < writers.length; x++)
|
||||
{
|
||||
if (nbt.hasKey(names[x]))
|
||||
{
|
||||
writers[x].deserializeNBT(nbt.getTag(names[x]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
package net.minecraftforge.common.capabilities;
|
||||
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
public interface ICapabilityProvider
|
||||
{
|
||||
/**
|
||||
* Determines if this object has support for the capability in question on the specific side.
|
||||
* The return value of this MIGHT change during runtime if this object gains or looses support
|
||||
* for a capability.
|
||||
*
|
||||
* Example:
|
||||
* A Pipe getting a cover placed on one side causing it loose the Inventory attachment function for that side.
|
||||
*
|
||||
* This is a light weight version of getCapability, intended for metadata uses.
|
||||
*
|
||||
* @param capability The capability to check
|
||||
* @param facing The Side to check from:
|
||||
* CAN BE NULL. Null is defined to represent 'internal' or 'self'
|
||||
* @return True if this object supports the capability.
|
||||
*/
|
||||
boolean hasCapability(Capability<?> capability, EnumFacing facing);
|
||||
|
||||
/**
|
||||
* Retrieves the handler for the capability requested on the specific side.
|
||||
* The return value CAN be null if the object does not support the capability.
|
||||
* The return value CAN be the same for multiple faces.
|
||||
*
|
||||
* @param capability The capability to check
|
||||
* @param facing The Side to check from:
|
||||
* CAN BE NULL. Null is defined to represent 'internal' or 'self'
|
||||
* @return True if this object supports the capability.
|
||||
*/
|
||||
<T> T getCapability(Capability<T> capability, EnumFacing facing);
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
package net.minecraftforge.common.capabilities;
|
||||
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
|
||||
/**
|
||||
* An interface designed to unify various things in the Minecraft
|
||||
* code base that can be serialized to and from a NBT tag.
|
||||
*/
|
||||
public interface INBTSerializable<T extends NBTBase>
|
||||
{
|
||||
T serializeNBT();
|
||||
void deserializeNBT(T nbt);
|
||||
}
|
||||
|
|
@ -1,13 +1,16 @@
|
|||
package rip.athena.client;
|
||||
|
||||
import lombok.Getter;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.events.EventBus;
|
||||
import rip.athena.client.gui.hud.HUDManager;
|
||||
import rip.athena.client.modules.ModuleManager;
|
||||
import rip.athena.client.utils.PrefixedLogger;
|
||||
import rip.athena.client.utils.input.KeybindManager;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
/**
|
||||
* The Athena class represents the main class of the Athena Client.
|
||||
* It encapsulates the client's name, version, build, and provides
|
||||
|
|
@ -40,6 +43,8 @@ public class Athena {
|
|||
|
||||
public static final Athena INSTANCE = new Athena();
|
||||
|
||||
public static final File MAIN_DIR = Paths.get(Minecraft.getMinecraft().mcDataDir.getAbsolutePath(), "Athena").toFile();
|
||||
|
||||
private final PrefixedLogger log = new PrefixedLogger("Athena");
|
||||
|
||||
private final String clientName = "Athena";
|
||||
|
|
@ -47,6 +52,7 @@ public class Athena {
|
|||
private final String clientBuild = "230601";
|
||||
|
||||
private ModuleManager moduleManager;
|
||||
private HUDManager hudManager;
|
||||
private EventBus eventBus;
|
||||
|
||||
/**
|
||||
|
|
@ -56,14 +62,22 @@ public class Athena {
|
|||
* connections with servers or other systems.
|
||||
*/
|
||||
public void initClient() {
|
||||
if(!MAIN_DIR.exists()) {
|
||||
MAIN_DIR.mkdir();
|
||||
}
|
||||
|
||||
this.moduleManager = new ModuleManager();
|
||||
this.hudManager = new HUDManager();
|
||||
this.eventBus = new EventBus();
|
||||
|
||||
registerEvents();
|
||||
|
||||
}
|
||||
|
||||
public void registerEvents() {
|
||||
eventBus.register(new KeybindManager());
|
||||
eventBus.register(hudManager);
|
||||
eventBus.register(this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
package rip.athena.client.events.types.entity;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import rip.athena.client.events.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
public class AttachCapabilitiesEvent extends Event {
|
||||
private Entity entity;
|
||||
private Map<ResourceLocation, ICapabilityProvider> caps = Maps.newLinkedHashMap();
|
||||
private Map<ResourceLocation, ICapabilityProvider> view = Collections.unmodifiableMap(caps);
|
||||
|
||||
public AttachCapabilitiesEvent(Entity entity) {
|
||||
this.entity = entity;
|
||||
}
|
||||
|
||||
public Entity getEntity() {
|
||||
return this.entity;
|
||||
}
|
||||
|
||||
public void addCapability(ResourceLocation key, ICapabilityProvider cap) {
|
||||
if (caps.containsKey(key))
|
||||
throw new IllegalStateException("Duplicate Capability Key: " + key + " " + cap);
|
||||
this.caps.put(key, cap);
|
||||
}
|
||||
|
||||
public Map<ResourceLocation, ICapabilityProvider> getCapabilities() {
|
||||
return view;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package rip.athena.client.events.types.entity;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
public class AttackEntityEvent extends Event {
|
||||
private Entity entity;
|
||||
private Entity target;
|
||||
|
||||
public AttackEntityEvent(Entity entity, Entity target) {
|
||||
this.entity = entity;
|
||||
this.target = target;
|
||||
}
|
||||
|
||||
public Entity getEntity() {
|
||||
return entity;
|
||||
}
|
||||
|
||||
public Entity getTarget() {
|
||||
return target;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package rip.athena.client.events.types.entity;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class EntityCreateEvent extends Event {
|
||||
private Entity player;
|
||||
private World world;
|
||||
|
||||
public EntityCreateEvent(Entity player, World world) {
|
||||
this.player = player;
|
||||
this.world = world;
|
||||
}
|
||||
|
||||
public Entity getEntity() {
|
||||
return player;
|
||||
}
|
||||
|
||||
public World getWorld() {
|
||||
return world;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package rip.athena.client.events.types.entity;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.DamageSource;
|
||||
|
||||
public class EntityDeathEvent extends Event {
|
||||
private Entity entity;
|
||||
private DamageSource cause;
|
||||
|
||||
public EntityDeathEvent(Entity entity, DamageSource cause) {
|
||||
this.entity = entity;
|
||||
this.cause = cause;
|
||||
}
|
||||
|
||||
public Entity getEntity() {
|
||||
return entity;
|
||||
}
|
||||
|
||||
public DamageSource getCause() {
|
||||
return cause;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package rip.athena.client.events.types.entity;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
|
||||
public class ItemPickupEvent extends Event {
|
||||
private EntityLivingBase entity;
|
||||
private Entity item;
|
||||
|
||||
public ItemPickupEvent(EntityLivingBase entity, Entity item) {
|
||||
this.entity = entity;
|
||||
this.item = item;
|
||||
}
|
||||
|
||||
public EntityLivingBase getEntity() {
|
||||
return entity;
|
||||
}
|
||||
|
||||
public Entity getItem() {
|
||||
return item;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package rip.athena.client.events.types.entity;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityMinecart;
|
||||
|
||||
public class MinecartInteractEvent extends Event {
|
||||
private Entity entity;
|
||||
private EntityMinecart minecart;
|
||||
|
||||
public MinecartInteractEvent(Entity entity, EntityMinecart minecart) {
|
||||
this.entity = entity;
|
||||
this.minecart = minecart;
|
||||
}
|
||||
|
||||
public Entity getEntity() {
|
||||
return entity;
|
||||
}
|
||||
|
||||
public EntityMinecart getMinecart() {
|
||||
return minecart;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
package rip.athena.client.events.types.entity;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class PlayerInteractEvent extends Event {
|
||||
private Action action;
|
||||
private BlockPos pos;
|
||||
private World world;
|
||||
|
||||
public PlayerInteractEvent(Action action, BlockPos pos, World world) {
|
||||
this.action = action;
|
||||
this.pos = pos;
|
||||
this.world = world;
|
||||
}
|
||||
|
||||
public Action getAction() {
|
||||
return action;
|
||||
}
|
||||
|
||||
public BlockPos getPos() {
|
||||
return pos;
|
||||
}
|
||||
|
||||
public World getWorld() {
|
||||
return world;
|
||||
}
|
||||
|
||||
public enum Action {
|
||||
USE_ITEM,
|
||||
LEFT_CLICK_BLOCK,
|
||||
RIGHT_CLICK_BLOCK;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
package rip.athena.client.events.types.entity;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
public class PlayerTickEvent extends Event {
|
||||
private EntityPlayer player;
|
||||
|
||||
public PlayerTickEvent(EntityPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
public EntityPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
package rip.athena.client.events.types.input;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
public class MouseDownEvent extends Event {
|
||||
private int button;
|
||||
|
||||
public MouseDownEvent(int button) {
|
||||
this.button = button;
|
||||
}
|
||||
|
||||
public int getButton() {
|
||||
return button;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package rip.athena.client.events.types.input;
|
||||
|
||||
import rip.athena.client.events.Event;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
public class MouseMoveEvent extends Event {
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
package rip.athena.client.events.types.network;
|
||||
|
||||
import net.minecraft.network.Packet;
|
||||
import rip.athena.client.events.Event;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
public class IngoingPacketEvent extends Event {
|
||||
private Packet<?> packet;
|
||||
|
||||
public IngoingPacketEvent(Packet<?> packet) {
|
||||
this.packet = packet;
|
||||
}
|
||||
|
||||
public Packet<?> getPacket() {
|
||||
return packet;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package rip.athena.client.events.types.render;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import rip.athena.client.events.Event;
|
||||
|
||||
public class RenderPlayerEvent extends Event {
|
||||
private EntityPlayer player;
|
||||
private double x;
|
||||
private double y;
|
||||
private double z;
|
||||
private float partialTicks;
|
||||
|
||||
public RenderPlayerEvent(EntityPlayer player, double x, double y, double z, float partialTicks) {
|
||||
this.player = player;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
this.partialTicks = partialTicks;
|
||||
}
|
||||
|
||||
public EntityPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
|
||||
public double getX() {
|
||||
return x;
|
||||
}
|
||||
|
||||
public double getY() {
|
||||
return y;
|
||||
}
|
||||
|
||||
public double getZ() {
|
||||
return z;
|
||||
}
|
||||
|
||||
public float getPartialTicks() {
|
||||
return partialTicks;
|
||||
}
|
||||
}
|
||||
|
|
@ -23,6 +23,7 @@ public class FontManager {
|
|||
|
||||
public static FontUtils baloo16 = new FontUtils("Baloo.ttf", Font.PLAIN, 16, 7, false);
|
||||
public static FontUtils baloo17 = new FontUtils("SFBOLD.ttf", Font.BOLD, 17, 7, false);
|
||||
public static FontUtils baloo30 = new FontUtils("SFBOLD.ttf", Font.PLAIN, 30, 7, false);
|
||||
public static FontUtils SFBOLD = new FontUtils("SFBOLD.ttf", Font.BOLD, 30, 7, false);
|
||||
public static FontUtils vision16 = new FontUtils("Vision.otf", Font.BOLD, 26, 7, false, 5);
|
||||
public static FontUtils vision30 = new FontUtils("Vision.otf", Font.BOLD, 30, 7, false, 5);
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ public class FontUtils {
|
|||
Font font = null;
|
||||
|
||||
try {
|
||||
Athena.INSTANCE.getLog().warn(Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation("Athena/font/" + fontName)).getInputStream() + "test");
|
||||
InputStream ex = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation("Athena/font/" + fontName)).getInputStream();
|
||||
font = Font.createFont(0, ex);
|
||||
font = font.deriveFont(fontType, size);
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,21 @@
|
|||
package rip.athena.client.gui.clickgui;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public enum Category {
|
||||
MODS("MODS"), SETTINGS("SETTINGS"), MACROS("MACROS"), WAYPOINTS("WAYPOINTS"), PROFILES("PROFILES"), COSMETICS("COSMETICS"), GROUPS("GROUPS");
|
||||
|
||||
private String name;
|
||||
|
||||
Category(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,10 @@
|
|||
package rip.athena.client.gui.hud;
|
||||
package rip.athena.client.gui.clickgui;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public interface IPage {
|
||||
void onInit();
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
package rip.athena.client.gui.hud;
|
||||
package rip.athena.client.gui.clickgui;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.clickgui.pages.ModsPage;
|
||||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MinecraftMenuImpl;
|
||||
|
|
@ -10,18 +11,24 @@ import rip.athena.client.gui.framework.components.MenuButton;
|
|||
import rip.athena.client.gui.framework.components.MenuDraggable;
|
||||
import rip.athena.client.gui.framework.components.MenuScrollPane;
|
||||
import rip.athena.client.gui.framework.draw.DrawImpl;
|
||||
import rip.athena.client.gui.hud.components.mods.CategoryButton;
|
||||
import rip.athena.client.gui.clickgui.components.mods.CategoryButton;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import rip.athena.client.gui.hud.pages.ModsPage;
|
||||
import rip.athena.client.modules.Module;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
import rip.athena.client.utils.render.AssetUtils;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class IngameMenu extends MinecraftMenuImpl implements DrawImpl {
|
||||
public static int MENU_ALPHA = 255;
|
||||
public static int MENU_TOP_BG_COLOR = new Color(30, 30, 30, MENU_ALPHA).getRGB();
|
||||
|
|
@ -88,8 +95,11 @@ public class IngameMenu extends MinecraftMenuImpl implements DrawImpl {
|
|||
}
|
||||
|
||||
menu.addComponent(comp);
|
||||
|
||||
x += FontManager.baloo17.getStringWidth(category.getName()) + 20;
|
||||
if(Settings.customGuiFont) {
|
||||
x += FontManager.baloo17.getStringWidth(category.getName()) + 20;
|
||||
} else {
|
||||
x += mc.fontRendererObj.getStringWidth(category.getName()) + 20;
|
||||
}
|
||||
}
|
||||
|
||||
initPage();
|
||||
|
|
@ -120,6 +130,7 @@ public class IngameMenu extends MinecraftMenuImpl implements DrawImpl {
|
|||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY(), menu.getWidth(), 58, MENU_TOP_BG_COLOR);
|
||||
|
||||
FontManager.font1.drawString(Athena.INSTANCE.getClientName().toUpperCase(), menu.getX() + 70, menu.getY() + 20, MENU_HEADER_TEXT_COLOR);
|
||||
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, menu.getWidth(), menu.getHeight() - 58, MENU_PANE_BG_COLOR);
|
||||
|
||||
drawShadowDown(menu.getX(), menu.getY() + 58, menu.getWidth());
|
||||
|
|
@ -1,9 +1,15 @@
|
|||
package rip.athena.client.gui.hud;
|
||||
package rip.athena.client.gui.clickgui;
|
||||
|
||||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.framework.draw.DrawImpl;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public abstract class Page implements IPage, DrawImpl {
|
||||
protected Minecraft mc;
|
||||
protected Menu menu;
|
||||
|
|
@ -1,12 +1,18 @@
|
|||
package rip.athena.client.gui.hud;
|
||||
package rip.athena.client.gui.clickgui;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.clickgui.pages.*;
|
||||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.hud.pages.*;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class PageManager {
|
||||
private IngameMenu parent;
|
||||
private Menu menu;
|
||||
|
|
@ -23,11 +29,11 @@ public class PageManager {
|
|||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
pages.put(Category.MODS, new ModsPage(mc, menu, parent));
|
||||
pages.put(Category.SETTINGS, new SettingsPage(mc, menu, parent));
|
||||
pages.put(Category.MACROS, new MacrosPage(mc, menu, parent));
|
||||
pages.put(Category.WAYPOINTS, new WaypointsPage(mc, menu, parent));
|
||||
pages.put(Category.PROFILES, new ProfilesPage(mc, menu, parent));
|
||||
pages.put(Category.COSMETICS, new CosmeticsPage(mc, menu, parent));
|
||||
pages.put(Category.FPS, new FPSPage(mc, menu, parent));
|
||||
pages.put(Category.GROUPS, new GroupsPage(mc, menu, parent));
|
||||
}
|
||||
|
||||
|
|
@ -1,10 +1,16 @@
|
|||
package rip.athena.client.gui.hud.components.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.components.cosmetics;
|
||||
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticActionButton extends CosmeticGenericButton {
|
||||
private String id;
|
||||
|
||||
|
|
@ -1,10 +1,16 @@
|
|||
package rip.athena.client.gui.hud.components.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.components.cosmetics;
|
||||
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticBindButton extends CosmeticGenericButton {
|
||||
private String type;
|
||||
private boolean binding;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package rip.athena.client.gui.hud.components.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.components.cosmetics;
|
||||
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
|
|
@ -15,6 +15,12 @@ import org.lwjgl.opengl.GL11;
|
|||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticCapeView extends MenuComponent {
|
||||
//private Cape cape;
|
||||
|
||||
|
|
@ -1,11 +1,16 @@
|
|||
package rip.athena.client.gui.hud.components.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.components.cosmetics;
|
||||
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.clickgui.components.macros.MacroButton;
|
||||
|
||||
import java.awt.*;
|
||||
import java.nio.charset.MalformedInputException;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticGenericButton extends MacroButton {
|
||||
protected boolean filledBackground;
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.cosmetics;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.cosmetics;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
|
|
@ -9,6 +8,12 @@ import rip.athena.client.gui.framework.draw.DrawType;
|
|||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticList extends MenuDropdown {
|
||||
protected int cursorWidth = 25;
|
||||
|
||||
|
|
@ -1,14 +1,19 @@
|
|||
package rip.athena.client.gui.hud.components.cosmetics;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.cosmetics;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.utils.render.DrawUtils;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticRainbowButton extends CosmeticGenericButton {
|
||||
public CosmeticRainbowButton(String text, int x, int y, int width, int height) {
|
||||
super(text, x, y, width, height, true);
|
||||
|
|
@ -60,8 +65,11 @@ public class CosmeticRainbowButton extends CosmeticGenericButton {
|
|||
drawShadowDown(x, y + height + 1, width + 1);
|
||||
drawShadowRight(x + width + 1, y, height + 1);
|
||||
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + (height / 2 - getStringHeight(text) / 2), -1);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + (height / 2 - getStringHeight(text) / 2), -1);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + (height / 2 - getStringHeight(text) / 2), -1);
|
||||
}
|
||||
mouseDown = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +1,18 @@
|
|||
package rip.athena.client.gui.hud.components.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.components.cosmetics;
|
||||
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.components.macros.MacroButton;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticToggleButton extends MacroButton {
|
||||
|
||||
public CosmeticToggleButton(String text, int x, int y, int width, int height, boolean approve) {
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package rip.athena.client.gui.hud.components.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.components.cosmetics;
|
||||
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
|
|
@ -14,6 +14,12 @@ import org.lwjgl.opengl.GL11;
|
|||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticUserPreview extends MenuComponent {
|
||||
public CosmeticUserPreview(int x, int y, int width, int height) {
|
||||
super(x, y, width, height);
|
||||
|
|
@ -1,11 +1,17 @@
|
|||
package rip.athena.client.gui.hud.components.fps;
|
||||
package rip.athena.client.gui.clickgui.components.fps;
|
||||
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.components.cosmetics.CosmeticGenericButton;
|
||||
import rip.athena.client.gui.clickgui.components.cosmetics.CosmeticGenericButton;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class FPSGenericButton extends CosmeticGenericButton {
|
||||
|
||||
public FPSGenericButton(String text, int x, int y, int width, int height, boolean filledBackground) {
|
||||
|
|
@ -1,9 +1,15 @@
|
|||
package rip.athena.client.gui.hud.components.fps;
|
||||
package rip.athena.client.gui.clickgui.components.fps;
|
||||
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.components.macros.FlipButton;
|
||||
import rip.athena.client.gui.hud.pages.fps.BlacklistModule;
|
||||
import rip.athena.client.gui.clickgui.components.macros.FlipButton;
|
||||
import rip.athena.client.gui.clickgui.pages.fps.BlacklistModule;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class FlipButtonFPS extends FlipButton {
|
||||
private BlacklistModule module;
|
||||
|
|
@ -1,9 +1,15 @@
|
|||
package rip.athena.client.gui.hud.components.fps;
|
||||
package rip.athena.client.gui.clickgui.components.fps;
|
||||
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.components.waypoints.WaypointTextBarrier;
|
||||
import rip.athena.client.gui.clickgui.components.waypoints.WaypointTextBarrier;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class FlipButtonParent extends WaypointTextBarrier {
|
||||
|
||||
|
|
@ -1,13 +1,19 @@
|
|||
package rip.athena.client.gui.hud.components.fps;
|
||||
package rip.athena.client.gui.clickgui.components.fps;
|
||||
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MainWindowBackgroundPS extends MenuComponent {
|
||||
public MainWindowBackgroundPS(int x, int y, int width, int height) {
|
||||
super(x, y, width, height);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.fps;
|
||||
package rip.athena.client.gui.clickgui.components.fps;
|
||||
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
|
|
@ -10,6 +10,12 @@ import java.awt.*;
|
|||
import java.awt.image.BufferedImage;
|
||||
import java.awt.image.RescaleOp;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MenuImageButton extends MenuButton {
|
||||
private static Color DISABLED_COLOR = new Color(255, 255, 255, 200);
|
||||
private static Color OVER_COLOR = new Color(255, 255, 255, 160);
|
||||
|
|
@ -1,16 +1,23 @@
|
|||
package rip.athena.client.gui.hud.components.fps;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.fps;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class OptifineParentBackground extends MenuComponent {
|
||||
protected ResourceLocation image;
|
||||
protected String topText;
|
||||
|
|
@ -64,17 +71,29 @@ public class OptifineParentBackground extends MenuComponent {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void drawText(String string, int x, int y, int color) {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
||||
public void drawText(String text, int x, int y, int color) {
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +1,18 @@
|
|||
package rip.athena.client.gui.hud.components.groups;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.groups;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.components.profiles.ProfilesBase;
|
||||
import rip.athena.client.gui.clickgui.components.profiles.ProfilesBase;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GroupBase extends ProfilesBase {
|
||||
protected static int GREEN_COLOR = new Color(2, 222, 9, 255).getRGB();
|
||||
protected static int GRAY_COLOR = new Color(164, 164, 164, 255).getRGB();
|
||||
|
|
@ -1,15 +1,20 @@
|
|||
package rip.athena.client.gui.hud.components.groups;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.groups;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GroupListEntry extends MenuComponent {
|
||||
protected String text;
|
||||
|
||||
|
|
@ -1,15 +1,20 @@
|
|||
package rip.athena.client.gui.hud.components.groups;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.groups;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GroupListMiniEntry extends MenuComponent {
|
||||
protected String name;
|
||||
protected String value;
|
||||
|
|
@ -1,14 +1,19 @@
|
|||
package rip.athena.client.gui.hud.components.groups;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.groups;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.pages.groups.GroupSubTab;
|
||||
import rip.athena.client.gui.clickgui.pages.groups.GroupSubTab;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GroupTextButton extends MenuButton {
|
||||
public GroupTextButton(GroupSubTab category, int x, int y) {
|
||||
super(category.getText(), x, y);
|
||||
|
|
@ -1,14 +1,19 @@
|
|||
package rip.athena.client.gui.hud.components.groups;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.groups;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GroupUserListHeader extends MenuComponent {
|
||||
protected String text;
|
||||
protected int amount;
|
||||
|
|
@ -1,16 +1,21 @@
|
|||
package rip.athena.client.gui.hud.components.groups;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.groups;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.utils.render.DrawUtils;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GroupUserListUser extends MenuComponent {
|
||||
protected ResourceLocation location;
|
||||
protected String name;
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.groups;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.groups;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
|
|
@ -9,6 +8,12 @@ import rip.athena.client.gui.framework.draw.DrawType;
|
|||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GroupValueList extends MenuDropdown {
|
||||
protected int cursorWidth = 25;
|
||||
protected String id;
|
||||
|
|
@ -1,14 +1,19 @@
|
|||
package rip.athena.client.gui.hud.components.macros;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.macros;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class FlipButton extends MenuButton {
|
||||
public static final int NORMAL_ON = new Color(15, 58, 28, IngameMenu.MENU_ALPHA).getRGB();
|
||||
public static final int NORMAL_OFF = new Color(58, 15, 17, IngameMenu.MENU_ALPHA).getRGB();
|
||||
|
|
@ -1,15 +1,20 @@
|
|||
package rip.athena.client.gui.hud.components.macros;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.macros;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MacroBase extends MenuComponent {
|
||||
protected String text;
|
||||
protected int spacing = 15;
|
||||
|
|
@ -1,13 +1,20 @@
|
|||
package rip.athena.client.gui.hud.components.macros;
|
||||
package rip.athena.client.gui.clickgui.components.macros;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MacroButton extends MenuButton {
|
||||
private boolean approve;
|
||||
|
||||
|
|
@ -66,18 +73,30 @@ public class MacroButton extends MenuButton {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void drawText(String string, int x, int y, int color) {
|
||||
FontManager.baloo17.drawString(string, x, y, color);
|
||||
public void drawText(String text, int x, int y, int color) {
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
|
||||
public void setApprove(boolean approve) {
|
||||
|
|
@ -1,16 +1,21 @@
|
|||
package rip.athena.client.gui.hud.components.macros;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.macros;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.components.mods.SearchTextfield;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.components.mods.SearchTextfield;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MacroSlimTextField extends SearchTextfield {
|
||||
public MacroSlimTextField(TextPattern pattern, int x, int y, int width, int height) {
|
||||
super(pattern, x, y, width, height);
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.macros;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.macros;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
|
|
@ -7,13 +6,20 @@ import rip.athena.client.font.FontManager;
|
|||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.components.mods.SearchTextfield;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.components.mods.SearchTextfield;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
import rip.athena.client.utils.render.DrawUtils;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MacroTextfield extends SearchTextfield {
|
||||
protected String placeholderText;
|
||||
protected int textPadding = 5;
|
||||
|
|
@ -96,18 +102,33 @@ public class MacroTextfield extends SearchTextfield {
|
|||
}
|
||||
}
|
||||
|
||||
int labelWidth = (int)FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
int labelWidth;
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
|
||||
int comp = 0;
|
||||
int toRender = index;
|
||||
while(labelWidth >= width + textPadding * 2) {
|
||||
if(comp < index){
|
||||
textToDraw = textToDraw.substring(1);
|
||||
|
||||
labelWidth = (int)FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
toRender--;
|
||||
} else if(comp > index){
|
||||
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
||||
labelWidth = (int)FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
}
|
||||
|
||||
comp++;
|
||||
|
|
@ -122,9 +143,20 @@ public class MacroTextfield extends SearchTextfield {
|
|||
toRender = 0;
|
||||
}
|
||||
|
||||
int textHeight = (int)FontManager.baloo17.FONT_HEIGHT;
|
||||
int textHeight;
|
||||
|
||||
drawVerticalLine(x + (int)FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 4, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
if(Settings.customGuiFont) {
|
||||
textHeight = (int) FontManager.baloo17.FONT_HEIGHT;
|
||||
} else {
|
||||
textHeight = Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
|
||||
}
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
drawVerticalLine(x + (int) FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 4, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
} else {
|
||||
drawVerticalLine(x + (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 4, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
}
|
||||
}
|
||||
|
||||
int renderIndex = comp;
|
||||
|
|
@ -138,16 +170,22 @@ public class MacroTextfield extends SearchTextfield {
|
|||
|
||||
if(textToDraw.isEmpty() && !isFocused()) {
|
||||
textToDraw = placeholderText;
|
||||
xAdd = (int) (width / 2 - FontManager.baloo17.getStringWidth(placeholderText) / 2);
|
||||
if(Settings.customGuiFont) {
|
||||
xAdd = (int) (width / 2 - FontManager.baloo17.getStringWidth(placeholderText) / 2);
|
||||
} else {
|
||||
xAdd = (width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(placeholderText) / 2);
|
||||
}
|
||||
textColor = PLACEHOLDER_COLOR.getRGB();
|
||||
|
||||
if(textToDraw.length() == 3) {
|
||||
textColor = textColorDisabled;
|
||||
}
|
||||
}
|
||||
|
||||
FontManager.baloo17.drawString(textToDraw, x + xAdd, y + height / 2 - (float) (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(textToDraw, x + xAdd, y + height / 2 - (float) (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x + xAdd, (int) (y + height / 2 - (float) Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2), textColor);
|
||||
}
|
||||
if(lastState == ButtonState.HOVER && mouseDown) {
|
||||
focused = true;
|
||||
lineTime = getLinePrediction();
|
||||
|
|
@ -174,7 +212,11 @@ public class MacroTextfield extends SearchTextfield {
|
|||
bestIndex = i;
|
||||
}
|
||||
|
||||
position += (int)FontManager.baloo17.getStringWidth(text.charAt(i) + "");
|
||||
if(Settings.customGuiFont) {
|
||||
position += (int) FontManager.baloo17.getStringWidth(text.charAt(i) + "");
|
||||
} else {
|
||||
position += (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + "");
|
||||
}
|
||||
}
|
||||
|
||||
if(mouseX > position) {
|
||||
|
|
@ -1,14 +1,19 @@
|
|||
package rip.athena.client.gui.hud.components.macros;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.macros;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class SimpleTextButton extends MenuButton {
|
||||
protected boolean leftColorChange;
|
||||
|
||||
|
|
@ -1,14 +1,21 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.Category;
|
||||
import rip.athena.client.gui.clickgui.Category;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CategoryButton extends MenuButton {
|
||||
public CategoryButton(Category category, int x, int y) {
|
||||
super(category.getName(), x, y);
|
||||
|
|
@ -35,8 +42,11 @@ public class CategoryButton extends MenuButton {
|
|||
int backgroundColor = getColor(DrawType.BACKGROUND, lastState);
|
||||
int textColor = getColor(DrawType.TEXT, lastState);
|
||||
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
||||
}
|
||||
if(isActive()) {
|
||||
drawHorizontalLine(x + (width / 2 - getStringWidth(text) / 2), y + 29, (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(text), 2, textColor);
|
||||
}
|
||||
|
|
@ -46,11 +56,19 @@ public class CategoryButton extends MenuButton {
|
|||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +1,20 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.components.MenuLabel;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class FeatureText extends MenuLabel {
|
||||
|
||||
public FeatureText(String text, String tooltip, int x, int y) {
|
||||
|
|
@ -29,12 +36,20 @@ public class FeatureText extends MenuLabel {
|
|||
|
||||
@Override
|
||||
public void drawText(String text, int x, int y, int color) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringWidth(String text) {
|
||||
return (int) FontManager.baloo17.getStringWidth(text);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(text);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(text);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -1,10 +1,16 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class FeatureValueText extends FeatureText {
|
||||
|
||||
public FeatureValueText(String text, String tooltip, int x, int y) {
|
||||
|
|
@ -1,16 +1,22 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
import rip.athena.client.utils.render.DrawUtils;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GoBackButton extends MenuButton {
|
||||
public GoBackButton(int x, int y) {
|
||||
super("GO BACK", x, y, 120, 25);
|
||||
|
|
@ -125,8 +131,11 @@ public class GoBackButton extends MenuButton {
|
|||
DrawUtils.drawRoundedRect(x, y, x + width + 1, y + height + 1, rounding, lineColor);
|
||||
DrawUtils.drawRoundedRect(x + 1, y + 1, x + width, y + height, rounding, backgroundColor);
|
||||
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||
}
|
||||
x -= 20;
|
||||
width = 30;
|
||||
|
||||
|
|
@ -153,11 +162,19 @@ public class GoBackButton extends MenuButton {
|
|||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return (int) FontManager.baloo17.FONT_HEIGHT;
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import rip.athena.client.gui.framework.components.MenuCheckbox;
|
||||
|
|
@ -7,6 +7,12 @@ import rip.athena.client.gui.framework.draw.DrawType;
|
|||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MenuModCheckbox extends MenuCheckbox {
|
||||
public MenuModCheckbox(int x, int y, int width, int height) {
|
||||
super("", x, y, width, height);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import rip.athena.client.gui.framework.components.MenuColorPicker;
|
||||
|
|
@ -8,6 +8,12 @@ import org.lwjgl.input.Mouse;
|
|||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MenuModColorPicker extends MenuColorPicker {
|
||||
public MenuModColorPicker(int x, int y, int width, int height, int defaultColor) {
|
||||
super(x, y, width, height, defaultColor);
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
|
|
@ -8,8 +7,16 @@ import rip.athena.client.gui.framework.MenuPriority;
|
|||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MenuModKeybind extends MenuComponent {
|
||||
public final static int mouseOffset = 500;
|
||||
|
|
@ -188,17 +195,29 @@ public class MenuModKeybind extends MenuComponent {
|
|||
|
||||
@Override
|
||||
public void drawText(String text, int x, int y, int color) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isBound() {
|
||||
|
|
@ -1,15 +1,22 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.components.MenuDropdown;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MenuModList extends MenuDropdown {
|
||||
protected int cursorWidth = 25;
|
||||
|
||||
|
|
@ -103,6 +110,8 @@ public class MenuModList extends MenuDropdown {
|
|||
int lineColor = getColor(DrawType.LINE, ButtonState.NORMAL);
|
||||
int textColor = getColor(DrawType.TEXT, ButtonState.NORMAL);
|
||||
|
||||
GlStateManager.color(1,1,1);
|
||||
|
||||
drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
||||
drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
||||
drawHorizontalLine(x, y + height, width + 1, 1, lineColor);
|
||||
|
|
@ -139,16 +148,28 @@ public class MenuModList extends MenuDropdown {
|
|||
|
||||
@Override
|
||||
public void drawText(String text, int x, int y, int color) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return (int) FontManager.baloo17.FONT_HEIGHT;
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
|
|
@ -7,9 +6,16 @@ import rip.athena.client.gui.framework.components.MenuSlider;
|
|||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import org.lwjgl.input.Mouse;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MenuModSlider extends MenuSlider {
|
||||
|
||||
public MenuModSlider(double startValue, double minValue, double maxValue, int precision, int x, int y, int width, int height) {
|
||||
|
|
@ -34,10 +40,11 @@ public class MenuModSlider extends MenuSlider {
|
|||
setColor(DrawType.TEXT, ButtonState.HOVERACTIVE, new Color(182, 182, 182, 255));
|
||||
setColor(DrawType.TEXT, ButtonState.DISABLED, new Color(100, 100, 100, 255));
|
||||
|
||||
setColor(DrawType.BACKGROUND, ButtonState.NORMAL, new Color(21, 67, 34, 255));
|
||||
setColor(DrawType.BACKGROUND, ButtonState.ACTIVE, new Color(12, 83, 33, 255));
|
||||
setColor(DrawType.BACKGROUND, ButtonState.HOVER, new Color(6, 42, 16, 255));
|
||||
setColor(DrawType.BACKGROUND, ButtonState.HOVERACTIVE, new Color(18, 126, 48, 255));
|
||||
setColor(DrawType.BACKGROUND, ButtonState.ACTIVE, new Color(231, 27, 44, 255));
|
||||
setColor(DrawType.BACKGROUND, ButtonState.HOVER, new Color(100, 40, 40, 255));
|
||||
setColor(DrawType.BACKGROUND, ButtonState.HOVERACTIVE, new Color(239, 46, 90, 255));
|
||||
|
||||
setColor(DrawType.BACKGROUND, ButtonState.NORMAL, new Color(231, 27, 44, 255));
|
||||
setColor(DrawType.BACKGROUND, ButtonState.POPUP, new Color(35, 35, 35, 255));
|
||||
|
||||
setColor(DrawType.LINE, ButtonState.NORMAL, new Color(62, 62, 62, 255));
|
||||
|
|
@ -130,16 +137,28 @@ public class MenuModSlider extends MenuSlider {
|
|||
|
||||
@Override
|
||||
public void drawText(String text, int x, int y, int color) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +1,24 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import rip.athena.client.modules.Category;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ModCategoryButton extends MenuButton {
|
||||
public static final int MAIN_COLOR = new Color(35, 35, 35, IngameMenu.MENU_ALPHA).getRGB();
|
||||
|
||||
|
|
@ -51,13 +57,12 @@ public class ModCategoryButton extends MenuButton {
|
|||
int textColor = getColor(DrawType.TEXT, lastState);
|
||||
|
||||
GlStateManager.color(1, 1, 1);
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 15, y, width - 35, height, backgroundColor);
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, width - 10, height, backgroundColor);
|
||||
|
||||
if(image != null) {
|
||||
//drawImage(image, x + 5, y + (height / 2 - IMAGE_SIZE / 2), IMAGE_SIZE, IMAGE_SIZE);
|
||||
FontManager.baloo17.drawString(text, x + IMAGE_SIZE + 5 + 5, y + height / 2 - (getStringHeight(text) / 2) - 1, textColor);
|
||||
} else {
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||
}
|
||||
|
||||
mouseDown = false;
|
||||
|
|
@ -65,11 +70,19 @@ public class ModCategoryButton extends MenuButton {
|
|||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
|
|
@ -13,6 +13,12 @@ import org.lwjgl.opengl.GL11;
|
|||
import java.awt.*;
|
||||
import java.util.Collections;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ModScrollPane extends MenuScrollPane {
|
||||
private boolean fullHeightScroller;
|
||||
|
||||
|
|
@ -1,20 +1,25 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.framework.components.MenuTextField;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
import rip.athena.client.utils.render.DrawUtils;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ModTextbox extends MenuTextField {
|
||||
private final static Color PLACEHOLDER_COLOR = new Color(80, 80, 82, IngameMenu.MENU_ALPHA);
|
||||
|
||||
public ModTextbox(TextPattern pattern, int x, int y, int width, int height) {
|
||||
super(pattern, x, y, width, height);
|
||||
|
|
@ -83,36 +88,59 @@ public class ModTextbox extends MenuTextField {
|
|||
}
|
||||
}
|
||||
|
||||
int labelWidth = (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
int labelWidth;
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
int comp = 0;
|
||||
int toRender = index;
|
||||
while(labelWidth >= width) {
|
||||
if(comp < index){
|
||||
textToDraw = textToDraw.substring(1);
|
||||
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
toRender--;
|
||||
} else if(comp > index){
|
||||
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
||||
labelWidth = (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
}
|
||||
|
||||
comp++;
|
||||
}
|
||||
|
||||
if(drawPointer) {
|
||||
if(toRender > textToDraw.length()) {
|
||||
if (toRender > textToDraw.length()) {
|
||||
toRender = textToDraw.length() - 1;
|
||||
}
|
||||
|
||||
if(toRender < 0) {
|
||||
if (toRender < 0) {
|
||||
toRender = 0;
|
||||
}
|
||||
|
||||
int textHeight = (int)Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
int textHeight;
|
||||
|
||||
drawVerticalLine(x + (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
if (Settings.customGuiFont) {
|
||||
textHeight = (int) FontManager.baloo17.getHeight(textToDraw);
|
||||
} else {
|
||||
textHeight = Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
|
||||
if (Settings.customGuiFont) {
|
||||
drawVerticalLine(x + (int) FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
} else {
|
||||
drawVerticalLine(x + (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
}
|
||||
}
|
||||
|
||||
int renderIndex = comp;
|
||||
int renderStopIndex = comp + textToDraw.length();
|
||||
|
||||
|
|
@ -122,8 +150,11 @@ public class ModTextbox extends MenuTextField {
|
|||
|
||||
int xAdd = 0;
|
||||
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x + minOffset + xAdd, y + height / 2 - (int)Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(textToDraw, x + minOffset + xAdd, y + height / 2 - (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x + minOffset + xAdd, y + height / 2 - (int) Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor);
|
||||
}
|
||||
if(lastState == ButtonState.HOVER && mouseDown) {
|
||||
focused = true;
|
||||
lineTime = getLinePrediction();
|
||||
|
|
@ -150,7 +181,11 @@ public class ModTextbox extends MenuTextField {
|
|||
bestIndex = i;
|
||||
}
|
||||
|
||||
position += (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + "");
|
||||
if(Settings.customGuiFont) {
|
||||
position += (int) FontManager.baloo17.getStringWidth(text.charAt(i) + "");
|
||||
} else {
|
||||
position += (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + "");
|
||||
}
|
||||
}
|
||||
|
||||
if(mouseX > position) {
|
||||
|
|
@ -1,14 +1,20 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ModsButton extends MenuButton {
|
||||
public ModsButton(String text, int x, int y) {
|
||||
super(text, x, y, 120, 20);
|
||||
|
|
@ -111,17 +117,29 @@ public class ModsButton extends MenuButton {
|
|||
drawHorizontalLine(x, y + height, width + 1, 1, lineColor);
|
||||
drawVerticalLine(x + width, y + 1, height - 1, 1, lineColor);
|
||||
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||
}
|
||||
mouseDown = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringWidth(String string) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String string) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,21 +1,29 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.modules.Module;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ModuleBox extends MenuComponent {
|
||||
protected static final int INACTIVE = new Color(10, 90, 32, IngameMenu.MENU_ALPHA).getRGB();
|
||||
protected static final int ACTIVE = new Color(90, 10, 12, IngameMenu.MENU_ALPHA).getRGB();
|
||||
|
|
@ -186,16 +194,21 @@ public class ModuleBox extends MenuComponent {
|
|||
|
||||
int yPos = y + (height / 2) - tHeight / 2 - 5;
|
||||
|
||||
for(String line : lines) {
|
||||
FontManager.vision30.drawString(line, x + (float) width / 2 - FontManager.vision30.getStringWidth(line) / 2, yPos, textColor);
|
||||
yPos += FontManager.vision30.getHeight(line);
|
||||
for (String line : lines) {
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo30.drawString(line, x + (float) width / 2 - FontManager.baloo30.getStringWidth(line) / 2, yPos, textColor);
|
||||
yPos += FontManager.baloo30.getHeight(line);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(line, (int) (x + (float) width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(line) / 2), yPos, textColor);
|
||||
yPos += Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
|
||||
int mouseX = parent.getMouseX();
|
||||
int mouseY = parent.getMouseY();
|
||||
|
||||
if(mouseX >= x + 10 && mouseX <= x + width - 11) {
|
||||
if(mouseY >= y + height - 10 - 20 && mouseY <= y + height - 10) {
|
||||
if (mouseX >= x + 10 && mouseX <= x + width - 11) {
|
||||
if (mouseY >= y + height - 10 - 20 && mouseY <= y + height - 10) {
|
||||
drawColor = backgroundColor;
|
||||
}
|
||||
}
|
||||
|
|
@ -206,35 +219,38 @@ public class ModuleBox extends MenuComponent {
|
|||
drawShadowRight(x + width - 10, y + height - 30, 20);*/
|
||||
|
||||
drawHorizontalLine(x + 10, y + height - 30, width - 20, 1, new Color(43, 43, 43, 225).getRGB());
|
||||
drawVerticalLine(x + 10, y + height - 30, 20, 1, new Color(43, 43, 43, 225).getRGB());
|
||||
drawVerticalLine(x + 10, y + height - 30, 20, 1, new Color(43, 43, 43, 225).getRGB());
|
||||
drawHorizontalLine(x + 10, y + height - 10, width - 20, 1, new Color(43, 43, 43, 225).getRGB());
|
||||
drawVerticalLine(x + width - 10, y + height - 30, 20, 1, new Color(43, 43, 43, 225).getRGB());
|
||||
drawVerticalLine(x + width - 10, y + height - 30, 20, 1, new Color(43, 43, 43, 225).getRGB());
|
||||
|
||||
//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 10, y + height - 10 - 20, width - 20, 20, module.isToggled() ? INACTIVE : ACTIVE);
|
||||
//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 11, y + height - 10 - 19, width - 22, 18, drawColor);
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 10, y + height - 10 - 20, width - 20, 20, module.isToggled() ? new Color(0, 200, 0, 255).getRGB() : new Color(200, 0, 0, 225).getRGB());
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 11, y + height - 10 - 19, width - 22, 18, module.isToggled() ? new Color(40, 157, 93, 255).getRGB() : new Color(157, 40, 40, 225).getRGB());
|
||||
|
||||
String text = module.isToggled() ? "ENABLED" : "DISABLED";
|
||||
|
||||
FontManager.baloo17.drawString(text, x + (float) width / 2 - FontManager.baloo17.getStringWidth(text) / 2, y + height - 10 - 15, module.isToggled() ? new Color(0, 200, 0, 255).getRGB() : new Color(200, 0, 0, 225).getRGB());
|
||||
|
||||
if(!module.getEntries().isEmpty()) {
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x + (float) width / 2 - FontManager.baloo17.getStringWidth(text) / 2, y + height - 10 - 15, -1);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, (int) (x + (float) width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(text) / 2), y + height - 10 - 15, -1);
|
||||
}
|
||||
if (!module.getEntries().isEmpty()) {
|
||||
drawColor = defaultColor;
|
||||
|
||||
if(mouseX >= x + width - 14 - 17 - 4 && mouseX <= x + width - 14 - 17 - 4 + 24) {
|
||||
if(mouseY >= y + 14 - 4 && mouseY <= y + 14 - 3 + 23) {
|
||||
if (mouseX >= x + width - 14 - 17 - 4 && mouseX <= x + width - 14 - 17 - 4 + 24) {
|
||||
if (mouseY >= y + 14 - 4 && mouseY <= y + 14 - 3 + 23) {
|
||||
drawColor = Color.black.getRGB();
|
||||
}
|
||||
}
|
||||
|
||||
drawShadowUp(x + width - 14 - 17 - 4, y + 14 - 4, 25);
|
||||
drawShadowLeft(x + width - 14 - 17 - 4, y + 14 - 4, 25);
|
||||
drawShadowDown(x + width - 14 - 17 - 4, y + 14 - 4 + 25, 25);
|
||||
drawShadowRight(x + width - 14 - 17 - 4 + 25, y + 14 - 4, 25);
|
||||
/*drawShadowUp(x + width - 14 - 17 - 4, y + 14 - 4, 25);
|
||||
drawShadowLeft(x + width - 14 - 17 - 4, y + 14 - 4, 25);
|
||||
drawShadowDown(x + width - 14 - 17 - 4, y + 14 - 4 + 25, 25);
|
||||
drawShadowRight(x + width - 14 - 17 - 4 + 25, y + 14 - 4, 25);*/
|
||||
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + width - 14 - 17 - 4, y + 14 - 4, 25, 25, COG_BORDER);
|
||||
//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + width - 14 - 17 - 4, y + 14 - 4, 25, 25, COG_BORDER);
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + width - 14 - 17 - 3, y + 14 - 3, 23, 23, drawColor);
|
||||
|
||||
//drawImage(COG, x + width - 14 - 17, y + 14, 17, 17);
|
||||
drawImage(new ResourceLocation("Athena/images/gear_white.png"), x + width - 14 - 17, y + 14, 17, 17);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,18 +1,25 @@
|
|||
package rip.athena.client.gui.hud.components.mods;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.mods;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.framework.components.MenuTextField;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
import rip.athena.client.utils.render.DrawUtils;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class SearchTextfield extends MenuTextField {
|
||||
protected final static Color PLACEHOLDER_COLOR = new Color(80, 80, 82, IngameMenu.MENU_ALPHA);
|
||||
|
||||
|
|
@ -55,6 +62,8 @@ public class SearchTextfield extends MenuTextField {
|
|||
int lineColor = getColor(DrawType.LINE, lastState);
|
||||
int textColor = getColor(DrawType.TEXT, lastState);
|
||||
|
||||
GlStateManager.color(1, 1,1,1);
|
||||
|
||||
DrawUtils.drawRoundedRect(x - 4, y - 4, x + width + 5, y + height + 5, 10, 83886080);
|
||||
DrawUtils.drawRoundedRect(x - 3, y - 3, x + width + 4, y + height + 4, 10, 369098752);
|
||||
DrawUtils.drawRoundedRect(x - 2, y - 2, x + width + 3, y + height + 3, 10, 587202560);
|
||||
|
|
@ -83,17 +92,31 @@ public class SearchTextfield extends MenuTextField {
|
|||
}
|
||||
}
|
||||
|
||||
int labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
int labelWidth;
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
int comp = 0;
|
||||
int toRender = index;
|
||||
while(labelWidth >= width) {
|
||||
if(comp < index){
|
||||
textToDraw = textToDraw.substring(1);
|
||||
labelWidth = (int)FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
toRender--;
|
||||
} else if(comp > index){
|
||||
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
||||
labelWidth = (int)FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
if(Settings.customGuiFont) {
|
||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
||||
} else {
|
||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||
}
|
||||
}
|
||||
|
||||
comp++;
|
||||
|
|
@ -108,9 +131,16 @@ public class SearchTextfield extends MenuTextField {
|
|||
toRender = 0;
|
||||
}
|
||||
|
||||
int textHeight = (int)FontManager.baloo17.getHeight(textToDraw);
|
||||
int textHeight;
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
textHeight = (int) FontManager.baloo17.getHeight(textToDraw);
|
||||
drawVerticalLine(x + 10 + (int)FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
} else {
|
||||
textHeight = Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
drawVerticalLine(x + 10 + (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
}
|
||||
|
||||
drawVerticalLine(x + 10 + (int)FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||
}
|
||||
|
||||
int renderIndex = comp;
|
||||
|
|
@ -128,8 +158,11 @@ public class SearchTextfield extends MenuTextField {
|
|||
textColor = PLACEHOLDER_COLOR.getRGB();
|
||||
}
|
||||
|
||||
FontManager.baloo17.drawString(textToDraw, x + 10 + minOffset + xAdd, y + (float) height / 2 - (float) (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(textToDraw, x + 10 + minOffset + xAdd, y + (float) height / 2 - (float) (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x + 10 + minOffset + xAdd, (int) (y + (float) height / 2 - (float) (int) Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2), textColor);
|
||||
}
|
||||
if(lastState == ButtonState.HOVER && mouseDown) {
|
||||
focused = true;
|
||||
lineTime = getLinePrediction();
|
||||
|
|
@ -1,15 +1,20 @@
|
|||
package rip.athena.client.gui.hud.components.profiles;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.profiles;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ProfilesBase extends MenuComponent {
|
||||
protected String text;
|
||||
|
||||
|
|
@ -1,11 +1,17 @@
|
|||
package rip.athena.client.gui.hud.components.profiles;
|
||||
package rip.athena.client.gui.clickgui.components.profiles;
|
||||
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.clickgui.components.macros.MacroButton;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ProfilesBlueButton extends MacroButton {
|
||||
|
||||
public ProfilesBlueButton(String text, int x, int y, int width, int height) {
|
||||
|
|
@ -1,14 +1,21 @@
|
|||
package rip.athena.client.gui.hud.components.waypoints;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.waypoints;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.MenuPriority;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class WaypointTextBarrier extends MenuComponent {
|
||||
protected String text;
|
||||
|
||||
|
|
@ -48,17 +55,29 @@ public class WaypointTextBarrier extends MenuComponent {
|
|||
|
||||
@Override
|
||||
public void drawText(String text, int x, int y, int color) {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, x, y, color);
|
||||
} else {
|
||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringWidth(String text) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(text);
|
||||
public int getStringWidth(String string) {
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getStringWidth(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStringHeight(String text) {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
public int getStringHeight(String string) {
|
||||
if(Settings.customGuiFont) {
|
||||
return (int) FontManager.baloo17.getHeight(string);
|
||||
} else {
|
||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||
}
|
||||
}
|
||||
|
||||
public String getText() {
|
||||
|
|
@ -1,17 +1,22 @@
|
|||
package rip.athena.client.gui.hud.components.waypoints;
|
||||
|
||||
package rip.athena.client.gui.clickgui.components.waypoints;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.components.mods.SearchTextfield;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.components.mods.SearchTextfield;
|
||||
import rip.athena.client.utils.render.DrawUtils;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class WaypointsTextfield extends SearchTextfield {
|
||||
protected int placeholderText;
|
||||
protected int textPadding = 5;
|
||||
|
|
@ -1,24 +1,26 @@
|
|||
package rip.athena.client.gui.hud.pages;
|
||||
package rip.athena.client.gui.clickgui.pages;
|
||||
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import rip.athena.client.gui.hud.Page;
|
||||
import rip.athena.client.gui.hud.components.cosmetics.*;
|
||||
import rip.athena.client.gui.hud.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.hud.components.mods.MenuModKeybind;
|
||||
import rip.athena.client.gui.hud.components.mods.ModCategoryButton;
|
||||
import rip.athena.client.gui.hud.components.mods.ModScrollPane;
|
||||
import rip.athena.client.gui.hud.pages.cosmetics.BandanaSize;
|
||||
import rip.athena.client.gui.hud.pages.cosmetics.CapeType;
|
||||
import rip.athena.client.gui.hud.pages.cosmetics.CosmeticType;
|
||||
import rip.athena.client.gui.clickgui.Page;
|
||||
import rip.athena.client.gui.clickgui.components.cosmetics.*;
|
||||
import rip.athena.client.gui.clickgui.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.clickgui.components.mods.MenuModKeybind;
|
||||
import rip.athena.client.gui.clickgui.components.mods.ModCategoryButton;
|
||||
import rip.athena.client.gui.clickgui.components.mods.ModScrollPane;
|
||||
import rip.athena.client.gui.clickgui.pages.cosmetics.BandanaSize;
|
||||
import rip.athena.client.gui.clickgui.pages.cosmetics.CapeType;
|
||||
import rip.athena.client.gui.clickgui.pages.cosmetics.CosmeticType;
|
||||
|
||||
import java.awt.*;
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class CosmeticsPage extends Page {
|
||||
private CosmeticType cosmeticType = CosmeticType.CAPES;
|
||||
|
|
@ -1,23 +1,19 @@
|
|||
package rip.athena.client.gui.hud.pages;
|
||||
package rip.athena.client.gui.clickgui.pages;
|
||||
|
||||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.Page;
|
||||
import rip.athena.client.gui.hud.components.cosmetics.CosmeticGenericButton;
|
||||
import rip.athena.client.gui.hud.components.groups.*;
|
||||
import rip.athena.client.gui.hud.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.hud.components.macros.MacroTextfield;
|
||||
import rip.athena.client.gui.hud.components.macros.SimpleTextButton;
|
||||
import rip.athena.client.gui.hud.components.mods.*;
|
||||
import rip.athena.client.gui.hud.components.profiles.ProfilesBase;
|
||||
import rip.athena.client.gui.hud.components.profiles.ProfilesBlueButton;
|
||||
import rip.athena.client.gui.hud.pages.groups.GroupSubTab;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.Page;
|
||||
import rip.athena.client.gui.clickgui.components.cosmetics.CosmeticGenericButton;
|
||||
import rip.athena.client.gui.clickgui.components.groups.*;
|
||||
import rip.athena.client.gui.clickgui.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.clickgui.components.macros.MacroTextfield;
|
||||
import rip.athena.client.gui.clickgui.components.mods.*;
|
||||
import rip.athena.client.gui.clickgui.pages.groups.GroupSubTab;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.json.JSONObject;
|
||||
import rip.athena.client.utils.render.AssetUtils;
|
||||
|
||||
import java.awt.*;
|
||||
|
|
@ -25,6 +21,12 @@ import java.io.IOException;
|
|||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class GroupsPage extends Page {
|
||||
private final static int SUB_TAB_COLOR = new Color(35, 35, 35, 255).getRGB();
|
||||
|
||||
|
|
@ -1,19 +1,24 @@
|
|||
package rip.athena.client.gui.hud.pages;
|
||||
package rip.athena.client.gui.clickgui.pages;
|
||||
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.Page;
|
||||
import rip.athena.client.gui.hud.components.macros.*;
|
||||
import rip.athena.client.gui.hud.components.mods.MenuModKeybind;
|
||||
import rip.athena.client.gui.hud.components.mods.ModCategoryButton;
|
||||
import rip.athena.client.gui.hud.components.mods.ModScrollPane;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.Page;
|
||||
import rip.athena.client.gui.clickgui.components.macros.*;
|
||||
import rip.athena.client.gui.clickgui.components.mods.MenuModKeybind;
|
||||
import rip.athena.client.gui.clickgui.components.mods.ModCategoryButton;
|
||||
import rip.athena.client.gui.clickgui.components.mods.ModScrollPane;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class MacrosPage extends Page {
|
||||
public final int MENU_SIDE_HEADER_BG_COLOR = new Color(35, 35, 35, IngameMenu.MENU_ALPHA).getRGB();
|
||||
public final static int MENU_SIDE_BG_COLOR = new Color(35, 35, 35, IngameMenu.MENU_ALPHA).getRGB();
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
package rip.athena.client.gui.hud.pages;
|
||||
package rip.athena.client.gui.clickgui.pages;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.config.ConfigEntry;
|
||||
|
|
@ -11,19 +10,29 @@ import rip.athena.client.gui.framework.Menu;
|
|||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.framework.components.MenuButton;
|
||||
import rip.athena.client.gui.framework.components.MenuTextField;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.Page;
|
||||
import rip.athena.client.gui.hud.components.mods.*;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.Page;
|
||||
import rip.athena.client.gui.clickgui.components.mods.*;
|
||||
import rip.athena.client.gui.hud.HUDEditor;
|
||||
import rip.athena.client.modules.Category;
|
||||
import rip.athena.client.modules.Module;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
import rip.athena.client.modules.impl.render.Crosshair;
|
||||
import rip.athena.client.utils.input.BindType;
|
||||
import rip.athena.client.utils.render.AssetUtils;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ModsPage extends Page {
|
||||
public final int MENU_HEADER_TEXT_COLOR_MOD = new Color(129, 129, 129, IngameMenu.MENU_ALPHA).getRGB();
|
||||
|
||||
|
|
@ -37,20 +46,20 @@ public class ModsPage extends Page {
|
|||
public Module activeModule;
|
||||
private String search;
|
||||
|
||||
//private HUDEditor hudEditor;
|
||||
private HUDEditor hudEditor;
|
||||
|
||||
public ModsPage(Minecraft mc, Menu menu, IngameMenu parent) {
|
||||
super(mc, menu, parent);
|
||||
|
||||
//hudEditor = new HUDEditor(parent.getFeature());
|
||||
hudEditor = new HUDEditor(parent.getFeature());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onInit() {
|
||||
for(Category category : Category.values()) {
|
||||
for (Category category : Category.values()) {
|
||||
String icon = category.getIcon();
|
||||
|
||||
if(icon.trim().length() > 0 && !category.isHidden()) {
|
||||
if (icon.trim().length() > 0 && !category.isHidden()) {
|
||||
MOD_TABS[category.getIndex()] = AssetUtils.getResource(icon);
|
||||
}
|
||||
}
|
||||
|
|
@ -62,32 +71,38 @@ public class ModsPage extends Page {
|
|||
int y = menu.getY() + 59;
|
||||
int height = 32;
|
||||
|
||||
drawVerticalLine(menu.getX() + 215, y + height - 30, height + 398, 3, new Color(27, 27, 27, 225).getRGB());
|
||||
drawVerticalLine(menu.getX() + 215, y + height - 30, height + 432, 3, new Color(27, 27, 27, 225).getRGB());
|
||||
|
||||
y += 50;
|
||||
|
||||
for(Category category : Category.values()) {
|
||||
for (Category category : Category.values()) {
|
||||
String icon = category.getIcon();
|
||||
|
||||
if(icon.trim().length() > 0 && !category.isHidden()) {
|
||||
drawShadowUp(menu.getX() + 15, y, 190);
|
||||
drawShadowDown(menu.getX() + 15, y + height, 190);
|
||||
if (icon.trim().length() > 0 && !category.isHidden()) {
|
||||
//drawShadowUp(menu.getX() + 15, y, 190);
|
||||
//drawShadowDown(menu.getX() + 15, y + height, 190);
|
||||
y += height + 2 + 10;
|
||||
}
|
||||
}
|
||||
|
||||
y = menu.getY() + menu.getHeight() - height;
|
||||
drawShadowUp(menu.getX() + 15, y - 2, 200);
|
||||
drawShadowUp(menu.getX(), y - 2, 215);
|
||||
|
||||
if(modCategory != null) {
|
||||
FontManager.baloo17.drawString(activeModule != null ? "SETTINGS | " : modCategory.getText(), menu.getX() + 255, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
|
||||
if(activeModule != null) {
|
||||
if (modCategory != null) {
|
||||
if (Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(activeModule != null ? "SETTINGS | " : modCategory.getText(), menu.getX() + 255, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
} else {
|
||||
mc.fontRendererObj.drawString(activeModule != null ? "SETTINGS | " : modCategory.getText(), menu.getX() + 255, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
}
|
||||
if (activeModule != null) {
|
||||
int offset = (int) FontManager.baloo17.getStringWidth("SETTINGS | ");
|
||||
String text = activeModule.getName().toUpperCase().trim();
|
||||
|
||||
FontManager.baloo17.drawString(text, menu.getX() + 255 + offset, menu.getY() + 80, MENU_HEADER_TEXT_COLOR_MOD);
|
||||
|
||||
if (Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString(text, menu.getX() + 255 + offset, menu.getY() + 80, MENU_HEADER_TEXT_COLOR_MOD);
|
||||
} else {
|
||||
mc.fontRendererObj.drawString(text, menu.getX() + 255 + offset, menu.getY() + 80, MENU_HEADER_TEXT_COLOR_MOD);
|
||||
}
|
||||
drawShadowUp(menu.getX() + 255, menu.getY() + 110 + 25 + 2, menu.getWidth() - 286);
|
||||
drawShadowLeft(menu.getX() + 255 + 2, menu.getY() + 110 + 25, menu.getHeight() - 110 - 50 - 5);
|
||||
drawShadowDown(menu.getX() + 255, menu.getY() + menu.getHeight() - 27 - 5, menu.getWidth() - 286);
|
||||
|
|
@ -96,13 +111,13 @@ public class ModsPage extends Page {
|
|||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + 255, menu.getY() + 110 + 25, menu.getWidth() - 255 - 31, menu.getHeight() - 110 - 50 - 5, MENU_BG_COLOR_MOD_BORDER);
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + 255 + 1, menu.getY() + 110 + 25 + 1, menu.getWidth() - 255 - 33, menu.getHeight() - 110 - 52 - 5, MENU_BG_COLOR_MOD);
|
||||
|
||||
/*if(activeModule instanceof Crosshair) {
|
||||
if (activeModule instanceof Crosshair) {
|
||||
Crosshair crosshair = (Crosshair) activeModule;
|
||||
int w = 86;
|
||||
int h = 76;
|
||||
|
||||
crosshair.drawPicker(menu.getX() + 255 + 25, menu.getY() + 290, w, h, menu.getMouseX(), menu.getMouseY());
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
drawHorizontalLine(menu.getX() + 255, menu.getY() + 110, menu.getWidth() - 255 - 31, 3, IngameMenu.MENU_LINE_COLOR);
|
||||
|
|
@ -114,15 +129,15 @@ public class ModsPage extends Page {
|
|||
int y = 59 + 50;
|
||||
int height = 32;
|
||||
|
||||
for(Category category : Category.values()) {
|
||||
for (Category category : Category.values()) {
|
||||
String icon = category.getIcon();
|
||||
|
||||
if(icon.trim().length() > 0 && !category.isHidden()) {
|
||||
if (icon.trim().length() > 0 && !category.isHidden()) {
|
||||
MenuButton comp = new ModCategoryButton(category, MOD_TABS[category.getIndex()], 0, y, 225, height) {
|
||||
@Override
|
||||
public void onAction() {
|
||||
for(rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) {
|
||||
if(component instanceof ModCategoryButton) {
|
||||
for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) {
|
||||
if (component instanceof ModCategoryButton) {
|
||||
ModCategoryButton button = (ModCategoryButton) component;
|
||||
button.setActive(component == this);
|
||||
}
|
||||
|
|
@ -134,7 +149,7 @@ public class ModsPage extends Page {
|
|||
}
|
||||
};
|
||||
|
||||
if(category == modCategory) {
|
||||
if (category == modCategory) {
|
||||
comp.setActive(true);
|
||||
}
|
||||
|
||||
|
|
@ -144,7 +159,7 @@ public class ModsPage extends Page {
|
|||
}
|
||||
}
|
||||
|
||||
if(activeModule == null) {
|
||||
if (activeModule == null) {
|
||||
MenuTextField searchbar = new SearchTextfield(TextPattern.NONE, menu.getWidth() - 31 - 250 - 5, 110 - 38, 250, 30) {
|
||||
@Override
|
||||
public void onAction() {
|
||||
|
|
@ -218,11 +233,11 @@ public class ModsPage extends Page {
|
|||
@Override
|
||||
public void onAction() {
|
||||
setActive(false);
|
||||
//mc.displayGuiScreen(hudEditor);
|
||||
mc.displayGuiScreen(hudEditor);
|
||||
}
|
||||
});
|
||||
|
||||
if(activeModule == null) {
|
||||
if (activeModule == null) {
|
||||
initModPage(pane);
|
||||
} else {
|
||||
pane.setX(255 + 1);
|
||||
|
|
@ -241,18 +256,18 @@ public class ModsPage extends Page {
|
|||
|
||||
int sliderWidth = pane.getWidth() - xSpacing * 2;
|
||||
|
||||
for(ConfigEntry configEntry : activeModule.getEntries()) {
|
||||
for (ConfigEntry configEntry : activeModule.getEntries()) {
|
||||
final FeatureText label;
|
||||
|
||||
String key = configEntry.getKey().toUpperCase();
|
||||
|
||||
if(configEntry.hasDescription()) {
|
||||
if (configEntry.hasDescription()) {
|
||||
toAdd.add(label = new FeatureText(key, 0, 0));
|
||||
} else {
|
||||
toAdd.add(label = new FeatureText(key, configEntry.getDescription(), 0, 0));
|
||||
}
|
||||
|
||||
if(configEntry instanceof BooleanEntry) {
|
||||
if (configEntry instanceof BooleanEntry) {
|
||||
BooleanEntry entry = (BooleanEntry) configEntry;
|
||||
|
||||
MenuModCheckbox checkbox = new MenuModCheckbox(0, 0, 15, 15) {
|
||||
|
|
@ -265,7 +280,7 @@ public class ModsPage extends Page {
|
|||
checkbox.setChecked((boolean) entry.getValue(activeModule));
|
||||
|
||||
toAdd.add(checkbox);
|
||||
} else if(configEntry instanceof ColorEntry) {
|
||||
} else if (configEntry instanceof ColorEntry) {
|
||||
ColorEntry entry = (ColorEntry) configEntry;
|
||||
|
||||
toAdd.add(new MenuModColorPicker(0, 0, 15, 15, ((Color) entry.getValue(activeModule)).getRGB()) {
|
||||
|
|
@ -274,18 +289,18 @@ public class ModsPage extends Page {
|
|||
entry.setValue(activeModule, getColor());
|
||||
}
|
||||
});
|
||||
} else if(configEntry instanceof DoubleEntry) {
|
||||
} else if (configEntry instanceof DoubleEntry) {
|
||||
DoubleEntry entry = (DoubleEntry) configEntry;
|
||||
|
||||
FeatureValueText valueText = new FeatureValueText("", 0, 0);
|
||||
|
||||
toAdd.add(valueText);
|
||||
|
||||
MenuModSlider slider = new MenuModSlider((double)entry.getValue(activeModule), entry.getMin(), entry.getMax(), 2, 0, 0, sliderWidth, 15) {
|
||||
MenuModSlider slider = new MenuModSlider((double) entry.getValue(activeModule), entry.getMin(), entry.getMax(), 2, 0, 0, sliderWidth, 15) {
|
||||
@Override
|
||||
public void onAction() {
|
||||
label.setText((entry.getKey() + " | ").toUpperCase());
|
||||
entry.setValue(activeModule, (double)getValue());
|
||||
entry.setValue(activeModule, (double) getValue());
|
||||
|
||||
valueText.setText(getValue() + "");
|
||||
}
|
||||
|
|
@ -294,18 +309,18 @@ public class ModsPage extends Page {
|
|||
slider.onAction();
|
||||
|
||||
toAdd.add(slider);
|
||||
} else if(configEntry instanceof FloatEntry) {
|
||||
} else if (configEntry instanceof FloatEntry) {
|
||||
FloatEntry entry = (FloatEntry) configEntry;
|
||||
|
||||
FeatureValueText valueText = new FeatureValueText("", 0, 0);
|
||||
|
||||
toAdd.add(valueText);
|
||||
|
||||
MenuModSlider slider = new MenuModSlider((float)entry.getValue(activeModule), entry.getMin(), entry.getMax(), 2, 0, 0, sliderWidth, 15) {
|
||||
MenuModSlider slider = new MenuModSlider((float) entry.getValue(activeModule), entry.getMin(), entry.getMax(), 2, 0, 0, sliderWidth, 15) {
|
||||
@Override
|
||||
public void onAction() {
|
||||
label.setText((entry.getKey() + " | ").toUpperCase());
|
||||
entry.setValue(activeModule, (float)getValue());
|
||||
entry.setValue(activeModule, (float) getValue());
|
||||
|
||||
valueText.setText(getValue() + "");
|
||||
}
|
||||
|
|
@ -314,14 +329,14 @@ public class ModsPage extends Page {
|
|||
slider.onAction();
|
||||
|
||||
toAdd.add(slider);
|
||||
} else if(configEntry instanceof IntEntry) {
|
||||
} else if (configEntry instanceof IntEntry) {
|
||||
IntEntry entry = (IntEntry) configEntry;
|
||||
|
||||
FeatureValueText valueText = new FeatureValueText("", 0, 0);
|
||||
|
||||
toAdd.add(valueText);
|
||||
|
||||
if(entry.isKeyBind()) {
|
||||
if (entry.isKeyBind()) {
|
||||
MenuModKeybind bind = new MenuModKeybind(0, 0, 175, 15) {
|
||||
@Override
|
||||
public void onAction() {
|
||||
|
|
@ -333,7 +348,7 @@ public class ModsPage extends Page {
|
|||
|
||||
toAdd.add(bind);
|
||||
} else {
|
||||
MenuModSlider slider = new MenuModSlider((int)entry.getValue(activeModule), entry.getMin(), entry.getMax(), 0, 0, sliderWidth, 15) {
|
||||
MenuModSlider slider = new MenuModSlider((int) entry.getValue(activeModule), entry.getMin(), entry.getMax(), 0, 0, sliderWidth, 15) {
|
||||
@Override
|
||||
public void onAction() {
|
||||
label.setText((entry.getKey() + " | ").toUpperCase());
|
||||
|
|
@ -347,7 +362,7 @@ public class ModsPage extends Page {
|
|||
|
||||
toAdd.add(slider);
|
||||
}
|
||||
} else if(configEntry instanceof ListEntry) {
|
||||
} else if (configEntry instanceof ListEntry) {
|
||||
ListEntry entry = (ListEntry) configEntry;
|
||||
|
||||
MenuModList list = new MenuModList(entry.getValues(), 0, 0, 15) {
|
||||
|
|
@ -360,7 +375,7 @@ public class ModsPage extends Page {
|
|||
list.setValue((String) configEntry.getValue(activeModule));
|
||||
|
||||
toAdd.add(list);
|
||||
} else if(configEntry instanceof StringEntry) {
|
||||
} else if (configEntry instanceof StringEntry) {
|
||||
StringEntry entry = (StringEntry) configEntry;
|
||||
|
||||
ModTextbox box = new ModTextbox(TextPattern.NONE, 0, 0, 175, 15) {
|
||||
|
|
@ -384,13 +399,13 @@ public class ModsPage extends Page {
|
|||
boolean isText = false;
|
||||
rip.athena.client.gui.framework.MenuComponent last = null;
|
||||
|
||||
for(rip.athena.client.gui.framework.MenuComponent component : toAdd) {
|
||||
if(component instanceof FeatureValueText) {
|
||||
if(last != null) {
|
||||
for (rip.athena.client.gui.framework.MenuComponent component : toAdd) {
|
||||
if (component instanceof FeatureValueText) {
|
||||
if (last != null) {
|
||||
component.setX(xPos);
|
||||
component.setY(yPos);
|
||||
}
|
||||
} else if(component instanceof FeatureText) {
|
||||
} else if (component instanceof FeatureText) {
|
||||
component.setX(xPos);
|
||||
component.setY(yPos);
|
||||
|
||||
|
|
@ -400,14 +415,14 @@ public class ModsPage extends Page {
|
|||
} else {
|
||||
xPos = defaultX;
|
||||
|
||||
if(isText) {
|
||||
if(component instanceof MenuModSlider) {
|
||||
if (isText) {
|
||||
if (component instanceof MenuModSlider) {
|
||||
yPos += ySpacing;
|
||||
|
||||
component.setX(xPos);
|
||||
component.setY(yPos);
|
||||
} else {
|
||||
if(component instanceof MenuModList) {
|
||||
if (component instanceof MenuModList) {
|
||||
component.setX(pane.getWidth() - component.getWidth() - xSpacing * 3 + 12);
|
||||
} else {
|
||||
component.setX(pane.getWidth() - component.getWidth() - xSpacing);
|
||||
|
|
@ -449,8 +464,8 @@ public class ModsPage extends Page {
|
|||
}
|
||||
|
||||
private void updateStates() {
|
||||
for(rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) {
|
||||
if(component instanceof ModsButton) {
|
||||
for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) {
|
||||
if (component instanceof ModsButton) {
|
||||
ModsButton button = (ModsButton) component;
|
||||
|
||||
button.setActive(activeModule.isToggled());
|
||||
|
|
@ -462,8 +477,8 @@ public class ModsPage extends Page {
|
|||
}
|
||||
|
||||
private void initModPage() {
|
||||
for(rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) {
|
||||
if(component instanceof ModScrollPane) {
|
||||
for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) {
|
||||
if (component instanceof ModScrollPane) {
|
||||
initModPage((ModScrollPane) component);
|
||||
return;
|
||||
}
|
||||
|
|
@ -473,8 +488,8 @@ public class ModsPage extends Page {
|
|||
private void initModPage(ModScrollPane pane) {
|
||||
pane.getComponents().clear();
|
||||
|
||||
for(rip.athena.client.gui.framework.MenuComponent c : menu.getComponents()) {
|
||||
if(c instanceof ModsButton || c instanceof MenuModList) {
|
||||
for (rip.athena.client.gui.framework.MenuComponent c : menu.getComponents()) {
|
||||
if (c instanceof ModsButton || c instanceof MenuModList) {
|
||||
menu.getComponents().remove(c);
|
||||
}
|
||||
}
|
||||
|
|
@ -485,10 +500,15 @@ public class ModsPage extends Page {
|
|||
int height = 150;
|
||||
int spacing = 16;
|
||||
|
||||
for(Module module : Athena.INSTANCE.getModuleManager().getModules().stream().filter(entry ->
|
||||
((search == null || search.isEmpty()) || entry.getName().toLowerCase().indexOf(search.toLowerCase()) >= 0) &&
|
||||
(entry.getCategory() == modCategory || modCategory == Category.ALL_MODS) && !entry.getCategory().isHidden()).collect(Collectors.toList())) {
|
||||
List<Module> modules = Athena.INSTANCE.getModuleManager().getModules().stream()
|
||||
.filter(entry ->
|
||||
((search == null || search.isEmpty()) || entry.getName().toLowerCase().contains(search.toLowerCase())) &&
|
||||
(entry.getCategory() == modCategory || modCategory == Category.ALL_MODS) && !entry.getCategory().isHidden())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
modules.sort(Comparator.comparing(module -> module.getName().toLowerCase()));
|
||||
|
||||
for (Module module : modules) {
|
||||
pane.addComponent(new ModuleBox(module, x, y, width, height) {
|
||||
@Override
|
||||
public void onOpenSettings() {
|
||||
|
|
@ -499,7 +519,7 @@ public class ModsPage extends Page {
|
|||
|
||||
x += width + spacing;
|
||||
|
||||
if(x + width >= pane.getWidth()) {
|
||||
if (x + width >= pane.getWidth()) {
|
||||
x = 0;
|
||||
y += height + spacing;
|
||||
}
|
||||
|
|
@ -1,28 +1,23 @@
|
|||
package rip.athena.client.gui.hud.pages;
|
||||
package rip.athena.client.gui.clickgui.pages;
|
||||
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.font.FontManager;
|
||||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.Page;
|
||||
import rip.athena.client.gui.hud.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.hud.components.macros.MacroTextfield;
|
||||
import rip.athena.client.gui.hud.components.macros.SimpleTextButton;
|
||||
import rip.athena.client.gui.hud.components.mods.ModCategoryButton;
|
||||
import rip.athena.client.gui.hud.components.mods.ModScrollPane;
|
||||
import rip.athena.client.gui.hud.components.profiles.ProfilesBase;
|
||||
import rip.athena.client.gui.hud.components.profiles.ProfilesBlueButton;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.Page;
|
||||
import rip.athena.client.gui.clickgui.components.macros.MacroButton;
|
||||
import rip.athena.client.gui.clickgui.components.macros.MacroTextfield;
|
||||
import rip.athena.client.gui.clickgui.components.mods.ModCategoryButton;
|
||||
import rip.athena.client.gui.clickgui.components.mods.ModScrollPane;
|
||||
import rip.athena.client.gui.clickgui.components.profiles.ProfilesBlueButton;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import org.apache.commons.lang3.RandomStringUtils;
|
||||
import org.json.JSONException;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
|
||||
import java.awt.*;
|
||||
import java.io.IOException;
|
||||
import java.net.URLEncoder;
|
||||
import java.util.NoSuchElementException;
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class ProfilesPage extends Page {
|
||||
private MacroTextfield nameNew;
|
||||
|
|
@ -75,7 +70,7 @@ public class ProfilesPage extends Page {
|
|||
}
|
||||
|
||||
/*try {
|
||||
WebRequest request = new WebRequest(Falcun.PROFILES_URL + "/uploads/" + URLEncoder.encode(nameAdd.getText(), "UTF-8") + "/config.json", "GET", ContentType.FORM, false);
|
||||
WebRequest request = new WebRequest(Athena.PROFILES_URL + "/uploads/" + URLEncoder.encode(nameAdd.getText(), "UTF-8") + "/config.json", "GET", ContentType.FORM, false);
|
||||
WebRequestResult result = request.connect();
|
||||
|
||||
if(result.getResponse() == 200) {
|
||||
|
|
@ -149,7 +144,7 @@ public class ProfilesPage extends Page {
|
|||
try {
|
||||
String code = URLEncoder.encode(RandomStringUtils.randomAlphabetic(12).toLowerCase(), "UTF-8");
|
||||
|
||||
WebRequest request = new WebRequest(Falcun.PROFILES_URL + "/upload.php?id=" + code, "POST", ContentType.MULTIPART_FORM, false);
|
||||
WebRequest request = new WebRequest(Athena.PROFILES_URL + "/upload.php?id=" + code, "POST", ContentType.MULTIPART_FORM, false);
|
||||
|
||||
String boundary = "WebKitFormBoundaryYDPG5KWy5y4yolEf";
|
||||
|
||||
|
|
@ -216,32 +211,53 @@ public class ProfilesPage extends Page {
|
|||
int y = menu.getY() + 59;
|
||||
int height = 32;
|
||||
|
||||
FontManager.baloo17.drawString("PROFILES", menu.getX() + 31, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString("PROFILES", menu.getX() + 31, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
} else {
|
||||
mc.fontRendererObj.drawString("PROFILES", menu.getX() + 31, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
}
|
||||
drawHorizontalLine(menu.getX() + 31, menu.getY() + 110, menu.getWidth() - width - 31 * 2, 3, IngameMenu.MENU_LINE_COLOR);
|
||||
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR);
|
||||
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR);
|
||||
drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width);
|
||||
FontManager.baloo17.drawString("CREATE NEW PROFILE", menu.getX() + menu.getWidth() - (float) width / 2 - FontManager.baloo17.getStringWidth("CREATE NEW PROFILE") / 2, y + (float) height / 2 - FontManager.baloo17.getHeight("CREATE NEW PROFILE") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString("CREATE NEW PROFILE", menu.getX() + menu.getWidth() - (float) width / 2 - FontManager.baloo17.getStringWidth("CREATE NEW PROFILE") / 2, y + (float) height / 2 - FontManager.baloo17.getHeight("CREATE NEW PROFILE") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
} else {
|
||||
mc.fontRendererObj.drawString("CREATE NEW PROFILE", (int) (menu.getX() + menu.getWidth() - (float) width / 2 - mc.fontRendererObj.getStringWidth("CREATE NEW PROFILE") / 2), (int) (y + (float) height / 2 - mc.fontRendererObj.FONT_HEIGHT / 2), IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
}
|
||||
|
||||
drawShadowDown(menu.getX() + menu.getWidth() - width, y - 1, width);
|
||||
|
||||
y += 60;
|
||||
|
||||
FontManager.baloo17.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
} else {
|
||||
mc.fontRendererObj.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
}
|
||||
|
||||
y += 120;
|
||||
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, y, width, height + 1, ModCategoryButton.MAIN_COLOR);
|
||||
drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width);
|
||||
drawShadowUp(menu.getX() + menu.getWidth() - width, y, width);
|
||||
FontManager.baloo17.drawString("DOWNLOAD PROFILE", menu.getX() + menu.getWidth() - (float) width / 2 - FontManager.baloo17.getStringWidth("DOWNLOAD PROFILE") / 2, y + (float) height / 2 - FontManager.baloo17.getHeight("DOWNLOAD PROFILE") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString("DOWNLOAD PROFILE", menu.getX() + menu.getWidth() - (float) width / 2 - FontManager.baloo17.getStringWidth("DOWNLOAD PROFILE") / 2, y + (float) height / 2 - FontManager.baloo17.getHeight("DOWNLOAD PROFILE") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
} else {
|
||||
mc.fontRendererObj.drawString("DOWNLOAD PROFILE", (int) (menu.getX() + menu.getWidth() - (float) width / 2 - mc.fontRendererObj.getStringWidth("DOWNLOAD PROFILE") / 2), (int) (y + (float) height / 2 - mc.fontRendererObj.FONT_HEIGHT / 2), IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
}
|
||||
|
||||
y += 50;
|
||||
|
||||
FontManager.baloo17.drawString("PROFILE CODE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
if(Settings.customGuiFont) {
|
||||
FontManager.baloo17.drawString("PROFILE CODE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
} else {
|
||||
mc.fontRendererObj.drawString("PROFILE CODE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package rip.athena.client.gui.hud.pages;
|
||||
package rip.athena.client.gui.clickgui.pages;
|
||||
|
||||
import rip.athena.client.Athena;
|
||||
import rip.athena.client.config.ConfigEntry;
|
||||
|
|
@ -6,7 +6,7 @@ import rip.athena.client.config.types.*;
|
|||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.framework.MenuComponent;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import net.minecraft.block.*;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityOtherPlayerMP;
|
||||
|
|
@ -22,23 +22,30 @@ import net.minecraft.entity.projectile.EntityArrow;
|
|||
import net.minecraft.tileentity.*;
|
||||
import net.minecraft.util.EnumParticleTypes;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import rip.athena.client.gui.hud.Page;
|
||||
import rip.athena.client.gui.hud.components.cosmetics.CosmeticGenericButton;
|
||||
import rip.athena.client.gui.hud.components.fps.*;
|
||||
import rip.athena.client.gui.hud.components.macros.FlipButton;
|
||||
import rip.athena.client.gui.hud.components.mods.*;
|
||||
import rip.athena.client.gui.hud.pages.fps.BlacklistModule;
|
||||
import rip.athena.client.gui.hud.pages.fps.BlacklistType;
|
||||
import rip.athena.client.gui.hud.pages.fps.FPSSubTab;
|
||||
import rip.athena.client.gui.clickgui.Page;
|
||||
import rip.athena.client.gui.clickgui.components.cosmetics.CosmeticGenericButton;
|
||||
import rip.athena.client.gui.clickgui.components.fps.*;
|
||||
import rip.athena.client.gui.clickgui.components.macros.FlipButton;
|
||||
import rip.athena.client.gui.clickgui.components.mods.*;
|
||||
import rip.athena.client.gui.clickgui.pages.fps.BlacklistModule;
|
||||
import rip.athena.client.gui.clickgui.pages.fps.BlacklistType;
|
||||
import rip.athena.client.gui.clickgui.pages.fps.FPSSubTab;
|
||||
import rip.athena.client.modules.Module;
|
||||
import rip.athena.client.modules.impl.fpssettings.OptimizerMod;
|
||||
import rip.athena.client.modules.impl.other.Settings;
|
||||
import rip.athena.client.utils.render.AssetUtils;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class FPSPage extends Page {
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class SettingsPage extends Page {
|
||||
private static ResourceLocation OF_LOW;
|
||||
private static ResourceLocation OF_MEDMED;
|
||||
private static ResourceLocation OF_HIGH;
|
||||
|
|
@ -175,7 +182,7 @@ public class FPSPage extends Page {
|
|||
registerEntity("Player (Other)", EntityOtherPlayerMP.class);
|
||||
}
|
||||
|
||||
public FPSPage(Minecraft mc, Menu menu, IngameMenu parent) {
|
||||
public SettingsPage(Minecraft mc, Menu menu, IngameMenu parent) {
|
||||
super(mc, menu, parent);
|
||||
}
|
||||
|
||||
|
|
@ -426,7 +433,7 @@ public class FPSPage extends Page {
|
|||
}
|
||||
});
|
||||
} else if(subTab == FPSSubTab.SETTINGS) {
|
||||
initSettings(Athena.INSTANCE.getModuleManager().get(OptimizerMod.class));
|
||||
initSettings(Athena.INSTANCE.getModuleManager().get(Settings.class));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -539,7 +546,6 @@ public class FPSPage extends Page {
|
|||
Minecraft.getMinecraft().gameSettings.ofVoidParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofWaterParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofPortalParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofPortalParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofFireworkParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofDrippingWaterLava = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofAnimatedTerrain = false;
|
||||
|
|
@ -608,7 +614,6 @@ public class FPSPage extends Page {
|
|||
Minecraft.getMinecraft().gameSettings.ofVoidParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofWaterParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofPortalParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofPortalParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofFireworkParticles = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofDrippingWaterLava = false;
|
||||
Minecraft.getMinecraft().gameSettings.ofAnimatedTerrain = true;
|
||||
|
|
@ -1,19 +1,25 @@
|
|||
package rip.athena.client.gui.hud.pages;
|
||||
package rip.athena.client.gui.clickgui.pages;
|
||||
|
||||
import rip.athena.client.gui.framework.Menu;
|
||||
import rip.athena.client.gui.framework.TextPattern;
|
||||
import rip.athena.client.gui.hud.IngameMenu;
|
||||
import rip.athena.client.gui.hud.Page;
|
||||
import rip.athena.client.gui.hud.components.macros.*;
|
||||
import rip.athena.client.gui.hud.components.mods.MenuModColorPicker;
|
||||
import rip.athena.client.gui.hud.components.mods.ModCategoryButton;
|
||||
import rip.athena.client.gui.hud.components.mods.ModScrollPane;
|
||||
import rip.athena.client.gui.hud.components.waypoints.WaypointTextBarrier;
|
||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||
import rip.athena.client.gui.clickgui.Page;
|
||||
import rip.athena.client.gui.clickgui.components.macros.*;
|
||||
import rip.athena.client.gui.clickgui.components.mods.MenuModColorPicker;
|
||||
import rip.athena.client.gui.clickgui.components.mods.ModCategoryButton;
|
||||
import rip.athena.client.gui.clickgui.components.mods.ModScrollPane;
|
||||
import rip.athena.client.gui.clickgui.components.waypoints.WaypointTextBarrier;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import rip.athena.client.utils.StringUtils;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class WaypointsPage extends Page {
|
||||
private MacroTextfield name;
|
||||
private MacroTextfield description;
|
||||
|
|
@ -1,4 +1,10 @@
|
|||
package rip.athena.client.gui.hud.pages.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.pages.cosmetics;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public enum BandanaSize {
|
||||
SMALL("SMALL"), MEDIUM("MEDIUM"), LARGE("LARGE");
|
||||
|
|
@ -1,4 +1,10 @@
|
|||
package rip.athena.client.gui.hud.pages.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.pages.cosmetics;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public enum CapeType {
|
||||
NORMAL("NORMAL"), BEND("BEND"), SHOULDERS("SHOULDERS"), BEND_AND_SHOULDERS("BEND & SHOULDERS");
|
||||
|
|
@ -1,4 +1,10 @@
|
|||
package rip.athena.client.gui.hud.pages.cosmetics;
|
||||
package rip.athena.client.gui.clickgui.pages.cosmetics;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public enum CosmeticType {
|
||||
CAPES("CAPES"), BANDANAS("BANDANAS"), EMOTES("EMOTES"), FLAGS("FLAGS");
|
||||
|
|
@ -1,11 +1,17 @@
|
|||
package rip.athena.client.gui.hud.pages.fps;
|
||||
package rip.athena.client.gui.clickgui.pages.fps;
|
||||
|
||||
import rip.athena.client.gui.hud.pages.FPSPage;
|
||||
import rip.athena.client.gui.clickgui.pages.SettingsPage;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumParticleTypes;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public class BlacklistModule {
|
||||
private String name;
|
||||
private BlacklistType type;
|
||||
|
|
@ -20,15 +26,15 @@ public class BlacklistModule {
|
|||
|
||||
switch(type) {
|
||||
case BLOCK:
|
||||
this.enabled = FPSPage.BLOCKS.contains(clazz);
|
||||
this.enabled = SettingsPage.BLOCKS.contains(clazz);
|
||||
break;
|
||||
|
||||
case ENTITY:
|
||||
this.enabled = FPSPage.ENTITIES.contains(clazz);
|
||||
this.enabled = SettingsPage.ENTITIES.contains(clazz);
|
||||
break;
|
||||
|
||||
case TILE_ENTITY:
|
||||
this.enabled = FPSPage.TILE_ENTITIES.contains(clazz);
|
||||
this.enabled = SettingsPage.TILE_ENTITIES.contains(clazz);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -40,7 +46,7 @@ public class BlacklistModule {
|
|||
this.name = name;
|
||||
this.type = BlacklistType.PARTICLE;
|
||||
this.particle = particle;
|
||||
this.enabled = FPSPage.PARTICLES.contains(particle);
|
||||
this.enabled = SettingsPage.PARTICLES.contains(particle);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
|
|
@ -72,11 +78,11 @@ public class BlacklistModule {
|
|||
Class<Block> block = (Class<Block>) clazz;
|
||||
|
||||
if(enabled) {
|
||||
if(!FPSPage.BLOCKS.contains(block)) {
|
||||
FPSPage.BLOCKS.add(block);
|
||||
if(!SettingsPage.BLOCKS.contains(block)) {
|
||||
SettingsPage.BLOCKS.add(block);
|
||||
}
|
||||
} else if(FPSPage.BLOCKS.contains(block)) {
|
||||
FPSPage.BLOCKS.remove(block);
|
||||
} else if(SettingsPage.BLOCKS.contains(block)) {
|
||||
SettingsPage.BLOCKS.remove(block);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -87,11 +93,11 @@ public class BlacklistModule {
|
|||
Class<Entity> entity = (Class<Entity>) clazz;
|
||||
|
||||
if(enabled) {
|
||||
if(!FPSPage.ENTITIES.contains(entity)) {
|
||||
FPSPage.ENTITIES.add(entity);
|
||||
if(!SettingsPage.ENTITIES.contains(entity)) {
|
||||
SettingsPage.ENTITIES.add(entity);
|
||||
}
|
||||
} else if(FPSPage.ENTITIES.contains(entity)) {
|
||||
FPSPage.ENTITIES.remove(entity);
|
||||
} else if(SettingsPage.ENTITIES.contains(entity)) {
|
||||
SettingsPage.ENTITIES.remove(entity);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -101,11 +107,11 @@ public class BlacklistModule {
|
|||
Class<TileEntity> tileEntity = (Class<TileEntity>) clazz;
|
||||
|
||||
if(enabled) {
|
||||
if(!FPSPage.TILE_ENTITIES.contains(tileEntity)) {
|
||||
FPSPage.TILE_ENTITIES.add(tileEntity);
|
||||
if(!SettingsPage.TILE_ENTITIES.contains(tileEntity)) {
|
||||
SettingsPage.TILE_ENTITIES.add(tileEntity);
|
||||
}
|
||||
} else if(FPSPage.TILE_ENTITIES.contains(tileEntity)) {
|
||||
FPSPage.TILE_ENTITIES.remove(tileEntity);
|
||||
} else if(SettingsPage.TILE_ENTITIES.contains(tileEntity)) {
|
||||
SettingsPage.TILE_ENTITIES.remove(tileEntity);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -113,11 +119,11 @@ public class BlacklistModule {
|
|||
case PARTICLE:
|
||||
if(particle != null) {
|
||||
if(enabled) {
|
||||
if(!FPSPage.PARTICLES.contains(particle)) {
|
||||
FPSPage.PARTICLES.add(particle);
|
||||
if(!SettingsPage.PARTICLES.contains(particle)) {
|
||||
SettingsPage.PARTICLES.add(particle);
|
||||
}
|
||||
} else if(FPSPage.PARTICLES.contains(particle)) {
|
||||
FPSPage.PARTICLES.remove(particle);
|
||||
} else if(SettingsPage.PARTICLES.contains(particle)) {
|
||||
SettingsPage.PARTICLES.remove(particle);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package rip.athena.client.gui.clickgui.pages.fps;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public enum BlacklistType {
|
||||
ENTITY, TILE_ENTITY, BLOCK, PARTICLE;
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package rip.athena.client.gui.clickgui.pages.fps;
|
||||
|
||||
/**
|
||||
* @author Athena Development
|
||||
* @project Athena-Client
|
||||
* @date 6/2/2023
|
||||
*/
|
||||
|
||||
public enum FPSSubTab {
|
||||
FPS, OPTIFINE, SETTINGS;
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue