diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScreen.java b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScreen.java index 704c357a..51c33170 100644 --- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScreen.java +++ b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiScreen.java @@ -71,9 +71,10 @@ public abstract class AbstractGuiScreen> extends wrapped.drawDefaultBackground(); } if (title != null) { - int x = screenSize.getWidth() / 2 - title.getMinSize().getWidth() / 2; + ReadableDimension titleSize = title.getMinSize(); + int x = screenSize.getWidth() / 2 - titleSize.getWidth() / 2; OffsetGuiRenderer eRenderer = new OffsetGuiRenderer(renderer, new Point(x, 10), new Dimension(0, 0)); - title.draw(eRenderer, null, null); + title.draw(eRenderer, titleSize, null); } super.draw(renderer, size, renderInfo); @@ -136,11 +137,6 @@ public abstract class AbstractGuiScreen> extends return screenSize; } - @Override - public ReadableDimension getPreferredSize() { - return screenSize; - } - @Override public ReadableDimension getMaxSize() { return screenSize; diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiLabel.java b/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiLabel.java index 45c4d387..a00b8742 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiLabel.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiLabel.java @@ -32,6 +32,8 @@ import org.lwjgl.util.Dimension; import org.lwjgl.util.ReadableColor; import org.lwjgl.util.ReadableDimension; +import java.util.List; + public abstract class AbstractGuiLabel> extends AbstractGuiElement implements IGuiLabel { @Getter private String text = ""; @@ -48,7 +50,14 @@ public abstract class AbstractGuiLabel> extends Ab @Override public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) { - renderer.drawString(0, 0, isEnabled() ? color : disabledColor, text); + FontRenderer fontRenderer = getMinecraft().fontRendererObj; + @SuppressWarnings("unchecked") + List lines = fontRenderer.listFormattedStringToWidth(text, size.getWidth()); + int y = 0; + for (String line : lines) { + renderer.drawString(0, y, isEnabled() ? color : disabledColor, line); + y+=fontRenderer.FONT_HEIGHT; + } } @Override