From ef9b51e9eca893184885026b14fd077b1ed1cf5f Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 26 Apr 2019 13:04:31 +0200 Subject: [PATCH] Update HDSkins/Kirin version --- HDSkins | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- .../client/gui/GuiPonySettings.java | 18 +++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/HDSkins b/HDSkins index 75592ae6..a4064e13 160000 --- a/HDSkins +++ b/HDSkins @@ -1 +1 @@ -Subproject commit 75592ae6b4ee1311e47cc51645076a7f5548d224 +Subproject commit a4064e13e77d9cd0e840109d626f65e424e4c944 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 949819d2..8aa71647 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Apr 15 20:00:20 CAT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java index 482099fe..676500d6 100644 --- a/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -1,10 +1,10 @@ package com.minelittlepony.client.gui; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.render.entities.MobRenderers; -import com.minelittlepony.common.client.gui.GameGui; import com.minelittlepony.common.client.gui.GuiHost; import com.minelittlepony.common.client.gui.IGuiGuest; import com.minelittlepony.common.client.gui.element.Label; @@ -50,7 +50,7 @@ public class GuiPonySettings implements IGuiGuest { config.setPonyLevel(level); return (float)level.ordinal(); }) - .setFormatter(value -> GameGui.format(PONY_LEVEL + "." + PonyLevel.valueFor(value).name().toLowerCase()))); + .setFormatter(value -> I18n.format(PONY_LEVEL + "." + PonyLevel.valueFor(value).name().toLowerCase()))); if (GuiScreen.isCtrlKeyDown() && GuiScreen.isShiftKeyDown()) { host.addButton(new Label(LEFT, row += 30)).getStyle().setText("minelp.debug.scale"); @@ -59,7 +59,7 @@ public class GuiPonySettings implements IGuiGuest { config.setGlobalScaleFactor(v); return config.getGlobalScaleFactor(); }) - .setFormatter(value -> GameGui.format("minelp.debug.scale.value", GameGui.format(describeCurrentScale(value))))); + .setFormatter(value -> I18n.format("minelp.debug.scale.value", I18n.format(describeCurrentScale(value))))); } row += 15; @@ -86,25 +86,25 @@ public class GuiPonySettings implements IGuiGuest { public String describeCurrentScale(float value) { if (value >= 3) { - return GameGui.format("minelp.debug.scale.meg"); + return I18n.format("minelp.debug.scale.meg"); } if (value == 2) { - return GameGui.format("minelp.debug.scale.max"); + return I18n.format("minelp.debug.scale.max"); } if (value == 1) { - return GameGui.format("minelp.debug.scale.mid"); + return I18n.format("minelp.debug.scale.mid"); } if (value == 0.9F) { - return GameGui.format("minelp.debug.scale.sa"); + return I18n.format("minelp.debug.scale.sa"); } if (value <= 0.1F) { - return GameGui.format("minelp.debug.scale.min"); + return I18n.format("minelp.debug.scale.min"); } return String.format("%f", value); } @Override - public boolean drawContents(GuiHost host, int mouseX, int mouseY, float partialTicks) { + public boolean render(GuiHost host, int mouseX, int mouseY, float partialTicks) { host.drawDefaultBackground(); return true; }