Skip to content

Commit 573420e

Browse files
author
eaglercraft
committed
u24
1 parent 401ebe2 commit 573420e

613 files changed

Lines changed: 5708 additions & 4445 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CompileJS.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#!/bin/sh
2-
chmod +x gradlew
1+
#!/bin/sh
2+
chmod +x gradlew
33
./gradlew generateJavascript

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ teavm.js {
2626
obfuscated = true
2727
sourceMap = true
2828
targetFileName = "../classes.js"
29-
// optimization = OptimizationLevel.ADVANCED
29+
optimization = org.teavm.gradle.api.OptimizationLevel.AGGRESSIVE
3030
outOfProcess = false
3131
fastGlobalAnalysis = false
3232
processMemory = 512

‎desktopRuntime/eclipseProject/.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<classpathentry kind="lib" path="deps_fix/lwjgl-openal.jar"/>
1818
<classpathentry kind="lib" path="deps_fix/lwjgl-opengles.jar"/>
1919
<classpathentry kind="lib" path="deps_fix/soundsystem-20120107.jar"/>
20+
<classpathentry kind="lib" path="deps_fix/webrtc-java-0.8.0.jar"/>
2021
<classpathentry kind="output" path="bin"/>
2122
</classpath>

‎desktopRuntime/eclipseProject/deps_fix/webrtc-java-0.8.0.jar‎

94.5 KB
Binary file not shown.

‎desktopRuntime/libwebrtc-java.so‎

25.1 MB
Binary file not shown.

‎desktopRuntime/resources/SignedClientTemplate.txt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<title>EaglercraftX 1.8</title>
99
<meta property="og:locale" content="en-US" />
1010
<meta property="og:type" content="website" />
11-
<meta property="og:title" content="EaglercraftX 1.8 Offline" />
12-
<meta property="og:description" content="this file is not a website, whoever uploaded it to this URL is a dumbass" />
11+
<meta property="og:title" content="EaglercraftX 1.8" />
12+
<meta property="og:description" content="Play minecraft 1.8 in your browser" />
1313
<script type="text/javascript">
1414
"use strict";
1515
const relayId = Math.floor(Math.random() * 3);
@@ -31,10 +31,15 @@ window.eaglercraftXOptsHints = {
3131
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
3232

3333
</script>
34+
<style type="eaglercraft" id="eaglercraftXClientSignature">data:application/octet-stream;base64,${client_signature}</style>
35+
<style type="eaglercraft" id="eaglercraftXClientBundle">data:application/octet-stream;base64,${client_bundle}</style>
3436
<script type="text/javascript">
3537
"use strict";
36-
window.eaglercraftXClientSignature = "data:application/octet-stream;base64,${client_signature}";
37-
window.eaglercraftXClientBundle = "data:application/octet-stream;base64,${client_bundle}";
38+
(function(){
39+
function eaglerBundleUnwrap(tagIn) { const e = document.getElementById(tagIn); const ret = e.innerText; e.remove(); return ret; }
40+
window.eaglercraftXClientSignature = eaglerBundleUnwrap("eaglercraftXClientSignature");
41+
window.eaglercraftXClientBundle = eaglerBundleUnwrap("eaglercraftXClientBundle");
42+
})();
3843
</script>
3944
<script type="text/javascript">
4045
"use strict";

‎desktopRuntime/resources/assets/eagler/CREDITS.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,28 @@
539539

540540
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
541541

542+
Project Name: webrtc-java
543+
Project Author: Alex Andres
544+
Project URL: https://github.com/devopvoid/webrtc-java
545+
546+
Used For: WebRTC LAN worlds in desktop runtime
547+
548+
* Copyright 2019 Alex Andres
549+
*
550+
* Licensed under the Apache License, Version 2.0 (the "License");
551+
* you may not use this file except in compliance with the License.
552+
* You may obtain a copy of the License at
553+
*
554+
* http://www.apache.org/licenses/LICENSE-2.0
555+
*
556+
* Unless required by applicable law or agreed to in writing, software
557+
* distributed under the License is distributed on an "AS IS" BASIS,
558+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
559+
* See the License for the specific language governing permissions and
560+
* limitations under the License.
561+
562+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
563+
542564
Project Name: Netty
543565
Project Author: Netty Project
544566
Project URL: https://netty.io/

‎desktopRuntime/resources/assets/eagler/glsl/deferred/deferred_core.vsh‎

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
1-
#line 2
2-
3-
/*
4-
* Copyright (c) 2023 lax1dude. All Rights Reserved.
5-
*
6-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
7-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
8-
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
9-
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
10-
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
11-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
12-
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
13-
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
14-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
15-
* POSSIBILITY OF SUCH DAMAGE.
16-
*
17-
*/
18-
19-
in vec3 a_position3f;
20-
21-
#ifdef COMPILE_TEXTURE_ATTRIB
22-
in vec2 a_texture2f;
23-
out vec2 v_texture2f;
24-
uniform mat4 u_textureMat4f01;
25-
#endif
26-
27-
#ifdef COMPILE_COLOR_ATTRIB
28-
in vec4 a_color4f;
29-
out vec4 v_color4f;
30-
#endif
31-
32-
#ifdef COMPILE_NORMAL_ATTRIB
33-
in vec4 a_normal4f;
34-
out vec3 v_normal3f;
35-
out float v_block1f;
36-
#endif
37-
38-
#ifdef COMPILE_STATE_WAVING_BLOCKS
39-
uniform mat4 u_modelMatrix4f;
40-
uniform mat4 u_viewMatrix4f;
41-
uniform vec3 u_wavingBlockOffset3f;
42-
uniform vec4 u_wavingBlockParam4f;
43-
#ifndef COMPILE_NORMAL_ATTRIB
44-
uniform float u_blockConstant1f;
45-
#endif
46-
#define DO_COMPILE_STATE_WAVING_BLOCKS
47-
#define FAKE_SIN(valueIn, valueOut)\
48-
valueOut = abs(1.0 - fract(valueIn * 0.159155) * 2.0);\
49-
valueOut = valueOut * valueOut * (3.0 - 2.0 * valueOut) * 2.0 - 1.0;
50-
#define LIB_INCLUDE_WAVING_BLOCKS_FUNCTION
51-
#endif
52-
53-
#EAGLER INCLUDE (2) "eagler:glsl/deferred/lib/waving_blocks.glsl"
54-
55-
#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
56-
out vec3 v_viewdir3f;
57-
#endif
58-
59-
#ifdef COMPILE_LIGHTMAP_ATTRIB
60-
in vec2 a_lightmap2f;
61-
out vec2 v_lightmap2f;
62-
uniform mat4 u_textureMat4f02;
63-
#endif
64-
65-
uniform mat4 u_modelviewMat4f;
66-
uniform mat4 u_projectionMat4f;
67-
68-
#define TEX_MAT3(mat4In) mat3(mat4In[0].xyw,mat4In[1].xyw,mat4In[3].xyw)
69-
70-
void main() {
71-
72-
#ifdef COMPILE_TEXTURE_ATTRIB
73-
vec3 v_textureTmp3f = TEX_MAT3(u_textureMat4f01) * vec3(a_texture2f, 1.0);
74-
v_texture2f = v_textureTmp3f.xy / v_textureTmp3f.z;
75-
#endif
76-
77-
#ifdef COMPILE_COLOR_ATTRIB
78-
v_color4f = a_color4f;
79-
#endif
80-
81-
#ifdef COMPILE_NORMAL_ATTRIB
82-
v_normal3f = normalize(mat3(u_modelviewMat4f) * a_normal4f.xyz);
83-
float blockId = v_block1f = floor((a_normal4f.w + 1.0) * 127.0 + 0.5);
84-
#endif
85-
86-
#ifdef COMPILE_LIGHTMAP_ATTRIB
87-
vec3 v_lightmapTmp3f = TEX_MAT3(u_textureMat4f02) * vec3(a_lightmap2f, 1.0);
88-
v_lightmap2f = v_lightmapTmp3f.xy / v_lightmapTmp3f.z;
89-
#endif
90-
91-
vec4 pos = vec4(a_position3f, 1.0);
92-
93-
#ifdef DO_COMPILE_STATE_WAVING_BLOCKS
94-
#ifndef COMPILE_NORMAL_ATTRIB
95-
float blockId = u_blockConstant1f;
96-
#endif
97-
#ifdef COMPILE_LIGHTMAP_ATTRIB
98-
if(v_lightmap2f.y > 0.33) {
99-
COMPUTE_WAVING_BLOCKS(pos, min(v_lightmap2f.y * 3.0 - 1.0, 1.0), 24.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
100-
}else {
101-
pos = u_modelviewMat4f * pos;
102-
}
103-
#else
104-
COMPUTE_WAVING_BLOCKS(pos, 1.0, 32.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
105-
#endif
106-
#else
107-
pos = u_modelviewMat4f * pos;
108-
#endif
109-
110-
#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
111-
v_viewdir3f = pos.xyz / pos.w;
112-
#endif
113-
114-
gl_Position = u_projectionMat4f * pos;
115-
116-
}
1+
#line 2
2+
3+
/*
4+
* Copyright (c) 2023 lax1dude. All Rights Reserved.
5+
*
6+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
7+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
8+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
9+
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
10+
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
11+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
12+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
13+
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
14+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
15+
* POSSIBILITY OF SUCH DAMAGE.
16+
*
17+
*/
18+
19+
in vec3 a_position3f;
20+
21+
#ifdef COMPILE_TEXTURE_ATTRIB
22+
in vec2 a_texture2f;
23+
out vec2 v_texture2f;
24+
uniform mat4 u_textureMat4f01;
25+
#endif
26+
27+
#ifdef COMPILE_COLOR_ATTRIB
28+
in vec4 a_color4f;
29+
out vec4 v_color4f;
30+
#endif
31+
32+
#ifdef COMPILE_NORMAL_ATTRIB
33+
in vec4 a_normal4f;
34+
out vec3 v_normal3f;
35+
out float v_block1f;
36+
#endif
37+
38+
#ifdef COMPILE_STATE_WAVING_BLOCKS
39+
uniform mat4 u_modelMatrix4f;
40+
uniform mat4 u_viewMatrix4f;
41+
uniform vec3 u_wavingBlockOffset3f;
42+
uniform vec4 u_wavingBlockParam4f;
43+
#ifndef COMPILE_NORMAL_ATTRIB
44+
uniform float u_blockConstant1f;
45+
#endif
46+
#define DO_COMPILE_STATE_WAVING_BLOCKS
47+
#define FAKE_SIN(valueIn, valueOut)\
48+
valueOut = abs(1.0 - fract(valueIn * 0.159155) * 2.0);\
49+
valueOut = valueOut * valueOut * (3.0 - 2.0 * valueOut) * 2.0 - 1.0;
50+
#define LIB_INCLUDE_WAVING_BLOCKS_FUNCTION
51+
#endif
52+
53+
#EAGLER INCLUDE (2) "eagler:glsl/deferred/lib/waving_blocks.glsl"
54+
55+
#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
56+
out vec3 v_viewdir3f;
57+
#endif
58+
59+
#ifdef COMPILE_LIGHTMAP_ATTRIB
60+
in vec2 a_lightmap2f;
61+
out vec2 v_lightmap2f;
62+
uniform mat4 u_textureMat4f02;
63+
#endif
64+
65+
uniform mat4 u_modelviewMat4f;
66+
uniform mat4 u_projectionMat4f;
67+
68+
#define TEX_MAT3(mat4In) mat3(mat4In[0].xyw,mat4In[1].xyw,mat4In[3].xyw)
69+
70+
void main() {
71+
72+
#ifdef COMPILE_TEXTURE_ATTRIB
73+
vec3 v_textureTmp3f = TEX_MAT3(u_textureMat4f01) * vec3(a_texture2f, 1.0);
74+
v_texture2f = v_textureTmp3f.xy / v_textureTmp3f.z;
75+
#endif
76+
77+
#ifdef COMPILE_COLOR_ATTRIB
78+
v_color4f = a_color4f;
79+
#endif
80+
81+
#ifdef COMPILE_NORMAL_ATTRIB
82+
v_normal3f = normalize(mat3(u_modelviewMat4f) * a_normal4f.xyz);
83+
float blockId = v_block1f = floor((a_normal4f.w + 1.0) * 127.0 + 0.5);
84+
#endif
85+
86+
#ifdef COMPILE_LIGHTMAP_ATTRIB
87+
vec3 v_lightmapTmp3f = TEX_MAT3(u_textureMat4f02) * vec3(a_lightmap2f, 1.0);
88+
v_lightmap2f = v_lightmapTmp3f.xy / v_lightmapTmp3f.z;
89+
#endif
90+
91+
vec4 pos = vec4(a_position3f, 1.0);
92+
93+
#ifdef DO_COMPILE_STATE_WAVING_BLOCKS
94+
#ifndef COMPILE_NORMAL_ATTRIB
95+
float blockId = u_blockConstant1f;
96+
#endif
97+
#ifdef COMPILE_LIGHTMAP_ATTRIB
98+
if(v_lightmap2f.y > 0.33) {
99+
COMPUTE_WAVING_BLOCKS(pos, min(v_lightmap2f.y * 3.0 - 1.0, 1.0), 24.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
100+
}else {
101+
pos = u_modelviewMat4f * pos;
102+
}
103+
#else
104+
COMPUTE_WAVING_BLOCKS(pos, 1.0, 32.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
105+
#endif
106+
#else
107+
pos = u_modelviewMat4f * pos;
108+
#endif
109+
110+
#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
111+
v_viewdir3f = pos.xyz / pos.w;
112+
#endif
113+
114+
gl_Position = u_projectionMat4f * pos;
115+
116+
}

‎desktopRuntime/resources/assets/eagler/glsl/deferred/post_tonemap.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void main() {
3434
float lumaHDR = textureLod(u_framebufferLumaAvgInput, vec2(0.5), 0.0).r;
3535
vec3 input3f = textureLod(u_lightingHDRFramebufferTexture, v_position2f, 0.0).rgb;
3636

37-
input3f /= (0.1 + clamp(lumaHDR * 6.0, 0.2, 4.0));
37+
input3f /= (0.07 + clamp(lumaHDR * 6.0, 0.2, 4.0));
3838

3939
input3f *= u_exposure3f;
4040

‎desktopRuntime/resources/assets/minecraft/lang/en_US.lang‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,41 @@ eaglercraft.editProfile.playerSkin=Player Skin
4444
eaglercraft.editProfile.addSkin=Add Skin
4545
eaglercraft.editProfile.clearSkin=Clear List
4646

47+
eaglercraft.editProfile.importExport=Import/Export
48+
49+
eaglercraft.settingsBackup.importExport.title=What do you wanna do?
50+
eaglercraft.settingsBackup.importExport.import=Import Profile and Settings...
51+
eaglercraft.settingsBackup.importExport.export=Export Profile and Settings...
52+
53+
eaglercraft.settingsBackup.import.title=Import Profile and Settings
54+
eaglercraft.settingsBackup.import.option.profile=Import Profile:
55+
eaglercraft.settingsBackup.import.option.settings=Import Settings:
56+
eaglercraft.settingsBackup.import.option.servers=Import Servers:
57+
eaglercraft.settingsBackup.import.option.resourcePacks=Resource Packs:
58+
eaglercraft.settingsBackup.import.option.import=Import
59+
60+
eaglercraft.settingsBackup.export.title=Export Profile and Settings
61+
eaglercraft.settingsBackup.export.option.profile=Export Profile:
62+
eaglercraft.settingsBackup.export.option.settings=Export Settings:
63+
eaglercraft.settingsBackup.export.option.servers=Export Servers:
64+
eaglercraft.settingsBackup.export.option.resourcePacks=Resource Packs:
65+
eaglercraft.settingsBackup.export.option.export=Export
66+
67+
eaglercraft.settingsBackup.exporting.1=Exporting Profile...
68+
eaglercraft.settingsBackup.exporting.2=Please Wait.
69+
70+
eaglercraft.settingsBackup.exporting.failed.1=Export Failed!
71+
eaglercraft.settingsBackup.exporting.failed.2=Could not compile EPK
72+
73+
eaglercraft.settingsBackup.importing.1=Importing Profile...
74+
eaglercraft.settingsBackup.importing.2=Please Wait.
75+
76+
eaglercraft.settingsBackup.importing.failed.1=Import Failed!
77+
eaglercraft.settingsBackup.importing.failed.2=Could not load EPK
78+
79+
eaglercraft.resourcePack.importFailed.1=Import Failed!
80+
eaglercraft.resourcePack.importFailed.2=Could not import ZIP file
81+
4782
eaglercraft.singleplayer.integratedStartup=Starting integrated server
4883

4984
eaglercraft.addServer.SSLWarn1=you are on an https: page!

0 commit comments

Comments
 (0)