3rdparty/resent-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Possible skill issue

Browse Source
This commit is contained in:
ThisIsALegitUsername 2023-02-22 18:08:30 +00:00
parent 00fe3f56c9
commit 3cd975f85c
4 changed files with 32979 additions and 33046 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62139
javascript/classes.js
View File

File diff suppressed because it is too large Load Diff

2
javascript/classes.js.map
View File

File diff suppressed because one or more lines are too long

407
src/main/java/net/minecraft/client/Minecraft.java
View File

@ -10,12 +10,6 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_MODELVIEW;
import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_PROJECTION;
import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_SMOOTH;
import com.google.common.collect.Lists;
import dev.resent.client.Resent;
import dev.resent.module.base.ModManager;
import dev.resent.ui.PreGUI;
import dev.resent.util.misc.W;
import java.io.IOException;
import java.io.InputStream;
import java.text.DecimalFormat;
@ -24,6 +18,14 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.Callable;
import org.apache.commons.lang3.Validate;
import com.google.common.collect.Lists;
import dev.resent.client.Resent;
import dev.resent.module.base.ModManager;
import dev.resent.util.misc.W;
import net.lax1dude.eaglercraft.v1_8.Display;
import net.lax1dude.eaglercraft.v1_8.EagRuntime;
import net.lax1dude.eaglercraft.v1_8.HString;
@ -159,7 +161,6 @@ import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.WorldProviderEnd;
import net.minecraft.world.WorldProviderHell;
import net.minecraft.world.WorldSettings;
import org.apache.commons.lang3.Validate;
/**+
* This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@ -180,7 +181,6 @@ import org.apache.commons.lang3.Validate;
*
*/
public class Minecraft implements IThreadListener {
private static final Logger logger = LogManager.getLogger();
private static final ResourceLocation locationMojangPng = new ResourceLocation("textures/gui/title/mojang.png");
public static final boolean isRunningOnMac = false;
@ -198,7 +198,7 @@ public class Minecraft implements IThreadListener {
private Timer timer = new Timer(20.0F);
public WorldClient theWorld;
public RenderGlobal renderGlobal;
public RenderManager renderManager;
private RenderManager renderManager;
private RenderItem renderItem;
private ItemRenderer itemRenderer;
public EntityPlayerSP thePlayer;
@ -345,13 +345,15 @@ public class Minecraft implements IThreadListener {
logger.fatal("Reported exception thrown!", reportedexception);
this.displayCrashReport(reportedexception.getCrashReport());
} catch (Throwable throwable1) {
CrashReport crashreport1 = this.addGraphicsAndWorldToCrashReport(new CrashReport("Unexpected error", throwable1));
CrashReport crashreport1 = this
.addGraphicsAndWorldToCrashReport(new CrashReport("Unexpected error", throwable1));
this.freeMemory();
logger.fatal("Unreported exception thrown!", throwable1);
this.displayCrashReport(crashreport1);
} finally {
this.shutdownMinecraftApplet();
}
}
/**+
@ -369,7 +371,8 @@ public class Minecraft implements IThreadListener {
logger.info("EagRuntime Version: " + EagRuntime.getVersion());
this.createDisplay();
this.registerMetadataSerializers();
this.mcResourcePackRepository = new ResourcePackRepository(this.mcDefaultResourcePack, this.metadataSerializer_, this.gameSettings);
this.mcResourcePackRepository = new ResourcePackRepository(this.mcDefaultResourcePack, this.metadataSerializer_,
this.gameSettings);
this.mcResourceManager = new SimpleReloadableResourceManager(this.metadataSerializer_);
this.mcLanguageManager = new LanguageManager(this.metadataSerializer_, this.gameSettings.language);
this.mcResourceManager.registerReloadListener(this.mcLanguageManager);
@ -380,33 +383,29 @@ public class Minecraft implements IThreadListener {
this.mcSoundHandler = new SoundHandler(this.mcResourceManager, this.gameSettings);
this.mcResourceManager.registerReloadListener(this.mcSoundHandler);
this.mcMusicTicker = new MusicTicker(this);
//this.resentFont = new FontRenderer(this.gameSettings, new ResourceLocation("eagler:gui/ascii.png"), this.renderEngine, false);
this.fontRendererObj = new EaglerFontRenderer(this.gameSettings, new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
this.fontRendererObj = new EaglerFontRenderer(this.gameSettings,
new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
if (this.gameSettings.language != null) {
this.fontRendererObj.setUnicodeFlag(this.isUnicode());
this.fontRendererObj.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
//this.resentFont.setUnicodeFlag(this.isUnicode());
//this.resentFont.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
}
//this.mcResourceManager.registerReloadListener(this.resentFont);
this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings, new ResourceLocation("textures/font/ascii_sga.png"), this.renderEngine, false);
this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings,
new ResourceLocation("textures/font/ascii_sga.png"), this.renderEngine, false);
this.mcResourceManager.registerReloadListener(this.fontRendererObj);
this.mcResourceManager.registerReloadListener(this.standardGalacticFontRenderer);
this.mcResourceManager.registerReloadListener(new GrassColorReloadListener());
this.mcResourceManager.registerReloadListener(new FoliageColorReloadListener());
AchievementList.openInventory.setStatStringFormatter(
new IStatStringFormat() {
AchievementList.openInventory.setStatStringFormatter(new IStatStringFormat() {
public String formatString(String parString1) {
try {
return HString.format(parString1, new Object[] { GameSettings.getKeyDisplayString(Minecraft.this.gameSettings.keyBindInventory.getKeyCode()) });
return HString.format(parString1, new Object[] { GameSettings
.getKeyDisplayString(Minecraft.this.gameSettings.keyBindInventory.getKeyCode()) });
} catch (Exception exception) {
return "Error: " + exception.getLocalizedMessage();
}
}
}
);
});
this.mouseHelper = new MouseHelper();
this.checkGLError("Pre startup");
GlStateManager.enableTexture2D();
@ -421,7 +420,6 @@ public class Minecraft implements IThreadListener {
GlStateManager.loadIdentity();
GlStateManager.matrixMode(GL_MODELVIEW);
this.checkGLError("Startup");
Resent.INSTANCE.init();
this.textureMapBlocks = new TextureMap("textures");
this.textureMapBlocks.setMipmapLevels(this.gameSettings.mipmapLevels);
this.renderEngine.loadTickableTexture(TextureMap.locationBlocksTexture, this.textureMapBlocks);
@ -435,7 +433,8 @@ public class Minecraft implements IThreadListener {
this.mcResourceManager.registerReloadListener(this.renderItem);
this.entityRenderer = new EntityRenderer(this, this.mcResourceManager);
this.mcResourceManager.registerReloadListener(this.entityRenderer);
this.blockRenderDispatcher = new BlockRendererDispatcher(this.modelManager.getBlockModelShapes(), this.gameSettings);
this.blockRenderDispatcher = new BlockRendererDispatcher(this.modelManager.getBlockModelShapes(),
this.gameSettings);
this.mcResourceManager.registerReloadListener(this.blockRenderDispatcher);
this.renderGlobal = new RenderGlobal(this);
this.mcResourceManager.registerReloadListener(this.renderGlobal);
@ -444,13 +443,14 @@ public class Minecraft implements IThreadListener {
this.effectRenderer = new EffectRenderer(this.theWorld, this.renderEngine);
SkinPreviewRenderer.initialize();
this.checkGLError("Post startup");
Resent.INSTANCE.init();
this.ingameGUI = new GuiIngame(this);
ServerList.initServerList(this);
EaglerProfile.read();
if (this.serverName != null) {
this.displayGuiScreen(new GuiScreenEditProfile(new GuiConnecting(new GuiMainMenu(), this, this.serverName, this.serverPort)));
this.displayGuiScreen(new GuiScreenEditProfile(
new GuiConnecting(new GuiMainMenu(), this, this.serverName, this.serverPort)));
} else {
this.displayGuiScreen(new GuiScreenEditProfile(new GuiMainMenu()));
}
@ -461,11 +461,16 @@ public class Minecraft implements IThreadListener {
}
private void registerMetadataSerializers() {
this.metadataSerializer_.registerMetadataSectionType(new TextureMetadataSectionSerializer(), TextureMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new FontMetadataSectionSerializer(), FontMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new AnimationMetadataSectionSerializer(), AnimationMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new PackMetadataSectionSerializer(), PackMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new LanguageMetadataSectionSerializer(), LanguageMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new TextureMetadataSectionSerializer(),
TextureMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new FontMetadataSectionSerializer(),
FontMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new AnimationMetadataSectionSerializer(),
AnimationMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new PackMetadataSectionSerializer(),
PackMetadataSection.class);
this.metadataSerializer_.registerMetadataSectionType(new LanguageMetadataSectionSerializer(),
LanguageMetadataSection.class);
}
private void initStream() {
@ -498,12 +503,14 @@ public class Minecraft implements IThreadListener {
Bootstrap.printToSYSOUT(report);
PlatformRuntime.writeCrashReport(report);
if (PlatformRuntime.getPlatformType() == EnumPlatformType.JAVASCRIPT) {
System.err.println("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
System.err.println(
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
System.err.println("NATIVE BROWSER EXCEPTION:");
if (!PlatformRuntime.printJSExceptionIfBrowser(crashReportIn.getCrashCause())) {
System.err.println("<undefined>");
}
System.err.println("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
System.err.println(
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
}
}
@ -516,7 +523,8 @@ public class Minecraft implements IThreadListener {
ArrayList arraylist = Lists.newArrayList(this.defaultResourcePacks);
for (ResourcePackRepository.Entry resourcepackrepository$entry : this.mcResourcePackRepository.getRepositoryEntries()) {
for (ResourcePackRepository.Entry resourcepackrepository$entry : this.mcResourcePackRepository
.getRepositoryEntries()) {
arraylist.add(resourcepackrepository$entry.getResourcePack());
}
@ -542,6 +550,7 @@ public class Minecraft implements IThreadListener {
if (this.renderGlobal != null) {
this.renderGlobal.loadRenderers();
}
}
private void updateDisplayMode() {
@ -557,7 +566,8 @@ public class Minecraft implements IThreadListener {
int i = scaledresolution.getScaleFactor();
GlStateManager.matrixMode(GL_PROJECTION);
GlStateManager.loadIdentity();
GlStateManager.ortho(0.0D, (double) scaledresolution.getScaledWidth(), (double) scaledresolution.getScaledHeight(), 0.0D, 1000.0D, 3000.0D);
GlStateManager.ortho(0.0D, (double) scaledresolution.getScaledWidth(),
(double) scaledresolution.getScaledHeight(), 0.0D, 1000.0D, 3000.0D);
GlStateManager.matrixMode(GL_MODELVIEW);
GlStateManager.loadIdentity();
GlStateManager.translate(0.0F, 0.0F, -2000.0F);
@ -569,7 +579,8 @@ public class Minecraft implements IThreadListener {
try {
inputstream = this.mcDefaultResourcePack.getInputStream(locationMojangPng);
this.mojangLogo = textureManagerInstance.getDynamicTextureLocation("logo", new DynamicTexture(ImageData.loadImageFile(inputstream)));
this.mojangLogo = textureManagerInstance.getDynamicTextureLocation("logo",
new DynamicTexture(ImageData.loadImageFile(inputstream)));
textureManagerInstance.bindTexture(this.mojangLogo);
} catch (IOException ioexception) {
logger.error("Unable to load logo: " + locationMojangPng, ioexception);
@ -580,15 +591,18 @@ public class Minecraft implements IThreadListener {
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
worldrenderer.pos(0.0D, (double) this.displayHeight, 0.0D).tex(0.0D, 0.0D).color(255, 255, 255, 255).endVertex();
worldrenderer.pos((double) this.displayWidth, (double) this.displayHeight, 0.0D).tex(0.0D, 0.0D).color(255, 255, 255, 255).endVertex();
worldrenderer.pos(0.0D, (double) this.displayHeight, 0.0D).tex(0.0D, 0.0D).color(255, 255, 255, 255)
.endVertex();
worldrenderer.pos((double) this.displayWidth, (double) this.displayHeight, 0.0D).tex(0.0D, 0.0D)
.color(255, 255, 255, 255).endVertex();
worldrenderer.pos((double) this.displayWidth, 0.0D, 0.0D).tex(0.0D, 0.0D).color(255, 255, 255, 255).endVertex();
worldrenderer.pos(0.0D, 0.0D, 0.0D).tex(0.0D, 0.0D).color(255, 255, 255, 255).endVertex();
tessellator.draw();
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
short short1 = 256;
short short2 = 256;
this.func_181536_a((scaledresolution.getScaledWidth() - short1) / 2, (scaledresolution.getScaledHeight() - short2) / 2, 0, 0, short1, short2, 255, 255, 255, 255);
this.func_181536_a((scaledresolution.getScaledWidth() - short1) / 2,
(scaledresolution.getScaledHeight() - short2) / 2, 0, 0, short1, short2, 255, 255, 255, 255);
GlStateManager.disableLighting();
GlStateManager.disableFog();
GlStateManager.enableAlpha();
@ -596,15 +610,24 @@ public class Minecraft implements IThreadListener {
this.updateDisplay();
}
public void func_181536_a(int parInt1, int parInt2, int parInt3, int parInt4, int parInt5, int parInt6, int parInt7, int parInt8, int parInt9, int parInt10) {
public void func_181536_a(int parInt1, int parInt2, int parInt3, int parInt4, int parInt5, int parInt6, int parInt7,
int parInt8, int parInt9, int parInt10) {
float f = 0.00390625F;
float f1 = 0.00390625F;
WorldRenderer worldrenderer = Tessellator.getInstance().getWorldRenderer();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
worldrenderer.pos((double) parInt1, (double) (parInt2 + parInt6), 0.0D).tex((double) ((float) parInt3 * f), (double) ((float) (parInt4 + parInt6) * f1)).color(parInt7, parInt8, parInt9, parInt10).endVertex();
worldrenderer.pos((double) (parInt1 + parInt5), (double) (parInt2 + parInt6), 0.0D).tex((double) ((float) (parInt3 + parInt5) * f), (double) ((float) (parInt4 + parInt6) * f1)).color(parInt7, parInt8, parInt9, parInt10).endVertex();
worldrenderer.pos((double) (parInt1 + parInt5), (double) parInt2, 0.0D).tex((double) ((float) (parInt3 + parInt5) * f), (double) ((float) parInt4 * f1)).color(parInt7, parInt8, parInt9, parInt10).endVertex();
worldrenderer.pos((double) parInt1, (double) parInt2, 0.0D).tex((double) ((float) parInt3 * f), (double) ((float) parInt4 * f1)).color(parInt7, parInt8, parInt9, parInt10).endVertex();
worldrenderer.pos((double) parInt1, (double) (parInt2 + parInt6), 0.0D)
.tex((double) ((float) parInt3 * f), (double) ((float) (parInt4 + parInt6) * f1))
.color(parInt7, parInt8, parInt9, parInt10).endVertex();
worldrenderer.pos((double) (parInt1 + parInt5), (double) (parInt2 + parInt6), 0.0D)
.tex((double) ((float) (parInt3 + parInt5) * f), (double) ((float) (parInt4 + parInt6) * f1))
.color(parInt7, parInt8, parInt9, parInt10).endVertex();
worldrenderer.pos((double) (parInt1 + parInt5), (double) parInt2, 0.0D)
.tex((double) ((float) (parInt3 + parInt5) * f), (double) ((float) parInt4 * f1))
.color(parInt7, parInt8, parInt9, parInt10).endVertex();
worldrenderer.pos((double) parInt1, (double) parInt2, 0.0D)
.tex((double) ((float) parInt3 * f), (double) ((float) parInt4 * f1))
.color(parInt7, parInt8, parInt9, parInt10).endVertex();
Tessellator.getInstance().draw();
}
@ -640,6 +663,7 @@ public class Minecraft implements IThreadListener {
this.mcSoundHandler.resumeSounds();
this.setIngameFocus();
}
}
/**+
@ -655,6 +679,7 @@ public class Minecraft implements IThreadListener {
logger.error("@ " + message);
logger.error(i + ": " + s);
}
}
}
@ -669,7 +694,9 @@ public class Minecraft implements IThreadListener {
try {
this.loadWorld((WorldClient) null);
} catch (Throwable var5) {}
} catch (Throwable var5) {
;
}
this.mcSoundHandler.unloadSounds();
} finally {
@ -677,6 +704,7 @@ public class Minecraft implements IThreadListener {
if (!this.hasCrashed) {
EagRuntime.exit();
}
}
}
@ -739,7 +767,8 @@ public class Minecraft implements IThreadListener {
}
this.mcProfiler.endSection();
if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart && !this.gameSettings.hideGUI) {
if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart
&& !this.gameSettings.hideGUI) {
if (!this.mcProfiler.profilingEnabled) {
this.mcProfiler.clearProfiling();
}
@ -767,19 +796,14 @@ public class Minecraft implements IThreadListener {
while (getSystemTime() >= this.debugUpdateTime + 1000L) {
debugFPS = this.fpsCounter;
this.debug =
HString.format(
"%d fps (%d chunk update%s) T: %s%s%s%s",
new Object[] {
Integer.valueOf(debugFPS),
Integer.valueOf(RenderChunk.renderChunksUpdated),
this.debug = HString.format("%d fps (%d chunk update%s) T: %s%s%s%s",
new Object[] { Integer.valueOf(debugFPS), Integer.valueOf(RenderChunk.renderChunksUpdated),
RenderChunk.renderChunksUpdated != 1 ? "s" : "",
(float) this.gameSettings.limitFramerate == GameSettings.Options.FRAMERATE_LIMIT.getValueMax() ? "inf" : Integer.valueOf(this.gameSettings.limitFramerate),
(float) this.gameSettings.limitFramerate == GameSettings.Options.FRAMERATE_LIMIT
.getValueMax() ? "inf" : Integer.valueOf(this.gameSettings.limitFramerate),
this.gameSettings.enableVsync ? " vsync" : "",
this.gameSettings.fancyGraphics ? "" : " fast",
this.gameSettings.clouds == 0 ? "" : (this.gameSettings.clouds == 1 ? " fast-clouds" : " fancy-clouds")
}
);
this.gameSettings.fancyGraphics ? "" : " fast", this.gameSettings.clouds == 0 ? ""
: (this.gameSettings.clouds == 1 ? " fast-clouds" : " fancy-clouds") });
RenderChunk.renderChunksUpdated = 0;
this.debugUpdateTime += 1000L;
this.fpsCounter = 0;
@ -819,6 +843,7 @@ public class Minecraft implements IThreadListener {
this.resize(this.displayWidth, this.displayHeight);
}
}
}
public int getLimitFramerate() {
@ -833,7 +858,9 @@ public class Minecraft implements IThreadListener {
try {
System.gc();
this.loadWorld((WorldClient) null);
} catch (Throwable var2) {}
} catch (Throwable var2) {
;
}
System.gc();
}
@ -855,14 +882,17 @@ public class Minecraft implements IThreadListener {
}
} else {
--keyCount;
if (keyCount < list.size() && !((Profiler.Result) list.get(keyCount)).field_76331_c.equals("unspecified")) {
if (keyCount < list.size()
&& !((Profiler.Result) list.get(keyCount)).field_76331_c.equals("unspecified")) {
if (this.debugProfilerName.length() > 0) {
this.debugProfilerName = this.debugProfilerName + ".";
}
this.debugProfilerName = this.debugProfilerName + ((Profiler.Result) list.get(keyCount)).field_76331_c;
this.debugProfilerName = this.debugProfilerName
+ ((Profiler.Result) list.get(keyCount)).field_76331_c;
}
}
}
}
@ -890,10 +920,14 @@ public class Minecraft implements IThreadListener {
int j = this.displayHeight - short1 * 2;
GlStateManager.enableBlend();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
worldrenderer.pos((double) ((float) i - (float) short1 * 1.1F), (double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
worldrenderer.pos((double) ((float) i - (float) short1 * 1.1F), (double) (j + short1 * 2), 0.0D).color(0, 0, 0, 100).endVertex();
worldrenderer.pos((double) ((float) i + (float) short1 * 1.1F), (double) (j + short1 * 2), 0.0D).color(0, 0, 0, 100).endVertex();
worldrenderer.pos((double) ((float) i + (float) short1 * 1.1F), (double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
worldrenderer.pos((double) ((float) i - (float) short1 * 1.1F),
(double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
worldrenderer.pos((double) ((float) i - (float) short1 * 1.1F), (double) (j + short1 * 2), 0.0D)
.color(0, 0, 0, 100).endVertex();
worldrenderer.pos((double) ((float) i + (float) short1 * 1.1F), (double) (j + short1 * 2), 0.0D)
.color(0, 0, 0, 100).endVertex();
worldrenderer.pos((double) ((float) i + (float) short1 * 1.1F),
(double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
tessellator.draw();
GlStateManager.disableBlend();
double d0 = 0.0D;
@ -909,21 +943,26 @@ public class Minecraft implements IThreadListener {
worldrenderer.pos((double) i, (double) j, 0.0D).color(j1, k1, l1, 255).endVertex();
for (int i2 = l; i2 >= 0; --i2) {
float f = (float) ((d0 + profiler$result1.field_76332_a * (double) i2 / (double) l) * 3.1415927410125732D * 2.0D / 100.0D);
float f = (float) ((d0 + profiler$result1.field_76332_a * (double) i2 / (double) l)
* 3.1415927410125732D * 2.0D / 100.0D);
float f1 = MathHelper.sin(f) * (float) short1;
float f2 = MathHelper.cos(f) * (float) short1 * 0.5F;
worldrenderer.pos((double) ((float) i + f1), (double) ((float) j - f2), 0.0D).color(j1, k1, l1, 255).endVertex();
worldrenderer.pos((double) ((float) i + f1), (double) ((float) j - f2), 0.0D).color(j1, k1, l1, 255)
.endVertex();
}
tessellator.draw();
worldrenderer.begin(5, DefaultVertexFormats.POSITION_COLOR);
for (int l2 = l; l2 >= 0; --l2) {
float f3 = (float) ((d0 + profiler$result1.field_76332_a * (double) l2 / (double) l) * 3.1415927410125732D * 2.0D / 100.0D);
float f3 = (float) ((d0 + profiler$result1.field_76332_a * (double) l2 / (double) l)
* 3.1415927410125732D * 2.0D / 100.0D);
float f4 = MathHelper.sin(f3) * (float) short1;
float f5 = MathHelper.cos(f3) * (float) short1 * 0.5F;
worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5), 0.0D).color(j1 >> 1, k1 >> 1, l1 >> 1, 255).endVertex();
worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5 + 10.0F), 0.0D).color(j1 >> 1, k1 >> 1, l1 >> 1, 255).endVertex();
worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5), 0.0D)
.color(j1 >> 1, k1 >> 1, l1 >> 1, 255).endVertex();
worldrenderer.pos((double) ((float) i + f4), (double) ((float) j - f5 + 10.0F), 0.0D)
.color(j1 >> 1, k1 >> 1, l1 >> 1, 255).endVertex();
}
tessellator.draw();
@ -945,7 +984,8 @@ public class Minecraft implements IThreadListener {
int k2 = 16777215;
this.fontRendererObj.drawStringWithShadow(s, (float) (i - short1), (float) (j - short1 / 2 - 16), k2);
this.fontRendererObj.drawStringWithShadow(s = decimalformat.format(profiler$result.field_76330_b) + "%", (float) (i + short1 - this.fontRendererObj.getStringWidth(s)), (float) (j - short1 / 2 - 16), k2);
this.fontRendererObj.drawStringWithShadow(s = decimalformat.format(profiler$result.field_76330_b) + "%",
(float) (i + short1 - this.fontRendererObj.getStringWidth(s)), (float) (j - short1 / 2 - 16), k2);
for (int j2 = 0; j2 < list.size(); ++j2) {
Profiler.Result profiler$result2 = (Profiler.Result) list.get(j2);
@ -957,10 +997,18 @@ public class Minecraft implements IThreadListener {
}
s1 = s1 + profiler$result2.field_76331_c;
this.fontRendererObj.drawStringWithShadow(s1, (float) (i - short1), (float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
this.fontRendererObj.drawStringWithShadow(s1 = decimalformat.format(profiler$result2.field_76332_a) + "%", (float) (i + short1 - 50 - this.fontRendererObj.getStringWidth(s1)), (float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
this.fontRendererObj.drawStringWithShadow(s1 = decimalformat.format(profiler$result2.field_76330_b) + "%", (float) (i + short1 - this.fontRendererObj.getStringWidth(s1)), (float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
this.fontRendererObj.drawStringWithShadow(s1, (float) (i - short1),
(float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
this.fontRendererObj.drawStringWithShadow(
s1 = decimalformat.format(profiler$result2.field_76332_a) + "%",
(float) (i + short1 - 50 - this.fontRendererObj.getStringWidth(s1)),
(float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
this.fontRendererObj.drawStringWithShadow(
s1 = decimalformat.format(profiler$result2.field_76330_b) + "%",
(float) (i + short1 - this.fontRendererObj.getStringWidth(s1)),
(float) (j + short1 / 2 + j2 * 8 + 20), profiler$result2.func_76329_a());
}
}
}
@ -1015,12 +1063,15 @@ public class Minecraft implements IThreadListener {
}
if (this.leftClickCounter <= 0 && !this.thePlayer.isUsingItem()) {
if (leftClick && this.objectMouseOver != null && this.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
if (leftClick && this.objectMouseOver != null
&& this.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
BlockPos blockpos = this.objectMouseOver.getBlockPos();
if (this.theWorld.getBlockState(blockpos).getBlock().getMaterial() != Material.air && this.playerController.onPlayerDamageBlock(blockpos, this.objectMouseOver.sideHit)) {
if (this.theWorld.getBlockState(blockpos).getBlock().getMaterial() != Material.air
&& this.playerController.onPlayerDamageBlock(blockpos, this.objectMouseOver.sideHit)) {
this.effectRenderer.addBlockHitEffects(blockpos, this.objectMouseOver.sideHit);
this.thePlayer.swingItem();
}
} else {
this.playerController.resetBlockRemoving();
}
@ -1035,6 +1086,7 @@ public class Minecraft implements IThreadListener {
if (this.playerController.isNotCreative()) {
this.leftClickCounter = 10;
}
} else {
switch (this.objectMouseOver.typeOfHit) {
case ENTITY:
@ -1052,6 +1104,7 @@ public class Minecraft implements IThreadListener {
this.leftClickCounter = 10;
}
}
}
}
}
@ -1069,9 +1122,11 @@ public class Minecraft implements IThreadListener {
} else {
switch (this.objectMouseOver.typeOfHit) {
case ENTITY:
if (this.playerController.func_178894_a(this.thePlayer, this.objectMouseOver.entityHit, this.objectMouseOver)) {
if (this.playerController.func_178894_a(this.thePlayer, this.objectMouseOver.entityHit,
this.objectMouseOver)) {
flag = false;
} else if (this.playerController.interactWithEntitySendPacket(this.thePlayer, this.objectMouseOver.entityHit)) {
} else if (this.playerController.interactWithEntitySendPacket(this.thePlayer,
this.objectMouseOver.entityHit)) {
flag = false;
}
break;
@ -1079,7 +1134,8 @@ public class Minecraft implements IThreadListener {
BlockPos blockpos = this.objectMouseOver.getBlockPos();
if (this.theWorld.getBlockState(blockpos).getBlock().getMaterial() != Material.air) {
int i = itemstack != null ? itemstack.stackSize : 0;
if (this.playerController.onPlayerRightClick(this.thePlayer, this.theWorld, itemstack, blockpos, this.objectMouseOver.sideHit, this.objectMouseOver.hitVec)) {
if (this.playerController.onPlayerRightClick(this.thePlayer, this.theWorld, itemstack, blockpos,
this.objectMouseOver.sideHit, this.objectMouseOver.hitVec)) {
flag = false;
this.thePlayer.swingItem();
}
@ -1099,10 +1155,12 @@ public class Minecraft implements IThreadListener {
if (flag) {
ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem();
if (itemstack1 != null && this.playerController.sendUseItem(this.thePlayer, this.theWorld, itemstack1)) {
if (itemstack1 != null
&& this.playerController.sendUseItem(this.thePlayer, this.theWorld, itemstack1)) {
this.entityRenderer.itemRenderer.resetEquippedProgress2();
}
}
}
}
@ -1170,7 +1228,8 @@ public class Minecraft implements IThreadListener {
this.displayInGameMenu();
}
}
} else if (this.currentScreen != null && this.currentScreen instanceof GuiSleepMP && !this.thePlayer.isPlayerSleeping()) {
} else if (this.currentScreen != null && this.currentScreen instanceof GuiSleepMP
&& !this.thePlayer.isPlayerSleeping()) {
this.displayGuiScreen((GuiScreen) null);
}
@ -1189,14 +1248,11 @@ public class Minecraft implements IThreadListener {
} catch (Throwable throwable1) {
CrashReport crashreport = CrashReport.makeCrashReport(throwable1, "Updating screen events");
CrashReportCategory crashreportcategory = crashreport.makeCategory("Affected screen");
crashreportcategory.addCrashSectionCallable(
"Screen name",
new Callable<String>() {
crashreportcategory.addCrashSectionCallable("Screen name", new Callable<String>() {
public String call() throws Exception {
return Minecraft.this.currentScreen.getClass().getName();
}
}
);
});
throw new ReportedException(crashreport);
}
@ -1206,14 +1262,11 @@ public class Minecraft implements IThreadListener {
} catch (Throwable throwable) {
CrashReport crashreport1 = CrashReport.makeCrashReport(throwable, "Ticking screen");
CrashReportCategory crashreportcategory1 = crashreport1.makeCategory("Affected screen");
crashreportcategory1.addCrashSectionCallable(
"Screen name",
new Callable<String>() {
crashreportcategory1.addCrashSectionCallable("Screen name", new Callable<String>() {
public String call() throws Exception {
return Minecraft.this.currentScreen.getClass().getName();
}
}
);
});
throw new ReportedException(crashreport1);
}
}
@ -1242,7 +1295,8 @@ public class Minecraft implements IThreadListener {
if (this.ingameGUI.getSpectatorGui().func_175262_a()) {
this.ingameGUI.getSpectatorGui().func_175259_b(-j);
} else {
float f = MathHelper.clamp_float(this.thePlayer.capabilities.getFlySpeed() + (float) j * 0.005F, 0.0F, 0.2F);
float f = MathHelper.clamp_float(
this.thePlayer.capabilities.getFlySpeed() + (float) j * 0.005F, 0.0F, 0.2F);
this.thePlayer.capabilities.setFlySpeed(f);
}
} else {
@ -1314,22 +1368,33 @@ public class Minecraft implements IThreadListener {
this.refreshResources();
}
if (k == 17 && Keyboard.isKeyDown(61)) {}
if (k == 17 && Keyboard.isKeyDown(61)) {
;
}
if (k == 18 && Keyboard.isKeyDown(61)) {}
if (k == 18 && Keyboard.isKeyDown(61)) {
;
}
if (k == 47 && Keyboard.isKeyDown(61)) {}
if (k == 47 && Keyboard.isKeyDown(61)) {
;
}
if (k == 38 && Keyboard.isKeyDown(61)) {}
if (k == 38 && Keyboard.isKeyDown(61)) {
;
}
if (k == 22 && Keyboard.isKeyDown(61)) {}
if (k == 22 && Keyboard.isKeyDown(61)) {
;
}
if (k == 20 && Keyboard.isKeyDown(61)) {
this.refreshResources();
}
if (k == 33 && Keyboard.isKeyDown(61)) {
this.gameSettings.setOptionValue(GameSettings.Options.RENDER_DISTANCE, GuiScreen.isShiftKeyDown() ? -1 : 1);
this.gameSettings.setOptionValue(GameSettings.Options.RENDER_DISTANCE,
GuiScreen.isShiftKeyDown() ? -1 : 1);
}
if (k == 30 && Keyboard.isKeyDown(61)) {
@ -1411,15 +1476,12 @@ public class Minecraft implements IThreadListener {
if (this.playerController.isRidingHorse()) {
this.thePlayer.sendHorseInventory();
} else {
this.getNetHandler().addToSendQueue(new C16PacketClientStatus(C16PacketClientStatus.EnumState.OPEN_INVENTORY_ACHIEVEMENT));
this.getNetHandler().addToSendQueue(
new C16PacketClientStatus(C16PacketClientStatus.EnumState.OPEN_INVENTORY_ACHIEVEMENT));
this.displayGuiScreen(new GuiInventory(this.thePlayer));
}
}
if (this.gameSettings.keyBindClickGui.isPressed()) {
this.displayGuiScreen(new PreGUI());
}
while (this.gameSettings.keyBindDrop.isPressed()) {
if (!this.thePlayer.isSpectator()) {
this.thePlayer.dropOneItem(GuiScreen.isCtrlKeyDown());
@ -1439,11 +1501,17 @@ public class Minecraft implements IThreadListener {
this.playerController.onStoppedUsingItem(this.thePlayer);
}
while (this.gameSettings.keyBindAttack.isPressed()) {}
while (this.gameSettings.keyBindAttack.isPressed()) {
;
}
while (this.gameSettings.keyBindUseItem.isPressed()) {}
while (this.gameSettings.keyBindUseItem.isPressed()) {
;
}
while (this.gameSettings.keyBindPickBlock.isPressed()) {}
while (this.gameSettings.keyBindPickBlock.isPressed()) {
;
}
} else {
while (this.gameSettings.keyBindAttack.isPressed()) {
this.clickMouse();
@ -1458,11 +1526,13 @@ public class Minecraft implements IThreadListener {
}
}
if (this.gameSettings.keyBindUseItem.isKeyDown() && this.rightClickDelayTimer == 0 && !this.thePlayer.isUsingItem()) {
if (this.gameSettings.keyBindUseItem.isKeyDown() && this.rightClickDelayTimer == 0
&& !this.thePlayer.isUsingItem()) {
this.rightClickMouse();
}
this.sendClickBlockToController(this.currentScreen == null && this.gameSettings.keyBindAttack.isKeyDown() && this.inGameHasFocus);
this.sendClickBlockToController(
this.currentScreen == null && this.gameSettings.keyBindAttack.isKeyDown() && this.inGameHasFocus);
}
if (this.theWorld != null) {
@ -1522,7 +1592,8 @@ public class Minecraft implements IThreadListener {
this.mcProfiler.endStartSection("animateTick");
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.theWorld.doVoidFogParticles(MathHelper.floor_double(this.thePlayer.posX),
MathHelper.floor_double(this.thePlayer.posY), MathHelper.floor_double(this.thePlayer.posZ));
}
this.mcProfiler.endStartSection("particles");
@ -1531,7 +1602,7 @@ public class Minecraft implements IThreadListener {
}
} else if (this.myNetworkManager != null) {
this.mcProfiler.endStartSection("pendingConnection");
//this.myNetworkManager.processReceivedPackets();
this.myNetworkManager.processReceivedPackets();
}
if (this.theWorld != null) {
@ -1608,7 +1679,6 @@ public class Minecraft implements IThreadListener {
this.thePlayer.movementInput = new MovementInputFromOptions(this.gameSettings);
this.playerController.setPlayerCapabilities(this.thePlayer);
this.renderViewEntity = this.thePlayer;
this.gameSettings.loadOptions();
} else {
this.thePlayer = null;
}
@ -1645,6 +1715,7 @@ public class Minecraft implements IThreadListener {
if (this.currentScreen instanceof GuiGameOver) {
this.displayGuiScreen((GuiScreen) null);
}
}
/**+
@ -1700,11 +1771,14 @@ public class Minecraft implements IThreadListener {
tileentity = this.theWorld.getTileEntity(blockpos);
}
Block block1 = object instanceof ItemBlock && !block.isFlowerPot() ? Block.getBlockFromItem((Item) object) : block;
Block block1 = object instanceof ItemBlock && !block.isFlowerPot()
? Block.getBlockFromItem((Item) object)
: block;
i = block1.getDamageValue(this.theWorld, blockpos);
flag1 = ((Item) object).getHasSubtypes();
} else {
if (this.objectMouseOver.typeOfHit != MovingObjectPosition.MovingObjectType.ENTITY || this.objectMouseOver.entityHit == null || !flag) {
if (this.objectMouseOver.typeOfHit != MovingObjectPosition.MovingObjectType.ENTITY
|| this.objectMouseOver.entityHit == null || !flag) {
return;
}
@ -1769,6 +1843,7 @@ public class Minecraft implements IThreadListener {
int j = this.thePlayer.inventoryContainer.inventorySlots.size() - 9 + inventoryplayer.currentItem;
this.playerController.sendSlotPacket(inventoryplayer.getStackInSlot(inventoryplayer.currentItem), j);
}
}
}
@ -1798,61 +1873,33 @@ public class Minecraft implements IThreadListener {
* type), and the worldInfo to the crash report
*/
public CrashReport addGraphicsAndWorldToCrashReport(CrashReport theCrash) {
theCrash
.getCategory()
.addCrashSectionCallable(
"Launched Version",
new Callable<String>() {
theCrash.getCategory().addCrashSectionCallable("Launched Version", new Callable<String>() {
public String call() throws Exception {
return Minecraft.this.launchedVersion;
}
}
);
theCrash
.getCategory()
.addCrashSectionCallable(
"LWJGL",
new Callable<String>() {
});
theCrash.getCategory().addCrashSectionCallable("LWJGL", new Callable<String>() {
public String call() {
return EagRuntime.getVersion();
}
}
);
theCrash
.getCategory()
.addCrashSectionCallable(
"OpenGL",
new Callable<String>() {
});
theCrash.getCategory().addCrashSectionCallable("OpenGL", new Callable<String>() {
public String call() {
return EaglercraftGPU.glGetString(7937) + " GL version " + EaglercraftGPU.glGetString(7938) + ", " + EaglercraftGPU.glGetString(7936);
return EaglercraftGPU.glGetString(7937) + " GL version " + EaglercraftGPU.glGetString(7938) + ", "
+ EaglercraftGPU.glGetString(7936);
}
}
);
theCrash
.getCategory()
.addCrashSectionCallable(
"Is Modded",
new Callable<String>() {
});
theCrash.getCategory().addCrashSectionCallable("Is Modded", new Callable<String>() {
public String call() throws Exception {
return "Definitely Not; You're an eagler";
}
}
);
theCrash
.getCategory()
.addCrashSectionCallable(
"Type",
new Callable<String>() {
});
theCrash.getCategory().addCrashSectionCallable("Type", new Callable<String>() {
public String call() throws Exception {
return "Client (map_client.txt)";
}
}
);
theCrash
.getCategory()
.addCrashSectionCallable(
"Resource Packs",
new Callable<String>() {
});
theCrash.getCategory().addCrashSectionCallable("Resource Packs", new Callable<String>() {
public String call() throws Exception {
StringBuilder stringbuilder = new StringBuilder();
@ -1869,28 +1916,18 @@ public class Minecraft implements IThreadListener {
return stringbuilder.toString();
}
}
);
theCrash
.getCategory()
.addCrashSectionCallable(
"Current Language",
new Callable<String>() {
});
theCrash.getCategory().addCrashSectionCallable("Current Language", new Callable<String>() {
public String call() throws Exception {
return Minecraft.this.mcLanguageManager.getCurrentLanguage().toString();
}
}
);
theCrash
.getCategory()
.addCrashSectionCallable(
"Profiler Position",
new Callable<String>() {
});
theCrash.getCategory().addCrashSectionCallable("Profiler Position", new Callable<String>() {
public String call() throws Exception {
return Minecraft.this.mcProfiler.profilingEnabled ? Minecraft.this.mcProfiler.getNameOfLastSection() : "N/A (disabled)";
return Minecraft.this.mcProfiler.profilingEnabled ? Minecraft.this.mcProfiler.getNameOfLastSection()
: "N/A (disabled)";
}
}
);
});
if (this.theWorld != null) {
this.theWorld.addWorldInfoToCrashReport(theCrash);
}
@ -1906,14 +1943,13 @@ public class Minecraft implements IThreadListener {
}
public ListenableFuture<Object> scheduleResourcesRefresh() {
return this.addScheduledTask(
new Runnable() {
return this.addScheduledTask(new Runnable() {
public void run() {
Minecraft.this.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"), I18n.format("resourcePack.load.pleaseWait"));
Minecraft.this.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
I18n.format("resourcePack.load.pleaseWait"));
Minecraft.this.refreshResources();
}
}
);
});
}
private String func_181538_aA() {
@ -1950,7 +1986,9 @@ public class Minecraft implements IThreadListener {
return false;
}
public static void stopIntegratedServer() {}
public static void stopIntegratedServer() {
}
/**+
* Gets the system time in milliseconds.
@ -2003,19 +2041,22 @@ public class Minecraft implements IThreadListener {
}
public MusicTicker.MusicType getAmbientMusicType() {
return this.thePlayer != null
? (
this.thePlayer.worldObj.provider instanceof WorldProviderHell
return this.thePlayer != null ? (this.thePlayer.worldObj.provider instanceof WorldProviderHell
? MusicTicker.MusicType.NETHER
: (this.thePlayer.worldObj.provider instanceof WorldProviderEnd ? (BossStatus.bossName != null && BossStatus.statusBarTime > 0 ? MusicTicker.MusicType.END_BOSS : MusicTicker.MusicType.END) : (this.thePlayer.capabilities.isCreativeMode && this.thePlayer.capabilities.allowFlying ? MusicTicker.MusicType.CREATIVE : MusicTicker.MusicType.GAME))
)
: (this.thePlayer.worldObj.provider instanceof WorldProviderEnd
? (BossStatus.bossName != null && BossStatus.statusBarTime > 0 ? MusicTicker.MusicType.END_BOSS
: MusicTicker.MusicType.END)
: (this.thePlayer.capabilities.isCreativeMode && this.thePlayer.capabilities.allowFlying
? MusicTicker.MusicType.CREATIVE
: MusicTicker.MusicType.GAME)))
: MusicTicker.MusicType.MENU;
}
public void dispatchKeypresses() {
int i = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() : Keyboard.getEventKey();
if (i != 0 && !Keyboard.isRepeatEvent()) {
if (!(this.currentScreen instanceof GuiControls) || ((GuiControls) this.currentScreen).time <= getSystemTime() - 20L) {
if (!(this.currentScreen instanceof GuiControls)
|| ((GuiControls) this.currentScreen).time <= getSystemTime() - 20L) {
if (Keyboard.getEventKeyState()) {
if (i == this.gameSettings.keyBindScreenshot.getKeyCode()) {
this.ingameGUI.getChatGUI().printChatMessage(ScreenShotHelper.saveScreenshot());

7
src/main/java/net/minecraft/client/multiplayer/PlayerControllerMP.java
View File

@ -287,15 +287,18 @@ public class PlayerControllerMP {
try {
this.netClientHandler.getNetworkManager().processReceivedPackets();
} catch (IOException ex) {
EaglercraftNetworkManager.logger.fatal("Unhandled IOException was thrown " + "while processing multiplayer packets!");
EaglercraftNetworkManager.logger
.fatal("Unhandled IOException was thrown " + "while processing multiplayer packets!");
EaglercraftNetworkManager.logger.fatal(ex);
EaglercraftNetworkManager.logger.fatal("Disconnecting...");
this.netClientHandler.getNetworkManager().closeChannel(new ChatComponentText("Exception thrown: " + ex.toString()));
this.netClientHandler.getNetworkManager()
.closeChannel(new ChatComponentText("Exception thrown: " + ex.toString()));
}
this.netClientHandler.getSkinCache().flush();
} else {
this.netClientHandler.getNetworkManager().checkDisconnected();
}
}
private boolean isHittingPosition(BlockPos pos) {