fixed rpc & clickgui opening
@ -353,20 +353,13 @@ public class Minecraft implements IThreadListener, IPlayerUsage
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (true)
|
while (true) {
|
||||||
{
|
try {
|
||||||
try
|
while (this.running) {
|
||||||
{
|
if (!this.hasCrashed || this.crashReporter == null) {
|
||||||
while (this.running)
|
try {
|
||||||
{
|
|
||||||
if (!this.hasCrashed || this.crashReporter == null)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
this.runGameLoop();
|
this.runGameLoop();
|
||||||
}
|
} catch (OutOfMemoryError var10) {
|
||||||
catch (OutOfMemoryError var10)
|
|
||||||
{
|
|
||||||
this.freeMemory();
|
this.freeMemory();
|
||||||
this.displayGuiScreen(new GuiMemoryErrorScreen());
|
this.displayGuiScreen(new GuiMemoryErrorScreen());
|
||||||
System.gc();
|
System.gc();
|
||||||
|
@ -415,8 +415,10 @@ public abstract class Render<T extends Entity>
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (rankTexture != null) {
|
if (rankTexture != null) {
|
||||||
|
GlStateManager.pushMatrix();
|
||||||
Minecraft.getMinecraft().getTextureManager().bindTexture(rankTexture);
|
Minecraft.getMinecraft().getTextureManager().bindTexture(rankTexture);
|
||||||
Gui.drawModalRectWithCustomSizedTexture(-fontrenderer.getStringWidth(entityIn.getDisplayName().getFormattedText()) / 2 - 12, (int) -2, 11, 11, 11, 11, 11, 11);
|
Gui.drawModalRectWithCustomSizedTexture(-fontrenderer.getStringWidth(entityIn.getDisplayName().getFormattedText()) / 2 - 12, (int) -2, 11, 11, 11, 11, 11, 11);
|
||||||
|
GlStateManager.popMatrix();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -135,7 +135,6 @@ public class Athena {
|
|||||||
this.cosmeticsManager = new CosmeticsManager();
|
this.cosmeticsManager = new CosmeticsManager();
|
||||||
|
|
||||||
this.configManager.postInit();
|
this.configManager.postInit();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void logInformation() {
|
private void logInformation() {
|
||||||
@ -212,7 +211,7 @@ public class Athena {
|
|||||||
hasSent = true;
|
hasSent = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
clientSidedAntiCheat.runChecks();
|
//clientSidedAntiCheat.runChecks();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package rip.athena.client.socket;
|
package rip.athena.client.socket;
|
||||||
|
|
||||||
import co.gongzh.procbridge.Client;
|
import co.gongzh.procbridge.Client;
|
||||||
import rip.athena.client.Athena;
|
|
||||||
|
|
||||||
import java.net.ServerSocket;
|
import java.net.ServerSocket;
|
||||||
import java.net.SocketException;
|
import java.net.SocketException;
|
||||||
@ -25,7 +24,7 @@ public class SocketClient {
|
|||||||
|
|
||||||
private static Map<String, String> rankCache = new HashMap<>();
|
private static Map<String, String> rankCache = new HashMap<>();
|
||||||
private static Map<String, Long> cacheTime = new HashMap<>();
|
private static Map<String, Long> cacheTime = new HashMap<>();
|
||||||
private static long cacheExpirationTime = 60 * 30000;
|
private static long cacheExpirationTime = 60 * 5000;
|
||||||
|
|
||||||
private static String currentUsername = "";
|
private static String currentUsername = "";
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ public class DiscordRPC {
|
|||||||
private Core core;
|
private Core core;
|
||||||
|
|
||||||
public DiscordRPC() {
|
public DiscordRPC() {
|
||||||
if(System.getProperty("os.name").equalsIgnoreCase("win")) {
|
if(System.getProperty("os.name").toLowerCase().contains("win")) {
|
||||||
try {
|
try {
|
||||||
Athena.INSTANCE.sendInitializationMessage("Discord RPC", false);
|
Athena.INSTANCE.sendInitializationMessage("Discord RPC", false);
|
||||||
|
|
||||||
|
@ -32,9 +32,7 @@ public class KeybindManager {
|
|||||||
*/
|
*/
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onKeyUp(KeyUpEvent event) {
|
public void onKeyUp(KeyUpEvent event) {
|
||||||
if (isInvalidScreen(Minecraft.getMinecraft().currentScreen)) {
|
if (isInvalidScreen(Minecraft.getMinecraft().currentScreen)) return;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (Module module : Athena.INSTANCE.getModuleRepository().getModules().stream().filter(entry ->
|
for (Module module : Athena.INSTANCE.getModuleRepository().getModules().stream().filter(entry ->
|
||||||
entry.isBound() &&
|
entry.isBound() &&
|
||||||
@ -54,6 +52,8 @@ public class KeybindManager {
|
|||||||
*/
|
*/
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onKeyDown(KeyDownEvent event) {
|
public void onKeyDown(KeyDownEvent event) {
|
||||||
|
if (isInvalidScreen(Minecraft.getMinecraft().currentScreen)) return;
|
||||||
|
|
||||||
for (Module module : Athena.INSTANCE.getModuleRepository().getModules().stream().filter(entry ->
|
for (Module module : Athena.INSTANCE.getModuleRepository().getModules().stream().filter(entry ->
|
||||||
entry.isBound() &&
|
entry.isBound() &&
|
||||||
entry.getKeyBind() == event.getKey()).collect(Collectors.toList())) {
|
entry.getKeyBind() == event.getKey()).collect(Collectors.toList())) {
|
||||||
@ -62,7 +62,6 @@ public class KeybindManager {
|
|||||||
module.setEnabled(true);
|
module.setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isInvalidScreen(Minecraft.getMinecraft().currentScreen)) return;
|
|
||||||
module.setEnabled(module.getBindType() != BindType.TOGGLE || !module.isToggled());
|
module.setEnabled(module.getBindType() != BindType.TOGGLE || !module.isToggled());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 776 B |
After Width: | Height: | Size: 771 B |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 467 B |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 3.9 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 517 B |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 4.1 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 172 B |
After Width: | Height: | Size: 648 B |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 557 B |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 2.5 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 652 B |
After Width: | Height: | Size: 750 B |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 815 B |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 963 B |
After Width: | Height: | Size: 949 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 697 B |
After Width: | Height: | Size: 726 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 3.6 KiB |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 940 B |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 569 B |
After Width: | Height: | Size: 720 B |
After Width: | Height: | Size: 1019 B |
After Width: | Height: | Size: 2.6 KiB |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 906 B |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 783 B |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 4.3 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 1015 B |
After Width: | Height: | Size: 2.5 KiB |
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 648 B |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 527 B |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 734 B |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 977 B |
After Width: | Height: | Size: 1013 B |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 1.8 KiB |