Instant setting load
This commit is contained in:
parent
b612d1b2ff
commit
11fc6316ad
124280
javascript/classes.js
124280
javascript/classes.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -1683,6 +1683,7 @@ public class Minecraft implements IThreadListener {
|
||||||
this.thePlayer.movementInput = new MovementInputFromOptions(this.gameSettings);
|
this.thePlayer.movementInput = new MovementInputFromOptions(this.gameSettings);
|
||||||
this.playerController.setPlayerCapabilities(this.thePlayer);
|
this.playerController.setPlayerCapabilities(this.thePlayer);
|
||||||
this.renderViewEntity = this.thePlayer;
|
this.renderViewEntity = this.thePlayer;
|
||||||
|
this.gameSettings.loadOptions();
|
||||||
} else {
|
} else {
|
||||||
this.thePlayer = null;
|
this.thePlayer = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -169,17 +169,18 @@ public class GuiIngame extends Gui {
|
||||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
this.mc.getTextureManager().bindTexture(icons);
|
this.mc.getTextureManager().bindTexture(icons);
|
||||||
GlStateManager.enableBlend();
|
GlStateManager.enableBlend();
|
||||||
if (this.showCrosshair()) {
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
|
||||||
Entity target = mc.pointedEntity;
|
|
||||||
if(!ModManager.crosshair.isEnabled())
|
|
||||||
GlStateManager.tryBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR, 1, 0);
|
|
||||||
|
|
||||||
if(target != null && ModManager.crosshair.isEnabled())
|
if (this.showCrosshair()) {
|
||||||
|
//GlStateManager.tryBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR, 1, 0);
|
||||||
|
|
||||||
|
if(Minecraft.getMinecraft().pointedEntity != null && ModManager.crosshair.isEnabled())
|
||||||
GlStateManager.color(RenderUtils.getColorWithoutRGB(Crosshair.color).getRed(), RenderUtils.getColorWithoutRGB(Crosshair.color).getGreen(), RenderUtils.getColorWithoutRGB(Crosshair.color).getBlue());
|
GlStateManager.color(RenderUtils.getColorWithoutRGB(Crosshair.color).getRed(), RenderUtils.getColorWithoutRGB(Crosshair.color).getGreen(), RenderUtils.getColorWithoutRGB(Crosshair.color).getBlue());
|
||||||
|
|
||||||
this.drawTexturedModalRect(i / 2 - 7, j / 2 - 7, 0, 0, 16, 16);
|
this.drawTexturedModalRect(i / 2 - 7, j / 2 - 7, 0, 0, 16, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
|
||||||
GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0);
|
GlStateManager.tryBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1, 0);
|
||||||
this.mc.mcProfiler.startSection("bossHealth");
|
this.mc.mcProfiler.startSection("bossHealth");
|
||||||
this.renderBossHealth();
|
this.renderBossHealth();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user