PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-25 13:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update HDSkins/Kirin version

Browse source
This commit is contained in:
Sollace 2019-04-26 13:04:31 +02:00
parent ebbcad4342
commit ef9b51e9ec
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HDSkins

@ -1 +1 @@
Subproject commit 75592ae6b4ee1311e47cc51645076a7f5548d224 Subproject commit a4064e13e77d9cd0e840109d626f65e424e4c944

3
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,6 @@
#Mon Apr 15 20:00:20 CAT 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

18
src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java
View file

@ -1,10 +1,10 @@
package com.minelittlepony.client.gui; package com.minelittlepony.client.gui;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.I18n;
import com.minelittlepony.MineLittlePony; import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.render.entities.MobRenderers; 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.GuiHost;
import com.minelittlepony.common.client.gui.IGuiGuest; import com.minelittlepony.common.client.gui.IGuiGuest;
import com.minelittlepony.common.client.gui.element.Label; import com.minelittlepony.common.client.gui.element.Label;
@ -50,7 +50,7 @@ public class GuiPonySettings implements IGuiGuest {
config.setPonyLevel(level); config.setPonyLevel(level);
return (float)level.ordinal(); 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()) { if (GuiScreen.isCtrlKeyDown() && GuiScreen.isShiftKeyDown()) {
host.addButton(new Label(LEFT, row += 30)).getStyle().setText("minelp.debug.scale"); host.addButton(new Label(LEFT, row += 30)).getStyle().setText("minelp.debug.scale");
@ -59,7 +59,7 @@ public class GuiPonySettings implements IGuiGuest {
config.setGlobalScaleFactor(v); config.setGlobalScaleFactor(v);
return config.getGlobalScaleFactor(); 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; row += 15;
@ -86,25 +86,25 @@ public class GuiPonySettings implements IGuiGuest {
public String describeCurrentScale(float value) { public String describeCurrentScale(float value) {
if (value >= 3) { if (value >= 3) {
return GameGui.format("minelp.debug.scale.meg"); return I18n.format("minelp.debug.scale.meg");
} }
if (value == 2) { if (value == 2) {
return GameGui.format("minelp.debug.scale.max"); return I18n.format("minelp.debug.scale.max");
} }
if (value == 1) { if (value == 1) {
return GameGui.format("minelp.debug.scale.mid"); return I18n.format("minelp.debug.scale.mid");
} }
if (value == 0.9F) { if (value == 0.9F) {
return GameGui.format("minelp.debug.scale.sa"); return I18n.format("minelp.debug.scale.sa");
} }
if (value <= 0.1F) { if (value <= 0.1F) {
return GameGui.format("minelp.debug.scale.min"); return I18n.format("minelp.debug.scale.min");
} }
return String.format("%f", value); return String.format("%f", value);
} }
@Override @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(); host.drawDefaultBackground();
return true; return true;
} }