eaglercraft/eaglercraft-1.5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reformatted some classes

Browse Source
This commit is contained in:
LAX1DUDE 2022-08-03 23:06:34 -07:00
parent efcf5f8e77
commit 1e6b8170b5
13 changed files with 366 additions and 476 deletions

25
sp-server/src/main/java/net/lax1dude/eaglercraft/sp/IntegratedServer.java

@ -18,30 +18,7 @@ import org.teavm.jso.JSObject;
import org.teavm.jso.typedarrays.ArrayBuffer;
import org.teavm.jso.typedarrays.Uint8Array;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket00StartServer;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket01StopServer;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket02InitWorld;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket03DeleteWorld;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket04RenameWorld;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket05RequestData;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket06RenameWorldNBT;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket07ImportWorld;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket09RequestResponse;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket0ASetWorldDifficulty;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket0BPause;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket0CPlayerChannel;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket0DProgressUpdate;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket0EListWorlds;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket0FListFiles;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket10FileRead;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket12FileWrite;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket13FileCopyMove;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket14StringList;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket15ThrowException;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacket16NBTList;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacketBase;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacketFFProcessKeepAlive;
import net.lax1dude.eaglercraft.sp.ipc.IPCPacketManager;
import net.lax1dude.eaglercraft.sp.ipc.*;
import net.minecraft.src.AchievementList;
import net.minecraft.src.AchievementMap;
import net.minecraft.src.ChunkCoordIntPair;

2
src/main/java/net/lax1dude/eaglercraft/WorkerNetworkManager.java

@ -6,8 +6,6 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.lax1dude.eaglercraft.sp.ipc.IPCInputStream;
import net.lax1dude.eaglercraft.sp.ipc.IPCOutputStream;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.NetHandler;
import net.minecraft.src.Packet;

572
src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java

File diff suppressed because it is too large Load Diff

73
src/main/java/net/lax1dude/eaglercraft/glemu/EffectPipeline.java

@ -1,77 +1,6 @@
package net.lax1dude.eaglercraft.glemu;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CLAMP;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_COLOR_ATTACHMENT0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CULL_FACE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH24_STENCIL8;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_STENCIL;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_STENCIL_ATTACHMENT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_TEST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FLOAT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAGMENT_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAMEBUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_LINEAR;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_NEAREST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_RGB;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_STATIC_DRAW;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE1;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE2;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MAG_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MIN_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_S;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_T;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TRIANGLES;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_BYTE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_INT_24_8;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VERTEX_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VIEWPORT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wgetShaderHeader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglActiveTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglAttachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindAttributeLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBufferData0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCompileShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDepthMask;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDetachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDisable;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDrawArrays;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglFramebufferTexture2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGenTextures;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetParameter;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramLinked;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderCompiled;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetUniformLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglLinkProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglShaderSource;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexImage2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexParameteri;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform3f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniformMat4fv;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUseProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglViewport;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.fileContents;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.*;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.isWebGL;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.matProjPointer;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.matProjV;

89
src/main/java/net/lax1dude/eaglercraft/glemu/EffectPipelineFXAA.java

