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

Fix rebase conflict

Browse source
This commit is contained in:
Sollace 2018-06-20 23:28:29 +02:00
parent 2c121d2960
commit 00d4009a76
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/minelittlepony/LiteModMineLittlePony.java
View file

@ -48,9 +48,4 @@ public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Co
public Class<? extends ConfigPanel> getConfigPanelClass() {
return PonySettingsPanel.class;
}
@Override
public void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock) {
mlp.onTick();
}
}

6
src/main/java/com/minelittlepony/MineLittlePony.java
View file

@ -79,14 +79,12 @@ public class MineLittlePony {
renderManager.initializeMobRenderers(rm, config);
}
void onTick() {
PonySkullRenderer.resolve();
}
void onTick(Minecraft minecraft, boolean inGame) {
if (inGame && minecraft.currentScreen == null && SETTINGS_GUI.isPressed()) {
minecraft.displayGuiScreen(new GuiPonySettings());
}
PonySkullRenderer.resolve();
}
/**