diff --git a/src/main/java/net/minecraft/client/gui/GuiNewChat.java b/src/main/java/net/minecraft/client/gui/GuiNewChat.java index 16e83d9e..7fa01469 100644 --- a/src/main/java/net/minecraft/client/gui/GuiNewChat.java +++ b/src/main/java/net/minecraft/client/gui/GuiNewChat.java @@ -86,7 +86,7 @@ public class GuiNewChat extends Gui GlStateManager.color(1,1,1); GlStateManager.enableBlend(); 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 { this.mc.fontRendererObj.drawStringWithShadow(s, (float) i2, (float) (j2 - 8), 16777215 + (l1 << 24)); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/IngameMenu.java b/src/main/java/rip/athena/client/gui/clickgui/IngameMenu.java index 500bcab5..352e5784 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/IngameMenu.java +++ b/src/main/java/rip/athena/client/gui/clickgui/IngameMenu.java @@ -100,7 +100,7 @@ public class IngameMenu extends MinecraftMenuImpl implements DrawImpl { menu.addComponent(comp); if(Settings.customGuiFont) { - x += FontManager.baloo17.getStringWidth(category.getName()) + 20; + x += rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(category.getName()) + 20; } else { 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.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); - 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); + 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); drawShadowDown(menu.getX(), menu.getY() + 58, menu.getWidth()); if(category != null) { diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticRainbowButton.java b/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticRainbowButton.java index 390f0e44..5021c6cb 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticRainbowButton.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/cosmetics/CosmeticRainbowButton.java @@ -70,7 +70,7 @@ public class CosmeticRainbowButton extends CosmeticGenericButton { drawShadowRight(x + width + 1, y, height + 1);*/ 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 { Minecraft.getMinecraft().fontRendererObj.drawString(text, x + (width / 2 - getStringWidth(text) / 2), y + (height / 2 - getStringHeight(text) / 2), -1); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/fps/OptifineParentBackground.java b/src/main/java/rip/athena/client/gui/clickgui/components/fps/OptifineParentBackground.java index d6ca0f02..dda08142 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/fps/OptifineParentBackground.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/fps/OptifineParentBackground.java @@ -77,7 +77,7 @@ public class OptifineParentBackground extends MenuComponent { @Override public void drawText(String text, int x, int y, int color) { if(Settings.customGuiFont) { - FontManager.baloo17.drawString(text, x, y, color); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color); } else { Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color); } @@ -86,7 +86,7 @@ public class OptifineParentBackground extends MenuComponent { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/FlipButton.java b/src/main/java/rip/athena/client/gui/clickgui/components/macros/FlipButton.java index b34d7626..1e533913 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/FlipButton.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/macros/FlipButton.java @@ -115,7 +115,7 @@ public class FlipButton extends MenuButton { @Override public void drawText(String string, int x, int y, int color) { if(Settings.customGuiFont) { - FontManager.baloo17.drawString(string, x, y, color); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string, x, y, color); } else { Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color); } @@ -124,7 +124,7 @@ public class FlipButton extends MenuButton { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroBase.java b/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroBase.java index 7bbb00c5..4c527432 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroBase.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroBase.java @@ -91,7 +91,7 @@ public class MacroBase extends MenuComponent { @Override public void drawText(String string, int x, int y, int color) { if(Settings.customGuiFont) { - FontManager.baloo17.drawString(string, x, y, color); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string, x, y, color); } else { Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color); } @@ -100,7 +100,7 @@ public class MacroBase extends MenuComponent { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroButton.java b/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroButton.java index 409619f5..e091b824 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroButton.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroButton.java @@ -81,7 +81,7 @@ public class MacroButton extends MenuButton { @Override public void drawText(String text, int x, int y, int color) { if(Settings.customGuiFont) { - FontManager.baloo17.drawString(text, x, y, color); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color); } else { Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color); } @@ -90,7 +90,7 @@ public class MacroButton extends MenuButton { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroSlimTextField.java b/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroSlimTextField.java index 1ef8d375..09e00005 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroSlimTextField.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroSlimTextField.java @@ -92,7 +92,7 @@ public class MacroSlimTextField extends SearchTextfield { int labelWidth; if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -103,7 +103,7 @@ public class MacroSlimTextField extends SearchTextfield { if(comp < index){ textToDraw = textToDraw.substring(1); if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -111,7 +111,7 @@ public class MacroSlimTextField extends SearchTextfield { } else if(comp > index){ textToDraw = textToDraw.substring(0, textToDraw.length() - 1); if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -132,7 +132,7 @@ public class MacroSlimTextField extends SearchTextfield { int textHeight; if(Settings.customGuiFont) { 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 { 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); @@ -146,7 +146,7 @@ public class MacroSlimTextField extends SearchTextfield { index--; } 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 { Minecraft.getMinecraft().fontRendererObj.drawString(textToDraw, x, y + height / 2 - (int)Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2, textColor); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroTextfield.java b/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroTextfield.java index c8fc955a..54d21171 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroTextfield.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/macros/MacroTextfield.java @@ -104,7 +104,7 @@ public class MacroTextfield extends SearchTextfield { int labelWidth; if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -116,7 +116,7 @@ public class MacroTextfield extends SearchTextfield { textToDraw = textToDraw.substring(1); if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -125,7 +125,7 @@ public class MacroTextfield extends SearchTextfield { textToDraw = textToDraw.substring(0, textToDraw.length() - 1); if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -153,7 +153,7 @@ public class MacroTextfield extends SearchTextfield { } 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 { 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()) { textToDraw = placeholderText; 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 { xAdd = (width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(placeholderText) / 2); } @@ -182,7 +182,7 @@ public class MacroTextfield extends SearchTextfield { } } 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 { 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) { - position += (int) FontManager.baloo17.getStringWidth(text.charAt(i) + ""); + position += (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text.charAt(i) + ""); } else { position += (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + ""); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/macros/SimpleTextButton.java b/src/main/java/rip/athena/client/gui/clickgui/components/macros/SimpleTextButton.java index 0a686906..4c947207 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/macros/SimpleTextButton.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/macros/SimpleTextButton.java @@ -79,7 +79,7 @@ public class SimpleTextButton extends MenuButton { @Override public void drawText(String string, int x, int y, int color) { 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 { Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color); } @@ -88,7 +88,7 @@ public class SimpleTextButton extends MenuButton { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string) - 1; + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) - 1; } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/CategoryButton.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/CategoryButton.java index 3256a38d..495a9a89 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/CategoryButton.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/CategoryButton.java @@ -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()); } 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 { 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); /* 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 { 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 public int getStringWidth(String string) { 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 { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } @@ -93,7 +93,7 @@ public class CategoryButton extends MenuButton { @Override public int getStringHeight(String string) { 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 { return Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT; } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureText.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureText.java index 7b07575f..ddca572c 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureText.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/FeatureText.java @@ -37,7 +37,7 @@ public class FeatureText extends MenuLabel { @Override public void drawText(String text, int x, int y, int color) { 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 { Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color); } @@ -46,7 +46,7 @@ public class FeatureText extends MenuLabel { @Override public int getStringWidth(String text) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(text); + return (int) rip.athena.client.utils.font.FontManager.getNunitoBold(30).width(text); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(text); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/GoBackButton.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/GoBackButton.java index a79c25a1..5a985331 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/GoBackButton.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/GoBackButton.java @@ -135,7 +135,7 @@ public class GoBackButton extends MenuButton { DrawUtils.drawRoundedRect(x + 1, y + 1, x + width, y + height, rounding, backgroundColor);*/ 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 { 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 public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModKeybind.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModKeybind.java index 4678d7f4..6651ce66 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModKeybind.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModKeybind.java @@ -161,8 +161,11 @@ public class MenuModKeybind extends MenuComponent { 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(35,35,35, 255).getRGB()); + DrawUtils.drawRoundedRect(x, y, x + width, y + height, 4.0f, new Color(50, 50, 50, 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); //drawVerticalLine(x, y + 1, height - 1, 1, lineColor); @@ -203,7 +206,7 @@ public class MenuModKeybind extends MenuComponent { @Override public void drawText(String text, int x, int y, int color) { if(Settings.customGuiFont) { - FontManager.baloo17.drawString(text, x, y, color); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color); } else { Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color); } @@ -212,7 +215,7 @@ public class MenuModKeybind extends MenuComponent { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModList.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModList.java index b895587b..d0635bbc 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModList.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModList.java @@ -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.DrawType; import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; @@ -112,10 +113,13 @@ public class MenuModList extends MenuDropdown { 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); 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 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 + 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) { backgroundColor = defBg; @@ -149,7 +153,7 @@ public class MenuModList extends MenuDropdown { @Override public void drawText(String text, int x, int y, int color) { if(Settings.customGuiFont) { - FontManager.baloo17.drawString(text, x, y, color); + rip.athena.client.utils.font.FontManager.getNunito(25).drawString(text, x, y, color); } else { Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color); } @@ -158,7 +162,7 @@ public class MenuModList extends MenuDropdown { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getNunito(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModSlider.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModSlider.java index de0c6642..05fbf031 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModSlider.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/MenuModSlider.java @@ -8,6 +8,8 @@ import rip.athena.client.gui.framework.draw.ButtonState; import rip.athena.client.gui.framework.draw.DrawType; import org.lwjgl.input.Mouse; import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.utils.render.DrawUtils; +import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; @@ -72,10 +74,13 @@ public class MenuModSlider extends MenuSlider { 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); 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 = ""; @@ -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); - + int cursorPos = linePos; int cursorWidth = 20; - + if(cursorPos < cursorWidth) { cursorPos = cursorWidth; } @@ -141,7 +146,7 @@ public class MenuModSlider extends MenuSlider { @Override public void drawText(String text, int x, int y, int color) { if(Settings.customGuiFont) { - FontManager.baloo17.drawString(text, x, y, color); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(text, x, y, color); } else { Minecraft.getMinecraft().fontRendererObj.drawString(text, x, y, color); } @@ -150,7 +155,7 @@ public class MenuModSlider extends MenuSlider { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModCategoryButton.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModCategoryButton.java index 58ea9966..c64b7bd4 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModCategoryButton.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModCategoryButton.java @@ -71,7 +71,7 @@ public class ModCategoryButton extends MenuButton { } 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 { 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); 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 { 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 public int getStringWidth(String string) { 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 { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModTextbox.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModTextbox.java index 1cdaa034..dbde667f 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModTextbox.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModTextbox.java @@ -93,7 +93,7 @@ public class ModTextbox extends MenuTextField { int labelWidth; if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -103,7 +103,7 @@ public class ModTextbox extends MenuTextField { if(comp < index){ textToDraw = textToDraw.substring(1); if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -112,7 +112,7 @@ public class ModTextbox extends MenuTextField { textToDraw = textToDraw.substring(0, textToDraw.length() - 1); if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -139,7 +139,7 @@ public class ModTextbox extends MenuTextField { } 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 { 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; 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 { 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) { - position += (int) FontManager.baloo17.getStringWidth(text.charAt(i) + ""); + position += (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text.charAt(i) + ""); } else { position += (int) Minecraft.getMinecraft().fontRendererObj.getStringWidth(text.charAt(i) + ""); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModsButton.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModsButton.java index f21774cb..2b478e76 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModsButton.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModsButton.java @@ -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.DrawType; import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; @@ -115,13 +116,16 @@ public class ModsButton extends MenuButton { 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); 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) { - 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 { 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 public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModuleBox.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModuleBox.java index e721c437..9c450356 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModuleBox.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/ModuleBox.java @@ -57,7 +57,7 @@ public class ModuleBox extends MenuComponent { 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()); curWord.setLength(0); toAdd = word; @@ -188,7 +188,7 @@ public class ModuleBox extends MenuComponent { for (String line : lines) { 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); yPos += FontManager.baloo30.getHeight(line); } else { @@ -214,8 +214,8 @@ public class ModuleBox extends MenuComponent { String text = module.isToggled() ? "ENABLED" : "DISABLED"; 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); - //FontManager.baloo17.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); + //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 { Minecraft.getMinecraft().fontRendererObj.drawString(text, (int) (x + (float) width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(text) / 2), y + height - 10 - 15, -1); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/mods/SearchTextfield.java b/src/main/java/rip/athena/client/gui/clickgui/components/mods/SearchTextfield.java index 462f8c39..8e84e85f 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/mods/SearchTextfield.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/mods/SearchTextfield.java @@ -96,7 +96,7 @@ public class SearchTextfield extends MenuTextField { int labelWidth; if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -106,7 +106,7 @@ public class SearchTextfield extends MenuTextField { if(comp < index){ textToDraw = textToDraw.substring(1); if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -114,7 +114,7 @@ public class SearchTextfield extends MenuTextField { } else if(comp > index){ textToDraw = textToDraw.substring(0, textToDraw.length() - 1); if(Settings.customGuiFont) { - labelWidth = (int) FontManager.baloo17.getStringWidth(textToDraw + 1); + labelWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(textToDraw + 1); } else { labelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(textToDraw + 1); } @@ -136,7 +136,7 @@ public class SearchTextfield extends MenuTextField { if(Settings.customGuiFont) { textHeight = (int) FontManager.baloo17.getHeight(textToDraw); - drawVerticalLine(x + 10 + (int)FontManager.baloo17.getStringWidth(textToDraw.substring(0, toRender)) + 1, y + height / 2 - textHeight / 2, textHeight, 1, textColor); + 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 { 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); @@ -191,7 +191,7 @@ public class SearchTextfield extends MenuTextField { 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) { diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBase.java b/src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBase.java index 603579e8..7ae843bc 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBase.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/profiles/ProfilesBase.java @@ -85,7 +85,7 @@ public class ProfilesBase extends MenuComponent { @Override public void drawText(String string, int x, int y, int color) { if(Settings.customGuiFont) { - FontManager.baloo17.drawString(string, x, y, color); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string, x, y, color); } else { Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color); } @@ -94,7 +94,7 @@ public class ProfilesBase extends MenuComponent { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointTextBarrier.java b/src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointTextBarrier.java index 2f4f1a94..7773b6ba 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointTextBarrier.java +++ b/src/main/java/rip/athena/client/gui/clickgui/components/waypoints/WaypointTextBarrier.java @@ -63,7 +63,7 @@ public class WaypointTextBarrier extends MenuComponent { @Override public void drawText(String string, int x, int y, int color) { 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 { Minecraft.getMinecraft().fontRendererObj.drawString(string, x, y, color); } @@ -72,7 +72,7 @@ public class WaypointTextBarrier extends MenuComponent { @Override public int getStringWidth(String string) { if(Settings.customGuiFont) { - return (int) FontManager.baloo17.getStringWidth(string) - 1; + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string) - 1; } else { return Minecraft.getMinecraft().fontRendererObj.getStringWidth(string); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/CosmeticsPage.java b/src/main/java/rip/athena/client/gui/clickgui/pages/CosmeticsPage.java index 1c4592fe..29ffad6a 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/CosmeticsPage.java +++ b/src/main/java/rip/athena/client/gui/clickgui/pages/CosmeticsPage.java @@ -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); 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, height + 1, ModCategoryButton.MAIN_COLOR); 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() + menu.getWidth() - width, y - 1, width); @@ -409,19 +409,19 @@ public class CosmeticsPage extends Page { x += 3; 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; - 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; - 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; - 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 diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/MacrosPage.java b/src/main/java/rip/athena/client/gui/clickgui/pages/MacrosPage.java index 845e29ab..4ec231c1 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/MacrosPage.java +++ b/src/main/java/rip/athena/client/gui/clickgui/pages/MacrosPage.java @@ -2,7 +2,6 @@ package rip.athena.client.gui.clickgui.pages; import net.minecraft.client.renderer.GlStateManager; import rip.athena.client.Athena; -import rip.athena.client.font.FontManager; import rip.athena.client.gui.framework.Menu; import rip.athena.client.gui.framework.TextPattern; import rip.athena.client.gui.clickgui.IngameMenu; @@ -15,6 +14,7 @@ import net.minecraft.client.Minecraft; import org.lwjgl.input.Keyboard; import rip.athena.client.macros.Macro; import rip.athena.client.modules.impl.other.Settings; +import rip.athena.client.utils.font.FontManager; import java.awt.*; @@ -108,7 +108,7 @@ public class MacrosPage extends Page { for(Macro macro : Athena.INSTANCE.getMacroManager().getMacros()) { 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 public void onAction() { 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()); 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 { 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); 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 { 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; 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 { Minecraft.getMinecraft().fontRendererObj.drawString("ENTER NAME", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR); } y += 70; 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 { Minecraft.getMinecraft().fontRendererObj.drawString("ENTER COMMAND LINE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR); } y += 70; 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 { Minecraft.getMinecraft().fontRendererObj.drawString("ADD KEYBIND", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR); } diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/ModsPage.java b/src/main/java/rip/athena/client/gui/clickgui/pages/ModsPage.java index 6e692cc5..85f15845 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/ModsPage.java +++ b/src/main/java/rip/athena/client/gui/clickgui/pages/ModsPage.java @@ -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); } 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(); if (Settings.customGuiFont) { @@ -123,13 +123,13 @@ public class ModsPage extends Page { @Override public void onLoad() { - int y = 59 + 10; + int y = 59 + 15; int x = 255; int height = 32; for (Category category : Category.values()) { 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 public void onAction() { for (rip.athena.client.gui.framework.MenuComponent component : menu.getComponents()) { @@ -151,7 +151,7 @@ public class ModsPage extends Page { menu.addComponent(comp); if(Settings.customGuiFont) { - x += FontManager.baloo17.getStringWidth(category.getText()) + 20; + x += rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(category.getText()) + 20; } else { x += mc.fontRendererObj.getStringWidth(category.getText()) + 20; } diff --git a/src/main/java/rip/athena/client/gui/clickgui/pages/ProfilesPage.java b/src/main/java/rip/athena/client/gui/clickgui/pages/ProfilesPage.java index 5e2c918d..9998a343 100644 --- a/src/main/java/rip/athena/client/gui/clickgui/pages/ProfilesPage.java +++ b/src/main/java/rip/athena/client/gui/clickgui/pages/ProfilesPage.java @@ -251,7 +251,7 @@ public class ProfilesPage extends Page { drawShadowDown(menu.getX() + menu.getWidth() - width, y + height, width); 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 { 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; 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 { 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); 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 { 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; 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 { mc.fontRendererObj.drawString("PROFILE CODE", x, y, IngameMenu.MENU_HEADER_TEXT_COLOR); } diff --git a/src/main/java/rip/athena/client/gui/hud/HUDEditor.java b/src/main/java/rip/athena/client/gui/hud/HUDEditor.java index c2fedc6b..f440b1d9 100644 --- a/src/main/java/rip/athena/client/gui/hud/HUDEditor.java +++ b/src/main/java/rip/athena/client/gui/hud/HUDEditor.java @@ -343,12 +343,12 @@ public class HUDEditor extends MinecraftMenuImpl implements DrawImpl { @Override 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 public int getStringWidth(String string) { - return (int) FontManager.baloo17.getStringWidth(string); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } @Override diff --git a/src/main/java/rip/athena/client/gui/notifications/Notification.java b/src/main/java/rip/athena/client/gui/notifications/Notification.java index c04ce4f3..bfd86db2 100644 --- a/src/main/java/rip/athena/client/gui/notifications/Notification.java +++ b/src/main/java/rip/athena/client/gui/notifications/Notification.java @@ -50,7 +50,7 @@ public class Notification { } 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 height = 20; @@ -84,7 +84,7 @@ public class Notification { float textOutDelta = delta = getDeltaByTime(2500, 1500); 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); drawRect(x - width, y, x, y - height, BACKGROUND_COLOR); drawRect(x - width + 2, y - 2, x - width, y - 2 - height + 4, LINE_COLOR); diff --git a/src/main/java/rip/athena/client/modules/impl/render/ArmorStatus.java b/src/main/java/rip/athena/client/modules/impl/render/ArmorStatus.java index 596c2a7b..c7aa5437 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/ArmorStatus.java +++ b/src/main/java/rip/athena/client/modules/impl/render/ArmorStatus.java @@ -169,8 +169,8 @@ public class ArmorStatus extends Module { : maxDamage > 0 ? 20 : 16)), (float) (xdraw + posY + 5), valueColor.getRGB()); } else { - width = (int) FontManager.baloo17.getStringWidth(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay)); - FontManager.baloo17.drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay), (int) (posX - 3 + width = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay)); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay), (int) (posX - 3 + (leftRight.equalsIgnoreCase("Left") ? maxDamage > 0 ? armorstatuswidth - width - 21 : armorstatuswidth - width - 21 : maxDamage > 0 ? 20 : 16)), @@ -215,8 +215,8 @@ public class ArmorStatus extends Module { + (leftRight.equalsIgnoreCase("Left") ? (armorstatuswidth) - width - 21 : 20)), (float) (xdraw + posY + 5), valueColor.getRGB()); } else { - width = (int) FontManager.baloo17.getStringWidth(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay)); - FontManager.baloo17.drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay), + width = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay)); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDisplay), (int) (posX - 3 + (leftRight.equalsIgnoreCase("Left") ? (armorstatuswidth) - width - 21 : 20)), (int) (xdraw + posY + 1), valueColor.getRGB()); @@ -270,8 +270,8 @@ public class ArmorStatus extends Module { color = ""; } if (this.customFont) { - width = (int) FontManager.baloo17.getStringWidth(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw)); - FontManager.baloo17.drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw), (int) (posX + ydraw + 16), (int) (posY + 1), + width = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw)); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw), (int) (posX + ydraw + 16), (int) (posY + 1), valueColor.getRGB()); } else { mc.fontRendererObj.drawStringWithShadow(color + toDraw, (float) (posX + ydraw + 18), @@ -305,8 +305,8 @@ public class ArmorStatus extends Module { color = ""; } if (this.customFont) { - width = (int) FontManager.baloo17.getStringWidth(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw)); - FontManager.baloo17.drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw), (int) (posX + ydraw + 15), (int) (posY + 1), + width = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw)); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(EnumChatFormatting.getTextWithoutFormattingCodes(toDraw), (int) (posX + ydraw + 15), (int) (posY + 1), valueColor.getRGB()); } else { mc.fontRendererObj.drawStringWithShadow(color + toDraw, (float) (posX + ydraw + 18), diff --git a/src/main/java/rip/athena/client/modules/impl/render/CPS.java b/src/main/java/rip/athena/client/modules/impl/render/CPS.java index 07aceca3..a22e2960 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/CPS.java +++ b/src/main/java/rip/athena/client/modules/impl/render/CPS.java @@ -10,6 +10,7 @@ import rip.athena.client.modules.Category; import rip.athena.client.modules.Module; import rip.athena.client.utils.ClickCounter; import rip.athena.client.utils.render.DrawUtils; +import rip.athena.client.utils.render.RoundedUtils; import java.awt.*; @@ -80,8 +81,8 @@ public class CPS extends Module { if(backGround) { 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()); - 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(), hud.getY(), hud.getX() + width, hud.getY() + height, 12.0f, new Color(50, 50, 50, 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 { 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; 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); if(isUsingStaticChroma) { @@ -100,7 +101,7 @@ public class CPS extends Module { } else if(isUsingWaveChroma) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY + 1, false, true); } 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 { hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16); diff --git a/src/main/java/rip/athena/client/modules/impl/render/Clock.java b/src/main/java/rip/athena/client/modules/impl/render/Clock.java index 21f1d3fc..0ce8129b 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Clock.java +++ b/src/main/java/rip/athena/client/modules/impl/render/Clock.java @@ -73,7 +73,7 @@ public class Clock extends Module { GL11.glPushMatrix(); int stringWidth = 0; if(customFont) { - stringWidth = (int) FontManager.baloo17.getStringWidth(string); + stringWidth = (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(string); } else { stringWidth = mc.fontRendererObj.getStringWidth(string); } @@ -95,7 +95,7 @@ public class Clock extends Module { float posX = hud.getX() + 9; 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); if(isUsingStaticChroma) { @@ -103,7 +103,7 @@ public class Clock extends Module { } else if(isUsingWaveChroma) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true); } 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 { hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16); diff --git a/src/main/java/rip/athena/client/modules/impl/render/Coordinates.java b/src/main/java/rip/athena/client/modules/impl/render/Coordinates.java index 7bae5c06..8577d5e9 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Coordinates.java +++ b/src/main/java/rip/athena/client/modules/impl/render/Coordinates.java @@ -315,7 +315,7 @@ public class Coordinates extends Module { public int getStringWidth(String text) { if (this.customFont) { - return (int) FontManager.baloo17.getStringWidth(text); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text); } else { 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) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, text, (int) posX, (int) posY - 2, false, true); } 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 { if (color.getBlue() == 5 && color.getRed() == 5 && color.getGreen() == 5) { diff --git a/src/main/java/rip/athena/client/modules/impl/render/CustomText.java b/src/main/java/rip/athena/client/modules/impl/render/CustomText.java index 934c20bd..f7bec3aa 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/CustomText.java +++ b/src/main/java/rip/athena/client/modules/impl/render/CustomText.java @@ -82,7 +82,7 @@ public class CustomText extends Module { float posX = hud.getX() + 9; 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); if(isUsingStaticChroma) { @@ -90,7 +90,7 @@ public class CustomText extends Module { } else if(isUsingWaveChroma) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, customText, (int) (posX), (int) posY + 1, false, true); } 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 { hud.setWidth(mc.fontRendererObj.getStringWidth(customText) + 16); diff --git a/src/main/java/rip/athena/client/modules/impl/render/EntityHUD.java b/src/main/java/rip/athena/client/modules/impl/render/EntityHUD.java index 2f579e74..ecabb179 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/EntityHUD.java +++ b/src/main/java/rip/athena/client/modules/impl/render/EntityHUD.java @@ -83,7 +83,7 @@ public class EntityHUD extends Module { float posX = hud.getX() + 9; 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); if(isUsingStaticChroma) { @@ -91,7 +91,7 @@ public class EntityHUD extends Module { } else if(isUsingWaveChroma) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true); } 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 { hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16); diff --git a/src/main/java/rip/athena/client/modules/impl/render/FPSMod.java b/src/main/java/rip/athena/client/modules/impl/render/FPSMod.java index fdfbe3bd..a4f0e3d3 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/FPSMod.java +++ b/src/main/java/rip/athena/client/modules/impl/render/FPSMod.java @@ -89,7 +89,7 @@ public class FPSMod extends Module { float posX = hud.getX() + 9; 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); if(isUsingStaticChroma) { @@ -97,8 +97,8 @@ public class FPSMod extends Module { } else if(isUsingWaveChroma) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY + 1, false, true); } else { - rip.athena.client.utils.font.FontManager.getPoppinsRegular(20).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.getPoppinsRegular(25).drawString(string,(int) (posX), (int)posY + 3, color.getRGB()); + //rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(string,(int) (posX), (int)posY + 1, color.getRGB()); } } else { hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16); diff --git a/src/main/java/rip/athena/client/modules/impl/render/Keystrokes.java b/src/main/java/rip/athena/client/modules/impl/render/Keystrokes.java index 5eb94a4b..fe1ffa89 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/Keystrokes.java +++ b/src/main/java/rip/athena/client/modules/impl/render/Keystrokes.java @@ -339,7 +339,7 @@ public class Keystrokes extends Module { public int getStringWidth(String text) { if (this.isCustomFont) { - return (int) FontManager.baloo17.getStringWidth(text); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text); } else { return (int) mc.fontRendererObj.getStringWidth(text); } @@ -347,7 +347,7 @@ public class Keystrokes extends Module { public int getStringHeight(String text) { if (this.isCustomFont) { - return (int) FontManager.baloo17.getStringWidth(text); + return (int) rip.athena.client.utils.font.FontManager.getProductSansRegular(30).width(text); } else { return mc.fontRendererObj.getStringWidth(text); } @@ -360,7 +360,7 @@ public class Keystrokes extends Module { } else if (isUsingWaveChroma) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, text, (int)posX + 1, (int)posY, false, true); } 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 { if (isUsingStaticChroma) { diff --git a/src/main/java/rip/athena/client/modules/impl/render/MemoryUsage.java b/src/main/java/rip/athena/client/modules/impl/render/MemoryUsage.java index bfd6d871..74d5d62d 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/MemoryUsage.java +++ b/src/main/java/rip/athena/client/modules/impl/render/MemoryUsage.java @@ -100,7 +100,7 @@ public class MemoryUsage extends Module { float posX = hud.getX() + 9; 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); if(isUsingStaticChroma) { @@ -108,7 +108,7 @@ public class MemoryUsage extends Module { } else if(isUsingWaveChroma) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, string, (int) (posX), (int) posY, false, true); } 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 { hud.setWidth(mc.fontRendererObj.getStringWidth(string) + 16); diff --git a/src/main/java/rip/athena/client/modules/impl/render/PotCounter.java b/src/main/java/rip/athena/client/modules/impl/render/PotCounter.java index 0fb01629..361e196a 100644 --- a/src/main/java/rip/athena/client/modules/impl/render/PotCounter.java +++ b/src/main/java/rip/athena/client/modules/impl/render/PotCounter.java @@ -107,7 +107,7 @@ public class PotCounter extends Module { float posX = hud.getX() + 9; 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)); if(isUsingStaticChroma) { @@ -115,7 +115,7 @@ public class PotCounter extends Module { } else if (isUsingWaveChroma) { DrawUtils.drawCustomFontChromaString(FontManager.baloo17, str, (int) posX, (int) posY + 1, false, true); } 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 { hud.setWidth(mc.fontRendererObj.getStringWidth(str) + 16); diff --git a/src/main/java/rip/athena/client/utils/render/HUDUtil.java b/src/main/java/rip/athena/client/utils/render/HUDUtil.java index 1a3abbb2..e713fd42 100644 --- a/src/main/java/rip/athena/client/utils/render/HUDUtil.java +++ b/src/main/java/rip/athena/client/utils/render/HUDUtil.java @@ -55,7 +55,7 @@ public class HUDUtil { String tmp = String.valueOf(letter); 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); } else { mc.fontRendererObj.drawString(tmp, (int) xTmp, (int) y, i); @@ -66,7 +66,7 @@ public class HUDUtil { } if(customFont) { - FontManager.baloo17.drawString(message, x, y, c); + rip.athena.client.utils.font.FontManager.getProductSansRegular(30).drawString(message, x, y, c); } else { mc.fontRendererObj.drawString(message, x, y, c, false); } diff --git a/workspace/hs_err_pid11804.log b/workspace/hs_err_pid11804.log new file mode 100644 index 00000000..990e1ba4 --- /dev/null +++ b/workspace/hs_err_pid11804.log @@ -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:: (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 (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 (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 (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 (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 (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 (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 (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 (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 (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 (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) + diff --git a/workspace/logs/2023-06-08-1.log.gz b/workspace/logs/2023-06-08-1.log.gz new file mode 100644 index 00000000..b69558b6 Binary files /dev/null and b/workspace/logs/2023-06-08-1.log.gz differ diff --git a/workspace/logs/2023-06-08-2.log.gz b/workspace/logs/2023-06-08-2.log.gz new file mode 100644 index 00000000..f5082069 Binary files /dev/null and b/workspace/logs/2023-06-08-2.log.gz differ diff --git a/workspace/logs/2023-06-08-3.log.gz b/workspace/logs/2023-06-08-3.log.gz new file mode 100644 index 00000000..fe57a593 Binary files /dev/null and b/workspace/logs/2023-06-08-3.log.gz differ diff --git a/workspace/logs/latest.log b/workspace/logs/latest.log new file mode 100644 index 00000000..275050bf --- /dev/null +++ b/workspace/logs/latest.log @@ -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]: dsfsdfsdfdf +[10:49:06] [Client thread/INFO]: [CHAT] dsfsdfsdfdf +[10:49:06] [Server thread/INFO]: dsfsdfsdfdf +[10:49:06] [Client thread/INFO]: [CHAT] dsfsdfsdfdf +[10:49:07] [Server thread/INFO]: dsfsdfsdfdf +[10:49:07] [Client thread/INFO]: [CHAT] dsfsdfsdfdf +[10:49:07] [Server thread/INFO]: dsfsdfsdfdf +[10:49:07] [Client thread/INFO]: [CHAT] dsfsdfsdfdf +[10:49:07] [Server thread/INFO]: dsfsdfsdfdf +[10:49:07] [Client thread/INFO]: [CHAT] 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 diff --git a/workspace/options.txt b/workspace/options.txt index 935f3791..e00536e7 100644 --- a/workspace/options.txt +++ b/workspace/options.txt @@ -1,7 +1,7 @@ invertYMouse:false mouseSensitivity:0.15492958 fov:0.0 -gamma:0.0 +gamma:1.0 saturation:0.0 renderDistance:8 guiScale:2 @@ -11,9 +11,9 @@ anaglyph3d:false maxFps:260 fboEnable:true difficulty:2 -fancyGraphics:false -ao:0 -renderClouds:fast +fancyGraphics:true +ao:2 +renderClouds:true resourcePacks:[] incompatibleResourcePacks:[] lastServer: diff --git a/workspace/optionsof.txt b/workspace/optionsof.txt index 4dbcbaea..87fb9772 100644 --- a/workspace/optionsof.txt +++ b/workspace/optionsof.txt @@ -32,7 +32,7 @@ ofLagometer:false ofShowFps:false ofAutoSaveTicks:4000 ofBetterGrass:3 -ofConnectedTextures:2 +ofConnectedTextures:3 ofWeather:true ofSky:true ofStars:true @@ -42,8 +42,8 @@ ofChunkUpdates:1 ofChunkUpdatesDynamic:false ofTime:0 ofClearWater:false -ofAaLevel:0 -ofAfLevel:1 +ofAaLevel:16 +ofAfLevel:8 ofProfiler:false ofBetterSnow:false ofSwampColors:true diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Mineshaft.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Mineshaft.dat new file mode 100644 index 00000000..b769a1f7 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Mineshaft.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Stronghold.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Stronghold.dat new file mode 100644 index 00000000..a3b9cfbd Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Stronghold.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Temple.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Temple.dat new file mode 100644 index 00000000..839d30aa Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Temple.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Village.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Village.dat new file mode 100644 index 00000000..d2f6a416 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/Village.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages.dat new file mode 100644 index 00000000..d07207fb Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages_end.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages_end.dat new file mode 100644 index 00000000..d07207fb Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages_end.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages_nether.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages_nether.dat new file mode 100644 index 00000000..d07207fb Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/data/villages_nether.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat new file mode 100644 index 00000000..afc8e552 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat_mcr b/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat_mcr new file mode 100644 index 00000000..547ef567 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat_mcr differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat_old b/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat_old new file mode 100644 index 00000000..36477ebc Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/level.dat_old differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/5d4844c1-110f-375f-8c73-6803b7a61e5d.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/5d4844c1-110f-375f-8c73-6803b7a61e5d.dat new file mode 100644 index 00000000..91208b87 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/5d4844c1-110f-375f-8c73-6803b7a61e5d.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/777409db-46bf-31bf-844f-6d600c083d6c.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/777409db-46bf-31bf-844f-6d600c083d6c.dat new file mode 100644 index 00000000..73c86e12 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/777409db-46bf-31bf-844f-6d600c083d6c.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/b84ce5d9-353d-370c-a2cf-b4a66513f5a8.dat b/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/b84ce5d9-353d-370c-a2cf-b4a66513f5a8.dat new file mode 100644 index 00000000..1468d111 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/playerdata/b84ce5d9-353d-370c-a2cf-b4a66513f5a8.dat differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.-1.mca b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.-1.mca new file mode 100644 index 00000000..f548693f Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.-1.mca differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.0.mca b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.0.mca new file mode 100644 index 00000000..7a18a1ac Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.0.mca differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.1.mca b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.1.mca new file mode 100644 index 00000000..99b27f20 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-1.1.mca differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-2.0.mca b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-2.0.mca new file mode 100644 index 00000000..94c5ebf6 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.-2.0.mca differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.-1.mca b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.-1.mca new file mode 100644 index 00000000..db2ba604 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.-1.mca differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.0.mca b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.0.mca new file mode 100644 index 00000000..ce4fe567 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.0.mca differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.1.mca b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.1.mca new file mode 100644 index 00000000..4c98acb4 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.0.1.mca differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.1.0.mca b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.1.0.mca new file mode 100644 index 00000000..191fd79e Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/region/r.1.0.mca differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/session.lock b/workspace/saves/Copy of Copy of mcpworldppdsa_/session.lock new file mode 100644 index 00000000..35bcdda7 Binary files /dev/null and b/workspace/saves/Copy of Copy of mcpworldppdsa_/session.lock differ diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/5d4844c1-110f-375f-8c73-6803b7a61e5d.json b/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/5d4844c1-110f-375f-8c73-6803b7a61e5d.json new file mode 100644 index 00000000..c590de26 --- /dev/null +++ b/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/5d4844c1-110f-375f-8c73-6803b7a61e5d.json @@ -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} \ No newline at end of file diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/777409db-46bf-31bf-844f-6d600c083d6c.json b/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/777409db-46bf-31bf-844f-6d600c083d6c.json new file mode 100644 index 00000000..a66e6b32 --- /dev/null +++ b/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/777409db-46bf-31bf-844f-6d600c083d6c.json @@ -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} \ No newline at end of file diff --git a/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/b84ce5d9-353d-370c-a2cf-b4a66513f5a8.json b/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/b84ce5d9-353d-370c-a2cf-b4a66513f5a8.json new file mode 100644 index 00000000..6416c536 --- /dev/null +++ b/workspace/saves/Copy of Copy of mcpworldppdsa_/stats/b84ce5d9-353d-370c-a2cf-b4a66513f5a8.json @@ -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"]}} \ No newline at end of file diff --git a/workspace/saves/Copy of mcpworldpp/session.lock b/workspace/saves/Copy of mcpworldpp/session.lock index 7229f69c..87e7d5df 100644 Binary files a/workspace/saves/Copy of mcpworldpp/session.lock and b/workspace/saves/Copy of mcpworldpp/session.lock differ diff --git a/workspace/settings/configs/default.json b/workspace/settings/configs/default.json index b13340d1..a3f6ade6 100644 --- a/workspace/settings/configs/default.json +++ b/workspace/settings/configs/default.json @@ -42,7 +42,7 @@ "CPS": { "settings": { "Static Chroma": false, - "Background": true, + "Background": false, "Custom Font": true, "Wave Chroma": false, "Color": { @@ -63,12 +63,12 @@ "bind": 0, "hud": {"cps": { "visible": true, - "x": 71, - "y": 175, + "x": 370, + "y": 286, "scale": 1 }}, "bindtype": "Toggle", - "enabled": true + "enabled": false }, "Crosshair": { "settings": { @@ -110,12 +110,12 @@ "bind": 0, "hud": {"fps": { "visible": true, - "x": 5, - "y": 175, + "x": 483, + "y": 316, "scale": 1 }}, "bindtype": "Toggle", - "enabled": true + "enabled": false }, "Block Overlay": { "settings": { @@ -126,8 +126,8 @@ "blue": 255, "alpha": 255 }, - "Line Width": 1, - "Mode": "Outline", + "Line Width": 5.5, + "Mode": "Both", "Highlight Color": { "red": 0, "green": 0, @@ -137,38 +137,7 @@ }, "bind": 0, "hud": {}, - "bindtype": "Toggle", - "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", + "bindtype": "Hold", "enabled": false }, "Clock": { @@ -195,20 +164,19 @@ "bind": 0, "hud": {"time": { "visible": true, - "x": 1, - "y": 190, + "x": 443, + "y": 150, "scale": 1 }}, "bindtype": "Toggle", "enabled": false }, - "Memory usage": { + "Custom Text": { "settings": { "Static Chroma": false, - "Background": true, "Custom Font": false, + "Background": true, "Wave Chroma": false, - "Percentage": false, "Color": { "red": 255, "green": 255, @@ -219,15 +187,16 @@ "red": 0, "green": 0, "blue": 0, - "alpha": 150 + "alpha": 153 }, - "Display Mode": "Modern" + "Display Mode": "Modern", + "Custom Text": "Penis" }, "bind": 0, - "hud": {"memory usage": { + "hud": {"customtext": { "visible": true, - "x": 1, - "y": 175, + "x": 648, + "y": 260, "scale": 1 }}, "bindtype": "Toggle", @@ -263,6 +232,37 @@ "bindtype": "Toggle", "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": { "settings": { "Value Display": "Value Damage", @@ -281,13 +281,13 @@ }, "bind": 0, "hud": {"armorstatus": { - "visible": true, + "visible": false, "x": 0, - "y": 200, + "y": 346, "scale": 1 }}, "bindtype": "Toggle", - "enabled": true + "enabled": false }, "Chat": { "settings": {"Custom Font": false}, @@ -325,20 +325,12 @@ "bindtype": "Toggle", "enabled": false }, - "macros": [ - { - "name": "test", - "command": "dsfsdfsdfdf", - "key": 34, - "enabled": true - }, - { - "name": "sdfsadfsdf", - "command": "sdfsdf", - "key": 33, - "enabled": true - } - ], + "macros": [{ + "name": "test", + "command": "dsfsdfsdfdf", + "key": 34, + "enabled": true + }], "Coordinates": { "settings": { "Show Compass": true, @@ -386,8 +378,8 @@ "bind": 0, "hud": {"coordinates": { "visible": true, - "x": 0, - "y": 150, + "x": 119, + "y": 138, "scale": 1 }}, "bindtype": "Toggle", @@ -423,8 +415,8 @@ "bind": 0, "hud": {"entityhud": { "visible": true, - "x": 1, - "y": 175, + "x": 826, + "y": 86, "scale": 1 }}, "bindtype": "Toggle", @@ -473,7 +465,7 @@ "hud": {"keystrokes": { "visible": true, "x": 0, - "y": 120, + "y": 18, "scale": 1 }}, "bindtype": "Toggle", @@ -492,7 +484,18 @@ "bind": 0, "hud": {}, "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": { "settings": { @@ -511,31 +514,20 @@ "red": 0, "green": 0, "blue": 0, - "alpha": 150 + "alpha": 153 }, "Display Mode": "Modern" }, "bind": 0, "hud": {"potioncounter": { "visible": true, - "x": 1, - "y": 200, + "x": 657, + "y": 150, "scale": 1 }}, "bindtype": "Toggle", "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": { "settings": {"Blur Amount": 2}, "bind": 0, diff --git a/workspace/usercache.json b/workspace/usercache.json index 23a3e8aa..46876701 100644 --- a/workspace/usercache.json +++ b/workspace/usercache.json @@ -1,5 +1 @@ -<<<<<<< HEAD -[{"name":"Player901","uuid":"fcaa91cc-3a77-3318-a8ae-f2f3862b7fde","expiresOn":"2023-07-08 07:52:28 +0200"},{"name":"Player86","uuid":"811b757c-1be5-33cf-864a-fb91beb14990","expiresOn":"2023-07-03 21:47:43 +0200"},{"name":"Player650","uuid":"19f51a77-b6fb-3469-a8b6-228ec5ce5961","expiresOn":"2023-07-04 21:56:20 +0200"},{"name":"Player378","uuid":"0a5e4ff0-6099-36b5-b64d-a84ffa9f1f72","expiresOn":"2023-07-04 19:57:34 +0200"},{"name":"Player897","uuid":"29b47250-4236-34ae-8b46-7341b800b727","expiresOn":"2023-07-02 22:01:45 +0200"},{"name":"Player970","uuid":"f2c5b984-5c4a-355c-800e-d2ce35cf8f1c","expiresOn":"2023-07-02 22:56:39 +0200"},{"name":"Player320","uuid":"77167de3-5df9-3c83-b06a-bed9a476e835","expiresOn":"2023-07-07 10:20:07 +0200"},{"name":"Player829","uuid":"4e1f5e28-f05f-3acf-ac65-db01d9d51f95","expiresOn":"2023-07-05 07:47:49 +0200"},{"name":"Player430","uuid":"5b6052a7-6bab-33d6-92c2-a3d77755ef06","expiresOn":"2023-07-04 22:05:05 +0200"},{"name":"Player273","uuid":"18b3a035-3e67-34ed-889e-932160306e4f","expiresOn":"2023-07-02 16:57:48 +0200"},{"name":"Player353","uuid":"1e0b9d62-e071-33ba-b82e-1c564a46e2f0","expiresOn":"2023-07-02 23:00:42 +0200"},{"name":"Player100","uuid":"b63c1160-7834-3764-9276-2fb9c5acd6ce","expiresOn":"2023-07-02 22:16:49 +0200"},{"name":"Player536","uuid":"8cfc5391-e37d-328f-a689-9b5f6c4663f5","expiresOn":"2023-07-07 10:47:53 +0200"},{"name":"Player930","uuid":"eac293da-7d7d-3c6a-94e5-fba80de0212f","expiresOn":"2023-07-02 20:52:17 +0200"},{"name":"Player106","uuid":"b31fadf2-d5d5-36b6-a9c6-26ad19735f31","expiresOn":"2023-07-05 09:49:36 +0200"},{"name":"Player758","uuid":"92f8a523-1476-36c1-a74b-ef7c8b1d0bfd","expiresOn":"2023-07-02 21:35:50 +0200"},{"name":"Player482","uuid":"a692389e-9f43-3e66-84db-bbfe94bd70db","expiresOn":"2023-07-04 18:27:43 +0200"},{"name":"Player818","uuid":"84e9e4f6-df8d-3fc9-b2c7-0eb3b9531d39","expiresOn":"2023-07-04 00:09:19 +0200"},{"name":"Player770","uuid":"78b89d61-eeb6-339b-a649-bd65ff29a266","expiresOn":"2023-07-07 10:03:52 +0200"},{"name":"Player808","uuid":"6e05ecd8-b367-3929-8021-d89bbb1d2225","expiresOn":"2023-07-04 19:36:14 +0200"},{"name":"Player547","uuid":"20c1711e-6e1a-34df-86a3-92ae832d2f9f","expiresOn":"2023-07-04 11:17:24 +0200"},{"name":"Player265","uuid":"e2fd3051-a7ee-3ec9-ae1f-a1b6240b0501","expiresOn":"2023-07-02 09:25:25 +0200"},{"name":"Player973","uuid":"dea644e0-8ac5-3c66-a811-a50bdc003ad8","expiresOn":"2023-07-04 19:50:50 +0200"},{"name":"Player745","uuid":"6b411cc5-cb23-3aef-b8b1-6cb73d96a2d5","expiresOn":"2023-07-02 21:39:54 +0200"},{"name":"Player952","uuid":"fef5996a-ff47-30bf-9025-1401c61fa24d","expiresOn":"2023-07-07 07:52:56 +0200"},{"name":"Player270","uuid":"e122e0b0-374f-3b1b-a986-63f4fefee57a","expiresOn":"2023-07-02 19:21:11 +0200"},{"name":"Player288","uuid":"3d9ab571-1ea5-360b-bc9d-77cd0b2f72a9","expiresOn":"2023-07-01 21:53:28 +0200"},{"name":"Player600","uuid":"c0f25d98-743c-364e-a2cd-82567612d750","expiresOn":"2023-07-04 19:37:54 +0200"},{"name":"Player136","uuid":"f4642d2b-29f9-34b7-8b90-e6570e856434","expiresOn":"2023-07-02 10:45:25 +0200"},{"name":"Player991","uuid":"fe171829-6121-3106-a1a5-6a3600a4ef7d","expiresOn":"2023-07-07 07:55:06 +0200"},{"name":"Player392","uuid":"61902a9a-ee57-3dbe-9983-6580939e802a","expiresOn":"2023-07-02 12:15:28 +0200"},{"name":"Player444","uuid":"b136c8aa-0654-3583-8db1-8749e12181a1","expiresOn":"2023-07-04 17:48:55 +0200"},{"name":"Player251","uuid":"c9700ac2-fb69-36ca-b322-09edfc5786fb","expiresOn":"2023-07-04 12:35:12 +0200"},{"name":"Player442","uuid":"39ce36e8-f4b8-3b30-a1f4-bfdbbc990254","expiresOn":"2023-07-04 21:57:48 +0200"},{"name":"Player855","uuid":"38ee4029-e397-3902-8d79-d6c4d51a8fef","expiresOn":"2023-07-04 22:02:10 +0200"},{"name":"Player788","uuid":"596302c2-a8ac-3ac1-b055-653042871aa0","expiresOn":"2023-07-07 09:11:44 +0200"},{"name":"Player562","uuid":"37815b4b-a277-3e88-89c9-687629f7c447","expiresOn":"2023-07-02 19:01:17 +0200"},{"name":"Player913","uuid":"90ee7131-905c-3e5a-b4c0-60424db8bd36","expiresOn":"2023-07-04 15:45:51 +0200"},{"name":"Player714","uuid":"0cad2f47-2665-3067-89f3-6434c639de1f","expiresOn":"2023-07-03 21:53:26 +0200"},{"name":"Player143","uuid":"241b8068-7327-314d-abe2-ee7690220b50","expiresOn":"2023-07-03 23:04:24 +0200"},{"name":"Player428","uuid":"e456eb14-598b-334f-9a18-0f7f93a2858c","expiresOn":"2023-07-04 22:06:08 +0200"},{"name":"Player537","uuid":"44915209-9814-3995-87c7-f4dc48b55294","expiresOn":"2023-07-07 11:16:47 +0200"},{"name":"Player421","uuid":"17b67947-156d-3518-9500-f7e04df5e64d","expiresOn":"2023-07-07 08:44:28 +0200"},{"name":"Player948","uuid":"2dd1d9e7-57ae-36c4-8b90-c235b1bdb90f","expiresOn":"2023-07-04 18:03:26 +0200"},{"name":"Player664","uuid":"b4af1ef6-4402-3592-bf8a-f26295105c46","expiresOn":"2023-07-04 17:49:17 +0200"},{"name":"Player787","uuid":"79f8754e-14dd-38b7-8860-09cab9cfb920","expiresOn":"2023-07-02 16:32:33 +0200"},{"name":"Player709","uuid":"ae379d70-8745-301c-b874-9ae51df0fbbc","expiresOn":"2023-07-04 19:43:39 +0200"},{"name":"Player439","uuid":"5a8b675a-352f-385b-94f4-369e3f70aa83","expiresOn":"2023-07-04 17:43:24 +0200"},{"name":"Player917","uuid":"99c5cfd7-706e-3304-b77d-748a9e6aeb44","expiresOn":"2023-07-04 21:52:34 +0200"},{"name":"Player116","uuid":"dfdc5dbd-4a0e-3b6a-a815-601a03741434","expiresOn":"2023-07-03 21:06:42 +0200"},{"name":"Player342","uuid":"56a50a28-2026-3b27-8279-243e3ff82a5a","expiresOn":"2023-07-04 20:04:04 +0200"},{"name":"Player710","uuid":"28507737-102c-35fd-ac17-02009db33c0a","expiresOn":"2023-07-02 09:36:13 +0200"},{"name":"Player207","uuid":"c5f2027d-c05b-3ad0-bbf1-20e3f4a553c8","expiresOn":"2023-07-04 12:26:40 +0200"},{"name":"Player910","uuid":"8610364c-1fe9-3801-96a1-4fb3dc123fc9","expiresOn":"2023-07-02 17:16:18 +0200"},{"name":"Player438","uuid":"ac813ddb-b155-3ee2-ab2a-d375fb559a6a","expiresOn":"2023-07-07 10:00:33 +0200"},{"name":"Player508","uuid":"69715e5e-1775-3a6c-8b64-1d82bcbbe688","expiresOn":"2023-07-02 16:53:31 +0200"},{"name":"Player694","uuid":"9a479c15-8100-309d-8c38-1d323bfdcf80","expiresOn":"2023-07-04 15:44:16 +0200"},{"name":"Player132","uuid":"5cc48495-676c-3721-aed2-7336730ff405","expiresOn":"2023-07-02 23:13:53 +0200"},{"name":"Player756","uuid":"393f993c-07f1-322f-8af5-e61da4aa15d9","expiresOn":"2023-07-02 11:25:49 +0200"},{"name":"Player382","uuid":"1b5803ef-dab8-3673-85ae-9a9160028e1f","expiresOn":"2023-07-02 11:38:22 +0200"},{"name":"Player953","uuid":"d75ffc85-72b0-3b94-be32-d104d89a3a6a","expiresOn":"2023-07-04 22:04:42 +0200"},{"name":"Player30","uuid":"e6ce70cd-b7cc-34be-b059-93e41d35480c","expiresOn":"2023-07-04 18:00:17 +0200"},{"name":"Player785","uuid":"122d3a74-28b3-3553-91d4-9092b640ce8e","expiresOn":"2023-07-07 10:27:11 +0200"},{"name":"Player820","uuid":"c89ac188-5207-3ca2-8ef0-ed700f7bdbef","expiresOn":"2023-07-02 23:35:15 +0200"},{"name":"Player804","uuid":"924198c2-2c42-36d7-958c-f259b1738969","expiresOn":"2023-07-02 17:08:22 +0200"},{"name":"Player338","uuid":"b5db5cb4-9b97-36ff-8827-c3d6087a4cc7","expiresOn":"2023-07-07 10:35:57 +0200"},{"name":"Player372","uuid":"b6529468-5313-3ea4-bc60-3e6ea6cabccd","expiresOn":"2023-07-01 22:10:43 +0200"},{"name":"Player257","uuid":"50e1ab02-92db-38bb-86bf-431939b828b5","expiresOn":"2023-07-02 18:17:49 +0200"},{"name":"Player306","uuid":"a08e137b-04fa-3fce-96cc-517c7a87690d","expiresOn":"2023-07-04 12:59:43 +0200"},{"name":"Player748","uuid":"05d2e66a-903f-3232-a8b0-3899ccc17800","expiresOn":"2023-07-04 18:08:21 +0200"},{"name":"Player620","uuid":"42468be1-4059-36e2-be82-cb1721e83191","expiresOn":"2023-07-02 17:19:52 +0200"},{"name":"Player368","uuid":"1c0e06f3-9808-3189-8407-cec21f7f6640","expiresOn":"2023-07-04 18:52:54 +0200"},{"name":"Player744","uuid":"aeca01bf-232e-37a2-985b-599827b3226a","expiresOn":"2023-07-02 20:19:08 +0200"},{"name":"Player535","uuid":"11827876-1185-3f24-850d-d0e7a71b9795","expiresOn":"2023-07-02 23:21:13 +0200"},{"name":"Player344","uuid":"337a131b-860d-346e-a281-649e07daeae5","expiresOn":"2023-07-02 17:36:01 +0200"},{"name":"Player734","uuid":"3f66a67c-db6c-36b7-b762-d7a40c17883b","expiresOn":"2023-07-04 20:41:07 +0200"},{"name":"Player982","uuid":"7d461d5d-f429-32b0-a043-0156fa837406","expiresOn":"2023-07-02 12:12:08 +0200"},{"name":"Player814","uuid":"777409db-46bf-31bf-844f-6d600c083d6c","expiresOn":"2023-07-02 18:05:17 +0200"},{"name":"Player312","uuid":"d566deca-6b21-32cb-af90-4edf09eeac2e","expiresOn":"2023-07-01 22:00:13 +0200"},{"name":"Player385","uuid":"1e3c9076-6029-36c6-8475-dd38d2030d5f","expiresOn":"2023-07-02 19:46:46 +0200"},{"name":"Player834","uuid":"446b6428-1dda-3773-8986-3a9e0deb6ae4","expiresOn":"2023-07-02 11:29:11 +0200"},{"name":"Player178","uuid":"b436a3b6-3bfd-34ab-a0ca-b7a09efebbdc","expiresOn":"2023-07-02 19:02:27 +0200"},{"name":"Player387","uuid":"3a8a4803-5263-381c-9fa0-2dc262c021aa","expiresOn":"2023-07-04 18:29:48 +0200"},{"name":"Player521","uuid":"88b1442b-3f7c-34cb-9b8b-19f2bae6b8af","expiresOn":"2023-07-04 15:25:46 +0200"},{"name":"Player43","uuid":"f16c07c2-b584-3cdf-b107-12544f991913","expiresOn":"2023-07-07 09:41:55 +0200"},{"name":"Player208","uuid":"a240c974-e4f5-311c-82e7-f92bb39b2584","expiresOn":"2023-07-02 23:32:08 +0200"},{"name":"Player771","uuid":"03825f5c-cf99-36d9-8f32-2c0adc70aba9","expiresOn":"2023-07-04 18:29:25 +0200"},{"name":"Player971","uuid":"f948ac75-0055-3be3-bc2b-d97345a02022","expiresOn":"2023-07-04 12:17:02 +0200"},{"name":"Player33","uuid":"80fb4b31-a429-3891-a185-827168eac297","expiresOn":"2023-07-04 15:21:41 +0200"},{"name":"Player198","uuid":"26d3a8a7-c365-3f1b-98bd-1e86d16aa724","expiresOn":"2023-07-07 09:52:56 +0200"},{"name":"Player592","uuid":"c1b94a42-98fc-3354-947f-44f786fd56fa","expiresOn":"2023-07-04 22:06:27 +0200"},{"name":"ziue","uuid":"74e89738-6c9e-4f59-83ef-d365849e6049","expiresOn":"2023-07-04 22:08:05 +0200"},{"name":"Player247","uuid":"8900053b-f4fc-363a-959f-93166c198461","expiresOn":"2023-07-04 22:07:38 +0200"},{"name":"Player196","uuid":"5763de83-e0ac-32bb-9102-41b754fdcdbe","expiresOn":"2023-07-01 21:48:18 +0200"},{"name":"Player52","uuid":"73181018-6474-36f0-8722-c7fb6befd317","expiresOn":"2023-07-07 08:48:16 +0200"},{"name":"Player504","uuid":"eb08048d-a3b9-3008-984c-fcc8bb7d8893","expiresOn":"2023-07-02 19:25:01 +0200"},{"name":"Player743","uuid":"9dc90764-797e-30c6-bac3-354c01806f0d","expiresOn":"2023-07-02 19:30:28 +0200"},{"name":"Player238","uuid":"af06bbec-ad1a-3c08-8bc5-9803d5e75131","expiresOn":"2023-07-07 10:48:40 +0200"},{"name":"Player328","uuid":"e5a660b6-9d51-36ee-858e-f73e02a3f36f","expiresOn":"2023-07-04 17:58:56 +0200"},{"name":"Player253","uuid":"326096ef-db00-3744-84c9-0b71611a13c5","expiresOn":"2023-07-02 13:53:37 +0200"},{"name":"Player7","uuid":"f9567117-2555-3219-a3d6-01de0ddd7332","expiresOn":"2023-07-02 19:26:43 +0200"},{"name":"Player933","uuid":"bfc5c6f8-886e-30ef-aac9-4df3c4277f54","expiresOn":"2023-07-07 09:53:35 +0200"},{"name":"Player494","uuid":"3e59bd01-5286-3f1f-b563-8ee24767718b","expiresOn":"2023-07-02 11:26:28 +0200"},{"name":"Player685","uuid":"4f2b9d55-5b3e-32ee-ad58-c8df44a23337","expiresOn":"2023-07-02 21:44:06 +0200"},{"name":"Player943","uuid":"2250da04-2be8-3508-9a2e-a09e550d0033","expiresOn":"2023-07-07 09:02:20 +0200"},{"name":"Player420","uuid":"f4755d8e-161a-3abe-8338-935e4189097a","expiresOn":"2023-07-02 13:03:11 +0200"},{"name":"Player548","uuid":"b89d12f3-1740-34c6-919e-a2949a3e81fe","expiresOn":"2023-07-02 12:43:12 +0200"},{"name":"Player983","uuid":"3959aa12-3a9d-3fc4-84ad-d0d3c7c6550b","expiresOn":"2023-07-02 17:07:49 +0200"},{"name":"Player367","uuid":"dcea94fd-efa4-3c29-93d8-2d56666245c7","expiresOn":"2023-07-04 17:00:07 +0200"},{"name":"Player936","uuid":"0ecc5f64-1f20-34a1-a889-f88d84dd36f3","expiresOn":"2023-07-04 13:32:46 +0200"},{"name":"Player847","uuid":"6004b361-ef29-34d2-b89c-32df237908c7","expiresOn":"2023-07-07 09:17:33 +0200"},{"name":"Player292","uuid":"e687d94c-f442-3ab7-a8a6-e1baf5dca36c","expiresOn":"2023-07-04 18:54:46 +0200"},{"name":"Player660","uuid":"fc1768ff-17ae-39e8-bef2-f3e0d98306ba","expiresOn":"2023-07-07 09:48:31 +0200"},{"name":"Player906","uuid":"f8a1463c-07b2-3433-918f-386b8accf0f1","expiresOn":"2023-07-04 17:56:13 +0200"},{"name":"Player540","uuid":"c2506432-c159-30c0-93d8-64f2a6272277","expiresOn":"2023-07-02 19:38:49 +0200"},{"name":"Player851","uuid":"ef840057-4261-321f-afc5-1f78d46c0c90","expiresOn":"2023-07-02 21:07:13 +0200"},{"name":"Player563","uuid":"1e92cadb-e057-30f8-a789-5ce10551ba1e","expiresOn":"2023-07-02 17:00:03 +0200"},{"name":"Player211","uuid":"da0854f1-946e-3e92-942a-afd6fa88ef77","expiresOn":"2023-07-01 22:05:04 +0200"},{"name":"Player204","uuid":"ac41f76c-b1dd-32f9-a5d3-3eb94da3e653","expiresOn":"2023-07-04 13:34:07 +0200"},{"name":"Player689","uuid":"e7f0f282-ec78-3bba-aaaf-9edc548f540d","expiresOn":"2023-07-07 10:11:20 +0200"},{"name":"Player124","uuid":"05d3c308-6531-310d-988c-a6164eaf800d","expiresOn":"2023-07-04 19:39:28 +0200"},{"name":"Player780","uuid":"6dc954f4-181a-3c6c-99e2-951f7202b4c5","expiresOn":"2023-07-02 19:34:11 +0200"},{"name":"Player308","uuid":"6db1171d-4fa6-31cb-b425-1896281a26e2","expiresOn":"2023-07-01 21:54:43 +0200"},{"name":"Player371","uuid":"184a029e-ad3d-3abd-8a1a-c044d35081d5","expiresOn":"2023-07-01 21:56:38 +0200"},{"name":"Player637","uuid":"3e97bd98-3fed-36a5-a2b2-bf93d544eeed","expiresOn":"2023-07-02 11:36:38 +0200"},{"name":"Player965","uuid":"2797ecaf-07ab-3788-a2f8-6002cfc50e1d","expiresOn":"2023-07-02 14:07:47 +0200"},{"name":"Player667","uuid":"336cdb69-b175-3ad2-a556-740278ca80ab","expiresOn":"2023-07-02 19:25:58 +0200"},{"name":"Player374","uuid":"80366950-5482-38de-842a-c4cdd5802ec2","expiresOn":"2023-07-04 12:25:51 +0200"},{"name":"Player773","uuid":"b7a940e4-3cde-3275-9c73-2f71fe593c98","expiresOn":"2023-07-02 12:11:14 +0200"},{"name":"Player277","uuid":"0d3f56a3-2b3f-38d6-a849-9d61b8f97a5c","expiresOn":"2023-07-02 23:03:56 +0200"},{"name":"Player90","uuid":"e5bad5ae-87fa-3676-b10f-8a571200822c","expiresOn":"2023-07-04 22:09:28 +0200"},{"name":"Player243","uuid":"6554aa36-758b-3cee-a8f7-555b71fa0c55","expiresOn":"2023-07-07 10:46:37 +0200"},{"name":"Player516","uuid":"492dc575-b72e-3d83-b2fd-33ab63727150","expiresOn":"2023-07-04 11:39:01 +0200"},{"name":"Player8","uuid":"fbf616a3-396f-3061-9319-5553e1ce264f","expiresOn":"2023-07-07 08:39:32 +0200"},{"name":"Player683","uuid":"e10ba356-0952-343e-8ccb-a3b6e69bf75e","expiresOn":"2023-07-02 23:26:36 +0200"},{"name":"Player907","uuid":"b5b2ff24-9e23-373f-97d2-19884357bdea","expiresOn":"2023-07-04 21:45:45 +0200"},{"name":"Player920","uuid":"ad8236b9-e26f-349c-902e-7100197cd86d","expiresOn":"2023-07-07 08:59:56 +0200"},{"name":"Player591","uuid":"3c7cef0c-c4d3-3eb2-a04d-c369cce398ef","expiresOn":"2023-07-03 21:38:40 +0200"},{"name":"Player122","uuid":"9f706b9c-a5d7-3950-a693-97c335e2631f","expiresOn":"2023-07-02 20:13:44 +0200"},{"name":"Player297","uuid":"04aedfc4-153f-3d65-bb99-866996994a71","expiresOn":"2023-07-02 19:10:52 +0200"},{"name":"Player711","uuid":"8878ef4a-de27-32df-b636-12a0a607ca5d","expiresOn":"2023-07-02 21:24:26 +0200"},{"name":"Player853","uuid":"93122710-9b50-34d0-8726-c7db8c850b07","expiresOn":"2023-07-02 23:23:55 +0200"},{"name":"Player569","uuid":"ae93e61c-5484-3859-844d-955ead0489d9","expiresOn":"2023-07-07 10:03:07 +0200"},{"name":"Player542","uuid":"ca200422-e977-3e4c-ad0b-8fd2f35df23f","expiresOn":"2023-07-07 10:28:06 +0200"},{"name":"Player397","uuid":"dcba42c1-27a4-3c10-af01-648a8cbd49eb","expiresOn":"2023-07-04 20:07:21 +0200"},{"name":"Player502","uuid":"1c6ab893-c8be-3ad8-a14c-5cafcb89dfd5","expiresOn":"2023-07-04 22:07:53 +0200"},{"name":"Player712","uuid":"e4358028-bc3b-38cc-b645-4d08d3b4f456","expiresOn":"2023-07-02 23:12:00 +0200"},{"name":"Player294","uuid":"132512aa-0146-35c4-8d7a-8445da21ff87","expiresOn":"2023-07-04 17:48:21 +0200"},{"name":"Player671","uuid":"41196538-4c2b-371d-b141-0e51ad033fac","expiresOn":"2023-07-02 13:23:27 +0200"},{"name":"Player370","uuid":"5db36629-721d-3a36-8728-14b3ab112351","expiresOn":"2023-07-04 12:42:11 +0200"},{"name":"Player463","uuid":"6256f6e3-2e58-3651-998e-2564a0b2a631","expiresOn":"2023-07-04 17:28:40 +0200"},{"name":"Player478","uuid":"303505c1-798d-3df3-ab8d-6c701f3fe36a","expiresOn":"2023-07-04 19:33:16 +0200"},{"name":"Player93","uuid":"04ba6478-628e-32a2-915d-0b45ca8b366b","expiresOn":"2023-07-02 21:21:03 +0200"},{"name":"Player287","uuid":"483a9f6c-d89c-3cd9-9ee4-92f25a76c0c5","expiresOn":"2023-07-04 17:37:10 +0200"},{"name":"Player790","uuid":"2f0d3d8c-afbe-358f-b8f3-786d7b0f9259","expiresOn":"2023-07-02 11:30:41 +0200"},{"name":"Player67","uuid":"24a251d3-c89c-39ba-8cae-1f7d4c0691c9","expiresOn":"2023-07-01 21:51:52 +0200"},{"name":"Player517","uuid":"3fff7d86-24d6-33b1-8ce1-9423a13c7c89","expiresOn":"2023-07-04 17:58:03 +0200"},{"name":"Player889","uuid":"a205b8da-efc6-37ad-8e1d-84c0239cdd21","expiresOn":"2023-07-04 13:07:57 +0200"},{"name":"Player293","uuid":"738c48db-b050-3c6f-9053-5a4abfe0d0a6","expiresOn":"2023-07-02 20:09:30 +0200"},{"name":"Player905","uuid":"a498be5d-0142-3d23-a17c-8823a1cd27b0","expiresOn":"2023-07-02 21:41:12 +0200"},{"name":"Player843","uuid":"45c2c1e2-9dd4-3d62-8e53-82e2b4b32b4a","expiresOn":"2023-07-04 20:02:02 +0200"},{"name":"Player38","uuid":"f189da80-d431-3f80-9126-43ccee16f040","expiresOn":"2023-07-03 22:36:28 +0200"},{"name":"Player231","uuid":"0ef61a2a-d91b-37b4-a10d-af67b917d543","expiresOn":"2023-07-02 21:33:30 +0200"},{"name":"Player669","uuid":"b5079939-0881-3d3d-a86e-56223944774f","expiresOn":"2023-07-07 12:58:20 +0200"}] -======= -[{"name":"Player436","uuid":"01986ee6-ca3c-3b64-bdcd-02039da5963f","expiresOn":"2023-07-07 21:59:32 +0200"},{"name":"Player414","uuid":"408d12c9-559c-3212-bca5-d1a3fc38a0f7","expiresOn":"2023-07-07 17:05:56 +0200"},{"name":"Player789","uuid":"81ef6cf6-107d-35d0-bf6b-c2f04f3d07c4","expiresOn":"2023-07-07 18:50:02 +0200"},{"name":"Player143","uuid":"241b8068-7327-314d-abe2-ee7690220b50","expiresOn":"2023-07-07 16:25:00 +0200"},{"name":"Player279","uuid":"5c6d79ca-db3a-3a0a-8d04-9e811bde5c64","expiresOn":"2023-07-07 16:59:26 +0200"},{"name":"Player839","uuid":"66397f00-f974-3e3d-944b-5f58f7613e27","expiresOn":"2023-07-07 20:54:06 +0200"},{"name":"Player286","uuid":"ead290bb-bad9-36fc-b265-db734c4eb7d4","expiresOn":"2023-07-07 16:58:30 +0200"},{"name":"Player113","uuid":"387e1557-1e63-3242-8750-2853d61db146","expiresOn":"2023-07-07 16:52:08 +0200"},{"name":"Player654","uuid":"44e8d65a-a4b2-3c63-9ef0-950bb5685028","expiresOn":"2023-07-07 16:54:25 +0200"},{"name":"Player123","uuid":"3da1e349-17b0-38ed-a07b-1e78c8ebd956","expiresOn":"2023-07-07 16:40:27 +0200"},{"name":"Player439","uuid":"5a8b675a-352f-385b-94f4-369e3f70aa83","expiresOn":"2023-07-07 16:52:30 +0200"}] ->>>>>>> 4d90bcee11f7db413edf86afe5d05bfaa26ba40c +[{"name":"Player268","uuid":"b84ce5d9-353d-370c-a2cf-b4a66513f5a8","expiresOn":"2023-07-08 10:42:07 +0200"},{"name":"Player571","uuid":"5d4844c1-110f-375f-8c73-6803b7a61e5d","expiresOn":"2023-07-08 08:06:30 +0200"},{"name":"Player814","uuid":"777409db-46bf-31bf-844f-6d600c083d6c","expiresOn":"2023-07-08 09:47:50 +0200"}] \ No newline at end of file