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

Fix guiskins constantly updating

Browse source
This commit is contained in:
Matthew Messinger 2015-08-12 22:41:51 -04:00
parent f1048026b3
commit 48fce4e3b1
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/minelittlepony/minelp/MineLittlePony.java
View file

@ -155,15 +155,17 @@ public class MineLittlePony implements InitCompleteListener {
this.ponyManager.setShowSnuzzles(this.config.getIntPropertySafe("snuzzles")); this.ponyManager.setShowSnuzzles(this.config.getIntPropertySafe("snuzzles"));
this.ponyManager.setShowScale(this.config.getIntPropertySafe("showscale")); this.ponyManager.setShowScale(this.config.getIntPropertySafe("showscale"));
if (inGame && minecraft.currentScreen == null && guiKeybinding.isPressed()) { if (inGame && minecraft.currentScreen == null && guiKeybinding.isPressed()) {
minecraft.displayGuiScreen(new MineLittlePonyGUI()); minecraft.displayGuiScreen(new MineLittlePonyGUI());
} }
// if (Keyboard.isKeyDown(Keyboard.KEY_O)) { // if (Keyboard.isKeyDown(Keyboard.KEY_O)) {
// ponyManager.initmodels(); // ponyManager.initmodels();
// } // }
if (!inGame && minecraft.currentScreen != null boolean pressed = minecraft.currentScreen instanceof GuiMainMenu
&& (minecraft.currentScreen instanceof GuiMainMenu && Keyboard.isKeyDown(skinKeybinding.getKeyCode()) && Keyboard.isKeyDown(skinKeybinding.getKeyCode());
|| minecraft.currentScreen instanceof GuiSkins)) { boolean skins = minecraft.currentScreen instanceof GuiSkins
&& !(minecraft.currentScreen instanceof GuiSkinsMineLP);
if (pressed || skins) {
minecraft.displayGuiScreen(new GuiSkinsMineLP()); minecraft.displayGuiScreen(new GuiSkinsMineLP());
} }

4
src/main/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
View file

@ -121,8 +121,8 @@ public class GuiSkins extends GuiScreen implements IUploadCompleteCallback, IOpe
Minecraft minecraft = Minecraft.getMinecraft(); Minecraft minecraft = Minecraft.getMinecraft();
this.screenTitle = manager; this.screenTitle = manager;
GameProfile profile = minecraft.getSession().getProfile(); GameProfile profile = minecraft.getSession().getProfile();
this.localPlayer = new EntityPlayerModel(profile); this.localPlayer = getModel(profile);
this.remotePlayer = new EntityPlayerModel(profile); this.remotePlayer = getModel(profile);
RenderManager rm = Minecraft.getMinecraft().getRenderManager(); RenderManager rm = Minecraft.getMinecraft().getRenderManager();
rm.renderEngine = minecraft.getTextureManager(); rm.renderEngine = minecraft.getTextureManager();
rm.options = minecraft.gameSettings; rm.options = minecraft.gameSettings;