@ -1,99 +1,12 @@
package net.lax1dude.eaglercraft.glemu;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_BACK;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CLAMP;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_COLOR_ATTACHMENT0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_COLOR_BUFFER_BIT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_CULL_FACE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_ATTACHMENT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_BUFFER_BIT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_COMPONENT32F;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DEPTH_TEST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_DRAW_FRAMEBUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FLOAT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAGMENT_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAMEBUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_LINE_SMOOTH;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_MULTISAMPLE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_NEAREST;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_READ_FRAMEBUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_RGB;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_RGB8;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_STATIC_DRAW;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MAG_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_MIN_FILTER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_S;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TEXTURE_WRAP_T;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_TRIANGLES;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_BYTE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VERTEX_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wgetShaderHeader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglActiveTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglAttachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindRenderbuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindTexture;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBlitFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBufferData0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglClear;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCompileShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateRenderBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteFramebuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteRenderbuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteTextures;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDepthMask;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDetachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDisable;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDrawArrays;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDrawBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnable;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglFramebufferRenderbuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglFramebufferTexture2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGenTextures;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramLinked;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderCompiled;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetUniformLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglLinkProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglRenderbufferStorage;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglRenderbufferStorageMultisample;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglShaderSource;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexImage2D;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglTexParameteri;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUseProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglViewport;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.fileContents;
import static net.lax1dude.eaglercraft.glemu.EaglerAdapterGL30.isWebGL;
import static net.lax1dude.eaglercraft.EaglerAdapter.*;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.IntBuffer;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferArrayGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.FramebufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ProgramGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.RenderbufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ShaderGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.TextureGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.UniformGL;
import net.minecraft.client.Minecraft;
public class EffectPipelineFXAA {

45
src/main/java/net/lax1dude/eaglercraft/glemu/FixedFunctionShader.java

@ -1,40 +1,7 @@
package net.lax1dude.eaglercraft.glemu;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FRAGMENT_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_VERTEX_SHADER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wgetShaderHeader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglAttachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindAttributeLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCompileShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDetachShader;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetProgramLinked;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderCompiled;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetShaderInfoLog;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglGetUniformLocation;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglLinkProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglShaderSource;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform1i;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform2f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform3f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniform4f;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUniformMat4fv;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglUseProgram;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.fileContents;
import static net.lax1dude.eaglercraft.EaglerAdapter.*;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferArrayGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.BufferGL;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ProgramGL;
@ -352,22 +319,22 @@ public class FixedFunctionShader {
public void setupArrayForProgram() {
_wglEnableVertexAttribArray(a_position);
_wglVertexAttribPointer(a_position, 3, EaglerAdapter._wGL_FLOAT, false, 32, 0);
_wglVertexAttribPointer(a_position, 3, _wGL_FLOAT, false, 32, 0);
if(enable_texture0) {
_wglEnableVertexAttribArray(a_texture0);
_wglVertexAttribPointer(a_texture0, 2, EaglerAdapter._wGL_FLOAT, false, 32, 12);
_wglVertexAttribPointer(a_texture0, 2, _wGL_FLOAT, false, 32, 12);
}
if(enable_color) {
_wglEnableVertexAttribArray(a_color);
_wglVertexAttribPointer(a_color, 4, EaglerAdapter._wGL_UNSIGNED_BYTE, true, 32, 20);
_wglVertexAttribPointer(a_color, 4, _wGL_UNSIGNED_BYTE, true, 32, 20);
}
if(enable_normal) {
_wglEnableVertexAttribArray(a_normal);
_wglVertexAttribPointer(a_normal, 4, EaglerAdapter._wGL_UNSIGNED_BYTE, true, 32, 24);
_wglVertexAttribPointer(a_normal, 4, _wGL_UNSIGNED_BYTE, true, 32, 24);
}
if(enable_texture1) {
_wglEnableVertexAttribArray(a_texture1);
_wglVertexAttribPointer(a_texture1, 2, EaglerAdapter._wGL_SHORT, false, 32, 28);
_wglVertexAttribPointer(a_texture1, 2, _wGL_SHORT, false, 32, 28);
}
}

15
src/main/java/net/lax1dude/eaglercraft/glemu/HighPolyMesh.java

@ -1,19 +1,6 @@
package net.lax1dude.eaglercraft.glemu;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_ELEMENT_ARRAY_BUFFER;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_FLOAT;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_STATIC_DRAW;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wGL_UNSIGNED_BYTE;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBindVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglBufferData0;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglCreateVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteBuffer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglDeleteVertexArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglEnableVertexAttribArray;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2._wglVertexAttribPointer;
import static net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.*;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;

4
src/main/java/net/minecraft/client/Minecraft.java

@ -8,11 +8,11 @@ import net.lax1dude.eaglercraft.DefaultSkinRenderer;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglerProfile;
import net.lax1dude.eaglercraft.GuiScreenEditProfile;
import net.lax1dude.eaglercraft.GuiScreenLicense;
import net.lax1dude.eaglercraft.GuiScreenSingleplayerConnecting;
import net.lax1dude.eaglercraft.GuiScreenSingleplayerLoading;
import net.lax1dude.eaglercraft.IntegratedServer;
import net.lax1dude.eaglercraft.GuiScreenLicense;
import net.lax1dude.eaglercraft.GuiVoiceOverlay;
import net.lax1dude.eaglercraft.IntegratedServer;
import net.lax1dude.eaglercraft.LocalStorageManager;
import net.lax1dude.eaglercraft.Voice;
import net.lax1dude.eaglercraft.WorkerNetworkManager;

3
src/main/java/net/minecraft/src/GuiIngame.java

@ -4,11 +4,10 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import net.lax1dude.eaglercraft.ConfigConstants;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.IntegratedServer;
import net.lax1dude.eaglercraft.EnumBrowser;
import net.lax1dude.eaglercraft.IntegratedServer;
import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.glemu.EffectPipeline;

1
src/main/java/net/minecraft/src/GuiSelectWorld.java

@ -9,7 +9,6 @@ import java.util.List;
import net.lax1dude.eaglercraft.GuiScreenBackupWorld;
import net.lax1dude.eaglercraft.GuiScreenCreateWorldSelection;
import net.lax1dude.eaglercraft.GuiScreenSingleplayerLoading;
import net.lax1dude.eaglercraft.GuiScreenSingleplayerNotImplemented;
import net.lax1dude.eaglercraft.IntegratedServer;
public class GuiSelectWorld extends GuiScreen {

2
src/main/java/net/minecraft/src/NetClientHandler.java

@ -12,10 +12,10 @@ import java.util.function.Consumer;
import net.lax1dude.eaglercraft.DefaultSkinRenderer;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.IntegratedServer;
import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.GuiScreenSingleplayerException;
import net.lax1dude.eaglercraft.GuiScreenSingleplayerLoading;
import net.lax1dude.eaglercraft.IntegratedServer;
import net.lax1dude.eaglercraft.Voice;
import net.lax1dude.eaglercraft.WebsocketNetworkManager;
import net.lax1dude.eaglercraft.WorkerNetworkManager;

6
src/main/java/net/minecraft/src/ServerList.java

@ -2,7 +2,6 @@ package net.minecraft.src;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@ -11,7 +10,10 @@ import java.util.Set;
import org.json.JSONArray;
import org.json.JSONObject;
import net.lax1dude.eaglercraft.*;
import net.lax1dude.eaglercraft.Base64;
import net.lax1dude.eaglercraft.ConfigConstants;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.LocalStorageManager;
import net.lax1dude.eaglercraft.ServerQuery.QueryResponse;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.RateLimit;
import net.minecraft.client.Minecraft;

5
src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java

@ -1,6 +1,7 @@
package net.lax1dude.eaglercraft.adapter;
import static net.lax1dude.eaglercraft.adapter.teavm.WebGL2RenderingContext.*;
import static org.teavm.jso.webgl.WebGLRenderingContext.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@ -24,6 +25,7 @@ import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.json.JSONObject;
import org.teavm.interop.Async;
import org.teavm.interop.AsyncCallback;
@ -35,9 +37,9 @@ import org.teavm.jso.ajax.XMLHttpRequest;
import org.teavm.jso.browser.Storage;
import org.teavm.jso.browser.TimerHandler;
import org.teavm.jso.browser.Window;
import org.teavm.jso.dom.events.ErrorEvent;
import org.teavm.jso.canvas.CanvasRenderingContext2D;
import org.teavm.jso.canvas.ImageData;
import org.teavm.jso.dom.events.ErrorEvent;
import org.teavm.jso.dom.events.Event;
import org.teavm.jso.dom.events.EventListener;
import org.teavm.jso.dom.events.KeyboardEvent;
@ -96,7 +98,6 @@ import net.lax1dude.eaglercraft.adapter.teavm.SelfDefence;
import net.lax1dude.eaglercraft.adapter.teavm.WebGL2RenderingContext;
import net.lax1dude.eaglercraft.adapter.teavm.WebGLQuery;
import net.lax1dude.eaglercraft.adapter.teavm.WebGLVertexArray;
import net.minecraft.client.Minecraft;
import net.minecraft.src.MathHelper;
public class EaglerAdapterImpl2 {