diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin index 1e81aec..610bba2 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.bin and b/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock index 78ceff6..911aa6b 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.lock and b/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin index b4b824e..289c28f 100644 Binary files a/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index de392b3..0be07ed 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/main/java/net/minecraft/src/EntityPlayerSP.java b/src/main/java/net/minecraft/src/EntityPlayerSP.java index 1d6103f..9f6a789 100644 --- a/src/main/java/net/minecraft/src/EntityPlayerSP.java +++ b/src/main/java/net/minecraft/src/EntityPlayerSP.java @@ -49,6 +49,10 @@ public class EntityPlayerSP extends EntityPlayer this.renderArmYaw = (float)((double)this.renderArmYaw + (double)(this.rotationYaw - this.renderArmYaw) * 0.5D); } + public boolean canSprint() { + return (float) this.getFoodStats().getFoodLevel() > 6.0F || this.capabilities.allowFlying; + } + /** * Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons * use this to react to sunlight and start to burn. @@ -157,7 +161,7 @@ public class EntityPlayerSP extends EntityPlayer this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (double)this.width * 0.35D); this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (double)this.width * 0.35D); this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ + (double)this.width * 0.35D); - boolean var4 = (float)this.getFoodStats().getFoodLevel() > 6.0F || this.capabilities.allowFlying; + boolean var4 = this.canSprint(); if (this.onGround && !var3 && this.movementInput.moveForward >= var2 && !this.isSprinting() && var4 && !this.isUsingItem() && !this.isPotionActive(Potion.blindness)) { diff --git a/src/main/java/net/minecraft/src/EntityRenderer.java b/src/main/java/net/minecraft/src/EntityRenderer.java index 5fdedfc..0c39ceb 100644 --- a/src/main/java/net/minecraft/src/EntityRenderer.java +++ b/src/main/java/net/minecraft/src/EntityRenderer.java @@ -158,6 +158,11 @@ public class EntityRenderer */ public int debugViewDirection; + public int startup = 0; + public int preStartup = 0; + + public boolean asdfghjkl = false; + public EntityRenderer(Minecraft par1Minecraft) { this.mc = par1Minecraft; diff --git a/src/main/java/net/minecraft/src/GameSettings.java b/src/main/java/net/minecraft/src/GameSettings.java index 37da2e6..b9bdfef 100644 --- a/src/main/java/net/minecraft/src/GameSettings.java +++ b/src/main/java/net/minecraft/src/GameSettings.java @@ -89,6 +89,9 @@ public class GameSettings public KeyBinding keyBindPlayerList = new KeyBinding("key.playerlist", 15); public KeyBinding keyBindPickBlock = new KeyBinding("key.pickItem", -98); public KeyBinding keyBindCommand = new KeyBinding("key.command", 53); + public KeyBinding keyBindSprint = new KeyBinding("key.sprint", 19); + public KeyBinding keyBindZoom = new KeyBinding("key.zoom", 46); + public KeyBinding keyBindFunction = new KeyBinding("key.function", 33); public KeyBinding[] keyBindings; protected Minecraft mc; private File optionsFile; diff --git a/src/main/java/net/minecraft/src/GuiButtonLanguage.java b/src/main/java/net/minecraft/src/GuiButtonLanguage.java index 13bee12..90ae5e1 100644 --- a/src/main/java/net/minecraft/src/GuiButtonLanguage.java +++ b/src/main/java/net/minecraft/src/GuiButtonLanguage.java @@ -16,7 +16,7 @@ public class GuiButtonLanguage extends GuiButton { if (this.drawButton) { - par1Minecraft.getTextureManager().bindTexture(GuiButton.buttonTextures); + GuiButton.buttonTextures.bindTexture(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); boolean var4 = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; int var5 = 106; diff --git a/src/main/java/net/minecraft/src/IntegratedServer.java b/src/main/java/net/minecraft/src/IntegratedServer.java index ae78a13..bbb9160 100644 --- a/src/main/java/net/minecraft/src/IntegratedServer.java +++ b/src/main/java/net/minecraft/src/IntegratedServer.java @@ -182,11 +182,6 @@ public class IntegratedServer extends MinecraftServer return par1CrashReport; } - public void addServerStatsToSnooper(PlayerUsageSnooper par1PlayerUsageSnooper) - { - super.addServerStatsToSnooper(par1PlayerUsageSnooper); - par1PlayerUsageSnooper.addData("snooper_partner", this.mc.getPlayerUsageSnooper().getUniqueID()); - } /** * Returns whether snooping is enabled or not. diff --git a/src/main/java/net/minecraft/src/McoClient.java b/src/main/java/net/minecraft/src/McoClient.java deleted file mode 100644 index 7350002..0000000 --- a/src/main/java/net/minecraft/src/McoClient.java +++ /dev/null @@ -1,265 +0,0 @@ -package net.minecraft.src; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map.Entry; - -public class McoClient -{ - private final String field_96390_a; - private final String field_100007_c; - private static String field_96388_b = "https://mcoapi.minecraft.net/"; - - public McoClient(Session par1Session) - { - this.field_96390_a = par1Session.getSessionID(); - this.field_100007_c = par1Session.getUsername(); - } - - public ValueObjectList func_96382_a() throws ExceptionMcoService, IOException - { - String var1 = this.func_96377_a(Request.func_96358_a(field_96388_b + "worlds")); - return ValueObjectList.func_98161_a(var1); - } - - public McoServer func_98176_a(long par1) throws ExceptionMcoService, IOException - { - String var3 = this.func_96377_a(Request.func_96358_a(field_96388_b + "worlds" + "/$ID".replace("$ID", String.valueOf(par1)))); - return McoServer.func_98165_c(var3); - } - - public McoServerAddress func_96374_a(long par1) throws ExceptionMcoService, IOException - { - String var3 = field_96388_b + "worlds" + "/$ID/join".replace("$ID", "" + par1); - String var4 = this.func_96377_a(Request.func_96358_a(var3)); - return McoServerAddress.func_98162_a(var4); - } - - public void func_96386_a(String par1Str, String par2Str, String par3Str, String par4Str) throws ExceptionMcoService, UnsupportedEncodingException - { - StringBuilder var5 = new StringBuilder(); - var5.append(field_96388_b).append("worlds").append("/$NAME/$LOCATION_ID".replace("$NAME", this.func_96380_a(par1Str))); - HashMap var6 = new HashMap(); - - if (par2Str != null && !par2Str.trim().equals("")) - { - var6.put("motd", par2Str); - } - - if (par3Str != null && !par3Str.equals("")) - { - var6.put("seed", par3Str); - } - - var6.put("template", par4Str); - - if (!var6.isEmpty()) - { - boolean var7 = true; - Entry var9; - - for (Iterator var8 = var6.entrySet().iterator(); var8.hasNext(); var5.append((String)var9.getKey()).append("=").append(this.func_96380_a((String)var9.getValue()))) - { - var9 = (Entry)var8.next(); - - if (var7) - { - var5.append("?"); - var7 = false; - } - else - { - var5.append("&"); - } - } - } - - this.func_96377_a(Request.func_104064_a(var5.toString(), "", 5000, 30000)); - } - - public Boolean func_96375_b() throws ExceptionMcoService, IOException - { - String var1 = field_96388_b + "mco" + "/available"; - String var2 = this.func_96377_a(Request.func_96358_a(var1)); - return Boolean.valueOf(var2); - } - - public Boolean func_140054_c() throws ExceptionMcoService, IOException - { - String var1 = field_96388_b + "mco" + "/client/outdated"; - String var2 = this.func_96377_a(Request.func_96358_a(var1)); - return Boolean.valueOf(var2); - } - - public int func_96379_c() throws ExceptionMcoService - { - String var1 = field_96388_b + "payments" + "/unused"; - String var2 = this.func_96377_a(Request.func_96358_a(var1)); - return Integer.valueOf(var2).intValue(); - } - - public void func_96381_a(long par1, String par3Str) throws ExceptionMcoService - { - String var4 = field_96388_b + "invites" + "/$WORLD_ID/invite/$USER_NAME".replace("$WORLD_ID", String.valueOf(par1)).replace("$USER_NAME", par3Str); - this.func_96377_a(Request.func_96355_b(var4)); - } - - public void func_140055_c(long par1) throws ExceptionMcoService - { - String var3 = field_96388_b + "invites" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(par1)); - this.func_96377_a(Request.func_96355_b(var3)); - } - - public McoServer func_96387_b(long par1, String par3Str) throws ExceptionMcoService, IOException - { - String var4 = field_96388_b + "invites" + "/$WORLD_ID/invite/$USER_NAME".replace("$WORLD_ID", String.valueOf(par1)).replace("$USER_NAME", par3Str); - String var5 = this.func_96377_a(Request.func_96361_b(var4, "")); - return McoServer.func_98165_c(var5); - } - - public BackupList func_111232_c(long par1) throws ExceptionMcoService - { - String var3 = field_96388_b + "worlds" + "/$WORLD_ID/backups".replace("$WORLD_ID", String.valueOf(par1)); - String var4 = this.func_96377_a(Request.func_96358_a(var3)); - return BackupList.func_111222_a(var4); - } - - public void func_96384_a(long par1, String par3Str, String par4Str, int par5, int par6) throws ExceptionMcoService, UnsupportedEncodingException - { - StringBuilder var7 = new StringBuilder(); - var7.append(field_96388_b).append("worlds").append("/$WORLD_ID/$NAME".replace("$WORLD_ID", String.valueOf(par1)).replace("$NAME", this.func_96380_a(par3Str))); - - if (par4Str != null && !par4Str.trim().equals("")) - { - var7.append("?motd=").append(this.func_96380_a(par4Str)); - } - else - { - var7.append("?motd="); - } - - var7.append("&difficulty=").append(par5).append("&gameMode=").append(par6); - this.func_96377_a(Request.func_96363_c(var7.toString(), "")); - } - - public void func_111235_c(long par1, String par3Str) throws ExceptionMcoService - { - String var4 = field_96388_b + "worlds" + "/$WORLD_ID/backups".replace("$WORLD_ID", String.valueOf(par1)) + "?backupId=" + par3Str; - this.func_96377_a(Request.func_96363_c(var4, "")); - } - - public WorldTemplateList func_111231_d() throws ExceptionMcoService - { - String var1 = field_96388_b + "worlds" + "/templates"; - String var2 = this.func_96377_a(Request.func_96358_a(var1)); - return WorldTemplateList.func_110735_a(var2); - } - - public Boolean func_96383_b(long par1) throws ExceptionMcoService, IOException - { - String var3 = field_96388_b + "worlds" + "/$WORLD_ID/open".replace("$WORLD_ID", String.valueOf(par1)); - String var4 = this.func_96377_a(Request.func_96363_c(var3, "")); - return Boolean.valueOf(var4); - } - - public Boolean func_96378_c(long par1) throws ExceptionMcoService, IOException - { - String var3 = field_96388_b + "worlds" + "/$WORLD_ID/close".replace("$WORLD_ID", String.valueOf(par1)); - String var4 = this.func_96377_a(Request.func_96363_c(var3, "")); - return Boolean.valueOf(var4); - } - - public Boolean func_96376_d(long par1, String par3Str) throws ExceptionMcoService, UnsupportedEncodingException - { - StringBuilder var4 = new StringBuilder(); - var4.append(field_96388_b).append("worlds").append("/$WORLD_ID/reset".replace("$WORLD_ID", String.valueOf(par1))); - - if (par3Str != null && par3Str.length() > 0) - { - var4.append("?seed=").append(this.func_96380_a(par3Str)); - } - - String var5 = this.func_96377_a(Request.func_96353_a(var4.toString(), "", 30000, 80000)); - return Boolean.valueOf(var5); - } - - public Boolean func_111233_e(long par1, String par3Str) throws ExceptionMcoService - { - StringBuilder var4 = new StringBuilder(); - var4.append(field_96388_b).append("worlds").append("/$WORLD_ID/reset".replace("$WORLD_ID", String.valueOf(par1))); - - if (par3Str != null) - { - var4.append("?template=").append(par3Str); - } - - String var5 = this.func_96377_a(Request.func_96353_a(var4.toString(), "", 30000, 80000)); - return Boolean.valueOf(var5); - } - - public ValueObjectSubscription func_98177_f(long par1) throws ExceptionMcoService, IOException - { - String var3 = this.func_96377_a(Request.func_96358_a(field_96388_b + "subscriptions" + "/$WORLD_ID".replace("$WORLD_ID", String.valueOf(par1)))); - return ValueObjectSubscription.func_98169_a(var3); - } - - public int func_130106_e() throws ExceptionMcoService - { - String var1 = this.func_96377_a(Request.func_96358_a(field_96388_b + "invites" + "/count/pending")); - return Integer.parseInt(var1); - } - - public PendingInvitesList func_130108_f() throws ExceptionMcoService - { - String var1 = this.func_96377_a(Request.func_96358_a(field_96388_b + "invites" + "/pending")); - return PendingInvitesList.func_130095_a(var1); - } - - public void func_130107_a(String par1Str) throws ExceptionMcoService - { - this.func_96377_a(Request.func_96363_c(field_96388_b + "invites" + "/accept/$INVITATION_ID".replace("$INVITATION_ID", par1Str), "")); - } - - public void func_130109_b(String par1Str) throws ExceptionMcoService - { - this.func_96377_a(Request.func_96363_c(field_96388_b + "invites" + "/reject/$INVITATION_ID".replace("$INVITATION_ID", par1Str), "")); - } - - private String func_96380_a(String par1Str) throws UnsupportedEncodingException - { - return URLEncoder.encode(par1Str, "UTF-8"); - } - - private String func_96377_a(Request par1Request) throws ExceptionMcoService - { - par1Request.func_100006_a("sid", this.field_96390_a); - par1Request.func_100006_a("user", this.field_100007_c); - par1Request.func_100006_a("version", "1.6.4"); - - try - { - int var2 = par1Request.func_96362_a(); - - if (var2 == 503) - { - int var3 = par1Request.func_111221_b(); - throw new ExceptionRetryCall(var3); - } - else if (var2 >= 200 && var2 < 300) - { - return par1Request.func_96364_c(); - } - else - { - throw new ExceptionMcoService(par1Request.func_96362_a(), par1Request.func_96364_c(), par1Request.func_130110_g()); - } - } - catch (ExceptionMcoHttp var4) - { - throw new ExceptionMcoService(500, "Server not available!", -1); - } - } -} diff --git a/src/main/java/net/minecraft/src/McoServer.java b/src/main/java/net/minecraft/src/McoServer.java deleted file mode 100644 index 96ef116..0000000 --- a/src/main/java/net/minecraft/src/McoServer.java +++ /dev/null @@ -1,180 +0,0 @@ -package net.minecraft.src; - -import argo.jdom.JdomParser; -import argo.jdom.JsonNode; -import argo.saj.InvalidSyntaxException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; - -public class McoServer -{ - public long field_96408_a; - public String field_96406_b; - public String field_96407_c; - public String field_96404_d; - public String field_96405_e; - public List field_96402_f; - public String field_96403_g; - public boolean field_98166_h; - public int field_110729_i; - public int field_110728_j; - public int field_104063_i; - public int field_96415_h; - public String field_96414_k = ""; - public boolean field_96411_l; - public boolean field_102022_m; - public long field_96412_m; - private String field_96409_n; - private String field_96410_o; - - public String func_96397_a() - { - if (this.field_96409_n == null) - { - try - { - this.field_96409_n = URLDecoder.decode(this.field_96407_c, "UTF-8"); - } - catch (UnsupportedEncodingException var2) - { - this.field_96409_n = this.field_96407_c; - } - } - - return this.field_96409_n; - } - - public String func_96398_b() - { - if (this.field_96410_o == null) - { - try - { - this.field_96410_o = URLDecoder.decode(this.field_96406_b, "UTF-8"); - } - catch (UnsupportedEncodingException var2) - { - this.field_96410_o = this.field_96406_b; - } - } - - return this.field_96410_o; - } - - public void func_96399_a(String par1Str) - { - this.field_96406_b = par1Str; - this.field_96410_o = null; - } - - public void func_96400_b(String par1Str) - { - this.field_96407_c = par1Str; - this.field_96409_n = null; - } - - public void func_96401_a(McoServer par1McoServer) - { - this.field_96414_k = par1McoServer.field_96414_k; - this.field_96412_m = par1McoServer.field_96412_m; - this.field_96411_l = par1McoServer.field_96411_l; - this.field_96415_h = par1McoServer.field_96415_h; - this.field_102022_m = true; - } - - public static McoServer func_98163_a(JsonNode par0JsonNode) - { - McoServer var1 = new McoServer(); - - try - { - var1.field_96408_a = Long.parseLong(par0JsonNode.getNumberValue(new Object[] {"id"})); - var1.field_96406_b = par0JsonNode.getStringValue(new Object[] {"name"}); - var1.field_96407_c = par0JsonNode.getStringValue(new Object[] {"motd"}); - var1.field_96404_d = par0JsonNode.getStringValue(new Object[] {"state"}); - var1.field_96405_e = par0JsonNode.getStringValue(new Object[] {"owner"}); - - if (par0JsonNode.isArrayNode(new Object[] {"invited"})) - { - var1.field_96402_f = func_98164_a(par0JsonNode.getArrayNode(new Object[] {"invited"})); - } - else - { - var1.field_96402_f = new ArrayList(); - } - - var1.field_104063_i = Integer.parseInt(par0JsonNode.getNumberValue(new Object[] {"daysLeft"})); - var1.field_96403_g = par0JsonNode.getStringValue(new Object[] {"ip"}); - var1.field_98166_h = par0JsonNode.getBooleanValue(new Object[] {"expired"}).booleanValue(); - var1.field_110729_i = Integer.parseInt(par0JsonNode.getNumberValue(new Object[] {"difficulty"})); - var1.field_110728_j = Integer.parseInt(par0JsonNode.getNumberValue(new Object[] {"gameMode"})); - } - catch (IllegalArgumentException var3) - { - ; - } - - return var1; - } - - private static List func_98164_a(List par0List) - { - ArrayList var1 = new ArrayList(); - Iterator var2 = par0List.iterator(); - - while (var2.hasNext()) - { - JsonNode var3 = (JsonNode)var2.next(); - var1.add(var3.getStringValue(new Object[0])); - } - - return var1; - } - - public static McoServer func_98165_c(String par0Str) - { - McoServer var1 = new McoServer(); - - try - { - var1 = func_98163_a((new JdomParser()).parse(par0Str)); - } - catch (InvalidSyntaxException var3) - { - ; - } - - return var1; - } - - public int hashCode() - { - return (new HashCodeBuilder(17, 37)).append(this.field_96408_a).append(this.field_96406_b).append(this.field_96407_c).append(this.field_96404_d).append(this.field_96405_e).append(this.field_98166_h).toHashCode(); - } - - public boolean equals(Object par1Obj) - { - if (par1Obj == null) - { - return false; - } - else if (par1Obj == this) - { - return true; - } - else if (par1Obj.getClass() != this.getClass()) - { - return false; - } - else - { - McoServer var2 = (McoServer)par1Obj; - return (new EqualsBuilder()).append(this.field_96408_a, var2.field_96408_a).append(this.field_96406_b, var2.field_96406_b).append(this.field_96407_c, var2.field_96407_c).append(this.field_96404_d, var2.field_96404_d).append(this.field_96405_e, var2.field_96405_e).append(this.field_98166_h, var2.field_98166_h).isEquals(); - } - } -} diff --git a/src/main/java/net/minecraft/src/McoServerAddress.java b/src/main/java/net/minecraft/src/McoServerAddress.java deleted file mode 100644 index 9038703..0000000 --- a/src/main/java/net/minecraft/src/McoServerAddress.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.minecraft.src; - -import argo.jdom.JdomParser; -import argo.jdom.JsonRootNode; -import argo.saj.InvalidSyntaxException; - -public class McoServerAddress extends ValueObject -{ - public String field_96417_a; - - public static McoServerAddress func_98162_a(String par0Str) - { - McoServerAddress var1 = new McoServerAddress(); - - try - { - JsonRootNode var2 = (new JdomParser()).parse(par0Str); - var1.field_96417_a = var2.getStringValue(new Object[] {"address"}); - } - catch (InvalidSyntaxException var3) - { - ; - } - catch (IllegalArgumentException var4) - { - ; - } - - return var1; - } -} diff --git a/src/main/java/net/minecraft/src/McoServerList.java b/src/main/java/net/minecraft/src/McoServerList.java deleted file mode 100644 index 301e125..0000000 --- a/src/main/java/net/minecraft/src/McoServerList.java +++ /dev/null @@ -1,131 +0,0 @@ -package net.minecraft.src; - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -public class McoServerList -{ - private volatile boolean field_98259_a; - private McoServerListUpdateTask field_98257_b = new McoServerListUpdateTask(this, (McoServerListEmptyAnon)null); - private java.util.Timer field_98258_c = new java.util.Timer(); - private Set field_140060_d = Sets.newHashSet(); - private List field_98255_d = Lists.newArrayList(); - private int field_130130_e; - private boolean field_140059_g; - private Session field_98254_f; - private int field_140061_i; - - public McoServerList() - { - this.field_98258_c.schedule(this.field_98257_b, 0L, 10000L); - this.field_98254_f = Minecraft.getMinecraft().getSession(); - } - - public synchronized void func_130129_a(Session par1Session) - { - this.field_98254_f = par1Session; - - if (this.field_98259_a) - { - this.field_98259_a = false; - this.field_98257_b = new McoServerListUpdateTask(this, (McoServerListEmptyAnon)null); - this.field_98258_c = new java.util.Timer(); - this.field_98258_c.schedule(this.field_98257_b, 0L, 10000L); - } - } - - public synchronized boolean func_130127_a() - { - return this.field_140059_g; - } - - public synchronized void func_98250_b() - { - this.field_140059_g = false; - } - - public synchronized List func_98252_c() - { - return Lists.newArrayList(this.field_98255_d); - } - - public int func_130124_d() - { - return this.field_130130_e; - } - - public int func_140056_e() - { - return this.field_140061_i; - } - - public synchronized void func_98248_d() - { - this.field_98259_a = true; - this.field_98257_b.cancel(); - this.field_98258_c.cancel(); - } - - private synchronized void func_96426_a(List par1List) - { - int var2 = 0; - Iterator var3 = this.field_140060_d.iterator(); - - while (var3.hasNext()) - { - McoServer var4 = (McoServer)var3.next(); - - if (par1List.remove(var4)) - { - ++var2; - } - } - - if (var2 == 0) - { - this.field_140060_d.clear(); - } - - this.field_98255_d = par1List; - this.field_140059_g = true; - } - - public synchronized void func_140058_a(McoServer par1McoServer) - { - this.field_98255_d.remove(par1McoServer); - this.field_140060_d.add(par1McoServer); - } - - private void func_130123_a(int par1) - { - this.field_130130_e = par1; - } - - static boolean func_98249_b(McoServerList par0McoServerList) - { - return par0McoServerList.field_98259_a; - } - - static Session func_100014_a(McoServerList par0McoServerList) - { - return par0McoServerList.field_98254_f; - } - - static void func_98247_a(McoServerList par0McoServerList, List par1List) - { - par0McoServerList.func_96426_a(par1List); - } - - static void func_130122_a(McoServerList par0McoServerList, int par1) - { - par0McoServerList.func_130123_a(par1); - } - - static int func_140057_b(McoServerList par0McoServerList, int par1) - { - return par0McoServerList.field_140061_i = par1; - } -} diff --git a/src/main/java/net/minecraft/src/McoServerListEmptyAnon.java b/src/main/java/net/minecraft/src/McoServerListEmptyAnon.java deleted file mode 100644 index 8ecceff..0000000 --- a/src/main/java/net/minecraft/src/McoServerListEmptyAnon.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.minecraft.src; - -class McoServerListEmptyAnon -{ -} diff --git a/src/main/java/net/minecraft/src/McoServerListUpdateTask.java b/src/main/java/net/minecraft/src/McoServerListUpdateTask.java deleted file mode 100644 index 603abed..0000000 --- a/src/main/java/net/minecraft/src/McoServerListUpdateTask.java +++ /dev/null @@ -1,97 +0,0 @@ -package net.minecraft.src; - -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.TimerTask; - -class McoServerListUpdateTask extends TimerTask -{ - private McoClient field_140066_b; - - final McoServerList field_140067_a; - - private McoServerListUpdateTask(McoServerList par1McoServerList) - { - this.field_140067_a = par1McoServerList; - } - - public void run() - { - if (!McoServerList.func_98249_b(this.field_140067_a)) - { - this.func_140064_c(); - this.func_140062_a(); - this.func_140063_b(); - } - } - - private void func_140062_a() - { - try - { - if (McoServerList.func_100014_a(this.field_140067_a) != null) - { - this.field_140066_b = new McoClient(McoServerList.func_100014_a(this.field_140067_a)); - List var1 = this.field_140066_b.func_96382_a().field_96430_d; - - if (var1 != null) - { - this.func_140065_a(var1); - McoServerList.func_98247_a(this.field_140067_a, var1); - } - } - } - catch (ExceptionMcoService var2) - { - Minecraft.getMinecraft().getLogAgent().logSevere(var2.toString()); - } - catch (IOException var3) - { - Minecraft.getMinecraft().getLogAgent().logWarning("Realms: could not parse response from server"); - } - } - - private void func_140063_b() - { - try - { - if (McoServerList.func_100014_a(this.field_140067_a) != null) - { - int var1 = this.field_140066_b.func_130106_e(); - McoServerList.func_130122_a(this.field_140067_a, var1); - } - } - catch (ExceptionMcoService var2) - { - Minecraft.getMinecraft().getLogAgent().logSevere(var2.toString()); - } - } - - private void func_140064_c() - { - try - { - if (McoServerList.func_100014_a(this.field_140067_a) != null) - { - McoClient var1 = new McoClient(McoServerList.func_100014_a(this.field_140067_a)); - McoServerList.func_140057_b(this.field_140067_a, var1.func_96379_c()); - } - } - catch (ExceptionMcoService var2) - { - Minecraft.getMinecraft().getLogAgent().logSevere(var2.toString()); - McoServerList.func_140057_b(this.field_140067_a, 0); - } - } - - private void func_140065_a(List par1List) - { - Collections.sort(par1List, new McoServerListUpdateTaskComparator(this, McoServerList.func_100014_a(this.field_140067_a).getUsername(), (McoServerListEmptyAnon)null)); - } - - McoServerListUpdateTask(McoServerList par1McoServerList, McoServerListEmptyAnon par2McoServerListEmptyAnon) - { - this(par1McoServerList); - } -} diff --git a/src/main/java/net/minecraft/src/McoServerListUpdateTaskComparator.java b/src/main/java/net/minecraft/src/McoServerListUpdateTaskComparator.java deleted file mode 100644 index 89f9985..0000000 --- a/src/main/java/net/minecraft/src/McoServerListUpdateTaskComparator.java +++ /dev/null @@ -1,59 +0,0 @@ -package net.minecraft.src; - -import java.util.Comparator; - -class McoServerListUpdateTaskComparator implements Comparator -{ - private final String field_140069_b; - - final McoServerListUpdateTask field_140070_a; - - private McoServerListUpdateTaskComparator(McoServerListUpdateTask par1McoServerListUpdateTask, String par2Str) - { - this.field_140070_a = par1McoServerListUpdateTask; - this.field_140069_b = par2Str; - } - - public int func_140068_a(McoServer par1McoServer, McoServer par2McoServer) - { - if (par1McoServer.field_96405_e.equals(par2McoServer.field_96405_e)) - { - return par1McoServer.field_96408_a < par2McoServer.field_96408_a ? 1 : (par1McoServer.field_96408_a > par2McoServer.field_96408_a ? -1 : 0); - } - else if (par1McoServer.field_96405_e.equals(this.field_140069_b)) - { - return -1; - } - else if (par2McoServer.field_96405_e.equals(this.field_140069_b)) - { - return 1; - } - else - { - if (par1McoServer.field_96404_d.equals("CLOSED") || par2McoServer.field_96404_d.equals("CLOSED")) - { - if (par1McoServer.field_96404_d.equals("CLOSED")) - { - return 1; - } - - if (par2McoServer.field_96404_d.equals("CLOSED")) - { - return 0; - } - } - - return par1McoServer.field_96408_a < par2McoServer.field_96408_a ? 1 : (par1McoServer.field_96408_a > par2McoServer.field_96408_a ? -1 : 0); - } - } - - public int compare(Object par1Obj, Object par2Obj) - { - return this.func_140068_a((McoServer)par1Obj, (McoServer)par2Obj); - } - - McoServerListUpdateTaskComparator(McoServerListUpdateTask par1McoServerListUpdateTask, String par2Str, McoServerListEmptyAnon par3McoServerListEmptyAnon) - { - this(par1McoServerListUpdateTask, par2Str); - } -} diff --git a/src/main/java/net/minecraft/src/Minecraft.java b/src/main/java/net/minecraft/src/Minecraft.java index 7b793d9..e3138f7 100644 --- a/src/main/java/net/minecraft/src/Minecraft.java +++ b/src/main/java/net/minecraft/src/Minecraft.java @@ -8,14 +8,10 @@ import com.google.common.collect.Lists; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.net.Proxy; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -24,18 +20,12 @@ import net.minecraft.client.ClientBrandRetriever; import net.minecraft.server.MinecraftServer; import org.lwjgl.LWJGLException; import org.lwjgl.Sys; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.ContextCapabilities; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL20; -import org.lwjgl.opengl.GLContext; -import org.lwjgl.opengl.PixelFormat; import org.lwjgl.util.glu.GLU; -public class Minecraft implements IPlayerUsage +public class Minecraft { /** A 10MiB preallocation to ensure the heap is reasonably sized. */ public static byte[] memoryReserve = new byte[10485760]; @@ -45,6 +35,8 @@ public class Minecraft implements IPlayerUsage /** The RenderEngine instance used by Minecraft */ public RenderEngine renderEngine; + private final ILogAgent mcLogAgent; + /** * Set to 'this' in Minecraft constructor; used by some settings get methods */ @@ -52,6 +44,7 @@ public class Minecraft implements IPlayerUsage public PlayerControllerMP playerController; private boolean fullscreen; private boolean hasCrashed; + private boolean isGonnaTakeDatScreenShot = false; /** Instance of CrashReport. */ private CrashReport crashReporter; @@ -59,8 +52,6 @@ public class Minecraft implements IPlayerUsage public int displayHeight; private Timer timer = new Timer(20.0F); - /** Instance of PlayerUsageSnooper. */ - private PlayerUsageSnooper usageSnooper = new PlayerUsageSnooper("client", this, MinecraftServer.getSystemTimeMillis()); public WorldClient theWorld; public RenderGlobal renderGlobal; public EntityClientPlayerMP thePlayer; @@ -186,6 +177,8 @@ public class Minecraft implements IPlayerUsage long secondTimer = 0l; + private HashSet shownPlayerMessages = new HashSet(); + /** Profiler currently displayed in the debug screen pie chart */ private String debugProfilerName = "root"; @@ -197,6 +190,7 @@ public class Minecraft implements IPlayerUsage public Minecraft() { + this.mcLogAgent = new LogAgent("Eagler-Client", " [CLIENT]", null); this.tempDisplayHeight = 480; this.fullscreen = false; Packet3Chat.maxChatLength = 32767; @@ -855,25 +849,6 @@ public class Minecraft implements IPlayerUsage System.gc(); } - /** - * checks if keys are down - */ - private void screenshotListener() - { - if (Keyboard.isKeyDown(60)) - { - if (!this.isTakingScreenshot) - { - this.isTakingScreenshot = true; - this.ingameGUI.getChatGUI().printChatMessage(ScreenShotHelper.saveScreenshot(this.mcDataDir, this.displayWidth, this.displayHeight)); - } - } - else - { - this.isTakingScreenshot = false; - } - } - /** * Update debugProfilerName in response to number keys in debug screen */ @@ -1069,15 +1044,11 @@ public class Minecraft implements IPlayerUsage /** * Displays the ingame menu */ - public void displayInGameMenu() - { - if (this.currentScreen == null) - { + public void displayInGameMenu() { + if (this.currentScreen == null) { this.displayGuiScreen(new GuiIngameMenu()); - - if (this.isSingleplayer() && !this.theIntegratedServer.getPublic()) - { - this.sndManager.pauseAllSounds(); + if(IntegratedServer.isWorldRunning() && !this.isSingleplayer()) { + IntegratedServer.autoSave(); } } } @@ -1287,294 +1258,239 @@ public class Minecraft implements IPlayerUsage return this.currentScreen != null && this.currentScreen instanceof GuiMainMenu ? 2 : this.gameSettings.limitFramerate; } + private void forceReload() { + System.err.println("FORCING RELOAD!"); + + if (this.sndManager != null) { + this.sndManager.stopAllSounds(); + } + + //this.sndManager = new SoundManager(); // FIX THIS + this.sndManager.loadSoundSettings(this.gameSettings); + } + + public boolean isSingleplayerOrLAN() { + return IntegratedServer.isWorldRunning(); + } + + public void displayEaglercraftText(String s) { + if(this.thePlayer != null && shownPlayerMessages.add(s)) { + this.thePlayer.sendChatToPlayer(new ChatMessageComponent().addText(s)); + } + } + + private boolean wasPaused = false; /** * Runs the current tick. */ public void runTick() { - if (this.rightClickDelayTimer > 0) - { + if (this.rightClickDelayTimer > 0) { --this.rightClickDelayTimer; } - this.mcProfiler.startSection("stats"); - this.statFileWriter.func_77449_e(); - this.mcProfiler.endStartSection("gui"); + this.isGamePaused = this.isSingleplayer() && this.theWorld != null && this.thePlayer != null && this.currentScreen != null + && this.currentScreen.doesGuiPauseGame() && !IntegratedServerLAN.isHostingLAN(); - if (!this.isGamePaused) - { + if(wasPaused != isGamePaused) { + IntegratedServer.setPaused(this.isGamePaused); + wasPaused = isGamePaused; + } + + if(lanState && !IntegratedServerLAN.isLANOpen()) { + lanState = false; + if(thePlayer != null) { + ChatMessageComponent message = new ChatMessageComponent(); + message.setColor(EnumChatFormatting.RED); + message.addText(StatCollector.translateToLocal("lanServer.relayDisconnected")); + thePlayer.sendChatToPlayer(message); + } + } + + if (!this.isGamePaused) { this.ingameGUI.updateTick(); } - this.mcProfiler.endStartSection("pick"); this.entityRenderer.getMouseOver(1.0F); - this.mcProfiler.endStartSection("gameMode"); - if (!this.isGamePaused && this.theWorld != null) - { + if (!this.isGamePaused && this.theWorld != null) { this.playerController.updateController(); } - this.mcProfiler.endStartSection("textures"); - - if (!this.isGamePaused) - { - this.renderEngine.tick(); + if (!this.isGamePaused) { + this.renderEngine.updateDynamicTextures(); } - if (this.currentScreen == null && this.thePlayer != null) - { - if (this.thePlayer.getHealth() <= 0.0F) - { - this.displayGuiScreen((GuiScreen)null); - } - else if (this.thePlayer.isPlayerSleeping() && this.theWorld != null) - { + DefaultSkinRenderer.deleteOldSkins(); + + if (this.currentScreen == null && this.thePlayer != null) { + if (this.thePlayer.getHealth() <= 0) { + this.displayGuiScreen((GuiScreen) null); + } else if (this.thePlayer.isPlayerSleeping() && this.theWorld != null) { this.displayGuiScreen(new GuiSleepMP()); } - } - else if (this.currentScreen != null && this.currentScreen instanceof GuiSleepMP && !this.thePlayer.isPlayerSleeping()) - { - this.displayGuiScreen((GuiScreen)null); + } else if (this.currentScreen != null && this.currentScreen instanceof GuiSleepMP && !this.thePlayer.isPlayerSleeping()) { + this.displayGuiScreen((GuiScreen) null); } - if (this.currentScreen != null) - { + if (this.currentScreen != null) { this.leftClickCounter = 10000; } - CrashReport var2; - CrashReportCategory var3; + if (this.currentScreen != null) { + this.currentScreen.handleInput(); - if (this.currentScreen != null) - { - try - { - this.currentScreen.handleInput(); - } - catch (Throwable var6) - { - var2 = CrashReport.makeCrashReport(var6, "Updating screen events"); - var3 = var2.makeCategory("Affected screen"); - var3.addCrashSectionCallable("Screen name", new CallableUpdatingScreenName(this)); - throw new ReportedException(var2); - } - - if (this.currentScreen != null) - { - try - { - this.currentScreen.updateScreen(); - } - catch (Throwable var5) - { - var2 = CrashReport.makeCrashReport(var5, "Ticking screen"); - var3 = var2.makeCategory("Affected screen"); - var3.addCrashSectionCallable("Screen name", new CallableParticleScreenName(this)); - throw new ReportedException(var2); - } + if (this.currentScreen != null) { + //this.currentScreen.guiParticles.update(); // FIX THIS + this.currentScreen.updateScreen(); } } - if (this.currentScreen == null || this.currentScreen.allowUserInput) - { - this.mcProfiler.endStartSection("mouse"); - int var1; + GuiMultiplayer.tickRefreshCooldown(); - while (Mouse.next()) - { - var1 = Mouse.getEventButton(); + if (this.currentScreen == null || this.currentScreen.allowUserInput) { - if (isRunningOnMac && var1 == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157))) - { - var1 = 1; + while (EaglerAdapter.mouseNext()) { + KeyBinding.setKeyBindState(EaglerAdapter.mouseGetEventButton() - 100, EaglerAdapter.mouseGetEventButtonState()); + + if (EaglerAdapter.mouseGetEventButtonState()) { + KeyBinding.onTick(EaglerAdapter.mouseGetEventButton() - 100); } - KeyBinding.setKeyBindState(var1 - 100, Mouse.getEventButtonState()); + long var1 = getSystemTime() - this.systemTime; - if (Mouse.getEventButtonState()) - { - KeyBinding.onTick(var1 - 100); - } + if (var1 <= 200L) { + int var10 = EaglerAdapter.mouseGetEventDWheel(); - long var9 = getSystemTime() - this.systemTime; + if (var10 != 0) { + this.thePlayer.inventory.changeCurrentItem(var10); - if (var9 <= 200L) - { - int var4 = Mouse.getEventDWheel(); - - if (var4 != 0) - { - this.thePlayer.inventory.changeCurrentItem(var4); - - if (this.gameSettings.noclip) - { - if (var4 > 0) - { - var4 = 1; + if (this.gameSettings.noclip) { + if (var10 > 0) { + var10 = 1; } - if (var4 < 0) - { - var4 = -1; + if (var10 < 0) { + var10 = -1; } - this.gameSettings.noclipRate += (float)var4 * 0.25F; + this.gameSettings.noclipRate += (float) var10 * 0.25F; } } - if (this.currentScreen == null) - { - if (!this.inGameHasFocus && Mouse.getEventButtonState()) - { + if (this.currentScreen == null) { + if ((!this.inGameHasFocus || !EaglerAdapter.isPointerLocked()) && EaglerAdapter.mouseGetEventButtonState()) { this.setIngameFocus(); } - } - else if (this.currentScreen != null) - { + } else if (this.currentScreen != null) { this.currentScreen.handleMouseInput(); } } } - if (this.leftClickCounter > 0) - { + if (this.leftClickCounter > 0) { --this.leftClickCounter; } - this.mcProfiler.endStartSection("keyboard"); boolean var8; - while (Keyboard.next()) - { - KeyBinding.setKeyBindState(Keyboard.getEventKey(), Keyboard.getEventKeyState()); + while (EaglerAdapter.keysNext()) { + KeyBinding.setKeyBindState(EaglerAdapter.getEventKey(), EaglerAdapter.getEventKeyState()); - if (Keyboard.getEventKeyState()) - { - KeyBinding.onTick(Keyboard.getEventKey()); + if (EaglerAdapter.getEventKeyState()) { + KeyBinding.onTick(EaglerAdapter.getEventKey()); } - if (this.field_83002_am > 0L) - { - if (getSystemTime() - this.field_83002_am >= 6000L) - { - throw new ReportedException(new CrashReport("Manually triggered debug crash", new Throwable())); + boolean F3down = (this.gameSettings.keyBindFunction.pressed && EaglerAdapter.isKeyDown(4)); + + if (this.field_83002_am > 0L) { + if (getSystemTime() - this.field_83002_am >= 6000L) { + throw new RuntimeException("manual crash"); } - if (!Keyboard.isKeyDown(46) || !Keyboard.isKeyDown(61)) - { + if (!EaglerAdapter.isKeyDown(46) || !F3down) { this.field_83002_am = -1L; } - } - else if (Keyboard.isKeyDown(46) && Keyboard.isKeyDown(61)) - { + } else if (F3down && EaglerAdapter.isKeyDown(46)) { this.field_83002_am = getSystemTime(); } - if (Keyboard.getEventKeyState()) - { - if (Keyboard.getEventKey() == 87) - { + if (EaglerAdapter.getEventKeyState()) { + isGonnaTakeDatScreenShot |= (this.gameSettings.keyBindFunction.pressed && EaglerAdapter.getEventKey() == 3); + if (EaglerAdapter.getEventKey() == 87) { this.toggleFullscreen(); - } - else - { - if (this.currentScreen != null) - { + } else { + if (this.currentScreen != null) { this.currentScreen.handleKeyboardInput(); - } - else - { - if (Keyboard.getEventKey() == 1) - { + } else { + if (EaglerAdapter.getEventKey() == 1) { this.displayInGameMenu(); } - if (Keyboard.getEventKey() == 31 && Keyboard.isKeyDown(61)) - { - this.refreshResources(); + if (F3down && EaglerAdapter.getEventKey() == 31) { + this.forceReload(); } - if (Keyboard.getEventKey() == 20 && Keyboard.isKeyDown(61)) - { - this.refreshResources(); + if (F3down && EaglerAdapter.getEventKey() == 20) { + this.renderEngine.refreshTextures(); + this.renderGlobal.loadRenderers(); + FixedFunctionShader.refreshCoreGL(); } - if (Keyboard.getEventKey() == 33 && Keyboard.isKeyDown(61)) - { - var8 = Keyboard.isKeyDown(42) | Keyboard.isKeyDown(54); + if (F3down && EaglerAdapter.getEventKey() == 33) { + var8 = EaglerAdapter.isKeyDown(42) | EaglerAdapter.isKeyDown(54); this.gameSettings.setOptionValue(EnumOptions.RENDER_DISTANCE, var8 ? -1 : 1); } - if (Keyboard.getEventKey() == 30 && Keyboard.isKeyDown(61)) - { + if (F3down && EaglerAdapter.getEventKey() == 30) { this.renderGlobal.loadRenderers(); } - if (Keyboard.getEventKey() == 35 && Keyboard.isKeyDown(61)) - { + if (F3down && EaglerAdapter.getEventKey() == 35) { this.gameSettings.advancedItemTooltips = !this.gameSettings.advancedItemTooltips; this.gameSettings.saveOptions(); } - if (Keyboard.getEventKey() == 48 && Keyboard.isKeyDown(61)) - { + if (F3down && EaglerAdapter.getEventKey() == 48) { RenderManager.field_85095_o = !RenderManager.field_85095_o; } - if (Keyboard.getEventKey() == 25 && Keyboard.isKeyDown(61)) - { + if (F3down && EaglerAdapter.getEventKey() == 25) { this.gameSettings.pauseOnLostFocus = !this.gameSettings.pauseOnLostFocus; this.gameSettings.saveOptions(); } - if (Keyboard.getEventKey() == 59) - { + if (this.gameSettings.keyBindFunction.pressed && EaglerAdapter.getEventKey() == 2) { this.gameSettings.hideGUI = !this.gameSettings.hideGUI; } - if (Keyboard.getEventKey() == 61) - { + if (EaglerAdapter.getEventKey() == 4 && this.gameSettings.keyBindFunction.pressed) { this.gameSettings.showDebugInfo = !this.gameSettings.showDebugInfo; - this.gameSettings.showDebugProfilerChart = GuiScreen.isShiftKeyDown(); + this.gameSettings.showDebugProfilerChart = true; } - if (Keyboard.getEventKey() == 63) - { + if (EaglerAdapter.getEventKey() == 6 && this.gameSettings.keyBindFunction.pressed) { ++this.gameSettings.thirdPersonView; - if (this.gameSettings.thirdPersonView > 2) - { + if (this.gameSettings.thirdPersonView > 2) { this.gameSettings.thirdPersonView = 0; } } - if (Keyboard.getEventKey() == 66) - { + if (EaglerAdapter.getEventKey() == 7 && this.gameSettings.keyBindFunction.pressed) { + this.gameSettings.showCoordinates = !this.gameSettings.showCoordinates; + this.gameSettings.saveOptions(); + } + + if (EaglerAdapter.getEventKey() == 9 && this.gameSettings.keyBindFunction.pressed) { this.gameSettings.smoothCamera = !this.gameSettings.smoothCamera; } } - for (var1 = 0; var1 < 9; ++var1) - { - if (Keyboard.getEventKey() == 2 + var1) - { - this.thePlayer.inventory.currentItem = var1; - } - } - - if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart) - { - if (Keyboard.getEventKey() == 11) - { - this.updateDebugProfilerName(0); - } - - for (var1 = 0; var1 < 9; ++var1) - { - if (Keyboard.getEventKey() == 2 + var1) - { - this.updateDebugProfilerName(var1 + 1); + if(!this.gameSettings.keyBindFunction.pressed) { + for (int var9 = 0; var9 < 9; ++var9) { + if (EaglerAdapter.getEventKey() == 2 + var9) { + this.thePlayer.inventory.currentItem = var9; } } } @@ -1584,178 +1500,166 @@ public class Minecraft implements IPlayerUsage var8 = this.gameSettings.chatVisibility != 2; - while (this.gameSettings.keyBindInventory.isPressed()) - { - if (this.playerController.func_110738_j()) - { - this.thePlayer.func_110322_i(); - } - else - { - this.displayGuiScreen(new GuiInventory(this.thePlayer)); - } + while (this.gameSettings.keyBindInventory.isPressed()) { + this.displayGuiScreen(new GuiInventory(this.thePlayer)); } - while (this.gameSettings.keyBindDrop.isPressed()) - { + while (this.gameSettings.keyBindDrop.isPressed()) { this.thePlayer.dropOneItem(GuiScreen.isCtrlKeyDown()); } - while (this.gameSettings.keyBindChat.isPressed() && var8) - { + while (this.gameSettings.keyBindChat.isPressed() && var8) { this.displayGuiScreen(new GuiChat()); } - if (this.currentScreen == null && this.gameSettings.keyBindCommand.isPressed() && var8) - { + if (this.currentScreen == null && EaglerAdapter.isKeyDown(53) && var8) { this.displayGuiScreen(new GuiChat("/")); } - if (this.thePlayer.isUsingItem()) - { - if (!this.gameSettings.keyBindUseItem.pressed) - { + if(this.gameSettings.keyBindSprint.pressed && !this.thePlayer.isSprinting() && this.thePlayer.canSprint() && !this.thePlayer.isCollidedHorizontally) { + this.thePlayer.setSprinting(true); + } + + if (this.thePlayer.isUsingItem()) { + if (!this.gameSettings.keyBindUseItem.pressed) { this.playerController.onStoppedUsingItem(this.thePlayer); } - label381: + label379: - while (true) - { - if (!this.gameSettings.keyBindAttack.isPressed()) - { - while (this.gameSettings.keyBindUseItem.isPressed()) - { + while (true) { + if (!this.gameSettings.keyBindAttack.isPressed()) { + while (this.gameSettings.keyBindUseItem.isPressed()) { ; } - while (true) - { - if (this.gameSettings.keyBindPickBlock.isPressed()) - { + while (true) { + if (this.gameSettings.keyBindPickBlock.isPressed()) { continue; } - break label381; + break label379; } } } - } - else - { - while (this.gameSettings.keyBindAttack.isPressed()) - { + } else { + while (this.gameSettings.keyBindAttack.isPressed()) { this.clickMouse(0); } - while (this.gameSettings.keyBindUseItem.isPressed()) - { + while (this.gameSettings.keyBindUseItem.isPressed()) { this.clickMouse(1); } - while (this.gameSettings.keyBindPickBlock.isPressed()) - { + while (this.gameSettings.keyBindPickBlock.isPressed()) { this.clickMiddleMouseButton(); } } - if (this.gameSettings.keyBindUseItem.pressed && this.rightClickDelayTimer == 0 && !this.thePlayer.isUsingItem()) - { + if (this.gameSettings.keyBindUseItem.pressed && this.rightClickDelayTimer == 0 && !this.thePlayer.isUsingItem()) { this.clickMouse(1); } this.sendClickBlockToController(0, this.currentScreen == null && this.gameSettings.keyBindAttack.pressed && this.inGameHasFocus); } - if (this.theWorld != null) - { - if (this.thePlayer != null) - { + if (this.theWorld != null) { + if (this.thePlayer != null) { ++this.joinPlayerCounter; - if (this.joinPlayerCounter == 30) - { + if (this.joinPlayerCounter == 30) { this.joinPlayerCounter = 0; this.theWorld.joinEntityInSurroundings(this.thePlayer); } + + ++messageOnLoginCounter; + + if(messageOnLoginCounter == 100 && isSingleplayerOrLAN()) { + displayEaglercraftText(EnumChatFormatting.GREEN + "Notice: chunk loading may take a while in singleplayer."); + } + + if(messageOnLoginCounter == 150 && isSingleplayerOrLAN()) { + displayEaglercraftText(EnumChatFormatting.AQUA + "Especially in new worlds, if no chunks show give the game up to 5 straight minutes before \"giving up\" on a new world"); + } } - this.mcProfiler.endStartSection("gameRenderer"); - - if (!this.isGamePaused) - { + if (!this.isGamePaused) { this.entityRenderer.updateRenderer(); } - this.mcProfiler.endStartSection("levelRenderer"); - - if (!this.isGamePaused) - { + if (!this.isGamePaused) { this.renderGlobal.updateClouds(); } - this.mcProfiler.endStartSection("level"); - - if (!this.isGamePaused) - { - if (this.theWorld.lastLightningBolt > 0) - { + if (!this.isGamePaused) { + if (this.theWorld.lastLightningBolt > 0) { --this.theWorld.lastLightningBolt; } this.theWorld.updateEntities(); } - if (!this.isGamePaused) - { + if (!this.isGamePaused) { this.theWorld.setAllowedSpawnTypes(this.theWorld.difficultySetting > 0, true); - try - { - this.theWorld.tick(); - } - catch (Throwable var7) - { - var2 = CrashReport.makeCrashReport(var7, "Exception in world tick"); - - if (this.theWorld == null) - { - var3 = var2.makeCategory("Affected level"); - var3.addCrashSection("Problem", "Level is null!"); - } - else - { - this.theWorld.addWorldInfoToCrashReport(var2); - } - - throw new ReportedException(var2); - } + this.theWorld.tick(); } - this.mcProfiler.endStartSection("animateTick"); - - if (!this.isGamePaused && this.theWorld != null) - { + if (!this.isGamePaused && this.theWorld != null) { this.theWorld.doVoidFogParticles(MathHelper.floor_double(this.thePlayer.posX), MathHelper.floor_double(this.thePlayer.posY), MathHelper.floor_double(this.thePlayer.posZ)); } - this.mcProfiler.endStartSection("particles"); - - if (!this.isGamePaused) - { + if (!this.isGamePaused) { this.effectRenderer.updateEffects(); } - } - else if (this.myNetworkManager != null) - { - this.mcProfiler.endStartSection("pendingConnection"); + } else if (this.myNetworkManager != null) { this.myNetworkManager.processReadPackets(); + } else { + this.entityRenderer.startup = 0; + this.entityRenderer.preStartup = 0; + this.entityRenderer.asdfghjkl = false; + } + + if(!(this.gameSettings.adderall || entityRenderer.asdfghjkl) || !yeeState) { + this.entityRenderer.startup = 0; + this.entityRenderer.preStartup = 0; + this.gameSettings.adderall = false; + this.entityRenderer.asdfghjkl = false; + } + + if(this.theWorld == null) { + this.sndManager.playTheTitleMusic(); + }else { + this.sndManager.stopTheTitleMusic(); + } + + if(reconnectAddress != null) { + if(theWorld != null) { + System.out.println("Redirecting to: " + reconnectAddress); + theWorld.sendQuittingDisconnectingPacket(); + loadWorld((WorldClient) null); + stopServerAndDisplayGuiScreen(new GuiConnecting(new GuiMultiplayer(new GuiMainMenu()), this, + new ServerData("reconnect", reconnectAddress, true))); + } + reconnectAddress = null; } - this.mcProfiler.endSection(); this.systemTime = getSystemTime(); } + public void stopServerAndDisplayGuiScreen(GuiScreen par1GuiScreen) { + if(!IntegratedServer.isWorldNotLoaded()) { + IntegratedServer.unloadWorld(); + displayGuiScreen(new GuiScreenSingleplayerLoading(par1GuiScreen, "saving world", () -> IntegratedServer.isReady())); + }else { + displayGuiScreen(par1GuiScreen); + } + } + + private int titleMusicObj = -1; + + public String reconnectAddress = null; + /** * Arguments: World foldername, World ingame name, WorldSettings */ @@ -2169,48 +2073,6 @@ public class Minecraft implements IPlayerUsage return theMinecraft; } - public void addServerStatsToSnooper(PlayerUsageSnooper par1PlayerUsageSnooper) - { - par1PlayerUsageSnooper.addData("fps", Integer.valueOf(debugFPS)); - par1PlayerUsageSnooper.addData("texpack_name", this.mcResourcePackRepository.getResourcePackName()); - par1PlayerUsageSnooper.addData("vsync_enabled", Boolean.valueOf(this.gameSettings.enableVsync)); - par1PlayerUsageSnooper.addData("display_frequency", Integer.valueOf(Display.getDisplayMode().getFrequency())); - par1PlayerUsageSnooper.addData("display_type", this.fullscreen ? "fullscreen" : "windowed"); - par1PlayerUsageSnooper.addData("run_time", Long.valueOf((MinecraftServer.getSystemTimeMillis() - par1PlayerUsageSnooper.func_130105_g()) / 60L * 1000L)); - - if (this.theIntegratedServer != null && this.theIntegratedServer.getPlayerUsageSnooper() != null) - { - par1PlayerUsageSnooper.addData("snooper_partner", this.theIntegratedServer.getPlayerUsageSnooper().getUniqueID()); - } - } - - public void addServerTypeToSnooper(PlayerUsageSnooper par1PlayerUsageSnooper) - { - par1PlayerUsageSnooper.addData("opengl_version", GL11.glGetString(GL11.GL_VERSION)); - par1PlayerUsageSnooper.addData("opengl_vendor", GL11.glGetString(GL11.GL_VENDOR)); - par1PlayerUsageSnooper.addData("client_brand", ClientBrandRetriever.getClientModName()); - par1PlayerUsageSnooper.addData("launched_version", this.launchedVersion); - ContextCapabilities var2 = GLContext.getCapabilities(); - par1PlayerUsageSnooper.addData("gl_caps[ARB_multitexture]", Boolean.valueOf(var2.GL_ARB_multitexture)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_multisample]", Boolean.valueOf(var2.GL_ARB_multisample)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_texture_cube_map]", Boolean.valueOf(var2.GL_ARB_texture_cube_map)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_vertex_blend]", Boolean.valueOf(var2.GL_ARB_vertex_blend)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_matrix_palette]", Boolean.valueOf(var2.GL_ARB_matrix_palette)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_vertex_program]", Boolean.valueOf(var2.GL_ARB_vertex_program)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_vertex_shader]", Boolean.valueOf(var2.GL_ARB_vertex_shader)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_fragment_program]", Boolean.valueOf(var2.GL_ARB_fragment_program)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_fragment_shader]", Boolean.valueOf(var2.GL_ARB_fragment_shader)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_shader_objects]", Boolean.valueOf(var2.GL_ARB_shader_objects)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_vertex_buffer_object]", Boolean.valueOf(var2.GL_ARB_vertex_buffer_object)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_framebuffer_object]", Boolean.valueOf(var2.GL_ARB_framebuffer_object)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_pixel_buffer_object]", Boolean.valueOf(var2.GL_ARB_pixel_buffer_object)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_uniform_buffer_object]", Boolean.valueOf(var2.GL_ARB_uniform_buffer_object)); - par1PlayerUsageSnooper.addData("gl_caps[ARB_texture_non_power_of_two]", Boolean.valueOf(var2.GL_ARB_texture_non_power_of_two)); - par1PlayerUsageSnooper.addData("gl_caps[gl_max_vertex_uniforms]", Integer.valueOf(GL11.glGetInteger(GL20.GL_MAX_VERTEX_UNIFORM_COMPONENTS))); - par1PlayerUsageSnooper.addData("gl_caps[gl_max_fragment_uniforms]", Integer.valueOf(GL11.glGetInteger(GL20.GL_MAX_FRAGMENT_UNIFORM_COMPONENTS))); - par1PlayerUsageSnooper.addData("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize())); - } - /** * Used in the usage snooper. */ @@ -2291,10 +2153,6 @@ public class Minecraft implements IPlayerUsage /** * Returns the PlayerUsageSnooper instance. */ - public PlayerUsageSnooper getPlayerUsageSnooper() - { - return this.usageSnooper; - } /** * Gets the system time in milliseconds. @@ -2319,7 +2177,7 @@ public class Minecraft implements IPlayerUsage public Session getSession() { - return this.session; + return null; } public RenderEngine getTextureManager() diff --git a/src/main/java/net/minecraft/src/ValueObjectList.java b/src/main/java/net/minecraft/src/ValueObjectList.java index 722346d..ed36d9b 100644 --- a/src/main/java/net/minecraft/src/ValueObjectList.java +++ b/src/main/java/net/minecraft/src/ValueObjectList.java @@ -28,7 +28,6 @@ public class ValueObjectList extends ValueObject while (var3.hasNext()) { JsonNode var4 = (JsonNode)var3.next(); - var1.field_96430_d.add(McoServer.func_98163_a(var4)); } } }