changed F+6 message, revert minor lag fix
This commit is contained in:
parent
2807ac9a10
commit
a07883f25a
|
@ -4,7 +4,7 @@ public class ConfigConstants {
|
||||||
|
|
||||||
public static boolean profanity = false;
|
public static boolean profanity = false;
|
||||||
|
|
||||||
public static final String version = "22w20a";
|
public static final String version = "22w20b";
|
||||||
public static final String mainMenuString = "eaglercraft " + version;
|
public static final String mainMenuString = "eaglercraft " + version;
|
||||||
|
|
||||||
public static final String forkMe = "https://github.com/LAX1DUDE/eaglercraft";
|
public static final String forkMe = "https://github.com/LAX1DUDE/eaglercraft";
|
||||||
|
|
|
@ -157,8 +157,6 @@ public class Minecraft implements Runnable {
|
||||||
int fpsCounter = 0;
|
int fpsCounter = 0;
|
||||||
long prevFrameTime = -1L;
|
long prevFrameTime = -1L;
|
||||||
|
|
||||||
public int showHints = 140;
|
|
||||||
|
|
||||||
long secondTimer = 0l;
|
long secondTimer = 0l;
|
||||||
|
|
||||||
private HashSet<String> shownPlayerMessages = new HashSet();
|
private HashSet<String> shownPlayerMessages = new HashSet();
|
||||||
|
@ -952,7 +950,7 @@ public class Minecraft implements Runnable {
|
||||||
|
|
||||||
public void displayEaglercraftText(String s) {
|
public void displayEaglercraftText(String s) {
|
||||||
if(this.thePlayer != null && shownPlayerMessages.add(s)) {
|
if(this.thePlayer != null && shownPlayerMessages.add(s)) {
|
||||||
this.thePlayer.sendChatToPlayer("notice: "+s);
|
this.thePlayer.sendChatToPlayer(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1342,10 +1340,6 @@ public class Minecraft implements Runnable {
|
||||||
this.joinPlayerCounter = 0;
|
this.joinPlayerCounter = 0;
|
||||||
this.theWorld.joinEntityInSurroundings(this.thePlayer);
|
this.theWorld.joinEntityInSurroundings(this.thePlayer);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.showHints > 0) {
|
|
||||||
--this.showHints;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.mcProfiler.endStartSection("gameRenderer");
|
this.mcProfiler.endStartSection("gameRenderer");
|
||||||
|
@ -1488,7 +1482,13 @@ public class Minecraft implements Runnable {
|
||||||
StringTranslate var4 = StringTranslate.getInstance();
|
StringTranslate var4 = StringTranslate.getInstance();
|
||||||
|
|
||||||
if(!this.gameSettings.fancyGraphics || this.gameSettings.ambientOcclusion == 0) {
|
if(!this.gameSettings.fancyGraphics || this.gameSettings.ambientOcclusion == 0) {
|
||||||
displayEaglercraftText(var4.translateKey("fancyGraphicsNote"));
|
displayEaglercraftText("Note: " + var4.translateKey("fancyGraphicsNote"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if(this.gameSettings.showCoordinates) {
|
||||||
|
displayEaglercraftText(EnumChatFormatting.LIGHT_PURPLE + "Note: use F+6 to hide the coordinates off of the screen (if you're in public)");
|
||||||
|
}else {
|
||||||
|
displayEaglercraftText(EnumChatFormatting.LIGHT_PURPLE + "Note: use F+6 to show your coordinates on the screen");
|
||||||
}
|
}
|
||||||
|
|
||||||
this.thePlayer.preparePlayerToSpawn();
|
this.thePlayer.preparePlayerToSpawn();
|
||||||
|
|
|
@ -133,7 +133,7 @@ public class GameSettings {
|
||||||
this.thirdPersonView = 0;
|
this.thirdPersonView = 0;
|
||||||
this.showDebugInfo = false;
|
this.showDebugInfo = false;
|
||||||
this.showDebugProfilerChart = true;
|
this.showDebugProfilerChart = true;
|
||||||
this.showCoordinates = false;
|
this.showCoordinates = true;
|
||||||
this.lastServer = "";
|
this.lastServer = "";
|
||||||
this.noclip = false;
|
this.noclip = false;
|
||||||
this.smoothCamera = false;
|
this.smoothCamera = false;
|
||||||
|
|
|
@ -462,10 +462,6 @@ public class GuiIngame extends Gui {
|
||||||
|
|
||||||
if(mc.gameSettings.showCoordinates) {
|
if(mc.gameSettings.showCoordinates) {
|
||||||
var8.drawStringWithShadow("x: "+MathHelper.floor_double(this.mc.thePlayer.posX)+", y: "+MathHelper.floor_double(this.mc.thePlayer.posY)+", z: "+MathHelper.floor_double(this.mc.thePlayer.posZ), 2, 12, 16777215);
|
var8.drawStringWithShadow("x: "+MathHelper.floor_double(this.mc.thePlayer.posX)+", y: "+MathHelper.floor_double(this.mc.thePlayer.posY)+", z: "+MathHelper.floor_double(this.mc.thePlayer.posZ), 2, 12, 16777215);
|
||||||
}else {
|
|
||||||
if(mc.showHints > 0) {
|
|
||||||
var8.drawStringWithShadow("Press F+6 to show coordinates", 2, 12, 16777215);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int offset = this.mc.isChatOpen() ? 135 : 0;
|
int offset = this.mc.isChatOpen() ? 135 : 0;
|
||||||
|
|
|
@ -1548,20 +1548,6 @@ public class EaglerAdapterImpl2 {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Async
|
|
||||||
private static native Object interrupt();
|
|
||||||
|
|
||||||
private static void interrupt(final AsyncCallback<Object> cb) {
|
|
||||||
Window.setTimeout(new TimerHandler() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTimer() {
|
|
||||||
cb.complete(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
}, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JSBody(params = { "obj" }, script = "if(obj.commit) obj.commit();")
|
@JSBody(params = { "obj" }, script = "if(obj.commit) obj.commit();")
|
||||||
private static native int commitContext(JSObject obj);
|
private static native int commitContext(JSObject obj);
|
||||||
|
|
||||||
|
@ -1582,14 +1568,11 @@ public class EaglerAdapterImpl2 {
|
||||||
if(renderingCanvas.getHeight() != h) {
|
if(renderingCanvas.getHeight() != h) {
|
||||||
renderingCanvas.setHeight(h);
|
renderingCanvas.setHeight(h);
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
try {
|
try {
|
||||||
Thread.sleep(1l);
|
Thread.sleep(1l);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
interrupt();
|
|
||||||
}
|
}
|
||||||
public static final void setVSyncEnabled(boolean p1) {
|
public static final void setVSyncEnabled(boolean p1) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user