fixes part 3

This commit is contained in:
lax1dude 2023-10-14 02:42:52 -07:00
parent d2ff714cf1
commit 3000ea56db
7 changed files with 18664 additions and 18575 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,60 +1,143 @@
eaglercraft is an AOT compiled port of mojang's minecraft 1.5.2 designed to run in an html5/javascript environment, using TeaVM and my opengl 1.3 emulator to simulate a desktop java enviroment fully compatible with minecraft java edition
§1this §1project §1was §1created §1by §1lax1dude§r §lCHANGES §lIN §lSERVICE §lPACK §l#1:§r
§4voice §4chat §4and §4singleplayer §4LAN §4worlds §4would §4not §4have §4been §4possible §4without §4ayunami2000's §4important §4contributions§r - resource packs §4(by §4ayunami2000)§r
- fixed sunrise/sunset fog color
- better optimized pipeline shader
- backported 1.8's state management
- backported 1.8's buffer streaming
- backported 1.8's hotbar FPS fix
- backported 1.8's double buffering
- backported 1.8's FXAA shader
compiling the javascript and emulating the JRE is largely made possible by the TeaVM project, created by Alexey Andreev and is available for free at §nhttp://teavm.org/§r under Apache License 2.0 Release date: §9MM/DD/YYYY§r
eaglercraft also makes use of jCraft's jzlib port, available at §nhttp://www.jcraft.com/jzlib/§r under BSD-style licensing. Time spent: §9~5 days§r
all graphical assets in this project were ripped from mojang's official minecraft.jar for minecraft version 1.5.2 and they are mojang's intellectual property. assets ommitted include the minecraft soundtrack and music disks and all software references to the mojang/minecraft api. §0Made §0by §4lax1dude§r
eaglercraft servers are powered by md_5's BungeeCord and the CraftBukkit project available at §nhttps://bukkit.org/§r. BungeeCord has been modified to accept eaglercraft's strange login packets and to host a websocket server to translate browser connections to raw TCP that vanilla minecraft servers can understand. All java plugins designed for CraftBukkit 1.5.2 are compatible with this configuration.
scroll down for the detailed license statements
========================================
Copyright (c) 2022 LAX1DUDE
This work is licensed under a Creative Commons
Attribution-NonCommercial 4.0 International License
§nhttp://creativecommons.org/licenses/by-nc/4.0/§r
========================================
TeaVM Copyright 2016 Alexey Andreev.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
§nhttp://www.apache.org/licenses/LICENSE-2.0§r
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
========================================
NVIDIA FXAA 3.11 by TIMOTHY LOTTES
Copyright (c) 2010, 2011 NVIDIA CORPORATION. ALL RIGHTS RESERVED.
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED *AS IS* AND NVIDIA AND ITS SUPPLIERS DISCLAIM ALL WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
========================================
JZlib Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================
|>
:>

View File

