changed fonts
This commit is contained in:
parent
a11e1b06f9
commit
ee9bdf506f
|
@ -86,7 +86,7 @@ public class GuiNewChat extends Gui
|
||||||
GlStateManager.color(1,1,1);
|
GlStateManager.color(1,1,1);
|
||||||
GlStateManager.enableBlend();
|
GlStateManager.enableBlend();
|
||||||
if(Chat.customFont) {
|
if(Chat.customFont) {
|
||||||
FontManager.baloo17.drawStringWithShadow(s, (float) i2, (float) (j2 - 10), 16777215 + (l1 << 24));
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawStringWithShadow(s, (float) i2, (float) (j2 - 10), 16777215 + (l1 << 24));
|
||||||
} else {
|
} else {
|
||||||
this.mc.fontRendererObj.drawStringWithShadow(s, (float) i2, (float) (j2 - 8), 16777215 + (l1 << 24));
|
this.mc.fontRendererObj.drawStringWithShadow(s, (float) i2, (float) (j2 - 8), 16777215 + (l1 << 24));
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,7 +100,7 @@ public class IngameMenu extends MinecraftMenuImpl implements DrawImpl {
|
||||||
|
|
||||||
menu.addComponent(comp);
|
menu.addComponent(comp);
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
x += FontManager.baloo17.getStringWidth(category.getName()) + 20;
|
x += rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(category.getName()) + 20;
|
||||||
} else {
|
} else {
|
||||||
x += mc.fontRendererObj.getStringWidth(category.getName()) + 20;
|
x += mc.fontRendererObj.getStringWidth(category.getName()) + 20;
|
||||||
}
|
}
|
||||||
|
@ -139,8 +139,8 @@ public class IngameMenu extends MinecraftMenuImpl implements DrawImpl {
|
||||||
RoundedUtils.drawRoundedOutline(menu.getX(), menu.getY(), menu.getX() + menu.getWidth(), menu.getY() + menu.getHeight(), 54, 5, new Color(50, 50, 50, 255).getRGB());
|
RoundedUtils.drawRoundedOutline(menu.getX(), menu.getY(), menu.getX() + menu.getWidth(), menu.getY() + menu.getHeight(), 54, 5, new Color(50, 50, 50, 255).getRGB());
|
||||||
RoundedUtils.drawRoundedRect(menu.getX(), menu.getY(), menu.getX() + menu.getWidth(), menu.getY() + menu.getHeight(), 54, new Color(30, 30, 30, 255).getRGB());
|
RoundedUtils.drawRoundedRect(menu.getX(), menu.getY(), menu.getX() + menu.getWidth(), menu.getY() + menu.getHeight(), 54, new Color(30, 30, 30, 255).getRGB());
|
||||||
|
|
||||||
rip.athena.client.utils.font.FontManager.getNunito(30).drawString(Athena.INSTANCE.getClientName().toUpperCase(), menu.getX() + 60, menu.getY() + 20, MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getNunitoBold(50).drawString(Athena.INSTANCE.getClientName().toUpperCase(), menu.getX() + 60, menu.getY() + 20, MENU_HEADER_TEXT_COLOR);
|
||||||
DrawUtils.drawImage(new ResourceLocation("Athena/logo/Athena.png"), (int) (menu.getX() + FontManager.font1.getStringWidth(Athena.INSTANCE.getClientName().toUpperCase()) + 70), (int) (menu.getY() - 10 + FontManager.font1.getHeight(Athena.INSTANCE.getClientName().toUpperCase())), 30, 30);
|
//DrawUtils.drawImage(new ResourceLocation("Athena/logo/Athena.png"), (int) (menu.getX() + FontManager.font1.getStringWidth(Athena.INSTANCE.getClientName().toUpperCase()) + 70), (int) (menu.getY() - 10 + FontManager.font1.getHeight(Athena.INSTANCE.getClientName().toUpperCase())), 30, 30);
|
||||||
drawShadowDown(menu.getX(), menu.getY() + 58, menu.getWidth());
|
drawShadowDown(menu.getX(), menu.getY() + 58, menu.getWidth());
|
||||||
|
|
||||||
if(category != null) {
|
if(category != null) {
|
||||||
|
|
|
@ -70,7 +70,7 @@ public class CosmeticRainbowButton extends CosmeticGenericButton {
|
||||||
drawShadowRight(x + width + 1, y, height + 1);*/
|
drawShadowRight(x + width + 1, y, height + 1);*/
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + (height / 2 - getStringHeight(text) / 2), -1);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + (height / 2 - getStringHeight(text) / 2), -1);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + (height / 2 - getStringHeight(text) / 2), -1);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + (height / 2 - getStringHeight(text) / 2), -1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@ public class OptifineParentBackground extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String text, int x, int y, int color) {
|
public void drawText(String text, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ public class OptifineParentBackground extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,7 +115,7 @@ public class FlipButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String string, int x, int y, int color) {
|
public void drawText(String string, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(string, x, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -124,7 +124,7 @@ public class FlipButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,7 +91,7 @@ public class MacroBase extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String string, int x, int y, int color) {
|
public void drawText(String string, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(string, x, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -100,7 +100,7 @@ public class MacroBase extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,7 +81,7 @@ public class MacroButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String text, int x, int y, int color) {
|
public void drawText(String text, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -90,7 +90,7 @@ public class MacroButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,7 +92,7 @@ public class MacroSlimTextField extends SearchTextfield {
|
||||||
int labelWidth;
|
int labelWidth;
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ public class MacroSlimTextField extends SearchTextfield {
|
||||||
if(comp < index){
|
if(comp < index){
|
||||||
textToDraw = textToDraw.substring(1);
|
textToDraw = textToDraw.substring(1);
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -111,7 +111,7 @@ public class MacroSlimTextField extends SearchTextfield {
|
||||||
} else if(comp > index){
|
} else if(comp > index){
|
||||||
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -132,7 +132,7 @@ public class MacroSlimTextField extends SearchTextfield {
|
||||||
int textHeight;
|
int textHeight;
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
textHeight = (int) FontManager.baloo17.getHeight(textToDraw);
|
textHeight = (int) FontManager.baloo17.getHeight(textToDraw);
|
||||||
drawVerticalLine(x + (int)FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
drawVerticalLine(x + (int)rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||||
} else {
|
} else {
|
||||||
textHeight = Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
textHeight = Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||||
drawVerticalLine(x + (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
drawVerticalLine(x + (int)Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||||
|
@ -146,7 +146,7 @@ public class MacroSlimTextField extends SearchTextfield {
|
||||||
index--;
|
index--;
|
||||||
}
|
}
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(textToDraw, x, y + height / 2 - (int)Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(textToDraw, x, y + height / 2 - (int)Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x, y + height / 2 - (int)Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x, y + height / 2 - (int)Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor);
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,7 +104,7 @@ public class MacroTextfield extends SearchTextfield {
|
||||||
|
|
||||||
int labelWidth;
|
int labelWidth;
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -116,7 +116,7 @@ public class MacroTextfield extends SearchTextfield {
|
||||||
textToDraw = textToDraw.substring(1);
|
textToDraw = textToDraw.substring(1);
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -125,7 +125,7 @@ public class MacroTextfield extends SearchTextfield {
|
||||||
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -153,7 +153,7 @@ public class MacroTextfield extends SearchTextfield {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
drawVerticalLine(x + (int) FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 4, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
drawVerticalLine(x + (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw.substring(0, toRender)) + 4, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||||
} else {
|
} else {
|
||||||
drawVerticalLine(x + (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 4, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
drawVerticalLine(x + (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 4, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||||
}
|
}
|
||||||
|
@ -171,7 +171,7 @@ public class MacroTextfield extends SearchTextfield {
|
||||||
if(textToDraw.isEmpty() && !isFocused()) {
|
if(textToDraw.isEmpty() && !isFocused()) {
|
||||||
textToDraw = placeholderText;
|
textToDraw = placeholderText;
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
xAdd = (int) (width / 2 - FontManager.baloo17.getStringWidth(placeholderText) / 2);
|
xAdd = (int) (width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(placeholderText) / 2);
|
||||||
} else {
|
} else {
|
||||||
xAdd = (width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(placeholderText) / 2);
|
xAdd = (width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(placeholderText) / 2);
|
||||||
}
|
}
|
||||||
|
@ -182,7 +182,7 @@ public class MacroTextfield extends SearchTextfield {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(textToDraw, x + xAdd, y + height / 2 - (float) (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(textToDraw, x + xAdd, y + height / 2 - (float) (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x + xAdd, (int) (y + height / 2 - (float) Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2), textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x + xAdd, (int) (y + height / 2 - (float) Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2), textColor);
|
||||||
}
|
}
|
||||||
|
@ -213,7 +213,7 @@ public class MacroTextfield extends SearchTextfield {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
position += (int) FontManager.baloo17.getStringWidth(text.charAt(i) + "");
|
position += (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text.charAt(i) + "");
|
||||||
} else {
|
} else {
|
||||||
position += (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + "");
|
position += (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + "");
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ public class SimpleTextButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String string, int x, int y, int color) {
|
public void drawText(String string, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(string, x - 3, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string, x - 3, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -88,7 +88,7 @@ public class SimpleTextButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string) - 1;
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) - 1;
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class CategoryButton extends MenuButton {
|
||||||
RoundedUtils.drawRoundedRect(x + 30, y, x + width - 20, y + height, 12, new Color(25,25,25,255).getRGB());
|
RoundedUtils.drawRoundedRect(x + 30, y, x + width - 20, y + height, 12, new Color(25,25,25,255).getRGB());
|
||||||
}
|
}
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
rip.athena.client.utils.font.FontManager.getNunito(20).drawString(text, x + 70, y + height / 2 - (getStringHeight(text) / 2) + 2, textColor);
|
rip.athena.client.utils.font.FontManager.getNunitoBold(20).drawString(text, x + 70, y + height / 2 - (getStringHeight(text) / 2) + 2, textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public class CategoryButton extends MenuButton {
|
||||||
DrawUtils.drawImage(image, x + 35, y + 3, 25, 25);
|
DrawUtils.drawImage(image, x + 35, y + 3, 25, 25);
|
||||||
/*
|
/*
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,7 @@ public class CategoryButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) rip.athena.client.utils.font.FontManager.getNunito(20).width(string);
|
return (int) rip.athena.client.utils.font.FontManager.getNunitoBold(20).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
@ -93,7 +93,7 @@ public class CategoryButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public int getStringHeight(String string) {
|
public int getStringHeight(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) rip.athena.client.utils.font.FontManager.getNunito(20).height();
|
return (int) rip.athena.client.utils.font.FontManager.getNunitoBold(20).height();
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class FeatureText extends MenuLabel {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String text, int x, int y, int color) {
|
public void drawText(String text, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
rip.athena.client.utils.font.FontManager.getNunito(30).drawString(text, x, y, color);
|
rip.athena.client.utils.font.FontManager.getNunitoBold(30).drawString(text, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ public class FeatureText extends MenuLabel {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String text) {
|
public int getStringWidth(String text) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(text);
|
return (int) rip.athena.client.utils.font.FontManager.getNunitoBold(30).width(text);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(text);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(text);
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,7 +135,7 @@ public class GoBackButton extends MenuButton {
|
||||||
DrawUtils.drawRoundedRect(x + 1, y + 1, x + width, y + height, rounding, backgroundColor);*/
|
DrawUtils.drawRoundedRect(x + 1, y + 1, x + width, y + height, rounding, backgroundColor);*/
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||||
}
|
}
|
||||||
|
@ -166,7 +166,7 @@ public class GoBackButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,8 +161,11 @@ public class MenuModKeybind extends MenuComponent {
|
||||||
|
|
||||||
GlStateManager.color(1,1,1);
|
GlStateManager.color(1,1,1);
|
||||||
|
|
||||||
DrawUtils.drawRoundedRect(x - 1, y - 1, x + width + 1, y + height + 1, 4.0f, lineColor);
|
DrawUtils.drawRoundedRect(x, y, x + width, y + height, 4.0f, new Color(50, 50, 50, 255).getRGB());
|
||||||
DrawUtils.drawRoundedRect(x, y, x + width, y + height, 4.0f, new Color(35,35,35, 255).getRGB());
|
DrawUtils.drawRoundedRect(x + 1, y + 1, x + width - 1, y + height - 1, 4.0f, new Color(35, 35, 35, 255).getRGB());
|
||||||
|
|
||||||
|
//DrawUtils.drawRoundedRect(x - 1, y - 1, x + width + 1, y + height + 1, 4.0f, lineColor);
|
||||||
|
//DrawUtils.drawRoundedRect(x, y, x + width, y + height, 4.0f, new Color(35,35,35, 255).getRGB());
|
||||||
|
|
||||||
//drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
//drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
||||||
//drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
//drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
||||||
|
@ -203,7 +206,7 @@ public class MenuModKeybind extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String text, int x, int y, int color) {
|
public void drawText(String text, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -212,7 +215,7 @@ public class MenuModKeybind extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ import rip.athena.client.gui.framework.components.MenuDropdown;
|
||||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||||
import rip.athena.client.gui.framework.draw.DrawType;
|
import rip.athena.client.gui.framework.draw.DrawType;
|
||||||
import rip.athena.client.modules.impl.other.Settings;
|
import rip.athena.client.modules.impl.other.Settings;
|
||||||
|
import rip.athena.client.utils.render.RoundedUtils;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
||||||
|
@ -112,10 +113,13 @@ public class MenuModList extends MenuDropdown {
|
||||||
|
|
||||||
GlStateManager.color(1,1,1);
|
GlStateManager.color(1,1,1);
|
||||||
|
|
||||||
drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
RoundedUtils.drawRoundedRect(x, y, x + width, y + height, 12.0f, new Color(50, 50, 50, 255).getRGB());
|
||||||
|
RoundedUtils.drawRoundedRect(x + 1, y + 1, x + width - 1, y + height - 1, 12.0f, new Color(35, 35, 35, 255).getRGB());
|
||||||
|
|
||||||
|
/*drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
||||||
drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
||||||
drawHorizontalLine(x, y + height, width + 1, 1, lineColor);
|
drawHorizontalLine(x, y + height, width + 1, 1, lineColor);
|
||||||
drawVerticalLine(x + width, y + 1, height - 1, 1, lineColor);
|
drawVerticalLine(x + width, y + 1, height - 1, 1, lineColor);*/
|
||||||
|
|
||||||
int mouseX = parent.getMouseX();
|
int mouseX = parent.getMouseX();
|
||||||
int mouseY = parent.getMouseY();
|
int mouseY = parent.getMouseY();
|
||||||
|
@ -128,7 +132,7 @@ public class MenuModList extends MenuDropdown {
|
||||||
|
|
||||||
//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, cursorWidth, height + 1, popupColor);
|
//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x, y, cursorWidth, height + 1, popupColor);
|
||||||
//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, cursorWidth - 2, height - 1, backgroundColor);
|
//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, cursorWidth - 2, height - 1, backgroundColor);
|
||||||
drawText("<", x + 3 + (cursorWidth / 2) - getStringWidth("<") / 2, y + height / 2 - getStringHeight("<") / 2, textColor);
|
drawText("<", x + (cursorWidth / 2) - getStringWidth("<") / 2, y + height / 2 - getStringHeight("<") / 2, textColor);
|
||||||
|
|
||||||
if(mouseX < x + width - cursorWidth - 1) {
|
if(mouseX < x + width - cursorWidth - 1) {
|
||||||
backgroundColor = defBg;
|
backgroundColor = defBg;
|
||||||
|
@ -149,7 +153,7 @@ public class MenuModList extends MenuDropdown {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String text, int x, int y, int color) {
|
public void drawText(String text, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x, y, color);
|
rip.athena.client.utils.font.FontManager.getNunito(25).drawString(text, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -158,7 +162,7 @@ public class MenuModList extends MenuDropdown {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getNunito(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,8 @@ import rip.athena.client.gui.framework.draw.ButtonState;
|
||||||
import rip.athena.client.gui.framework.draw.DrawType;
|
import rip.athena.client.gui.framework.draw.DrawType;
|
||||||
import org.lwjgl.input.Mouse;
|
import org.lwjgl.input.Mouse;
|
||||||
import rip.athena.client.modules.impl.other.Settings;
|
import rip.athena.client.modules.impl.other.Settings;
|
||||||
|
import rip.athena.client.utils.render.DrawUtils;
|
||||||
|
import rip.athena.client.utils.render.RoundedUtils;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
||||||
|
@ -72,10 +74,13 @@ public class MenuModSlider extends MenuSlider {
|
||||||
|
|
||||||
GlStateManager.color(1,1,1);
|
GlStateManager.color(1,1,1);
|
||||||
|
|
||||||
drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
RoundedUtils.drawRoundedRect(x, y, x + width, y + height, 12.0f, new Color(50, 50, 50, 255).getRGB());
|
||||||
|
RoundedUtils.drawRoundedRect(x + 1, y + 1, x + width - 1, y + height - 1, 12.0f, new Color(35, 35, 35, 255).getRGB());
|
||||||
|
|
||||||
|
/*drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
||||||
drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
||||||
drawHorizontalLine(x, y + height, width + 1, 1, lineColor);
|
drawHorizontalLine(x, y + height, width + 1, 1, lineColor);
|
||||||
drawVerticalLine(x + width, y + 1, height - 1, 1, lineColor);
|
drawVerticalLine(x + width, y + 1, height - 1, 1, lineColor);*/
|
||||||
|
|
||||||
String data = "";
|
String data = "";
|
||||||
|
|
||||||
|
@ -96,10 +101,10 @@ public class MenuModSlider extends MenuSlider {
|
||||||
}
|
}
|
||||||
|
|
||||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, linePos, height - 1, backgroundColor);
|
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, linePos, height - 1, backgroundColor);
|
||||||
|
|
||||||
int cursorPos = linePos;
|
int cursorPos = linePos;
|
||||||
int cursorWidth = 20;
|
int cursorWidth = 20;
|
||||||
|
|
||||||
if(cursorPos < cursorWidth) {
|
if(cursorPos < cursorWidth) {
|
||||||
cursorPos = cursorWidth;
|
cursorPos = cursorWidth;
|
||||||
}
|
}
|
||||||
|
@ -141,7 +146,7 @@ public class MenuModSlider extends MenuSlider {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String text, int x, int y, int color) {
|
public void drawText(String text, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -150,7 +155,7 @@ public class MenuModSlider extends MenuSlider {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class ModCategoryButton extends MenuButton {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
rip.athena.client.utils.font.FontManager.getProductSansRegular(20).drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
rip.athena.client.utils.font.FontManager.getNunitoBold(20).drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2) - 3, textColor);
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,7 @@ public class ModCategoryButton extends MenuButton {
|
||||||
DrawUtils.drawRoundedRect(x + 10, y, x + width - 20, y + height, 4, backgroundColor);
|
DrawUtils.drawRoundedRect(x + 10, y, x + width - 20, y + height, 4, backgroundColor);
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2) - 3, y + height / 2 - (getStringHeight(text) / 2), textColor);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x + (width / 2 - getStringWidth(text) / 2) - 3, y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||||
}*/
|
}*/
|
||||||
|
@ -95,7 +95,7 @@ public class ModCategoryButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(20).width(string);
|
return (int) rip.athena.client.utils.font.FontManager.getNunitoBold(20).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class ModTextbox extends MenuTextField {
|
||||||
|
|
||||||
int labelWidth;
|
int labelWidth;
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ public class ModTextbox extends MenuTextField {
|
||||||
if(comp < index){
|
if(comp < index){
|
||||||
textToDraw = textToDraw.substring(1);
|
textToDraw = textToDraw.substring(1);
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -112,7 +112,7 @@ public class ModTextbox extends MenuTextField {
|
||||||
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -139,7 +139,7 @@ public class ModTextbox extends MenuTextField {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Settings.customGuiFont) {
|
if (Settings.customGuiFont) {
|
||||||
drawVerticalLine(x + (int) FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
drawVerticalLine(x + (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||||
} else {
|
} else {
|
||||||
drawVerticalLine(x + (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
drawVerticalLine(x + (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||||
}
|
}
|
||||||
|
@ -154,7 +154,7 @@ public class ModTextbox extends MenuTextField {
|
||||||
int xAdd = 0;
|
int xAdd = 0;
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(textToDraw, x + minOffset + xAdd, y + height / 2 - (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(textToDraw, x + minOffset + xAdd, y + height / 2 - (int) FontManager.baloo17.getHeight(textToDraw) / 2, textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x + minOffset + xAdd, y + height / 2 - (int) Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x + minOffset + xAdd, y + height / 2 - (int) Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor);
|
||||||
}
|
}
|
||||||
|
@ -185,7 +185,7 @@ public class ModTextbox extends MenuTextField {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
position += (int) FontManager.baloo17.getStringWidth(text.charAt(i) + "");
|
position += (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text.charAt(i) + "");
|
||||||
} else {
|
} else {
|
||||||
position += (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + "");
|
position += (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + "");
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ import rip.athena.client.gui.framework.components.MenuButton;
|
||||||
import rip.athena.client.gui.framework.draw.ButtonState;
|
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||||
import rip.athena.client.gui.framework.draw.DrawType;
|
import rip.athena.client.gui.framework.draw.DrawType;
|
||||||
import rip.athena.client.modules.impl.other.Settings;
|
import rip.athena.client.modules.impl.other.Settings;
|
||||||
|
import rip.athena.client.utils.render.RoundedUtils;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
||||||
|
@ -115,13 +116,16 @@ public class ModsButton extends MenuButton {
|
||||||
|
|
||||||
GlStateManager.color(1,1,1);
|
GlStateManager.color(1,1,1);
|
||||||
|
|
||||||
drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
RoundedUtils.drawRoundedRect(x, y, x + width, y + height, 12.0f, new Color(50, 50, 50, 255).getRGB());
|
||||||
|
RoundedUtils.drawRoundedRect(x + 1, y + 1, x + width - 1, y + height - 1, 12.0f, new Color(35, 35, 35, 255).getRGB());
|
||||||
|
|
||||||
|
/*drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
||||||
drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
drawVerticalLine(x, y + 1, height - 1, 1, lineColor);
|
||||||
drawHorizontalLine(x, y + height, width + 1, 1, lineColor);
|
drawHorizontalLine(x, y + height, width + 1, 1, lineColor);
|
||||||
drawVerticalLine(x + width, y + 1, height - 1, 1, lineColor);
|
drawVerticalLine(x + width, y + 1, height - 1, 1, lineColor);*/
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + height / 2 - (getStringHeight(text) / 2), textColor);
|
||||||
}
|
}
|
||||||
|
@ -131,7 +135,7 @@ public class ModsButton extends MenuButton {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class ModuleBox extends MenuComponent {
|
||||||
toAdd = " " + toAdd;
|
toAdd = " " + toAdd;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(FontManager.baloo17.getStringWidth(curWord.toString() + toAdd) + MIN_SPACING > width) {
|
if(rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(curWord.toString() + toAdd) + MIN_SPACING > width) {
|
||||||
lines.add(curWord.toString());
|
lines.add(curWord.toString());
|
||||||
curWord.setLength(0);
|
curWord.setLength(0);
|
||||||
toAdd = word;
|
toAdd = word;
|
||||||
|
@ -188,7 +188,7 @@ public class ModuleBox extends MenuComponent {
|
||||||
|
|
||||||
for (String line : lines) {
|
for (String line : lines) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(line, x + (float) width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(line) / 2, yPos, textColor);
|
rip.athena.client.utils.font.FontManager.getNunitoBold(30).drawString(line, x + (float) width / 2 - (double) rip.athena.client.utils.font.FontManager.getNunitoBold(30).width(line) / 2, yPos, textColor);
|
||||||
//FontManager.baloo30.drawString(line, x + (float) width / 2 - FontManager.baloo30.getStringWidth(line) / 2, yPos, textColor);
|
//FontManager.baloo30.drawString(line, x + (float) width / 2 - FontManager.baloo30.getStringWidth(line) / 2, yPos, textColor);
|
||||||
yPos += FontManager.baloo30.getHeight(line);
|
yPos += FontManager.baloo30.getHeight(line);
|
||||||
} else {
|
} else {
|
||||||
|
@ -214,8 +214,8 @@ public class ModuleBox extends MenuComponent {
|
||||||
String text = module.isToggled() ? "ENABLED" : "DISABLED";
|
String text = module.isToggled() ? "ENABLED" : "DISABLED";
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
rip.athena.client.utils.font.FontManager.getNunito(20).drawString(text, x + (float) width / 2 - FontManager.baloo17.getStringWidth(text) / 2, y + height - 10 - 15, -1);
|
rip.athena.client.utils.font.FontManager.getNunitoBold(25).drawString(text, x + (float) width / 2 - (double) rip.athena.client.utils.font.FontManager.getNunitoBold(25).width(text) / 2, y + height - 10 - 15, -1);
|
||||||
//FontManager.baloo17.drawString(text, x + (float) width / 2 - FontManager.baloo17.getStringWidth(text) / 2, y + height - 10 - 15, -1);
|
//rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x + (float) width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text) / 2, y + height - 10 - 15, -1);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(text, (int) (x + (float) width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(text) / 2), y + height - 10 - 15, -1);
|
Minecraft.getMinecraft().fontRendererObj.drawString(text, (int) (x + (float) width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(text) / 2), y + height - 10 - 15, -1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,7 +96,7 @@ public class SearchTextfield extends MenuTextField {
|
||||||
int labelWidth;
|
int labelWidth;
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -106,7 +106,7 @@ public class SearchTextfield extends MenuTextField {
|
||||||
if(comp < index){
|
if(comp < index){
|
||||||
textToDraw = textToDraw.substring(1);
|
textToDraw = textToDraw.substring(1);
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -114,7 +114,7 @@ public class SearchTextfield extends MenuTextField {
|
||||||
} else if(comp > index){
|
} else if(comp > index){
|
||||||
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
textToDraw = textToDraw.substring(0, textToDraw.length() - 1);
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1);
|
labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1);
|
||||||
} else {
|
} else {
|
||||||
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1);
|
||||||
}
|
}
|
||||||
|
@ -136,7 +136,7 @@ public class SearchTextfield extends MenuTextField {
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
textHeight = (int) FontManager.baloo17.getHeight(textToDraw);
|
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);
|
drawVerticalLine(x + 10 + (int)rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||||
} else {
|
} else {
|
||||||
textHeight = Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT;
|
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)Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor);
|
||||||
|
@ -191,7 +191,7 @@ public class SearchTextfield extends MenuTextField {
|
||||||
bestIndex = i;
|
bestIndex = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
position += (int)FontManager.baloo17.getStringWidth(text.charAt(i) + "");
|
position += (int)rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text.charAt(i) + "");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mouseX > position) {
|
if(mouseX > position) {
|
||||||
|
|
|
@ -85,7 +85,7 @@ public class ProfilesBase extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String string, int x, int y, int color) {
|
public void drawText(String string, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(string, x, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string, x, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -94,7 +94,7 @@ public class ProfilesBase extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ public class WaypointTextBarrier extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String string, int x, int y, int color) {
|
public void drawText(String string, int x, int y, int color) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString(string, x - 3, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string, x - 3, y, color);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color);
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ public class WaypointTextBarrier extends MenuComponent {
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string) - 1;
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) - 1;
|
||||||
} else {
|
} else {
|
||||||
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
|
|
@ -395,13 +395,13 @@ public class CosmeticsPage extends Page {
|
||||||
|
|
||||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX() + menu.getWidth() - width, menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_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);
|
drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width);
|
||||||
FontManager.baloo17.drawString("COSMETIC SETTINGS", menu.getX() + menu.getWidth() - width / 2 - FontManager.baloo17.getStringWidth("COSMETIC SETTINGS") / 2, y + height / 2 - FontManager.baloo17.getHeight("COSMETIC SETTINGS") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("COSMETIC SETTINGS", menu.getX() + menu.getWidth() - width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width("COSMETIC SETTINGS") / 2, y + height / 2 - FontManager.baloo17.getHeight("COSMETIC SETTINGS") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
|
|
||||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR);
|
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, width, menu.getHeight() - 58, MacrosPage.MENU_SIDE_BG_COLOR);
|
||||||
|
|
||||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR);
|
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(menu.getX(), menu.getY() + 58, width, height + 1, ModCategoryButton.MAIN_COLOR);
|
||||||
drawShadowDown(menu.getX(), y + height, width);
|
drawShadowDown(menu.getX(), y + height, width);
|
||||||
FontManager.baloo17.drawString("COSMETICS", menu.getX() + width / 2 - FontManager.baloo17.getStringWidth("COSMETICS") / 2, y + height / 2 - FontManager.baloo17.getHeight("COSMETICS") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("COSMETICS", menu.getX() + width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width("COSMETICS") / 2, y + height / 2 - FontManager.baloo17.getHeight("COSMETICS") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
|
|
||||||
drawShadowDown(menu.getX(), y - 1, width);
|
drawShadowDown(menu.getX(), y - 1, width);
|
||||||
drawShadowDown(menu.getX() + menu.getWidth() - width, y - 1, width);
|
drawShadowDown(menu.getX() + menu.getWidth() - width, y - 1, width);
|
||||||
|
@ -409,19 +409,19 @@ public class CosmeticsPage extends Page {
|
||||||
x += 3;
|
x += 3;
|
||||||
y += 50;
|
y += 50;
|
||||||
|
|
||||||
FontManager.baloo17.drawString("EMOTE WHEEL KEYBIND", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("EMOTE WHEEL KEYBIND", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
|
|
||||||
y += 60;
|
y += 60;
|
||||||
|
|
||||||
FontManager.baloo17.drawString("ENABLED EMOTES", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("ENABLED EMOTES", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
|
|
||||||
y += 150;
|
y += 150;
|
||||||
|
|
||||||
FontManager.baloo17.drawString("CAPE LOCATION", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("CAPE LOCATION", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
|
|
||||||
y += 60;
|
y += 60;
|
||||||
|
|
||||||
FontManager.baloo17.drawString("BANDANA LOCATION", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("BANDANA LOCATION", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -2,7 +2,6 @@ package rip.athena.client.gui.clickgui.pages;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.GlStateManager;
|
import net.minecraft.client.renderer.GlStateManager;
|
||||||
import rip.athena.client.Athena;
|
import rip.athena.client.Athena;
|
||||||
import rip.athena.client.font.FontManager;
|
|
||||||
import rip.athena.client.gui.framework.Menu;
|
import rip.athena.client.gui.framework.Menu;
|
||||||
import rip.athena.client.gui.framework.TextPattern;
|
import rip.athena.client.gui.framework.TextPattern;
|
||||||
import rip.athena.client.gui.clickgui.IngameMenu;
|
import rip.athena.client.gui.clickgui.IngameMenu;
|
||||||
|
@ -15,6 +14,7 @@ import net.minecraft.client.Minecraft;
|
||||||
import org.lwjgl.input.Keyboard;
|
import org.lwjgl.input.Keyboard;
|
||||||
import rip.athena.client.macros.Macro;
|
import rip.athena.client.macros.Macro;
|
||||||
import rip.athena.client.modules.impl.other.Settings;
|
import rip.athena.client.modules.impl.other.Settings;
|
||||||
|
import rip.athena.client.utils.font.FontManager;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ public class MacrosPage extends Page {
|
||||||
for(Macro macro : Athena.INSTANCE.getMacroManager().getMacros()) {
|
for(Macro macro : Athena.INSTANCE.getMacroManager().getMacros()) {
|
||||||
scrollPane.addComponent(new MacroBase(macro.getName(), x, y, width - 90, height));
|
scrollPane.addComponent(new MacroBase(macro.getName(), x, y, width - 90, height));
|
||||||
|
|
||||||
MacroSlimTextField field = new MacroSlimTextField(TextPattern.NONE, x + 80 + spacing, y, (width - 320 - spacing * 4 - 90), height - 5) {
|
MacroSlimTextField field = new MacroSlimTextField(TextPattern.NONE, x + 80 + spacing + rip.athena.client.utils.font.FontManager.getNunito(20).width(macro.getName()), y, (width - 320 - spacing * 4 - 90), height - 5) {
|
||||||
@Override
|
@Override
|
||||||
public void onAction() {
|
public void onAction() {
|
||||||
macro.setCommand(getText());
|
macro.setCommand(getText());
|
||||||
|
@ -165,7 +165,7 @@ public class MacrosPage extends Page {
|
||||||
drawVerticalLine(menu.getX() + 215, y + height - 30, height + 432, 3, new Color(32, 32, 32, 225).getRGB());
|
drawVerticalLine(menu.getX() + 215, y + height - 30, height + 432, 3, new Color(32, 32, 32, 225).getRGB());
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.vision16.drawString("MACROS", menu.getX() + 235, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
FontManager.getNunitoBold(30).drawString("MACROS", menu.getX() + 235, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString("MACROS", menu.getX() + 235, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
Minecraft.getMinecraft().fontRendererObj.drawString("MACROS", menu.getX() + 235, menu.getY() + 80, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
|
@ -177,7 +177,7 @@ public class MacrosPage extends Page {
|
||||||
drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width);
|
drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width);
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString("ADD NEW MACRO", menu.getX() + menu.getWidth() - width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth("ADD NEW MACRO") / 2, y + height / 2 - Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("ADD NEW MACRO", menu.getX() + menu.getWidth() - width / 2 - (double) FontManager.getProductSansRegular(30).width("ADD NEW MACRO") / 2, y + height / 2 - Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString("ADD NEW MACRO", menu.getX() + menu.getWidth() - width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth("ADD NEW MACRO") / 2, y + height / 2 - Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
Minecraft.getMinecraft().fontRendererObj.drawString("ADD NEW MACRO", menu.getX() + menu.getWidth() - width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth("ADD NEW MACRO") / 2, y + height / 2 - Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
|
@ -186,19 +186,19 @@ public class MacrosPage extends Page {
|
||||||
y += 60;
|
y += 60;
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
Minecraft.getMinecraft().fontRendererObj.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
y += 70;
|
y += 70;
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString("ENTER COMMAND LINE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("ENTER COMMAND LINE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString("ENTER COMMAND LINE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
Minecraft.getMinecraft().fontRendererObj.drawString("ENTER COMMAND LINE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
y += 70;
|
y += 70;
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString("ADD KEYBIND", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("ADD KEYBIND", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} else {
|
||||||
Minecraft.getMinecraft().fontRendererObj.drawString("ADD KEYBIND", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
Minecraft.getMinecraft().fontRendererObj.drawString("ADD KEYBIND", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,7 +92,7 @@ public class ModsPage extends Page {
|
||||||
mc.fontRendererObj.drawString(activeModule != null ? "SETTINGS | " : modCategory.getText(), menu.getX() + 255, menu.getY() + 25, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
mc.fontRendererObj.drawString(activeModule != null ? "SETTINGS | " : modCategory.getText(), menu.getX() + 255, menu.getY() + 25, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
if (activeModule != null) {
|
if (activeModule != null) {
|
||||||
int offset = (int) FontManager.baloo17.getStringWidth("SETTINGS | ");
|
int offset = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width("SETTINGS | ");
|
||||||
String text = activeModule.getName().toUpperCase().trim();
|
String text = activeModule.getName().toUpperCase().trim();
|
||||||
|
|
||||||
if (Settings.customGuiFont) {
|
if (Settings.customGuiFont) {
|
||||||
|
@ -123,13 +123,13 @@ public class ModsPage extends Page {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLoad() {
|
public void onLoad() {
|
||||||
int y = 59 + 10;
|
int y = 59 + 15;
|
||||||
int x = 255;
|
int x = 255;
|
||||||
int height = 32;
|
int height = 32;
|
||||||
|
|
||||||
for (Category category : Category.values()) {
|
for (Category category : Category.values()) {
|
||||||
if (!category.isHidden()) {
|
if (!category.isHidden()) {
|
||||||
MenuButton comp = new ModCategoryButton(category, x, y, (int) (50 + FontManager.baloo17.getStringWidth(category.getText())), height) {
|
MenuButton comp = new ModCategoryButton(category, x, y, (int) (30 + rip.athena.client.utils.font.FontManager.getNunitoBold(30).width(category.getText())), height) {
|
||||||
@Override
|
@Override
|
||||||
public void onAction() {
|
public void onAction() {
|
||||||
for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) {
|
for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) {
|
||||||
|
@ -151,7 +151,7 @@ public class ModsPage extends Page {
|
||||||
|
|
||||||
menu.addComponent(comp);
|
menu.addComponent(comp);
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
x += FontManager.baloo17.getStringWidth(category.getText()) + 20;
|
x += rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(category.getText()) + 20;
|
||||||
} else {
|
} else {
|
||||||
x += mc.fontRendererObj.getStringWidth(category.getText()) + 20;
|
x += mc.fontRendererObj.getStringWidth(category.getText()) + 20;
|
||||||
}
|
}
|
||||||
|
|
|
@ -251,7 +251,7 @@ public class ProfilesPage extends Page {
|
||||||
drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width);
|
drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width);
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
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);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("CREATE NEW PROFILE", menu.getX() + menu.getWidth() - (float) width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width("CREATE NEW PROFILE") / 2, y + (float) height / 2 - FontManager.baloo17.getHeight("CREATE NEW PROFILE") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} 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);
|
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);
|
||||||
}
|
}
|
||||||
|
@ -261,7 +261,7 @@ public class ProfilesPage extends Page {
|
||||||
y += 60;
|
y += 60;
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} else {
|
||||||
mc.fontRendererObj.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
mc.fontRendererObj.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
|
@ -273,7 +273,7 @@ public class ProfilesPage extends Page {
|
||||||
drawShadowUp(menu.getX() + menu.getWidth() - width, y, width);
|
drawShadowUp(menu.getX() + menu.getWidth() - width, y, width);
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
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);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("DOWNLOAD PROFILE", menu.getX() + menu.getWidth() - (float) width / 2 - rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width("DOWNLOAD PROFILE") / 2, y + (float) height / 2 - FontManager.baloo17.getHeight("DOWNLOAD PROFILE") / 2, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} 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);
|
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);
|
||||||
}
|
}
|
||||||
|
@ -281,7 +281,7 @@ public class ProfilesPage extends Page {
|
||||||
y += 50;
|
y += 50;
|
||||||
|
|
||||||
if(Settings.customGuiFont) {
|
if(Settings.customGuiFont) {
|
||||||
FontManager.baloo17.drawString("PROFILE CODE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString("PROFILE CODE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
} else {
|
} else {
|
||||||
mc.fontRendererObj.drawString("PROFILE CODE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
mc.fontRendererObj.drawString("PROFILE CODE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR);
|
||||||
}
|
}
|
||||||
|
|
|
@ -343,12 +343,12 @@ public class HUDEditor extends MinecraftMenuImpl implements DrawImpl {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawText(String text, int x, int y, int color) {
|
public void drawText(String text, int x, int y, int color) {
|
||||||
FontManager.baloo17.drawString(text, x, y, color);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getStringWidth(String string) {
|
public int getStringWidth(String string) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(string);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class Notification {
|
||||||
}
|
}
|
||||||
|
|
||||||
int x = new ScaledResolution(Minecraft.getMinecraft()).getScaledWidth();
|
int x = new ScaledResolution(Minecraft.getMinecraft()).getScaledWidth();
|
||||||
int stringWidth = (int) FontManager.baloo17.getStringWidth(text) + 10;
|
int stringWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text) + 10;
|
||||||
|
|
||||||
int width = 30;
|
int width = 30;
|
||||||
int height = 20;
|
int height = 20;
|
||||||
|
@ -84,7 +84,7 @@ public class Notification {
|
||||||
|
|
||||||
float textOutDelta = delta = getDeltaByTime(2500, 1500);
|
float textOutDelta = delta = getDeltaByTime(2500, 1500);
|
||||||
if(textReady == 1) {
|
if(textReady == 1) {
|
||||||
FontManager.baloo17.drawString(text, x - width - Math.round(stringWidth * delta) + 5, y - 14, TEXT_COLOR.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x - width - Math.round(stringWidth * delta) + 5, y - 14, TEXT_COLOR.getRGB());
|
||||||
GL11.glColor4f(BACKGROUND_COLOR.getRed() / 255F, BACKGROUND_COLOR.getGreen() / 255F, BACKGROUND_COLOR.getBlue() / 255F, BACKGROUND_COLOR.getAlpha() / 255F);
|
GL11.glColor4f(BACKGROUND_COLOR.getRed() / 255F, BACKGROUND_COLOR.getGreen() / 255F, BACKGROUND_COLOR.getBlue() / 255F, BACKGROUND_COLOR.getAlpha() / 255F);
|
||||||
drawRect(x - width, y, x, y - height, BACKGROUND_COLOR);
|
drawRect(x - width, y, x, y - height, BACKGROUND_COLOR);
|
||||||
drawRect(x - width + 2, y - 2, x - width, y - 2 - height + 4, LINE_COLOR);
|
drawRect(x - width + 2, y - 2, x - width, y - 2 - height + 4, LINE_COLOR);
|
||||||
|
|
|
@ -169,8 +169,8 @@ public class ArmorStatus extends Module {
|
||||||
: maxDamage > 0 ? 20 : 16)),
|
: maxDamage > 0 ? 20 : 16)),
|
||||||
(float) (xdraw + posY + 5), valueColor.getRGB());
|
(float) (xdraw + posY + 5), valueColor.getRGB());
|
||||||
} else {
|
} else {
|
||||||
width = (int) FontManager.baloo17.getStringWidth(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay));
|
width = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay));
|
||||||
FontManager.baloo17.drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay), (int) (posX - 3
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay), (int) (posX - 3
|
||||||
+ (leftRight.equalsIgnoreCase("Left")
|
+ (leftRight.equalsIgnoreCase("Left")
|
||||||
? maxDamage > 0 ? armorstatuswidth - width - 21 : armorstatuswidth - width - 21
|
? maxDamage > 0 ? armorstatuswidth - width - 21 : armorstatuswidth - width - 21
|
||||||
: maxDamage > 0 ? 20 : 16)),
|
: maxDamage > 0 ? 20 : 16)),
|
||||||
|
@ -215,8 +215,8 @@ public class ArmorStatus extends Module {
|
||||||
+ (leftRight.equalsIgnoreCase("Left") ? (armorstatuswidth) - width - 21 : 20)),
|
+ (leftRight.equalsIgnoreCase("Left") ? (armorstatuswidth) - width - 21 : 20)),
|
||||||
(float) (xdraw + posY + 5), valueColor.getRGB());
|
(float) (xdraw + posY + 5), valueColor.getRGB());
|
||||||
} else {
|
} else {
|
||||||
width = (int) FontManager.baloo17.getStringWidth(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay));
|
width = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay));
|
||||||
FontManager.baloo17.drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay),
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay),
|
||||||
(int) (posX - 3
|
(int) (posX - 3
|
||||||
+ (leftRight.equalsIgnoreCase("Left") ? (armorstatuswidth) - width - 21 : 20)),
|
+ (leftRight.equalsIgnoreCase("Left") ? (armorstatuswidth) - width - 21 : 20)),
|
||||||
(int) (xdraw + posY + 1), valueColor.getRGB());
|
(int) (xdraw + posY + 1), valueColor.getRGB());
|
||||||
|
@ -270,8 +270,8 @@ public class ArmorStatus extends Module {
|
||||||
color = "";
|
color = "";
|
||||||
}
|
}
|
||||||
if (this.customFont) {
|
if (this.customFont) {
|
||||||
width = (int) FontManager.baloo17.getStringWidth(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw));
|
width = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw));
|
||||||
FontManager.baloo17.drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw), (int) (posX + ydraw + 16), (int) (posY + 1),
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw), (int) (posX + ydraw + 16), (int) (posY + 1),
|
||||||
valueColor.getRGB());
|
valueColor.getRGB());
|
||||||
} else {
|
} else {
|
||||||
mc.fontRendererObj.drawStringWithShadow(color + toDraw, (float) (posX + ydraw + 18),
|
mc.fontRendererObj.drawStringWithShadow(color + toDraw, (float) (posX + ydraw + 18),
|
||||||
|
@ -305,8 +305,8 @@ public class ArmorStatus extends Module {
|
||||||
color = "";
|
color = "";
|
||||||
}
|
}
|
||||||
if (this.customFont) {
|
if (this.customFont) {
|
||||||
width = (int) FontManager.baloo17.getStringWidth(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw));
|
width = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw));
|
||||||
FontManager.baloo17.drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw), (int) (posX + ydraw + 15), (int) (posY + 1),
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw), (int) (posX + ydraw + 15), (int) (posY + 1),
|
||||||
valueColor.getRGB());
|
valueColor.getRGB());
|
||||||
} else {
|
} else {
|
||||||
mc.fontRendererObj.drawStringWithShadow(color + toDraw, (float) (posX + ydraw + 18),
|
mc.fontRendererObj.drawStringWithShadow(color + toDraw, (float) (posX + ydraw + 18),
|
||||||
|
|
|
@ -10,6 +10,7 @@ import rip.athena.client.modules.Category;
|
||||||
import rip.athena.client.modules.Module;
|
import rip.athena.client.modules.Module;
|
||||||
import rip.athena.client.utils.ClickCounter;
|
import rip.athena.client.utils.ClickCounter;
|
||||||
import rip.athena.client.utils.render.DrawUtils;
|
import rip.athena.client.utils.render.DrawUtils;
|
||||||
|
import rip.athena.client.utils.render.RoundedUtils;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
||||||
|
@ -80,8 +81,8 @@ public class CPS extends Module {
|
||||||
|
|
||||||
if(backGround) {
|
if(backGround) {
|
||||||
if(backgroundMode.equalsIgnoreCase("Modern")) {
|
if(backgroundMode.equalsIgnoreCase("Modern")) {
|
||||||
DrawUtils.drawRoundedRect(hud.getX(), hud.getY(), hud.getX() + width, hud.getY() + height, 4.0f, new Color(50, 50, 50, 255).getRGB());
|
RoundedUtils.drawRoundedRect(hud.getX(), hud.getY(), hud.getX() + width, hud.getY() + height, 12.0f, new Color(50, 50, 50, 255).getRGB());
|
||||||
DrawUtils.drawRoundedRect(hud.getX() + 1, hud.getY() + 1, hud.getX() + width - 1, hud.getY() + height - 1, 4.0f, new Color(35, 35, 35, 255).getRGB());
|
RoundedUtils.drawRoundedRect(hud.getX() + 1, hud.getY() + 1, hud.getX() + width - 1, hud.getY() + height - 1, 12.0f, new Color(35, 35, 35, 255).getRGB());
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
DrawUtils.drawGradientRect(hud.getX(), hud.getY(), hud.getX() + width, hud.getY() + height, background.getRGB(), background.getRGB());
|
DrawUtils.drawGradientRect(hud.getX(), hud.getY(), hud.getX() + width, hud.getY() + height, background.getRGB(), background.getRGB());
|
||||||
|
@ -92,7 +93,7 @@ public class CPS extends Module {
|
||||||
float posX = hud.getX() + 9;
|
float posX = hud.getX() + 9;
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
hud.setWidth((int) FontManager.baloo17.getStringWidth(string) + 16);
|
hud.setWidth((int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) + 16);
|
||||||
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
||||||
|
|
||||||
if(isUsingStaticChroma) {
|
if(isUsingStaticChroma) {
|
||||||
|
@ -100,7 +101,7 @@ public class CPS extends Module {
|
||||||
} else if(isUsingWaveChroma) {
|
} else if(isUsingWaveChroma) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY + 1, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY + 1, false, true);
|
||||||
} else {
|
} else {
|
||||||
FontManager.baloo17.drawString(string,(int) (posX), (int)posY + 1, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(25).drawString(string,(int) (posX) + 1, (int)posY + 2, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class Clock extends Module {
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
int stringWidth = 0;
|
int stringWidth = 0;
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
stringWidth = (int) FontManager.baloo17.getStringWidth(string);
|
stringWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string);
|
||||||
} else {
|
} else {
|
||||||
stringWidth = mc.fontRendererObj.getStringWidth(string);
|
stringWidth = mc.fontRendererObj.getStringWidth(string);
|
||||||
}
|
}
|
||||||
|
@ -95,7 +95,7 @@ public class Clock extends Module {
|
||||||
float posX = hud.getX() + 9;
|
float posX = hud.getX() + 9;
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
hud.setWidth((int)FontManager.baloo17.getStringWidth(string) + 16);
|
hud.setWidth((int)rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) + 16);
|
||||||
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
||||||
|
|
||||||
if(isUsingStaticChroma) {
|
if(isUsingStaticChroma) {
|
||||||
|
@ -103,7 +103,7 @@ public class Clock extends Module {
|
||||||
} else if(isUsingWaveChroma) {
|
} else if(isUsingWaveChroma) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true);
|
||||||
} else {
|
} else {
|
||||||
FontManager.baloo17.drawString(string,(int) (posX), (int)posY, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string,(int) (posX), (int)posY, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
||||||
|
|
|
@ -315,7 +315,7 @@ public class Coordinates extends Module {
|
||||||
|
|
||||||
public int getStringWidth(String text) {
|
public int getStringWidth(String text) {
|
||||||
if (this.customFont) {
|
if (this.customFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(text);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text);
|
||||||
} else {
|
} else {
|
||||||
return mc.fontRendererObj.getStringWidth(text);
|
return mc.fontRendererObj.getStringWidth(text);
|
||||||
}
|
}
|
||||||
|
@ -405,7 +405,7 @@ public class Coordinates extends Module {
|
||||||
} else if (color.getBlue() == 6 && color.getRed() == 6 && color.getGreen() == 6) {
|
} else if (color.getBlue() == 6 && color.getRed() == 6 && color.getGreen() == 6) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, text, (int) posX, (int) posY - 2, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, text, (int) posX, (int) posY - 2, false, true);
|
||||||
} else {
|
} else {
|
||||||
FontManager.baloo17.drawString(text, (int) posX, (int) posY - 2, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, (int) posX, (int) posY - 2, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (color.getBlue() == 5 && color.getRed() == 5 && color.getGreen() == 5) {
|
if (color.getBlue() == 5 && color.getRed() == 5 && color.getGreen() == 5) {
|
||||||
|
|
|
@ -82,7 +82,7 @@ public class CustomText extends Module {
|
||||||
float posX = hud.getX() + 9;
|
float posX = hud.getX() + 9;
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
hud.setWidth((int) FontManager.baloo17.getStringWidth(customText) + 16);
|
hud.setWidth((int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(customText) + 16);
|
||||||
hud.setHeight((int)FontManager.baloo17.getHeight(customText) + 7);
|
hud.setHeight((int)FontManager.baloo17.getHeight(customText) + 7);
|
||||||
|
|
||||||
if(isUsingStaticChroma) {
|
if(isUsingStaticChroma) {
|
||||||
|
@ -90,7 +90,7 @@ public class CustomText extends Module {
|
||||||
} else if(isUsingWaveChroma) {
|
} else if(isUsingWaveChroma) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, customText, (int) (posX), (int) posY + 1, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, customText, (int) (posX), (int) posY + 1, false, true);
|
||||||
} else {
|
} else {
|
||||||
FontManager.baloo17.drawString(customText,(int) (posX), (int)posY + 1, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(customText,(int) (posX), (int)posY + 1, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
hud.setWidth(mc.fontRendererObj.getStringWidth(customText) + 16);
|
hud.setWidth(mc.fontRendererObj.getStringWidth(customText) + 16);
|
||||||
|
|
|
@ -83,7 +83,7 @@ public class EntityHUD extends Module {
|
||||||
float posX = hud.getX() + 9;
|
float posX = hud.getX() + 9;
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
hud.setWidth((int) FontManager.baloo17.getStringWidth(string) + 16);
|
hud.setWidth((int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) + 16);
|
||||||
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
||||||
|
|
||||||
if(isUsingStaticChroma) {
|
if(isUsingStaticChroma) {
|
||||||
|
@ -91,7 +91,7 @@ public class EntityHUD extends Module {
|
||||||
} else if(isUsingWaveChroma) {
|
} else if(isUsingWaveChroma) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true);
|
||||||
} else {
|
} else {
|
||||||
FontManager.baloo17.drawString(string,(int) (posX), (int)posY, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string,(int) (posX), (int)posY, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
||||||
|
|
|
@ -89,7 +89,7 @@ public class FPSMod extends Module {
|
||||||
float posX = hud.getX() + 9;
|
float posX = hud.getX() + 9;
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
hud.setWidth((int)FontManager.baloo17.getStringWidth(string) + 16);
|
hud.setWidth((int)rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) + 16);
|
||||||
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
||||||
|
|
||||||
if(isUsingStaticChroma) {
|
if(isUsingStaticChroma) {
|
||||||
|
@ -97,8 +97,8 @@ public class FPSMod extends Module {
|
||||||
} else if(isUsingWaveChroma) {
|
} else if(isUsingWaveChroma) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY + 1, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY + 1, false, true);
|
||||||
} else {
|
} else {
|
||||||
rip.athena.client.utils.font.FontManager.getPoppinsRegular(20).drawString(string,(int) (posX), (int)posY + 3, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getPoppinsRegular(25).drawString(string,(int) (posX), (int)posY + 3, color.getRGB());
|
||||||
//FontManager.baloo17.drawString(string,(int) (posX), (int)posY + 1, color.getRGB());
|
//rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string,(int) (posX), (int)posY + 1, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
||||||
|
|
|
@ -339,7 +339,7 @@ public class Keystrokes extends Module {
|
||||||
|
|
||||||
public int getStringWidth(String text) {
|
public int getStringWidth(String text) {
|
||||||
if (this.isCustomFont) {
|
if (this.isCustomFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(text);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text);
|
||||||
} else {
|
} else {
|
||||||
return (int) mc.fontRendererObj.getStringWidth(text);
|
return (int) mc.fontRendererObj.getStringWidth(text);
|
||||||
}
|
}
|
||||||
|
@ -347,7 +347,7 @@ public class Keystrokes extends Module {
|
||||||
|
|
||||||
public int getStringHeight(String text) {
|
public int getStringHeight(String text) {
|
||||||
if (this.isCustomFont) {
|
if (this.isCustomFont) {
|
||||||
return (int) FontManager.baloo17.getStringWidth(text);
|
return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text);
|
||||||
} else {
|
} else {
|
||||||
return mc.fontRendererObj.getStringWidth(text);
|
return mc.fontRendererObj.getStringWidth(text);
|
||||||
}
|
}
|
||||||
|
@ -360,7 +360,7 @@ public class Keystrokes extends Module {
|
||||||
} else if (isUsingWaveChroma) {
|
} else if (isUsingWaveChroma) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, text, (int)posX + 1, (int)posY, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, text, (int)posX + 1, (int)posY, false, true);
|
||||||
} else {
|
} else {
|
||||||
FontManager.baloo17.drawString(text, (int)posX + 1, (int)posY, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, (int)posX + 1, (int)posY, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (isUsingStaticChroma) {
|
if (isUsingStaticChroma) {
|
||||||
|
|
|
@ -100,7 +100,7 @@ public class MemoryUsage extends Module {
|
||||||
float posX = hud.getX() + 9;
|
float posX = hud.getX() + 9;
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
hud.setWidth((int)FontManager.baloo17.getStringWidth(string) + 16);
|
hud.setWidth((int)rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) + 16);
|
||||||
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
hud.setHeight((int)FontManager.baloo17.getHeight(string) + 7);
|
||||||
|
|
||||||
if(isUsingStaticChroma) {
|
if(isUsingStaticChroma) {
|
||||||
|
@ -108,7 +108,7 @@ public class MemoryUsage extends Module {
|
||||||
} else if(isUsingWaveChroma) {
|
} else if(isUsingWaveChroma) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true);
|
||||||
} else {
|
} else {
|
||||||
FontManager.baloo17.drawString(string,(int) (posX), (int)posY, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string,(int) (posX), (int)posY, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16);
|
||||||
|
|
|
@ -107,7 +107,7 @@ public class PotCounter extends Module {
|
||||||
float posX = hud.getX() + 9;
|
float posX = hud.getX() + 9;
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
hud.setWidth((int) (FontManager.baloo17.getStringWidth(str) + 16));
|
hud.setWidth((int) (rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(str) + 16));
|
||||||
hud.setHeight((int) (FontManager.baloo17.getHeight(str) + 7));
|
hud.setHeight((int) (FontManager.baloo17.getHeight(str) + 7));
|
||||||
|
|
||||||
if(isUsingStaticChroma) {
|
if(isUsingStaticChroma) {
|
||||||
|
@ -115,7 +115,7 @@ public class PotCounter extends Module {
|
||||||
} else if (isUsingWaveChroma) {
|
} else if (isUsingWaveChroma) {
|
||||||
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, str, (int) posX, (int) posY + 1, false, true);
|
DrawUtils.drawCustomFontChromaString(FontManager.baloo17, str, (int) posX, (int) posY + 1, false, true);
|
||||||
} else {
|
} else {
|
||||||
FontManager.baloo17.drawString(str, (int) posX, (int) posY + 1, color.getRGB());
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(str, (int) posX, (int) posY + 1, color.getRGB());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
hud.setWidth(mc.fontRendererObj.getStringWidth(str) + 16);
|
hud.setWidth(mc.fontRendererObj.getStringWidth(str) + 16);
|
||||||
|
|
|
@ -55,7 +55,7 @@ public class HUDUtil {
|
||||||
String tmp = String.valueOf(letter);
|
String tmp = String.valueOf(letter);
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
FontManager.baloo17.drawString(tmp, (int) xTmp, (int) y, i);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(tmp, (int) xTmp, (int) y, i);
|
||||||
xTmp += FontManager.baloo17.getCharWidth(letter);
|
xTmp += FontManager.baloo17.getCharWidth(letter);
|
||||||
} else {
|
} else {
|
||||||
mc.fontRendererObj.drawString(tmp, (int) xTmp, (int) y, i);
|
mc.fontRendererObj.drawString(tmp, (int) xTmp, (int) y, i);
|
||||||
|
@ -66,7 +66,7 @@ public class HUDUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(customFont) {
|
if(customFont) {
|
||||||
FontManager.baloo17.drawString(message, x, y, c);
|
rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(message, x, y, c);
|
||||||
} else {
|
} else {
|
||||||
mc.fontRendererObj.drawString(message, x, y, c, false);
|
mc.fontRendererObj.drawString(message, x, y, c, false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,455 @@
|
||||||
|
#
|
||||||
|
# A fatal error has been detected by the Java Runtime Environment:
|
||||||
|
#
|
||||||
|
# EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffe2f36366c, pid=11804, tid=0x0000000000001c3c
|
||||||
|
#
|
||||||
|
# JRE version: Java(TM) SE Runtime Environment (8.0_202-b08) (build 1.8.0_202-b08)
|
||||||
|
# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.202-b08 mixed mode windows-amd64 compressed oops)
|
||||||
|
# Problematic frame:
|
||||||
|
# C [igxelpicd64.dll+0x13366c]
|
||||||
|
#
|
||||||
|
# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
|
||||||
|
#
|
||||||
|
# If you would like to submit a bug report, please visit:
|
||||||
|
# http://bugreport.java.com/bugreport/crash.jsp
|
||||||
|
#
|
||||||
|
|
||||||
|
--------------- T H R E A D ---------------
|
||||||
|
|
||||||
|
Current thread (0x000000001e605800): VMThread [stack: 0x00000000200c0000,0x00000000201c0000] [id=7228]
|
||||||
|
|
||||||
|
siginfo: ExceptionCode=0xc0000005, reading address 0x00000000000356f8
|
||||||
|
|
||||||
|
Registers:
|
||||||
|
RAX=0x000000003dae3698, RBX=0x000000003dae3590, RCX=0x0000000000000000, RDX=0x0000000000000000
|
||||||
|
RSP=0x00000000201bea00, RBP=0x0000000000000000, RSI=0x000000003dae3b60, RDI=0x000000002abae980
|
||||||
|
R8 =0x0000000000000014, R9 =0x0000000000000000, R10=0x0000000000000000, R11=0x0000000000000000
|
||||||
|
R12=0x0000000000000000, R13=0x000000003daebf60, R14=0x0000000000d56a00, R15=0x0000000000000016
|
||||||
|
RIP=0x00007ffe2f36366c, EFLAGS=0x0000000000010202
|
||||||
|
|
||||||
|
Top of Stack: (sp=0x00000000201bea00)
|
||||||
|
0x00000000201bea00: 000000000050af20 00007ffec0ebf070
|
||||||
|
0x00000000201bea10: fcf1005f7df100b6 00007ffec10b0eb4
|
||||||
|
0x00000000201bea20: 64f3012128f300db 3df4023e1df40128
|
||||||
|
0x00000000201bea30: 48f5013eccf40077 57f5010d50f500b1
|
||||||
|
0x00000000201bea40: 000000002ab65138 0000000000d56a02
|
||||||
|
0x00000000201bea50: 0000000000000000 000000000000000e
|
||||||
|
0x00000000201bea60: 0000000000000000 0000000000000000
|
||||||
|
0x00000000201bea70: 00000000201beb80 00007ffe2f4dbc3c
|
||||||
|
0x00000000201bea80: 000000000050af20 000000002abae980
|
||||||
|
0x00000000201bea90: 0002015e5cff0200 012be83000000000
|
||||||
|
0x00000000201beaa0: 00000000000035a4 000074041af90000
|
||||||
|
0x00000000201beab0: 0000000000000000 350201411c020150
|
||||||
|
0x00000000201beac0: bd020115a402014f 3705011e9204007e
|
||||||
|
0x00000000201bead0: d606013ca40500c6 290a00edcd07014d
|
||||||
|
0x00000000201beae0: ff0b011f380b00d8 00007ffe2f4d19a0
|
||||||
|
0x00000000201beaf0: 9a0d0140810c0122 9d0e007e4d0e0103
|
||||||
|
|
||||||
|
Instructions: (pc=0x00007ffe2f36366c)
|
||||||
|
0x00007ffe2f36364c: 83 20 01 00 00 48 8d 04 d5 21 00 00 00 48 03 c2
|
||||||
|
0x00007ffe2f36365c: 48 8d 04 c3 48 85 c0 0f 85 ff 00 00 00 49 8b cb
|
||||||
|
0x00007ffe2f36366c: 48 3b 8d f8 56 03 00 0f 87 f3 02 00 00 4c 39 9b
|
||||||
|
0x00007ffe2f36367c: 48 06 00 00 0f 85 31 da 86 00 44 8b 97 c8 01 00
|
||||||
|
|
||||||
|
|
||||||
|
Register to memory mapping:
|
||||||
|
|
||||||
|
RAX=0x000000003dae3698 is an unknown value
|
||||||
|
RBX=0x000000003dae3590 is an unknown value
|
||||||
|
RCX=0x0000000000000000 is an unknown value
|
||||||
|
RDX=0x0000000000000000 is an unknown value
|
||||||
|
RSP=0x00000000201bea00 is an unknown value
|
||||||
|
RBP=0x0000000000000000 is an unknown value
|
||||||
|
RSI=0x000000003dae3b60 is an unknown value
|
||||||
|
RDI=0x000000002abae980 is an unknown value
|
||||||
|
R8 =0x0000000000000014 is an unknown value
|
||||||
|
R9 =0x0000000000000000 is an unknown value
|
||||||
|
R10=0x0000000000000000 is an unknown value
|
||||||
|
R11=0x0000000000000000 is an unknown value
|
||||||
|
R12=0x0000000000000000 is an unknown value
|
||||||
|
R13=0x000000003daebf60 is an unknown value
|
||||||
|
R14=0x0000000000d56a00 is an unknown value
|
||||||
|
R15=0x0000000000000016 is an unknown value
|
||||||
|
|
||||||
|
|
||||||
|
Stack: [0x00000000200c0000,0x00000000201c0000], sp=0x00000000201bea00, free space=1018k
|
||||||
|
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
|
||||||
|
|
||||||
|
VM_Operation (0x000000002acdef70): Exit, mode: safepoint, requested by thread 0x00000000215a9000
|
||||||
|
|
||||||
|
|
||||||
|
--------------- P R O C E S S ---------------
|
||||||
|
|
||||||
|
Java Threads: ( => current thread )
|
||||||
|
0x000000001e8c3800 JavaThread "AWT-Shutdown" [_thread_blocked, id=14000, stack(0x000000005cd70000,0x000000005ce70000)]
|
||||||
|
0x00000000215a9000 JavaThread "SIGINT handler" daemon [_thread_blocked, id=10060, stack(0x000000002abe0000,0x000000002ace0000)]
|
||||||
|
0x000000002159f000 JavaThread "Netty Server IO #1" daemon [_thread_in_native, id=16808, stack(0x0000000049b50000,0x0000000049c50000)]
|
||||||
|
0x00000000215a6000 JavaThread "Netty Local Client IO #0" daemon [_thread_blocked, id=20184, stack(0x0000000034050000,0x0000000034150000)]
|
||||||
|
0x00000000215a0800 JavaThread "Netty Server IO #0" daemon [_thread_in_native, id=1924, stack(0x0000000031e80000,0x0000000031f80000)]
|
||||||
|
0x000000002159e800 JavaThread "File IO Thread" [_thread_blocked, id=9364, stack(0x00000000314a0000,0x00000000315a0000)]
|
||||||
|
0x00000000215a3000 JavaThread "LWJGL Timer" daemon [_thread_blocked, id=21676, stack(0x0000000043ef0000,0x0000000043ff0000)]
|
||||||
|
0x000000002159d000 JavaThread "Chunk Batcher 1" daemon [_thread_blocked, id=20360, stack(0x0000000036d20000,0x0000000036e20000)]
|
||||||
|
0x00000000215a2800 JavaThread "Chunk Batcher 0" daemon [_thread_blocked, id=20324, stack(0x0000000033e40000,0x0000000033f40000)]
|
||||||
|
0x000000001e8c0800 JavaThread "Thread-9" [_thread_blocked, id=20740, stack(0x00000000321c0000,0x00000000322c0000)]
|
||||||
|
0x000000001e8c2000 JavaThread "Thread-8" [_thread_blocked, id=3916, stack(0x0000000033f50000,0x0000000034050000)]
|
||||||
|
0x0000000025a0d000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=11012, stack(0x0000000027d30000,0x0000000027e30000)]
|
||||||
|
0x0000000026f05800 JavaThread "Thread-6" [_thread_blocked, id=14380, stack(0x0000000027c30000,0x0000000027d30000)]
|
||||||
|
0x00000000273c3000 JavaThread "Timer hack thread" daemon [_thread_blocked, id=12092, stack(0x0000000025340000,0x0000000025440000)]
|
||||||
|
0x0000000024269000 JavaThread "Snooper Timer" daemon [_thread_blocked, id=16340, stack(0x0000000025240000,0x0000000025340000)]
|
||||||
|
0x000000001e91e000 JavaThread "Service Thread" daemon [_thread_blocked, id=21064, stack(0x0000000021d90000,0x0000000021e90000)]
|
||||||
|
0x000000001e8c1800 JavaThread "C1 CompilerThread11" daemon [_thread_blocked, id=13056, stack(0x0000000021390000,0x0000000021490000)]
|
||||||
|
0x000000001e8c6800 JavaThread "C1 CompilerThread10" daemon [_thread_blocked, id=22456, stack(0x0000000021290000,0x0000000021390000)]
|
||||||
|
0x000000001e8c3000 JavaThread "C1 CompilerThread9" daemon [_thread_blocked, id=2124, stack(0x0000000021190000,0x0000000021290000)]
|
||||||
|
0x000000001e8c4800 JavaThread "C1 CompilerThread8" daemon [_thread_blocked, id=4868, stack(0x0000000021090000,0x0000000021190000)]
|
||||||
|
0x000000001e8c0000 JavaThread "C2 CompilerThread7" daemon [_thread_blocked, id=19652, stack(0x0000000020f90000,0x0000000021090000)]
|
||||||
|
0x000000001e8b6000 JavaThread "C2 CompilerThread6" daemon [_thread_blocked, id=2076, stack(0x0000000020e90000,0x0000000020f90000)]
|
||||||
|
0x000000001e8b5800 JavaThread "C2 CompilerThread5" daemon [_thread_blocked, id=15232, stack(0x0000000020d90000,0x0000000020e90000)]
|
||||||
|
0x000000001e8b2800 JavaThread "C2 CompilerThread4" daemon [_thread_blocked, id=16096, stack(0x0000000020c90000,0x0000000020d90000)]
|
||||||
|
0x000000001e8ac000 JavaThread "C2 CompilerThread3" daemon [_thread_blocked, id=8880, stack(0x0000000020b90000,0x0000000020c90000)]
|
||||||
|
0x000000001e8ab000 JavaThread "C2 CompilerThread2" daemon [_thread_blocked, id=6860, stack(0x0000000020a90000,0x0000000020b90000)]
|
||||||
|
0x000000001e8aa800 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=6740, stack(0x0000000020990000,0x0000000020a90000)]
|
||||||
|
0x000000001e8a8800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=21888, stack(0x0000000020890000,0x0000000020990000)]
|
||||||
|
0x000000001e898800 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=9708, stack(0x0000000020790000,0x0000000020890000)]
|
||||||
|
0x000000001e646800 JavaThread "Attach Listener" daemon [_thread_blocked, id=6904, stack(0x0000000020690000,0x0000000020790000)]
|
||||||
|
0x000000001e646000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=22092, stack(0x0000000020590000,0x0000000020690000)]
|
||||||
|
0x000000001e62e000 JavaThread "Finalizer" daemon [_thread_blocked, id=17024, stack(0x0000000020390000,0x0000000020490000)]
|
||||||
|
0x000000001c869800 JavaThread "Reference Handler" daemon [_thread_blocked, id=2352, stack(0x00000000201c0000,0x00000000202c0000)]
|
||||||
|
0x0000000002885000 JavaThread "Client thread" [_thread_blocked, id=21220, stack(0x00000000023f0000,0x00000000024f0000)]
|
||||||
|
|
||||||
|
Other Threads:
|
||||||
|
=>0x000000001e605800 VMThread [stack: 0x00000000200c0000,0x00000000201c0000] [id=7228]
|
||||||
|
|
||||||
|
VM state:at safepoint (shutting down)
|
||||||
|
|
||||||
|
VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event])
|
||||||
|
[0x0000000002881b50] Threads_lock - owner thread: 0x000000001e605800
|
||||||
|
|
||||||
|
heap address: 0x00000006c5a00000, size: 4006 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
|
||||||
|
Narrow klass base: 0x0000000000000000, Narrow klass shift: 3
|
||||||
|
Compressed class space size: 1073741824 Address: 0x00000007c0000000
|
||||||
|
|
||||||
|
Heap:
|
||||||
|
PSYoungGen total 736768K, used 350342K [0x000000076c900000, 0x000000079f180000, 0x00000007c0000000)
|
||||||
|
eden space 655872K, 45% used [0x000000076c900000,0x000000077eb2db78,0x0000000794980000)
|
||||||
|
from space 80896K, 65% used [0x000000079a280000,0x000000079d673f30,0x000000079f180000)
|
||||||
|
to space 86016K, 0% used [0x0000000794980000,0x0000000794980000,0x0000000799d80000)
|
||||||
|
ParOldGen total 245760K, used 192968K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d1672020,0x00000006d4a00000)
|
||||||
|
Metaspace used 47712K, capacity 48309K, committed 48512K, reserved 1091584K
|
||||||
|
class space used 5521K, capacity 5686K, committed 5760K, reserved 1048576K
|
||||||
|
|
||||||
|
Card table byte_map: [0x0000000011d40000,0x0000000012520000] byte_map_base: 0x000000000e713000
|
||||||
|
|
||||||
|
Marking Bits: (ParMarkBitMap*) 0x000000005f445ce0
|
||||||
|
Begin Bits: [0x0000000013960000, 0x00000000177f8000)
|
||||||
|
End Bits: [0x00000000177f8000, 0x000000001b690000)
|
||||||
|
|
||||||
|
Polling page: 0x0000000000400000
|
||||||
|
|
||||||
|
CodeCache: size=245760Kb used=38908Kb max_used=40537Kb free=206851Kb
|
||||||
|
bounds [0x0000000002980000, 0x0000000005180000, 0x0000000011980000]
|
||||||
|
total_blobs=9874 nmethods=8964 adapters=818
|
||||||
|
compilation: enabled
|
||||||
|
|
||||||
|
Compilation events (10 events):
|
||||||
|
Event: 160.485 Thread 0x000000001e8c3000 nmethod 12997 0x0000000003b18b10 code [0x0000000003b18d80, 0x0000000003b19b78]
|
||||||
|
Event: 160.485 Thread 0x000000001e8c1800 nmethod 13002 0x0000000002f5a990 code [0x0000000002f5aae0, 0x0000000002f5ac70]
|
||||||
|
Event: 160.485 Thread 0x000000001e8c3000 13003 3 net.minecraft.network.NetworkManager$InboundHandlerTuplePacketListener::<init> (15 bytes)
|
||||||
|
Event: 160.485 Thread 0x000000001e8c3000 nmethod 13003 0x0000000003250390 code [0x00000000032504e0, 0x00000000032506d0]
|
||||||
|
Event: 160.485 Thread 0x000000001e8aa800 nmethod 12994 0x00000000032c5190 code [0x00000000032c52e0, 0x00000000032c53f8]
|
||||||
|
Event: 160.486 Thread 0x000000001e8a8800 nmethod 12995 0x0000000004c98ed0 code [0x0000000004c99020, 0x0000000004c991e8]
|
||||||
|
Event: 160.489 Thread 0x000000001e8c6800 13004 3 java.util.Collections$SetFromMap::add (22 bytes)
|
||||||
|
Event: 160.489 Thread 0x000000001e8c6800 nmethod 13004 0x00000000036b3c90 code [0x00000000036b3e00, 0x00000000036b4088]
|
||||||
|
Event: 160.537 Thread 0x000000001e8b2800 13005 4 java.lang.Long::hashCode (8 bytes)
|
||||||
|
Event: 160.537 Thread 0x000000001e8b2800 nmethod 13005 0x00000000042dcf90 code [0x00000000042dd0c0, 0x00000000042dd138]
|
||||||
|
|
||||||
|
GC Heap History (10 events):
|
||||||
|
Event: 45.756 GC heap before
|
||||||
|
{Heap before GC invocations=28 (full 4):
|
||||||
|
PSYoungGen total 642048K, used 563124K [0x000000076c900000, 0x000000079e280000, 0x00000007c0000000)
|
||||||
|
eden space 534016K, 99% used [0x000000076c900000,0x000000078d119348,0x000000078d280000)
|
||||||
|
from space 108032K, 28% used [0x000000078d280000,0x000000078f054028,0x0000000793c00000)
|
||||||
|
to space 103936K, 0% used [0x0000000797d00000,0x0000000797d00000,0x000000079e280000)
|
||||||
|
ParOldGen total 245760K, used 192672K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d1628010,0x00000006d4a00000)
|
||||||
|
Metaspace used 46136K, capacity 46635K, committed 47104K, reserved 1091584K
|
||||||
|
class space used 5431K, capacity 5557K, committed 5632K, reserved 1048576K
|
||||||
|
Event: 45.763 GC heap after
|
||||||
|
Heap after GC invocations=28 (full 4):
|
||||||
|
PSYoungGen total 673792K, used 36496K [0x000000076c900000, 0x000000079cc80000, 0x00000007c0000000)
|
||||||
|
eden space 592384K, 0% used [0x000000076c900000,0x000000076c900000,0x0000000790b80000)
|
||||||
|
from space 81408K, 44% used [0x0000000797d00000,0x000000079a0a42b8,0x000000079cc80000)
|
||||||
|
to space 98816K, 0% used [0x0000000790b80000,0x0000000790b80000,0x0000000796c00000)
|
||||||
|
ParOldGen total 245760K, used 192680K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d162a010,0x00000006d4a00000)
|
||||||
|
Metaspace used 46136K, capacity 46635K, committed 47104K, reserved 1091584K
|
||||||
|
class space used 5431K, capacity 5557K, committed 5632K, reserved 1048576K
|
||||||
|
}
|
||||||
|
Event: 66.411 GC heap before
|
||||||
|
{Heap before GC invocations=29 (full 4):
|
||||||
|
PSYoungGen total 673792K, used 628880K [0x000000076c900000, 0x000000079cc80000, 0x00000007c0000000)
|
||||||
|
eden space 592384K, 100% used [0x000000076c900000,0x0000000790b80000,0x0000000790b80000)
|
||||||
|
from space 81408K, 44% used [0x0000000797d00000,0x000000079a0a42b8,0x000000079cc80000)
|
||||||
|
to space 98816K, 0% used [0x0000000790b80000,0x0000000790b80000,0x0000000796c00000)
|
||||||
|
ParOldGen total 245760K, used 192680K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d162a010,0x00000006d4a00000)
|
||||||
|
Metaspace used 47154K, capacity 47661K, committed 48000K, reserved 1091584K
|
||||||
|
class space used 5505K, capacity 5648K, committed 5760K, reserved 1048576K
|
||||||
|
Event: 66.417 GC heap after
|
||||||
|
Heap after GC invocations=29 (full 4):
|
||||||
|
PSYoungGen total 691200K, used 36937K [0x000000076c900000, 0x000000079f680000, 0x00000007c0000000)
|
||||||
|
eden space 592384K, 0% used [0x000000076c900000,0x000000076c900000,0x0000000790b80000)
|
||||||
|
from space 98816K, 37% used [0x0000000790b80000,0x0000000792f92608,0x0000000796c00000)
|
||||||
|
to space 94208K, 0% used [0x0000000799a80000,0x0000000799a80000,0x000000079f680000)
|
||||||
|
ParOldGen total 245760K, used 192688K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d162c010,0x00000006d4a00000)
|
||||||
|
Metaspace used 47154K, capacity 47661K, committed 48000K, reserved 1091584K
|
||||||
|
class space used 5505K, capacity 5648K, committed 5760K, reserved 1048576K
|
||||||
|
}
|
||||||
|
Event: 101.847 GC heap before
|
||||||
|
{Heap before GC invocations=30 (full 4):
|
||||||
|
PSYoungGen total 691200K, used 629321K [0x000000076c900000, 0x000000079f680000, 0x00000007c0000000)
|
||||||
|
eden space 592384K, 100% used [0x000000076c900000,0x0000000790b80000,0x0000000790b80000)
|
||||||
|
from space 98816K, 37% used [0x0000000790b80000,0x0000000792f92608,0x0000000796c00000)
|
||||||
|
to space 94208K, 0% used [0x0000000799a80000,0x0000000799a80000,0x000000079f680000)
|
||||||
|
ParOldGen total 245760K, used 192688K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d162c010,0x00000006d4a00000)
|
||||||
|
Metaspace used 47388K, capacity 47929K, committed 48256K, reserved 1091584K
|
||||||
|
class space used 5512K, capacity 5650K, committed 5760K, reserved 1048576K
|
||||||
|
Event: 101.858 GC heap after
|
||||||
|
Heap after GC invocations=30 (full 4):
|
||||||
|
PSYoungGen total 709120K, used 37411K [0x000000076c900000, 0x000000079e380000, 0x00000007c0000000)
|
||||||
|
eden space 634368K, 0% used [0x000000076c900000,0x000000076c900000,0x0000000793480000)
|
||||||
|
from space 74752K, 50% used [0x0000000799a80000,0x000000079bf08f68,0x000000079e380000)
|
||||||
|
to space 89600K, 0% used [0x0000000793480000,0x0000000793480000,0x0000000798c00000)
|
||||||
|
ParOldGen total 245760K, used 192696K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d162e010,0x00000006d4a00000)
|
||||||
|
Metaspace used 47388K, capacity 47929K, committed 48256K, reserved 1091584K
|
||||||
|
class space used 5512K, capacity 5650K, committed 5760K, reserved 1048576K
|
||||||
|
}
|
||||||
|
Event: 122.476 GC heap before
|
||||||
|
{Heap before GC invocations=31 (full 4):
|
||||||
|
PSYoungGen total 709120K, used 671779K [0x000000076c900000, 0x000000079e380000, 0x00000007c0000000)
|
||||||
|
eden space 634368K, 100% used [0x000000076c900000,0x0000000793480000,0x0000000793480000)
|
||||||
|
from space 74752K, 50% used [0x0000000799a80000,0x000000079bf08f68,0x000000079e380000)
|
||||||
|
to space 89600K, 0% used [0x0000000793480000,0x0000000793480000,0x0000000798c00000)
|
||||||
|
ParOldGen total 245760K, used 192696K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d162e010,0x00000006d4a00000)
|
||||||
|
Metaspace used 47497K, capacity 48079K, committed 48256K, reserved 1091584K
|
||||||
|
class space used 5514K, capacity 5653K, committed 5760K, reserved 1048576K
|
||||||
|
Event: 122.483 GC heap after
|
||||||
|
Heap after GC invocations=31 (full 4):
|
||||||
|
PSYoungGen total 723968K, used 44773K [0x000000076c900000, 0x000000079f680000, 0x00000007c0000000)
|
||||||
|
eden space 634368K, 0% used [0x000000076c900000,0x000000076c900000,0x0000000793480000)
|
||||||
|
from space 89600K, 49% used [0x0000000793480000,0x0000000796039400,0x0000000798c00000)
|
||||||
|
to space 86016K, 0% used [0x000000079a280000,0x000000079a280000,0x000000079f680000)
|
||||||
|
ParOldGen total 245760K, used 192704K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d1630010,0x00000006d4a00000)
|
||||||
|
Metaspace used 47497K, capacity 48079K, committed 48256K, reserved 1091584K
|
||||||
|
class space used 5514K, capacity 5653K, committed 5760K, reserved 1048576K
|
||||||
|
}
|
||||||
|
Event: 142.889 GC heap before
|
||||||
|
{Heap before GC invocations=32 (full 4):
|
||||||
|
PSYoungGen total 723968K, used 679141K [0x000000076c900000, 0x000000079f680000, 0x00000007c0000000)
|
||||||
|
eden space 634368K, 100% used [0x000000076c900000,0x0000000793480000,0x0000000793480000)
|
||||||
|
from space 89600K, 49% used [0x0000000793480000,0x0000000796039400,0x0000000798c00000)
|
||||||
|
to space 86016K, 0% used [0x000000079a280000,0x000000079a280000,0x000000079f680000)
|
||||||
|
ParOldGen total 245760K, used 192704K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d1630010,0x00000006d4a00000)
|
||||||
|
Metaspace used 47662K, capacity 48213K, committed 48512K, reserved 1091584K
|
||||||
|
class space used 5517K, capacity 5654K, committed 5760K, reserved 1048576K
|
||||||
|
Event: 142.899 GC heap after
|
||||||
|
Heap after GC invocations=32 (full 4):
|
||||||
|
PSYoungGen total 736768K, used 53199K [0x000000076c900000, 0x000000079f180000, 0x00000007c0000000)
|
||||||
|
eden space 655872K, 0% used [0x000000076c900000,0x000000076c900000,0x0000000794980000)
|
||||||
|
from space 80896K, 65% used [0x000000079a280000,0x000000079d673f30,0x000000079f180000)
|
||||||
|
to space 86016K, 0% used [0x0000000794980000,0x0000000794980000,0x0000000799d80000)
|
||||||
|
ParOldGen total 245760K, used 192968K [0x00000006c5a00000, 0x00000006d4a00000, 0x000000076c900000)
|
||||||
|
object space 245760K, 78% used [0x00000006c5a00000,0x00000006d1672020,0x00000006d4a00000)
|
||||||
|
Metaspace used 47662K, capacity 48213K, committed 48512K, reserved 1091584K
|
||||||
|
class space used 5517K, capacity 5654K, committed 5760K, reserved 1048576K
|
||||||
|
}
|
||||||
|
|
||||||
|
Deoptimization events (10 events):
|
||||||
|
Event: 160.453 Thread 0x000000002159f000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000004650de4 method=net.minecraft.network.NetworkManager$4.run()V @ 43
|
||||||
|
Event: 160.453 Thread 0x000000002159f000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00000000049fd5d4 method=io.netty.util.concurrent.DefaultPromise.notifyListener0(Lio/netty/util/concurrent/Future;Lio/netty/util/concurrent/GenericFutureListener;)V @ 2
|
||||||
|
Event: 160.453 Thread 0x000000002159f000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003b31cd4 method=io.netty.channel.local.LocalChannel.isActive()Z @ 5
|
||||||
|
Event: 160.453 Thread 0x000000002159f000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000004536c94 method=io.netty.channel.local.LocalChannel.isOpen()Z @ 5
|
||||||
|
Event: 160.453 Thread 0x00000000215a6000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000004a8f77c method=io.netty.channel.local.LocalChannel.isActive()Z @ 5
|
||||||
|
Event: 160.479 Thread 0x00000000215aa800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000048629c4 method=java.lang.String.valueOf(Ljava/lang/Object;)Ljava/lang/String; @ 1
|
||||||
|
Event: 160.479 Thread 0x00000000215aa800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000004f1c60c method=io.netty.channel.local.LocalChannel.isOpen()Z @ 5
|
||||||
|
Event: 160.484 Thread 0x00000000215aa800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000004510250 method=java.util.concurrent.FutureTask.finishCompletion()V @ 6
|
||||||
|
Event: 160.488 Thread 0x00000000215aa000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003e8f350 method=java.util.Collections$SetFromMap.add(Ljava/lang/Object;)Z @ 13
|
||||||
|
Event: 160.544 Thread 0x00000000215a9000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x0000000003a6e374 method=java.util.Collections.reverse(Ljava/util/List;)V @ 1
|
||||||
|
|
||||||
|
Classes redefined (1 events):
|
||||||
|
Event: 0.105 Thread 0x000000001e605800 redefined class name=java.io.FileOutputStream, count=1
|
||||||
|
|
||||||
|
Internal exceptions (10 events):
|
||||||
|
Event: 160.473 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d8cb8) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.481 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d8f10) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.489 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d9168) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.497 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d93c0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.504 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d9618) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.511 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d9870) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.519 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d9ac8) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.526 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d9d20) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.533 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7d9f78) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
Event: 160.542 Thread 0x000000001e8c2000 Exception <a 'java/lang/InterruptedException': sleep interrupted> (0x000000077c7da1d0) thrown at [C:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u202\12323\hotspot\src\share\vm\prims\jvm.cpp, line 3336]
|
||||||
|
|
||||||
|
Events (10 events):
|
||||||
|
Event: 160.537 Thread 0x00000000215aa800 Thread exited: 0x00000000215aa800
|
||||||
|
Event: 160.537 Thread 0x000000001e8b2800 flushing nmethod 0x00000000041e2c10
|
||||||
|
Event: 160.538 Thread 0x000000001e8b2800 flushing nmethod 0x00000000043117d0
|
||||||
|
Event: 160.538 Thread 0x000000001e8b2800 flushing nmethod 0x000000000431e650
|
||||||
|
Event: 160.538 Thread 0x000000001e8b2800 flushing nmethod 0x000000000436fd90
|
||||||
|
Event: 160.544 Thread 0x00000000215ab800 Thread exited: 0x00000000215ab800
|
||||||
|
Event: 160.544 Thread 0x00000000215a9000 Uncommon trap: trap_request=0xffffffde fr.pc=0x0000000003a6e374
|
||||||
|
Event: 160.544 Thread 0x00000000215a9000 DEOPT PACKING pc=0x0000000003a6e374 sp=0x000000002acdee50
|
||||||
|
Event: 160.544 Thread 0x00000000215a9000 DEOPT UNPACKING pc=0x00000000029c583b sp=0x000000002acdee58 mode 2
|
||||||
|
Event: 160.545 Executing VM operation: Exit
|
||||||
|
|
||||||
|
|
||||||
|
Dynamic libraries:
|
||||||
|
0x00007ff742fa0000 - 0x00007ff742fd7000 C:\Program Files\Java\jdk1.8.0_202\bin\java.exe
|
||||||
|
0x00007ffec1010000 - 0x00007ffec1208000 C:\WINDOWS\SYSTEM32\ntdll.dll
|
||||||
|
0x00007ffec0d70000 - 0x00007ffec0e2f000 C:\WINDOWS\System32\KERNEL32.DLL
|
||||||
|
0x00007ffec0a70000 - 0x00007ffec0d66000 C:\WINDOWS\System32\KERNELBASE.dll
|
||||||
|
0x0000000077ee0000 - 0x0000000077f1b000 C:\WINDOWS\System32\cyinjct.dll
|
||||||
|
0x00007ffec08f0000 - 0x00007ffec08fc000 C:\WINDOWS\System32\ntnativeapi.dll
|
||||||
|
0x00007ffec08d0000 - 0x00007ffec08ee000 C:\WINDOWS\System32\cyvera.dll
|
||||||
|
0x00007ffec0860000 - 0x00007ffec08c9000 C:\WINDOWS\System32\cyvrtrap.dll
|
||||||
|
0x00007ffec0540000 - 0x00007ffec05ef000 C:\WINDOWS\System32\ADVAPI32.dll
|
||||||
|
0x00007ffec05f0000 - 0x00007ffec068e000 C:\WINDOWS\System32\msvcrt.dll
|
||||||
|
0x00007ffec0430000 - 0x00007ffec04cc000 C:\WINDOWS\System32\sechost.dll
|
||||||
|
0x00007ffec0940000 - 0x00007ffec0a66000 C:\WINDOWS\System32\RPCRT4.dll
|
||||||
|
0x00007ffec0e30000 - 0x00007ffec0fcd000 C:\WINDOWS\System32\USER32.dll
|
||||||
|
0x00007ffebe700000 - 0x00007ffebe722000 C:\WINDOWS\System32\win32u.dll
|
||||||
|
0x00007ffebf760000 - 0x00007ffebf78c000 C:\WINDOWS\System32\GDI32.dll
|
||||||
|
0x00007ffebe980000 - 0x00007ffebea95000 C:\WINDOWS\System32\gdi32full.dll
|
||||||
|
0x00007ffebe730000 - 0x00007ffebe7cd000 C:\WINDOWS\System32\msvcp_win.dll
|
||||||
|
0x00007ffebe5d0000 - 0x00007ffebe6d0000 C:\WINDOWS\System32\ucrtbase.dll
|
||||||
|
0x00007ffea1280000 - 0x00007ffea151a000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.1110_none_60b5254171f9507e\COMCTL32.dll
|
||||||
|
0x00007ffebf720000 - 0x00007ffebf750000 C:\WINDOWS\System32\IMM32.DLL
|
||||||
|
0x000000005f4d0000 - 0x000000005f5a2000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\msvcr100.dll
|
||||||
|
0x000000005ec20000 - 0x000000005f4c5000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\server\jvm.dll
|
||||||
|
0x00007ffebef60000 - 0x00007ffebef68000 C:\WINDOWS\System32\PSAPI.DLL
|
||||||
|
0x00007ffe4e5d0000 - 0x00007ffe4e5d9000 C:\WINDOWS\SYSTEM32\WSOCK32.dll
|
||||||
|
0x00007ffec04d0000 - 0x00007ffec053b000 C:\WINDOWS\System32\WS2_32.dll
|
||||||
|
0x00007ffe9f1c0000 - 0x00007ffe9f1e7000 C:\WINDOWS\SYSTEM32\WINMM.dll
|
||||||
|
0x00007ffeb75a0000 - 0x00007ffeb75aa000 C:\WINDOWS\SYSTEM32\VERSION.dll
|
||||||
|
0x00007ffebb4d0000 - 0x00007ffebb4df000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\verify.dll
|
||||||
|
0x00007ffea7830000 - 0x00007ffea7859000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\java.dll
|
||||||
|
0x00007ffeb7390000 - 0x00007ffeb73b3000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\instrument.dll
|
||||||
|
0x00007ffec0820000 - 0x00007ffec0857000 C:\Program Files\Palo Alto Networks\Traps\cyjagent.dll
|
||||||
|
0x00007ffea7810000 - 0x00007ffea7826000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\zip.dll
|
||||||
|
0x00007ffebef70000 - 0x00007ffebf6b4000 C:\WINDOWS\System32\SHELL32.dll
|
||||||
|
0x00007ffebc0c0000 - 0x00007ffebc853000 C:\WINDOWS\SYSTEM32\windows.storage.dll
|
||||||
|
0x00007ffec0010000 - 0x00007ffec0364000 C:\WINDOWS\System32\combase.dll
|
||||||
|
0x00007ffebdee0000 - 0x00007ffebdf0e000 C:\WINDOWS\SYSTEM32\Wldp.dll
|
||||||
|
0x00007ffec0770000 - 0x00007ffec081d000 C:\WINDOWS\System32\SHCORE.dll
|
||||||
|
0x00007ffebfcd0000 - 0x00007ffebfd25000 C:\WINDOWS\System32\shlwapi.dll
|
||||||
|
0x00007ffebe510000 - 0x00007ffebe52f000 C:\WINDOWS\SYSTEM32\profapi.dll
|
||||||
|
0x00007ffeb73e0000 - 0x00007ffeb73fa000 C:\Program Files\JetBrains\IntelliJ IDEA Community Edition 2023.1.2\bin\breakgen64.dll
|
||||||
|
0x00007ffebb4f0000 - 0x00007ffebb50a000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\net.dll
|
||||||
|
0x00007ffea5860000 - 0x00007ffea5a4c000 C:\WINDOWS\SYSTEM32\urlmon.dll
|
||||||
|
0x00007ffea5a70000 - 0x00007ffea5d21000 C:\WINDOWS\SYSTEM32\iertutil.dll
|
||||||
|
0x00007ffebd130000 - 0x00007ffebd158000 C:\WINDOWS\SYSTEM32\srvcli.dll
|
||||||
|
0x00007ffebda10000 - 0x00007ffebda1c000 C:\WINDOWS\SYSTEM32\netutils.dll
|
||||||
|
0x00007ffebdcc0000 - 0x00007ffebdd2a000 C:\WINDOWS\system32\mswsock.dll
|
||||||
|
0x00007ffeb9510000 - 0x00007ffeb951d000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\management.dll
|
||||||
|
0x00007ffea76a0000 - 0x00007ffea76b2000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\nio.dll
|
||||||
|
0x00007ffe87ba0000 - 0x00007ffe87bb7000 C:\WINDOWS\system32\napinsp.dll
|
||||||
|
0x00007ffe87bc0000 - 0x00007ffe87bdb000 C:\WINDOWS\system32\pnrpnsp.dll
|
||||||
|
0x00007ffeb8120000 - 0x00007ffeb8135000 C:\WINDOWS\system32\wshbth.dll
|
||||||
|
0x00007ffeb1060000 - 0x00007ffeb107d000 C:\WINDOWS\system32\NLAapi.dll
|
||||||
|
0x00007ffebd9d0000 - 0x00007ffebda0c000 C:\WINDOWS\SYSTEM32\IPHLPAPI.DLL
|
||||||
|
0x00007ffebda20000 - 0x00007ffebdaeb000 C:\WINDOWS\SYSTEM32\DNSAPI.dll
|
||||||
|
0x00007ffebee30000 - 0x00007ffebee38000 C:\WINDOWS\System32\NSI.dll
|
||||||
|
0x00007ffe87be0000 - 0x00007ffe87bf2000 C:\WINDOWS\System32\winrnr.dll
|
||||||
|
0x00007ffea8340000 - 0x00007ffea834a000 C:\Windows\System32\rasadhlp.dll
|
||||||
|
0x00007ffeb0b20000 - 0x00007ffeb0ba2000 C:\WINDOWS\System32\fwpuclnt.dll
|
||||||
|
0x00007ffebe6d0000 - 0x00007ffebe6f7000 C:\WINDOWS\System32\bcrypt.dll
|
||||||
|
0x0000000180000000 - 0x0000000180053000 C:\Users\remgab001\Desktop\Athena-Client\workspace\versions\1.8.8\1.8.8-natives\lwjgl64.dll
|
||||||
|
0x00007ffe35da0000 - 0x00007ffe35ec5000 C:\WINDOWS\SYSTEM32\OPENGL32.dll
|
||||||
|
0x00007ffe35d70000 - 0x00007ffe35d9c000 C:\WINDOWS\SYSTEM32\GLU32.dll
|
||||||
|
0x00007ffebdf90000 - 0x00007ffebdfa8000 C:\WINDOWS\SYSTEM32\CRYPTSP.dll
|
||||||
|
0x00007ffebd480000 - 0x00007ffebd4b4000 C:\WINDOWS\system32\rsaenh.dll
|
||||||
|
0x00007ffebe490000 - 0x00007ffebe4be000 C:\WINDOWS\SYSTEM32\USERENV.dll
|
||||||
|
0x00007ffebe8f0000 - 0x00007ffebe972000 C:\WINDOWS\System32\bcryptprimitives.dll
|
||||||
|
0x00007ffebde50000 - 0x00007ffebde5c000 C:\WINDOWS\SYSTEM32\CRYPTBASE.dll
|
||||||
|
0x00007ffeae860000 - 0x00007ffeae877000 C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL
|
||||||
|
0x00007ffeae840000 - 0x00007ffeae85d000 C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL
|
||||||
|
0x00007ffe79890000 - 0x00007ffe79a29000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\awt.dll
|
||||||
|
0x00007ffebfc00000 - 0x00007ffebfccd000 C:\WINDOWS\System32\OLEAUT32.dll
|
||||||
|
0x00007ffebb280000 - 0x00007ffebb311000 C:\WINDOWS\SYSTEM32\apphelp.dll
|
||||||
|
0x00007ffeb8140000 - 0x00007ffeb81ee000 C:\WINDOWS\SYSTEM32\mscms.dll
|
||||||
|
0x00007ffeb82d0000 - 0x00007ffeb82e1000 C:\WINDOWS\SYSTEM32\ColorAdapterClient.dll
|
||||||
|
0x00007ffebcf80000 - 0x00007ffebcf92000 C:\WINDOWS\SYSTEM32\kernel.appcore.dll
|
||||||
|
0x00007ffebb660000 - 0x00007ffebb6fe000 C:\WINDOWS\system32\uxtheme.dll
|
||||||
|
0x00007ffebee40000 - 0x00007ffebef54000 C:\WINDOWS\System32\MSCTF.dll
|
||||||
|
0x00007ffea70e0000 - 0x00007ffea71da000 C:\WINDOWS\SYSTEM32\textinputframework.dll
|
||||||
|
0x00007ffeba770000 - 0x00007ffebaace000 C:\WINDOWS\System32\CoreUIComponents.dll
|
||||||
|
0x00007ffebb040000 - 0x00007ffebb132000 C:\WINDOWS\System32\CoreMessaging.dll
|
||||||
|
0x00007ffebd740000 - 0x00007ffebd773000 C:\WINDOWS\SYSTEM32\ntmarta.dll
|
||||||
|
0x00007ffeb9980000 - 0x00007ffeb9ad4000 C:\WINDOWS\SYSTEM32\wintypes.dll
|
||||||
|
0x00007ffebed00000 - 0x00007ffebee2a000 C:\WINDOWS\System32\ole32.dll
|
||||||
|
0x00007ffebec50000 - 0x00007ffebecf9000 C:\WINDOWS\System32\clbcatq.dll
|
||||||
|
0x00007ffe2f230000 - 0x00007ffe30223000 C:\WINDOWS\System32\DriverStore\FileRepository\iigd_dch.inf_amd64_307c52ae370e15f2\igxelpicd64.dll
|
||||||
|
0x00007ffebba90000 - 0x00007ffebbabf000 C:\WINDOWS\system32\dwmapi.dll
|
||||||
|
0x00007ffebcc60000 - 0x00007ffebcd53000 C:\WINDOWS\system32\dxgi.dll
|
||||||
|
0x00007ffe4e0f0000 - 0x00007ffe4e543000 C:\WINDOWS\System32\DriverStore\FileRepository\iigd_dch.inf_amd64_307c52ae370e15f2\igdml64.dll
|
||||||
|
0x00007ffeb1e10000 - 0x00007ffeb21d7000 C:\WINDOWS\System32\DriverStore\FileRepository\iigd_dch.inf_amd64_307c52ae370e15f2\igdgmm64.dll
|
||||||
|
0x00007ffe80fd0000 - 0x00007ffe81013000 C:\WINDOWS\SYSTEM32\icm32.dll
|
||||||
|
0x00007ffeab1c0000 - 0x00007ffeae7d1000 C:\WINDOWS\System32\DriverStore\FileRepository\iigd_dch.inf_amd64_307c52ae370e15f2\igc64.dll
|
||||||
|
0x00007ffebdf30000 - 0x00007ffebdf7b000 C:\WINDOWS\SYSTEM32\powrprof.dll
|
||||||
|
0x00007ffebdf10000 - 0x00007ffebdf22000 C:\WINDOWS\SYSTEM32\UMPDC.dll
|
||||||
|
0x00000000025f0000 - 0x0000000002628000 C:\Users\remgab001\AppData\Local\Temp\jna\jna1616983451323733159.dll
|
||||||
|
0x00007ffe94160000 - 0x00007ffe94191000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\jpeg.dll
|
||||||
|
0x0000000070a40000 - 0x0000000070adc000 C:\Users\remgab001\Desktop\Athena-Client\workspace\versions\1.8.8\1.8.8-natives\avutil-ttv-51.dll
|
||||||
|
0x0000000065980000 - 0x00000000659d6000 C:\Users\remgab001\Desktop\Athena-Client\workspace\versions\1.8.8\1.8.8-natives\swresample-ttv-0.dll
|
||||||
|
0x000000006eb80000 - 0x000000006ec50000 C:\Users\remgab001\Desktop\Athena-Client\workspace\versions\1.8.8\1.8.8-natives\libmp3lame-ttv.dll
|
||||||
|
0x00007ffe2de80000 - 0x00007ffe2f224000 C:\Users\remgab001\Desktop\Athena-Client\workspace\versions\1.8.8\1.8.8-natives\libmfxsw64.dll
|
||||||
|
0x00007ffe79330000 - 0x00007ffe7949d000 C:\Users\remgab001\Desktop\Athena-Client\workspace\versions\1.8.8\1.8.8-natives\twitchsdk.dll
|
||||||
|
0x00007ffe9a3a0000 - 0x00007ffe9a879000 C:\WINDOWS\SYSTEM32\WININET.dll
|
||||||
|
0x0000000034560000 - 0x00000000345c4000 C:\Users\remgab001\Desktop\Athena-Client\workspace\versions\1.8.8\1.8.8-natives\OpenAL64.dll
|
||||||
|
0x00007ffe7a240000 - 0x00007ffe7a2dc000 C:\WINDOWS\SYSTEM32\dsound.dll
|
||||||
|
0x00007ffe9c2f0000 - 0x00007ffe9c316000 C:\WINDOWS\SYSTEM32\winmmbase.dll
|
||||||
|
0x00007ffeb4db0000 - 0x00007ffeb4e35000 C:\WINDOWS\System32\MMDevApi.dll
|
||||||
|
0x00007ffebe380000 - 0x00007ffebe3ac000 C:\WINDOWS\System32\DEVOBJ.dll
|
||||||
|
0x00007ffebec00000 - 0x00007ffebec4e000 C:\WINDOWS\System32\cfgmgr32.dll
|
||||||
|
0x00007ffeb4e40000 - 0x00007ffeb4fc2000 C:\WINDOWS\SYSTEM32\AUDIOSES.DLL
|
||||||
|
0x00007ffebbbe0000 - 0x00007ffebbbf4000 C:\WINDOWS\SYSTEM32\resourcepolicyclient.dll
|
||||||
|
0x00007ffe86d60000 - 0x00007ffe86da7000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\fontmanager.dll
|
||||||
|
0x00007ffe7d570000 - 0x00007ffe7d5b2000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\t2k.dll
|
||||||
|
0x00007ffea0150000 - 0x00007ffea017a000 C:\Program Files\Java\jdk1.8.0_202\jre\bin\dcpr.dll
|
||||||
|
0x00007ffebc930000 - 0x00007ffebcb14000 C:\WINDOWS\SYSTEM32\dbghelp.dll
|
||||||
|
|
||||||
|
VM Arguments:
|
||||||
|
jvm_args: -Djava.library.path=versions/1.8.8/1.8.8-natives/ -javaagent:C:\Program Files\JetBrains\IntelliJ IDEA Community Edition 2023.1.2\lib\idea_rt.jar=56647:C:\Program Files\JetBrains\IntelliJ IDEA Community Edition 2023.1.2\bin -Dfile.encoding=UTF-8 -agentpath:C:\Program Files\Palo Alto Networks\Traps\cyjagent.dll
|
||||||
|
java_command: Start
|
||||||
|
java_class_path (initial): C:\Program Files\Java\jdk1.8.0_202\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\deploy.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\access-bridge-64.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\cldrdata.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\dnsns.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\jaccess.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\jfxrt.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\localedata.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\nashorn.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\sunec.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\sunjce_provider.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\sunmscapi.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\sunpkcs11.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\ext\zipfs.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\javaws.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\jce.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\jfr.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\jfxswt.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\management-agent.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\plugin.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\resources.jar;C:\Program Files\Java\jdk1.8.0_202\jre\lib\rt.jar;C:\Users\remgab001\Desktop\Athena-Client\target\classes;C:\Users\remgab001\.m2\repository\net\minecraft\minecraft\1.8.8\minecraft-1.8.8.jar;C:\Users\remgab001\.m2\repository\co\gongzh\procbridge\procbridge\1.1.1\procbridge-1.1.1.jar;C:\Users\remgab001\.m2\repository\org\jetbrains\annotations\16.0.3\annotations-16.0.3.jar;C:\Users\remgab001\.m2\repository\org\json\json\20230227\json-20230227.jar;C:\Users\remgab001\.m2\repository\javax\vecmath\vecmath\1.5.2\vecmath-1.5.2.jar;C:\Users\remgab001\.m2\repository\org\reflections\reflections\0.10.2\reflections-0.10.2.jar;C:\Users\remgab001\.m2\repository\org\javassist\javassist\3.28.0-GA\javassist-3
|
||||||
|
Launcher Type: SUN_STANDARD
|
||||||
|
|
||||||
|
Environment Variables:
|
||||||
|
PATH=C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\dotnet\;C:\Users\remgab001\AppData\Local\Microsoft\WindowsApps;C:\Users\remgab001\AppData\Roaming\npm;C:\Users\remgab001\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\remgab001\.dotnet\tools
|
||||||
|
USERNAME=remgab001
|
||||||
|
OS=Windows_NT
|
||||||
|
PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 154 Stepping 3, GenuineIntel
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
--------------- S Y S T E M ---------------
|
||||||
|
|
||||||
|
OS: Windows 10.0 , 64 bit Build 19041 (10.0.19041.2913)
|
||||||
|
|
||||||
|
CPU:total 20 (initial active 20) (10 cores per cpu, 2 threads per core) family 6 model 154 stepping 3, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2, adx
|
||||||
|
|
||||||
|
Memory: 4k page, physical 16400820k(3620948k free), swap 33178036k(15629472k free)
|
||||||
|
|
||||||
|
vm_info: Java HotSpot(TM) 64-Bit Server VM (25.202-b08) for windows-amd64 JRE (1.8.0_202-b08), built on Dec 15 2018 19:54:30 by "java_re" with MS VC++ 10.0 (VS2010)
|
||||||
|
|
||||||
|
time: Thu Jun 08 08:08:49 2023
|
||||||
|
timezone: Vest-Europa (sommertid)
|
||||||
|
elapsed time: 160 seconds (0d 0h 2m 40s)
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,205 @@
|
||||||
|
[10:41:51] [Client thread/INFO]: Setting user: Player268
|
||||||
|
[10:41:51] [Client thread/INFO]: (Session ID is token:0:Player268)
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] *** Reflector Forge ***
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.Attributes
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: mods.betterfoliage.client.BetterFoliageClient
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.asm.transformers.BlamingTransformer
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.ChunkWatchEvent$UnWatch
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.relauncher.CoreModManager
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.DimensionManager
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Pre
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Post
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$CameraSetup
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$FogColors
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.EventBus
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event$Result
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.ExtendedBlockState
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.FMLClientHandler
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.FMLCommonHandler
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.biome.BiomeGenBase.getWaterColorMultiplier
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addDestroyEffects
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addHitEffects
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canCreatureSpawn
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canRenderInLayer
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.doesSideBlockRendering
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getBedDirection
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getExtendedState
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.hasTileEntity
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isAir
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBed
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBedFoot
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isSideSolid
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.canRiderInteract
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.captureDrops
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.capturedDrops
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRenderInPass
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRiderSit
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.ForgeEventFactory
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeHooks
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ForgeHooksClient
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getDurabilityForDisplay
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getModel
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.onEntitySwing
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.shouldCauseReequipAnimation
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.showDurabilityBar
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.ItemRecord.getRecordResource
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeModContainer
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.potion.PotionEffect.isCurativeItem
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.canRenderBreaking
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.getRenderBoundingBox
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.hasFastRenderer
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.shouldRenderInPass
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.preDrawBatch
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.drawBatch
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.preDraw
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.postDraw
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.countEntities
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.getPerWorldStorage
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getCloudRenderer
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getSkyRenderer
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getWeatherRenderer
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.GuiModList
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.IColoredBakedQuad
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.IExtendedBlockState
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.IRenderHandler
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ISmartBlockModel
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ItemModelMesherForge
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraft.launchwrapper.Launch
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.pipeline.LightUtil
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.MinecraftForge
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.MinecraftForgeClient
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ModelLoader
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderBlockOverlayEvent$OverlayType
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.registry.RenderingRegistry
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderItemInFrameEvent
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Pre
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Post
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Pre
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Post
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.SplashProgress
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.WorldEvent$Load
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] *** Reflector Vanilla ***
|
||||||
|
[10:41:52] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: optifine.OptiFineClassTransformer
|
||||||
|
[10:41:52] [Client thread/ERROR]: [Athena] Failed to load resource outside namespace (C:\Users\remgab001\Desktop\Athena-Client\workspace\.\assets\minecraft\Athena\gui\settings.png).javax.imageio.IIOException: Can't read input file!
|
||||||
|
[10:41:52] [Client thread/INFO]: LWJGL Version: 2.9.4
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine]
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] OptiFine_1.8.8_HD_U_H8
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] Build: null
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] OS: Windows 10 (amd64) version 10.0
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] Java: 1.8.0_202, Oracle Corporation
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] VM: Java HotSpot(TM) 64-Bit Server VM (mixed mode), Oracle Corporation
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] LWJGL: 2.9.4
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] OpenGL: Intel(R) Iris(R) Xe Graphics, version 4.6.0 - Build 30.0.101.1298, Intel
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] OpenGL Version: 4.6.0
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] OpenGL Fancy fog: Not available (GL_NV_fog_distance)
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] Maximum texture size: 16384x16384
|
||||||
|
[10:41:53] [Client thread/INFO]: [OptiFine] FSAA Samples: 16
|
||||||
|
[10:41:53] [Thread-7/INFO]: [OptiFine] Checking for new version
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] ShadersMod version: 2.4.12
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] OpenGL Version: 4.6.0 - Build 30.0.101.1298
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] Vendor: Intel
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] Renderer: Intel(R) Iris(R) Xe Graphics
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] Capabilities: 2.0 2.1 3.0 3.2 4.0
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] GL_MAX_DRAW_BUFFERS: 8
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] GL_MAX_COLOR_ATTACHMENTS_EXT: 8
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] GL_MAX_TEXTURE_IMAGE_UNITS: 32
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] Load ShadersMod configuration.
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] Shaders can not be loaded, Antialiasing is enabled: 16x
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] Shaders can not be loaded, Fast Render is enabled.
|
||||||
|
[10:41:53] [Client thread/INFO]: [Shaders] No shaderpack loaded.
|
||||||
|
[10:41:53] [Thread-7/INFO]: [OptiFine] Version found: I7
|
||||||
|
[10:41:54] [Client thread/INFO]: Reloading ResourceManager: Default
|
||||||
|
[10:41:54] [Client thread/INFO]: [OptiFine] *** Reloading textures ***
|
||||||
|
[10:41:54] [Client thread/INFO]: [OptiFine] Resource packs: Default
|
||||||
|
[10:41:54] [Sound Library Loader/INFO]: Starting up SoundSystem...
|
||||||
|
[10:41:54] [Thread-8/INFO]: Initializing LWJGL OpenAL
|
||||||
|
[10:41:54] [Thread-8/INFO]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org)
|
||||||
|
[10:41:55] [Thread-8/INFO]: OpenAL initialized.
|
||||||
|
[10:41:55] [Sound Library Loader/INFO]: Sound engine started
|
||||||
|
[10:41:56] [Client thread/INFO]: [OptiFine] Mipmap levels: 4
|
||||||
|
[10:41:56] [Client thread/INFO]: [OptiFine] Multitexture: true
|
||||||
|
[10:41:56] [Client thread/INFO]: [OptiFine] Multipass connected textures: false
|
||||||
|
[10:41:56] [Client thread/ERROR]: Using missing texture, unable to load minecraft:mcpatcher/ctm/default/empty.png, java.io.FileNotFoundException
|
||||||
|
[10:41:56] [Client thread/INFO]: Created: 512x512 textures-atlas
|
||||||
|
[10:41:58] [Client thread/INFO]: [OptiFine] *** Reloading custom textures ***
|
||||||
|
[10:41:58] [Client thread/INFO]: [OptiFine] Enable face culling: acacia_leaves, birch_leaves, dark_oak_leaves, jungle_leaves, oak_leaves, spruce_leaves
|
||||||
|
[10:42:06] [Server thread/INFO]: Starting integrated minecraft server version 1.8.8
|
||||||
|
[10:42:06] [Server thread/INFO]: Generating keypair
|
||||||
|
[10:42:06] [Server thread/INFO]: Preparing start region for level 0
|
||||||
|
[10:42:07] [Server thread/INFO]: Changing view distance to 8, from 10
|
||||||
|
[10:42:07] [Server thread/INFO]: Player268[local:E:78c35288] logged in with entity id 57 at (-370.13231447523856, 77.54040525373046, 351.4682160208162)
|
||||||
|
[10:42:07] [Server thread/INFO]: Player268 joined the game
|
||||||
|
[10:42:08] [Client thread/INFO]: [CHAT] A new §eOptiFine§f version is available: §eHD Ultra I7§f
|
||||||
|
[10:42:17] [Server thread/INFO]: Saving and pausing game...
|
||||||
|
[10:42:17] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Overworld
|
||||||
|
[10:42:17] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Nether
|
||||||
|
[10:42:17] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/The End
|
||||||
|
[10:42:21] [Client thread/INFO]: Reloading ResourceManager: Default
|
||||||
|
[10:42:21] [Client thread/INFO]: [OptiFine] *** Reloading textures ***
|
||||||
|
[10:42:21] [Client thread/INFO]: [OptiFine] Resource packs: Default
|
||||||
|
[10:42:21] [Client thread/INFO]: SoundSystem shutting down...
|
||||||
|
[10:42:21] [Client thread/WARN]: Author: Paul Lamb, www.paulscode.com
|
||||||
|
[10:42:21] [Sound Library Loader/INFO]: Starting up SoundSystem...
|
||||||
|
[10:42:22] [Thread-16/INFO]: Initializing LWJGL OpenAL
|
||||||
|
[10:42:22] [Thread-16/INFO]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org)
|
||||||
|
[10:42:22] [Thread-16/INFO]: OpenAL initialized.
|
||||||
|
[10:42:22] [Sound Library Loader/INFO]: Sound engine started
|
||||||
|
[10:42:22] [Client thread/INFO]: [OptiFine] Mipmap levels: 4
|
||||||
|
[10:42:22] [Client thread/INFO]: [OptiFine] Multitexture: true
|
||||||
|
[10:42:22] [Client thread/INFO]: [OptiFine] Multipass connected textures: false
|
||||||
|
[10:42:22] [Client thread/ERROR]: Using missing texture, unable to load minecraft:mcpatcher/ctm/default/empty.png, java.io.FileNotFoundException
|
||||||
|
[10:42:22] [Client thread/INFO]: Created: 512x512 textures-atlas
|
||||||
|
[10:42:24] [Client thread/INFO]: [OptiFine] *** Reloading custom textures ***
|
||||||
|
[10:42:24] [Client thread/INFO]: [OptiFine] Enable face culling: acacia_leaves, birch_leaves, dark_oak_leaves, jungle_leaves, oak_leaves, spruce_leaves
|
||||||
|
[10:42:25] [Client thread/INFO]: Reloading ResourceManager: Default
|
||||||
|
[10:42:25] [Client thread/INFO]: [OptiFine] *** Reloading textures ***
|
||||||
|
[10:42:25] [Client thread/INFO]: [OptiFine] Resource packs: Default
|
||||||
|
[10:42:26] [Client thread/INFO]: SoundSystem shutting down...
|
||||||
|
[10:42:26] [Client thread/WARN]: Author: Paul Lamb, www.paulscode.com
|
||||||
|
[10:42:26] [Sound Library Loader/INFO]: Starting up SoundSystem...
|
||||||
|
[10:42:26] [Thread-18/INFO]: Initializing LWJGL OpenAL
|
||||||
|
[10:42:26] [Thread-18/INFO]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org)
|
||||||
|
[10:42:26] [Thread-18/INFO]: OpenAL initialized.
|
||||||
|
[10:42:26] [Client thread/INFO]: [OptiFine] Mipmap levels: 4
|
||||||
|
[10:42:26] [Client thread/INFO]: [OptiFine] Multitexture: true
|
||||||
|
[10:42:26] [Sound Library Loader/INFO]: Sound engine started
|
||||||
|
[10:42:27] [Client thread/INFO]: Created: 512x512 textures-atlas
|
||||||
|
[10:42:27] [Client thread/INFO]: [OptiFine] *** Reloading custom textures ***
|
||||||
|
[10:42:27] [Client thread/INFO]: [OptiFine] Enable face culling: acacia_leaves, birch_leaves, dark_oak_leaves, jungle_leaves, oak_leaves, spruce_leaves
|
||||||
|
[10:42:32] [Server thread/INFO]: Saving and pausing game...
|
||||||
|
[10:42:32] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Overworld
|
||||||
|
[10:42:32] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Nether
|
||||||
|
[10:42:32] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/The End
|
||||||
|
[10:42:34] [Server thread/INFO]: Saving and pausing game...
|
||||||
|
[10:42:34] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Overworld
|
||||||
|
[10:42:34] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Nether
|
||||||
|
[10:42:34] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/The End
|
||||||
|
[10:49:06] [Server thread/INFO]: <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:06] [Client thread/INFO]: [CHAT] <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:06] [Server thread/INFO]: <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:06] [Client thread/INFO]: [CHAT] <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:07] [Server thread/INFO]: <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:07] [Client thread/INFO]: [CHAT] <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:07] [Server thread/INFO]: <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:07] [Client thread/INFO]: [CHAT] <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:07] [Server thread/INFO]: <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:07] [Client thread/INFO]: [CHAT] <Player268> dsfsdfsdfdf
|
||||||
|
[10:49:10] [Server thread/INFO]: Saving and pausing game...
|
||||||
|
[10:49:10] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Overworld
|
||||||
|
[10:49:10] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Nether
|
||||||
|
[10:49:10] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/The End
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving and pausing game...
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Overworld
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Nether
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/The End
|
||||||
|
[10:53:45] [Client thread/INFO]: Stopping!
|
||||||
|
[10:53:45] [Client thread/INFO]: [Athena] Shutting down client
|
||||||
|
[10:53:45] [Client thread/INFO]: SoundSystem shutting down...
|
||||||
|
[10:53:45] [Server thread/INFO]: Stopping server
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving players
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving worlds
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Overworld
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/Nether
|
||||||
|
[10:53:45] [Server thread/INFO]: Saving chunks for level 'Copy of Copy of mcpworldppdsa|'/The End
|
||||||
|
[10:53:45] [Client thread/WARN]: Author: Paul Lamb, www.paulscode.com
|
|
@ -1,7 +1,7 @@
|
||||||
invertYMouse:false
|
invertYMouse:false
|
||||||
mouseSensitivity:0.15492958
|
mouseSensitivity:0.15492958
|
||||||
fov:0.0
|
fov:0.0
|
||||||
gamma:0.0
|
gamma:1.0
|
||||||
saturation:0.0
|
saturation:0.0
|
||||||
renderDistance:8
|
renderDistance:8
|
||||||
guiScale:2
|
guiScale:2
|
||||||
|
@ -11,9 +11,9 @@ anaglyph3d:false
|
||||||
maxFps:260
|
maxFps:260
|
||||||
fboEnable:true
|
fboEnable:true
|
||||||
difficulty:2
|
difficulty:2
|
||||||
fancyGraphics:false
|
fancyGraphics:true
|
||||||
ao:0
|
ao:2
|
||||||
renderClouds:fast
|
renderClouds:true
|
||||||
resourcePacks:[]
|
resourcePacks:[]
|
||||||
incompatibleResourcePacks:[]
|
incompatibleResourcePacks:[]
|
||||||
lastServer:
|
lastServer:
|
||||||
|
|
|
@ -32,7 +32,7 @@ ofLagometer:false
|
||||||
ofShowFps:false
|
ofShowFps:false
|
||||||
ofAutoSaveTicks:4000
|
ofAutoSaveTicks:4000
|
||||||
ofBetterGrass:3
|
ofBetterGrass:3
|
||||||
ofConnectedTextures:2
|
ofConnectedTextures:3
|
||||||
ofWeather:true
|
ofWeather:true
|
||||||
ofSky:true
|
ofSky:true
|
||||||
ofStars:true
|
ofStars:true
|
||||||
|
@ -42,8 +42,8 @@ ofChunkUpdates:1
|
||||||
ofChunkUpdatesDynamic:false
|
ofChunkUpdatesDynamic:false
|
||||||
ofTime:0
|
ofTime:0
|
||||||
ofClearWater:false
|
ofClearWater:false
|
||||||
ofAaLevel:0
|
ofAaLevel:16
|
||||||
ofAfLevel:1
|
ofAfLevel:8
|
||||||
ofProfiler:false
|
ofProfiler:false
|
||||||
ofBetterSnow:false
|
ofBetterSnow:false
|
||||||
ofSwampColors:true
|
ofSwampColors:true
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1 @@
|
||||||
|
{"stat.flyOneCm":31003,"stat.useItem.minecraft.glass":4,"stat.walkOneCm":3748,"stat.jump":143,"stat.swimOneCm":629,"stat.useItem.minecraft.sand":1,"stat.playOneMinute":2643,"achievement.openInventory":1,"stat.leaveGame":1,"stat.useItem.minecraft.log":19,"stat.timeSinceDeath":2643,"achievement.mineWood":1,"stat.sprintOneCm":3106,"achievement.exploreAllBiomes":{"value":0,"progress":["River","Desert"]},"stat.diveOneCm":734}
|
|
@ -0,0 +1 @@
|
||||||
|
{"stat.flyOneCm":34722,"stat.useItem.minecraft.glass":20,"stat.walkOneCm":4972,"stat.jump":62,"stat.useItem.minecraft.sand":54,"stat.swimOneCm":41,"stat.playOneMinute":63636,"stat.useItem.minecraft.planks":19,"stat.leaveGame":1,"stat.useItem.minecraft.log":1,"stat.damageDealt":30,"stat.useItem.minecraft.cobblestone":7,"stat.killEntity.Zombie":1,"stat.timeSinceDeath":63636,"stat.sprintOneCm":3670,"stat.mobKills":1,"achievement.exploreAllBiomes":{"value":0,"progress":["DesertHills","River","Desert"]},"stat.diveOneCm":456}
|
|
@ -0,0 +1 @@
|
||||||
|
{"stat.flyOneCm":9485,"stat.walkOneCm":2172,"stat.useItem.minecraft.sand":64,"stat.jump":26,"stat.playOneMinute":13330,"stat.leaveGame":1,"stat.timeSinceDeath":13330,"stat.sprintOneCm":1496,"achievement.exploreAllBiomes":{"value":0,"progress":["DesertHills","Desert"]}}
|
Binary file not shown.
|
@ -42,7 +42,7 @@
|
||||||
"CPS": {
|
"CPS": {
|
||||||
"settings": {
|
"settings": {
|
||||||
"Static Chroma": false,
|
"Static Chroma": false,
|
||||||
"Background": true,
|
"Background": false,
|
||||||
"Custom Font": true,
|
"Custom Font": true,
|
||||||
"Wave Chroma": false,
|
"Wave Chroma": false,
|
||||||
"Color": {
|
"Color": {
|
||||||
|
@ -63,12 +63,12 @@
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {"cps": {
|
"hud": {"cps": {
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"x": 71,
|
"x": 370,
|
||||||
"y": 175,
|
"y": 286,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
"enabled": true
|
"enabled": false
|
||||||
},
|
},
|
||||||
"Crosshair": {
|
"Crosshair": {
|
||||||
"settings": {
|
"settings": {
|
||||||
|
@ -110,12 +110,12 @@
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {"fps": {
|
"hud": {"fps": {
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"x": 5,
|
"x": 483,
|
||||||
"y": 175,
|
"y": 316,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
"enabled": true
|
"enabled": false
|
||||||
},
|
},
|
||||||
"Block Overlay": {
|
"Block Overlay": {
|
||||||
"settings": {
|
"settings": {
|
||||||
|
@ -126,8 +126,8 @@
|
||||||
"blue": 255,
|
"blue": 255,
|
||||||
"alpha": 255
|
"alpha": 255
|
||||||
},
|
},
|
||||||
"Line Width": 1,
|
"Line Width": 5.5,
|
||||||
"Mode": "Outline",
|
"Mode": "Both",
|
||||||
"Highlight Color": {
|
"Highlight Color": {
|
||||||
"red": 0,
|
"red": 0,
|
||||||
"green": 0,
|
"green": 0,
|
||||||
|
@ -137,38 +137,7 @@
|
||||||
},
|
},
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {},
|
"hud": {},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Hold",
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
"Custom Text": {
|
|
||||||
"settings": {
|
|
||||||
"Static Chroma": false,
|
|
||||||
"Custom Font": false,
|
|
||||||
"Background": true,
|
|
||||||
"Wave Chroma": false,
|
|
||||||
"Color": {
|
|
||||||
"red": 255,
|
|
||||||
"green": 255,
|
|
||||||
"blue": 255,
|
|
||||||
"alpha": 255
|
|
||||||
},
|
|
||||||
"Background Color": {
|
|
||||||
"red": 0,
|
|
||||||
"green": 0,
|
|
||||||
"blue": 0,
|
|
||||||
"alpha": 150
|
|
||||||
},
|
|
||||||
"Display Mode": "Modern",
|
|
||||||
"Custom Text": "Custom Text Here"
|
|
||||||
},
|
|
||||||
"bind": 0,
|
|
||||||
"hud": {"customtext": {
|
|
||||||
"visible": true,
|
|
||||||
"x": 1,
|
|
||||||
"y": 200,
|
|
||||||
"scale": 1
|
|
||||||
}},
|
|
||||||
"bindtype": "Toggle",
|
|
||||||
"enabled": false
|
"enabled": false
|
||||||
},
|
},
|
||||||
"Clock": {
|
"Clock": {
|
||||||
|
@ -195,20 +164,19 @@
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {"time": {
|
"hud": {"time": {
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"x": 1,
|
"x": 443,
|
||||||
"y": 190,
|
"y": 150,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
"enabled": false
|
"enabled": false
|
||||||
},
|
},
|
||||||
"Memory usage": {
|
"Custom Text": {
|
||||||
"settings": {
|
"settings": {
|
||||||
"Static Chroma": false,
|
"Static Chroma": false,
|
||||||
"Background": true,
|
|
||||||
"Custom Font": false,
|
"Custom Font": false,
|
||||||
|
"Background": true,
|
||||||
"Wave Chroma": false,
|
"Wave Chroma": false,
|
||||||
"Percentage": false,
|
|
||||||
"Color": {
|
"Color": {
|
||||||
"red": 255,
|
"red": 255,
|
||||||
"green": 255,
|
"green": 255,
|
||||||
|
@ -219,15 +187,16 @@
|
||||||
"red": 0,
|
"red": 0,
|
||||||
"green": 0,
|
"green": 0,
|
||||||
"blue": 0,
|
"blue": 0,
|
||||||
"alpha": 150
|
"alpha": 153
|
||||||
},
|
},
|
||||||
"Display Mode": "Modern"
|
"Display Mode": "Modern",
|
||||||
|
"Custom Text": "Penis"
|
||||||
},
|
},
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {"memory usage": {
|
"hud": {"customtext": {
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"x": 1,
|
"x": 648,
|
||||||
"y": 175,
|
"y": 260,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
|
@ -263,6 +232,37 @@
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
"enabled": false
|
"enabled": false
|
||||||
},
|
},
|
||||||
|
"Memory usage": {
|
||||||
|
"settings": {
|
||||||
|
"Static Chroma": false,
|
||||||
|
"Background": true,
|
||||||
|
"Custom Font": false,
|
||||||
|
"Wave Chroma": false,
|
||||||
|
"Percentage": false,
|
||||||
|
"Color": {
|
||||||
|
"red": 255,
|
||||||
|
"green": 255,
|
||||||
|
"blue": 255,
|
||||||
|
"alpha": 255
|
||||||
|
},
|
||||||
|
"Background Color": {
|
||||||
|
"red": 0,
|
||||||
|
"green": 0,
|
||||||
|
"blue": 0,
|
||||||
|
"alpha": 150
|
||||||
|
},
|
||||||
|
"Display Mode": "Modern"
|
||||||
|
},
|
||||||
|
"bind": 0,
|
||||||
|
"hud": {"memory usage": {
|
||||||
|
"visible": true,
|
||||||
|
"x": 303,
|
||||||
|
"y": 265,
|
||||||
|
"scale": 1
|
||||||
|
}},
|
||||||
|
"bindtype": "Toggle",
|
||||||
|
"enabled": false
|
||||||
|
},
|
||||||
"Armor Status": {
|
"Armor Status": {
|
||||||
"settings": {
|
"settings": {
|
||||||
"Value Display": "Value Damage",
|
"Value Display": "Value Damage",
|
||||||
|
@ -281,13 +281,13 @@
|
||||||
},
|
},
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {"armorstatus": {
|
"hud": {"armorstatus": {
|
||||||
"visible": true,
|
"visible": false,
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 200,
|
"y": 346,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
"enabled": true
|
"enabled": false
|
||||||
},
|
},
|
||||||
"Chat": {
|
"Chat": {
|
||||||
"settings": {"Custom Font": false},
|
"settings": {"Custom Font": false},
|
||||||
|
@ -325,20 +325,12 @@
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
"enabled": false
|
"enabled": false
|
||||||
},
|
},
|
||||||
"macros": [
|
"macros": [{
|
||||||
{
|
"name": "test",
|
||||||
"name": "test",
|
"command": "dsfsdfsdfdf",
|
||||||
"command": "dsfsdfsdfdf",
|
"key": 34,
|
||||||
"key": 34,
|
"enabled": true
|
||||||
"enabled": true
|
}],
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sdfsadfsdf",
|
|
||||||
"command": "sdfsdf",
|
|
||||||
"key": 33,
|
|
||||||
"enabled": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"Coordinates": {
|
"Coordinates": {
|
||||||
"settings": {
|
"settings": {
|
||||||
"Show Compass": true,
|
"Show Compass": true,
|
||||||
|
@ -386,8 +378,8 @@
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {"coordinates": {
|
"hud": {"coordinates": {
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"x": 0,
|
"x": 119,
|
||||||
"y": 150,
|
"y": 138,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
|
@ -423,8 +415,8 @@
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {"entityhud": {
|
"hud": {"entityhud": {
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"x": 1,
|
"x": 826,
|
||||||
"y": 175,
|
"y": 86,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
|
@ -473,7 +465,7 @@
|
||||||
"hud": {"keystrokes": {
|
"hud": {"keystrokes": {
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 120,
|
"y": 18,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
|
@ -492,7 +484,18 @@
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {},
|
"hud": {},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
"enabled": true
|
"enabled": false
|
||||||
|
},
|
||||||
|
"General Settings": {
|
||||||
|
"settings": {
|
||||||
|
"Show Logo On Tab": true,
|
||||||
|
"F5 Nametags": true,
|
||||||
|
"Custom GUI Font": true
|
||||||
|
},
|
||||||
|
"bind": 0,
|
||||||
|
"hud": {},
|
||||||
|
"bindtype": "Toggle",
|
||||||
|
"enabled": false
|
||||||
},
|
},
|
||||||
"Pot Counter": {
|
"Pot Counter": {
|
||||||
"settings": {
|
"settings": {
|
||||||
|
@ -511,31 +514,20 @@
|
||||||
"red": 0,
|
"red": 0,
|
||||||
"green": 0,
|
"green": 0,
|
||||||
"blue": 0,
|
"blue": 0,
|
||||||
"alpha": 150
|
"alpha": 153
|
||||||
},
|
},
|
||||||
"Display Mode": "Modern"
|
"Display Mode": "Modern"
|
||||||
},
|
},
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
"hud": {"potioncounter": {
|
"hud": {"potioncounter": {
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"x": 1,
|
"x": 657,
|
||||||
"y": 200,
|
"y": 150,
|
||||||
"scale": 1
|
"scale": 1
|
||||||
}},
|
}},
|
||||||
"bindtype": "Toggle",
|
"bindtype": "Toggle",
|
||||||
"enabled": false
|
"enabled": false
|
||||||
},
|
},
|
||||||
"General Settings": {
|
|
||||||
"settings": {
|
|
||||||
"Show Logo On Tab": true,
|
|
||||||
"F5 Nametags": true,
|
|
||||||
"Custom GUI Font": true
|
|
||||||
},
|
|
||||||
"bind": 0,
|
|
||||||
"hud": {},
|
|
||||||
"bindtype": "Toggle",
|
|
||||||
"enabled": false
|
|
||||||
},
|
|
||||||
"Motion Blur": {
|
"Motion Blur": {
|
||||||
"settings": {"Blur Amount": 2},
|
"settings": {"Blur Amount": 2},
|
||||||
"bind": 0,
|
"bind": 0,
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue