more

Author: colbster937

src/game/java/net/minecraft/client/Minecraft.java

@@ -4,6 +4,7 @@
 import net.lax1dude.eaglercraft.internal.PlatformOpenGL;
 import net.lax1dude.eaglercraft.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.internal.vfs2.VFile2;
+import net.lax1dude.eaglercraft.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.profile.GuiScreenEditProfile;
 import net.minecraft.src.AchievementList;
@@ -106,7 +107,6 @@ public class Minecraft implements Runnable {
 	public static byte[] field_28006_b = new byte[10485760];
 	private static Minecraft theMinecraft;
 	public PlayerController playerController;
-	private boolean fullscreen = false;
 	private boolean hasCrashed = false;
 	public int displayWidth;
 	public int displayHeight;
@@ -152,7 +152,7 @@ public class Minecraft implements Runnable {
 	long prevFrameTime = -1L;
 	public boolean inGameHasFocus = false;
 	public boolean isRaining = false;
-	long systemTime = System.currentTimeMillis();
+	long systemTime = EagRuntime.steadyTimeMillis();
 	private int joinPlayerCounter = 0;
 
 	private String serverIP;
@@ -162,7 +162,6 @@ public Minecraft() {
 		StatList.func_27360_a();
 		this.displayWidth = Display.getWidth();
 		this.displayHeight = Display.getHeight();
-		this.fullscreen = false;
 
 		this.session = new Session("Player", "");
 		theMinecraft = this;
@@ -277,7 +276,8 @@ private void loadScreen() throws LWJGLException {
 		GL11.glDisable(GL11.GL_FOG);
 		GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.renderEngine.getTexture("/title/mojang.png"));
 		var2.startDrawingQuads();
-		var2.setColorOpaque_I(16777215);
+		// var2.setColorOpaque_I(16777215);
+		var2.setColorRGBA(255, 255, 255, 255);
 		var2.addVertexWithUV(0.0D, (double) this.displayHeight, 0.0D, 0.0D, 0.0D);
 		var2.addVertexWithUV((double) this.displayWidth, (double) this.displayHeight, 0.0D, 0.0D, 0.0D);
 		var2.addVertexWithUV((double) this.displayWidth, 0.0D, 0.0D, 0.0D, 0.0D);
@@ -290,8 +290,9 @@ private void loadScreen() throws LWJGLException {
 		this.scaledTessellator((var1.getScaledWidth() - var3) / 2, (var1.getScaledHeight() - var4) / 2, 0, 0, var3, var4);
 		GL11.glDisable(GL11.GL_LIGHTING);
 		GL11.glDisable(GL11.GL_FOG);
-		GL11.glEnable(GL11.GL_ALPHA_TEST);
+		GL11.glEnable(GL11.GL_ALPHA);
 		GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
+		Display.update();
 	}
 
 	public void scaledTessellator(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -423,16 +424,15 @@ public void run() {
 		}
 
 		try {
-			long var1 = System.currentTimeMillis();
+			long var1 = EagRuntime.steadyTimeMillis();
 			int var3 = 0;
 
 			while (this.running) {
 				try {
 					AxisAlignedBB.clearBoundingBoxPool();
 					Vec3D.initialize();
-					if (Display.isCloseRequested()) {
-						this.shutdown();
-					}
+					
+					Display.checkContextLost();
 
 					if (this.isGamePaused && this.theWorld != null) {
 						float var4 = this.timer.renderPartialTicks;
@@ -442,7 +442,7 @@ public void run() {
 						this.timer.updateTimer();
 					}
 
-					long var23 = System.nanoTime();
+					long var23 = EagRuntime.nanoTime();
 
 					for (int var6 = 0; var6 < this.timer.elapsedTicks; ++var6) {
 						++this.ticksRan;
@@ -456,10 +456,15 @@ public void run() {
 						}
 					}
 
-					long var24 = System.nanoTime() - var23;
+					long var24 = EagRuntime.nanoTime() - var23;
 					this.checkGLError("Pre render");
 					RenderBlocks.fancyGrass = this.gameSettings.fancyGrass;
 					this.sndManager.func_338_a(this.thePlayer, this.timer.renderPartialTicks);
+					EaglercraftGPU.optimize();
+					PlatformOpenGL._wglBindFramebuffer(0x8D40, null);
+					GL11.glViewport(0, 0, this.displayWidth, this.displayHeight);
+					GL11.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+					GL11.glPushMatrix();
 					GL11.glEnable(GL11.GL_TEXTURE_2D);
 					if (this.theWorld != null) {
 						this.theWorld.updatingLighting();
@@ -477,14 +482,12 @@ public void run() {
 						this.entityRenderer.updateCameraAndRender(this.timer.renderPartialTicks);
 					}
 
-					if (!Display.isActive() && this.fullscreen) {
-						this.toggleFullscreen();
-					}
+					GL11.glPopMatrix();
 
 					if (this.gameSettings.showDebugInfo) {
 						this.displayDebugInfo(var24);
 					} else {
-						this.prevFrameTime = System.nanoTime();
+						this.prevFrameTime = EagRuntime.nanoTime();
 					}
 
 					this.guiAchievement.updateAchievementWindow();
@@ -496,7 +499,7 @@ public void run() {
 					++var3;
 
 					for (this.isGamePaused = !this.isMultiplayerWorld() && this.currentScreen != null
-							&& this.currentScreen.doesGuiPauseGame(); System.currentTimeMillis() >= var1 + 1000L; var3 = 0) {
+							&& this.currentScreen.doesGuiPauseGame(); EagRuntime.steadyTimeMillis() >= var1 + 1000L; var3 = 0) {
 						this.debug = var3 + " fps, " + WorldRenderer.chunksUpdated + " chunk updates";
 						this.fps = var3;
 						WorldRenderer.chunksUpdated = 0;
@@ -562,10 +565,10 @@ private void screenshotListener() {
 	private void displayDebugInfo(long var1) {
 		long var3 = 16666666L;
 		if (this.prevFrameTime == -1L) {
-			this.prevFrameTime = System.nanoTime();
+			this.prevFrameTime = EagRuntime.nanoTime();
 		}
 
-		long var5 = System.nanoTime();
+		long var5 = EagRuntime.nanoTime();
 		tickTimes[numRecordedFrameTimes & frameTimes.length - 1] = var1;
 		frameTimes[numRecordedFrameTimes++ & frameTimes.length - 1] = var5 - this.prevFrameTime;
 		this.prevFrameTime = var5;
@@ -853,7 +856,7 @@ public void runTick() {
 					KeyBinding.func_35960_a(Mouse.getEventButton() - 100);
 				}
 
-				long var5 = System.currentTimeMillis() - this.systemTime;
+				long var5 = EagRuntime.steadyTimeMillis() - this.systemTime;
 				if (var5 <= 200L) {
 					var3 = Mouse.getEventDWheel();
 					if (var3 != 0) {
@@ -1028,7 +1031,7 @@ public void runTick() {
 			}
 		}
 
-		this.systemTime = System.currentTimeMillis();
+		this.systemTime = EagRuntime.steadyTimeMillis();
 	}
 
 	private void forceReload() {

src/game/java/net/minecraft/src/BlockFire.java

@@ -1,10 +1,12 @@
 package net.minecraft.src;
 
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.lax1dude.eaglercraft.Random;
 
 public class BlockFire extends Block {
-	private int[] chanceToEncourageFire = new int[256];
-	private int[] abilityToCatchFire = new int[256];
+	private Object2IntMap<Integer> chanceToEncourageFire = new Object2IntOpenHashMap<>(256);
+	private Object2IntMap<Integer> abilityToCatchFire = new Object2IntOpenHashMap<>(256);
 
 	protected BlockFire(int var1, int var2) {
 		super(var1, var2, Material.fire);
@@ -25,8 +27,8 @@ public void initializeBlock() {
 	}
 
 	private void setBurnRate(int var1, int var2, int var3) {
-		this.chanceToEncourageFire[var1] = var2;
-		this.abilityToCatchFire[var1] = var3;
+		this.chanceToEncourageFire.put(Integer.valueOf(var1), var2);
+		this.abilityToCatchFire.put(Integer.valueOf(var1), var3);
 	}
 
 	public AxisAlignedBB getCollisionBoundingBoxFromPool(World var1, int var2, int var3, int var4) {
@@ -114,7 +116,7 @@ public void updateTick(World var1, int var2, int var3, int var4, Random var5) {
 	}
 
 	private void tryToCatchBlockOnFire(World var1, int var2, int var3, int var4, int var5, Random var6, int var7) {
-		int var8 = this.abilityToCatchFire[var1.getBlockId(var2, var3, var4)];
+		int var8 = this.abilityToCatchFire.get(var1.getBlockId(var2, var3, var4));
 		if(var6.nextInt(var5) < var8) {
 			boolean var9 = var1.getBlockId(var2, var3, var4) == Block.tnt.blockID;
 			if(var6.nextInt(var7 + 10) < 5 && !var1.canLightningStrikeAt(var2, var3, var4)) {
@@ -159,11 +161,11 @@ public boolean isCollidable() {
 	}
 
 	public boolean canBlockCatchFire(IBlockAccess var1, int var2, int var3, int var4) {
-		return this.chanceToEncourageFire[var1.getBlockId(var2, var3, var4)] > 0;
+		return this.chanceToEncourageFire.get(var1.getBlockId(var2, var3, var4)) > 0;
 	}
 
 	public int getChanceToEncourageFire(World var1, int var2, int var3, int var4, int var5) {
-		int var6 = this.chanceToEncourageFire[var1.getBlockId(var2, var3, var4)];
+		int var6 = this.chanceToEncourageFire.get(var1.getBlockId(var2, var3, var4));
 		return var6 > var5 ? var6 : var5;
 	}
 

src/game/java/net/minecraft/src/BlockStairs.java

@@ -67,7 +67,7 @@ public void getCollidingBoundingBoxes(World var1, int var2, int var3, int var4,
 	}
 
 	public void randomDisplayTick(World var1, int var2, int var3, int var4, Random var5) {
-		this.modelBlock.randomDisplayTick(var1, var2, var3, var4, var5);
+		if (this.modelBlock != null) this.modelBlock.randomDisplayTick(var1, var2, var3, var4, var5);
 	}
 
 	public void onBlockClicked(World var1, int var2, int var3, int var4, EntityPlayer var5) {

src/game/java/net/minecraft/src/Chunk.java

@@ -520,7 +520,7 @@ public void addEntity(Entity var1) {
 		int var2 = MathHelper.floor_double(var1.posX / 16.0D);
 		int var3 = MathHelper.floor_double(var1.posZ / 16.0D);
 		if(var2 != this.xPosition || var3 != this.zPosition) {
-			System.out.println("Wrong location! " + var1);
+			System.out.println("Wrong location! " + var1 + ":" + var1.getClass().getSimpleName());
 			EagRuntime.dumpStack();
 		}
 

src/game/java/net/minecraft/src/ChunkCache.java

@@ -180,7 +180,6 @@ public int func_35454_a(EnumSkyBlock var1, int var2, int var3, int var4) {
 		}
 
 		if(var3 >= 0) {
-			this.worldObj.getClass();
 			if(var3 < 128 && var2 >= -30000000 && var4 >= -30000000 && var2 < 30000000 && var4 <= 30000000) {
 				int var5 = this.getBlockId(var2, var3, var4);
 				int var6;

src/game/java/net/minecraft/src/ChunkProviderLoadOrGenerate.java

@@ -2,11 +2,14 @@
 
 import java.io.IOException;
 
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+
 public class ChunkProviderLoadOrGenerate implements IChunkProvider {
 	private Chunk blankChunk;
 	private IChunkProvider chunkProvider;
 	private IChunkLoader chunkLoader;
-	private Chunk[] chunks;
+	private Long2ObjectMap<Chunk> chunks = new Long2ObjectOpenHashMap<>(1024);
 	private World worldObj;
 	int lastQueriedChunkXPos;
 	int lastQueriedChunkZPos;
@@ -30,10 +33,8 @@ public boolean chunkExists(int var1, int var2) {
 		} else if(var1 == this.lastQueriedChunkXPos && var2 == this.lastQueriedChunkZPos && this.lastQueriedChunk != null) {
 			return true;
 		} else {
-			int var3 = var1 & 31;
-			int var4 = var2 & 31;
-			int var5 = var3 + var4 * 32;
-			return this.chunks[var5] != null && (this.chunks[var5] == this.blankChunk || this.chunks[var5].isAtLocation(var1, var2));
+			Chunk var3 = this.chunks.get(ChunkCoordIntPair.chunkXZ2Int(var1, var2));
+			return var3 != null && (var3 == this.blankChunk || var3.isAtLocation(var1, var2));
 		}
 	}
 
@@ -47,14 +48,13 @@ public Chunk provideChunk(int var1, int var2) {
 		} else if(!this.worldObj.findingSpawnPoint && !this.canChunkExist(var1, var2)) {
 			return this.blankChunk;
 		} else {
-			int var3 = var1 & 31;
-			int var4 = var2 & 31;
-			int var5 = var3 + var4 * 32;
+			long var3 = ChunkCoordIntPair.chunkXZ2Int(var1, var2);
+			Chunk var5 = this.chunks.get(var3);
 			if(!this.chunkExists(var1, var2)) {
-				if(this.chunks[var5] != null) {
-					this.chunks[var5].onChunkUnload();
-					this.saveChunk(this.chunks[var5]);
-					this.saveExtraChunkData(this.chunks[var5]);
+				if(var5 != null) {
+					var5.onChunkUnload();
+					this.saveChunk(var5);
+					this.saveExtraChunkData(var5);
 				}
 
 				Chunk var6 = this.func_542_c(var1, var2);
@@ -67,19 +67,20 @@ public Chunk provideChunk(int var1, int var2) {
 					}
 				}
 
-				this.chunks[var5] = var6;
+				this.chunks.put(var3, var6);
 				var6.func_4143_d();
-				if(this.chunks[var5] != null) {
-					this.chunks[var5].onChunkLoad();
+				if(var6 != null) {
+					var6.onChunkLoad();
 				}
 
-				this.chunks[var5].func_35843_a(this, this, var1, var2);
+				var6.func_35843_a(this, this, var1, var2);
+				var5 = var6;
 			}
 
 			this.lastQueriedChunkXPos = var1;
 			this.lastQueriedChunkZPos = var2;
-			this.lastQueriedChunk = this.chunks[var5];
-			return this.chunks[var5];
+			this.lastQueriedChunk = var5;
+			return var5;
 		}
 	}
 
@@ -141,24 +142,24 @@ public boolean saveChunks(boolean var1, IProgressUpdate var2) {
 		int var4 = 0;
 		int var5;
 		if(var2 != null) {
-			for(var5 = 0; var5 < this.chunks.length; ++var5) {
-				if(this.chunks[var5] != null && this.chunks[var5].needsSaving(var1)) {
+			for(Chunk var6 : this.chunks.values()) {
+				if(var6 != null && var6.needsSaving(var1)) {
 					++var4;
 				}
 			}
 		}
 
 		var5 = 0;
 
-		for(int var6 = 0; var6 < this.chunks.length; ++var6) {
-			if(this.chunks[var6] != null) {
-				if(var1 && !this.chunks[var6].neverSave) {
-					this.saveExtraChunkData(this.chunks[var6]);
+		for(Chunk var6 : this.chunks.values()) {
+			if(var6 != null) {
+				if(var1 && !var6.neverSave) {
+					this.saveExtraChunkData(var6);
 				}
 
-				if(this.chunks[var6].needsSaving(var1)) {
-					this.saveChunk(this.chunks[var6]);
-					this.chunks[var6].isModified = false;
+				if(var6.needsSaving(var1)) {
+					this.saveChunk(var6);
+					var6.isModified = false;
 					++var3;
 					if(var3 == 2 && !var1) {
 						return false;
@@ -198,6 +199,6 @@ public boolean canSave() {
 	}
 
 	public String makeString() {
-		return "ChunkCache: " + this.chunks.length;
+		return "ChunkCache: " + this.chunks.size();
 	}
 }

src/game/java/net/minecraft/src/ClippingHelper.java

@@ -2,8 +2,8 @@
 
 public class ClippingHelper {
 	public float[][] frustum = new float[16][16];
-	public float[] projectionMatrix = new float[16];
-	public float[] modelviewMatrix = new float[16];
+	public static float[] projectionMatrix = new float[16];
+	public static float[] modelviewMatrix = new float[16];
 	public float[] clippingMatrix = new float[16];
 
 	public boolean isBoxInFrustum(double var1, double var3, double var5, double var7, double var9, double var11) {

src/game/java/net/minecraft/src/ClippingHelperImpl.java

@@ -80,4 +80,4 @@ private void init() {
 		this.frustum[5][3] = this.clippingMatrix[15] + this.clippingMatrix[14];
 		this.normalize(this.frustum, 5);
 	}
-}
+}