@ -91,7 +91,7 @@ public class GuiMainMenu extends GuiScreen {
this.start += this.start % 10000l; this.start += this.start % 10000l;
this.ackLines = new ArrayList(); this.ackLines = new ArrayList();
if(!LocalStorageManager.gameSettingsStorage.getBoolean("seenAcknowledgements")) { if(!LocalStorageManager.gameSettingsStorage.getBoolean("seenAcknowledgementsSP1")) {
this.showAck = true; this.showAck = true;
} }
} }
@ -128,8 +128,8 @@ public class GuiMainMenu extends GuiScreen {
} }
private void hideAck() { private void hideAck() {
if(!LocalStorageManager.gameSettingsStorage.getBoolean("seenAcknowledgements")) { if(!LocalStorageManager.gameSettingsStorage.getBoolean("seenAcknowledgementsSP1")) {
LocalStorageManager.gameSettingsStorage.setBoolean("seenAcknowledgements", true); LocalStorageManager.gameSettingsStorage.setBoolean("seenAcknowledgementsSP1", true);
LocalStorageManager.saveStorageG(); LocalStorageManager.saveStorageG();
} }
showAck = false; showAck = false;

View File

@ -588,6 +588,7 @@ public class EaglerAdapterImpl2 {
public static final int _wGL_ELEMENT_ARRAY_BUFFER = ELEMENT_ARRAY_BUFFER; public static final int _wGL_ELEMENT_ARRAY_BUFFER = ELEMENT_ARRAY_BUFFER;
public static final int _wGL_STATIC_DRAW = STATIC_DRAW; public static final int _wGL_STATIC_DRAW = STATIC_DRAW;
public static final int _wGL_DYNAMIC_DRAW = DYNAMIC_DRAW; public static final int _wGL_DYNAMIC_DRAW = DYNAMIC_DRAW;
public static final int _wGL_STREAM_DRAW = STREAM_DRAW;
public static final int _wGL_INVALID_ENUM = INVALID_ENUM; public static final int _wGL_INVALID_ENUM = INVALID_ENUM;
public static final int _wGL_INVALID_VALUE= INVALID_VALUE; public static final int _wGL_INVALID_VALUE= INVALID_VALUE;
public static final int _wGL_INVALID_OPERATION = INVALID_OPERATION; public static final int _wGL_INVALID_OPERATION = INVALID_OPERATION;
@ -737,6 +738,9 @@ public class EaglerAdapterImpl2 {
public static final void _wglBlendFunc(int p1, int p2) { public static final void _wglBlendFunc(int p1, int p2) {
webgl.blendFunc(p1, p2); webgl.blendFunc(p1, p2);
} }
public static final void _wglBlendFuncSeparate(int p1, int p2, int p3, int p4) {
webgl.blendFuncSeparate(p1, p2, p3, p4);
}
public static final void _wglBlendColor(float r, float g, float b, float a) { public static final void _wglBlendColor(float r, float g, float b, float a) {
webgl.blendColor(r, g, b, a); webgl.blendColor(r, g, b, a);
} }
@ -869,6 +873,9 @@ public class EaglerAdapterImpl2 {
public static final void _wglBufferData(int p1, Object p2, int p3) { public static final void _wglBufferData(int p1, Object p2, int p3) {
webgl.bufferData(p1, (Int32Array)p2, p3); webgl.bufferData(p1, (Int32Array)p2, p3);
} }
public static final void _wglBufferData00(int p1, long len, int p3) {
webgl.bufferData(p1, (int)len, p3);
}
public static final void _wglBufferSubData(int p1, int p2, Object p3) { public static final void _wglBufferSubData(int p1, int p2, Object p3) {
webgl.bufferSubData(p1, p2, (Int32Array)p3); webgl.bufferSubData(p1, p2, (Int32Array)p3);
} }

View File

@ -319,8 +319,8 @@ public class Tessellator {
* integer). * integer).
*/ */
public void setColorOpaque_I(int par1) { public void setColorOpaque_I(int par1) {
int var2 = par1 >> 16 & 255; int var2 = par1 >>> 16 & 255;
int var3 = par1 >> 8 & 255; int var3 = par1 >>> 8 & 255;
int var4 = par1 & 255; int var4 = par1 & 255;
this.setColorOpaque(var2, var3, var4); this.setColorOpaque(var2, var3, var4);
} }
@ -330,8 +330,8 @@ public class Tessellator {
* values. * values.
*/ */
public void setColorRGBA_I(int par1, int par2) { public void setColorRGBA_I(int par1, int par2) {
int var3 = par1 >> 16 & 255; int var3 = par1 >>> 16 & 255;
int var4 = par1 >> 8 & 255; int var4 = par1 >>> 8 & 255;
int var5 = par1 & 255; int var5 = par1 & 255;
this.setColorRGBA(var3, var4, var5, par2); this.setColorRGBA(var3, var4, var5, par2);
} }