This commit is contained in:
Coll147 2023-11-05 11:42:25 +01:00
parent 0083c988a2
commit 6c7ca531eb
22 changed files with 56559 additions and 56919 deletions

View File

@ -1,23 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Eaglercraft 1.5.2 - Service Pack 1
Eaglercraft 1.5.2 - Service Pack 1.01
Released: October 27th, 2023 - "23w43a"
New in Service Pack 1:
Huge FPS boosts, lessons learned during the development of 1.8 have been applied
to 1.5, and ayunami2000 added basic support for resource packs. Update your
unblocked game websites ASAP for the best user experience on slow hardware.
Huge FPS boosts, lessons learned during the development of EaglercraftX 1.8
have been applied to 1.5, and ayunami2000 added basic support for resource
packs. Update your unblocked game websites ASAP for the best user experience
on slow hardware.
- 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
- backported X's state management
- backported X's buffer streaming
- backported X's hotbar FPS fix
- backported X's double buffering
- backported X's FXAA shader
Made by lax1dude
@ -26,10 +27,10 @@ Run "GetRepositorySignature.bat", and verify that this is the result:
~~~ Repository SHA-256: ~~~
71a8ef1c208d98f2
324d169ab580042f
aae707451c858c0c
599083505b32e0d7
5239fb2c2cba1a93
e7ce93cce1f7571e
9fe989a98e650b03
af10eb24f3d5c222
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -41,7 +42,7 @@ GetRepositorySignature.bat: 4B995076348E03A5322F3EB6AF72948E4C27CEB6
GetRepositorySignature.sh: 8B269BA0D54C2B4BD7E9199B10C9769D39F00DC6
If this is all correct, then this is the official Eaglercraft 1.5.2 Service Pack 1
If this is all correct, then this is the official Eaglercraft 1.5.2 Service Pack 1.01
You can download a clean copy of "GetRepositorySignature.jar" here: [https://deev.is/eagler/GetRepositorySignature.jar]
@ -57,17 +58,17 @@ To verify the PGP signature on this message, my public key is here: [https://dee
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEcBgAq2s4AHU8tLsdcu68cJImpGoFAmU8lcwACgkQcu68cJIm
pGofzg/+JROwhvzaxf53TTDLGW6/5cAYro5L07nrtvVcj29FVRBg/KQRaONau5oW
B7fSgap+p7QuCESqfNqzErQKhpowBOAs985F7xNYoudgrvgAi66FKvgLsw57B0G4
vh0P4fHqq+xaVOpwxz/0xCm1Ac6oak16Jx2itmPMRXgmmSDujpgxFSBTe+RzQPOP
zCEW7GCSyjhOQWKeTNvTqqOJjBl8j/B3sD31DAG5D7yiE1tf7/a2TXv2/9CLaDb7
Zc+VoAi6hfy7S5AJ0AcfWInogLzhb40u0SmFnnMmJSiGj27RoLJtNTNmZ9LD2bGC
41qfuBk6d1SD7vGgA0rsLvHrrbABTydUwTy+6hj6Mtr4uM8OfGevlgDQV5TvJORr
0bCGrHUz2g6l5MCuqjMgG+5iYgnj/7THEe6wC2O82U9BNz/MJoGc3fFQvVrQ2Zue
WKA12ZQyZfF9Dya31IoYljMrOMvxvTuZO1C0dvP4Ts19yiAr+efY8G3oOnnMeyQb
evTr+ysUHbZh0r+lPXzM1JfIZJqEMbHOKNzEL92btnd6Ft5EgVC2zFZj5kWYe3Uv
SD5zO56PGIoGXZ6zrUQNUWL26MvvhdfJlZ4dMBBShMYzm8ueVMzrnhUUGQ7CxqMA
P90Z/xfYFETNC9wVSlmiekhJdOaFrKc7ZMoO4zqlxrMVw1qG/fc=
=VwBl
iQIzBAEBCAAdFiEEcBgAq2s4AHU8tLsdcu68cJImpGoFAmVGEFcACgkQcu68cJIm
pGo+2hAAmC0mPbQzfSR/GCb3ilOynH4GwLHhhRjsKjtucOBkmCRd+oPr0jXrI8xj
GfdXJ+gqXgKTfzC9Mhh1mZbdJo6m75HNJD1Y4eWInkaNEwMZ+win3efhiqx7iXGr
nDRl8F39IwHp/Y9OCO1+H7GJXsawvB45LWaMYrHQgiYdtaOIYvlYFdJLFXTwJY4X
HRXb+C7YnHBP1xzCpWhjpgkFwZbTa6c+NYr3z6lnHighai2Ix26BhpZKVjhURNJU
YMu1MqeTHDuDwCyqMKgZHj2qMFh50iu7IlxyJlE7sC2uB22GnPO8thKuYpKT9abU
zcBu0N/r68+y8CBS61gNBdDf4GeigF2c6N5A9B00W9SqJ3U6hzPHPuUj+JrSMe/t
Wq0CN36PmRHdJo3zP8tFtngBBjWlA/3IZWzVCmBcvxpTdkd6YaqHVSE2sxD6hGOB
QOuAojqr+dOxuinxcmmjlVab+kyurgbWKUtqmvrnpE/e4fQp6gloeoOPaGlqsjOs
QLaALHHhbZb/w+j1YjkkcwSYA8cF7q5Ndl/t8/BhHsSO/JLZ9SxsuDlkxlpoLogq
jT8ns8kaDa2xZliibIEYu8ldqDLecpu76P8LBwe8OtRAdz338OG/63qvqRg9U9Jc
igIanqpf7TjOa5Nt9wqCaOrqvzTtldkulKAeF1IE9uSejiTkJX4=
=l8Sa
-----END PGP SIGNATURE-----

View File

@ -9,14 +9,14 @@
Eaglercraft is real Minecraft 1.5.2 that you can play in any regular web browser. That includes school chromebooks, it works on all chromebooks. It supports both singleplayer and multiplayer.
# New in Service Pack 1:
**Huge FPS boosts, lessons learned during the development of 1.8 have been applied to 1.5, and [ayunami2000](https://github.com/ayunami2000/) added basic support for resource packs. Update your unblocked game websites ASAP for the best user experience on slow hardware.**
**Huge FPS boosts, lessons learned during the development of EaglercraftX 1.8 have been applied to 1.5, and [ayunami2000](https://github.com/ayunami2000/) added basic support for resource packs. Update your unblocked game websites ASAP for the best user experience on slow hardware.**
- 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
- backported X's state management
- backported X's buffer streaming
- backported X's hotbar FPS fix
- backported X's double buffering
- backported X's FXAA shader
**The LAN world relay server is now bundled with the client, you can download it using a button in the "Network Settings" menu where LAN relays are configured. Hopefully this will prevent LAN worlds from ever becoming defunct once our default relay servers no longer exist.**

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

@ -4,11 +4,11 @@
- 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
- backported X's state management
- backported X's buffer streaming
- backported X's hotbar FPS fix
- backported X's double buffering
- backported X's FXAA shader
Release date: §910/27/2023§r

View File

@ -1,7 +1,7 @@
// copyright (c) 2020-2023 lax1dude
#line 7
#line 4
precision highp int;
precision highp sampler2D;
@ -129,7 +129,8 @@ in vec2 v_texture1;
out vec4 fragColor;
#define TEX_MAT3(mat4In) mat3(mat4In[0].xyw,mat4In[1].xyw,mat4In[3].xyw)
#define TEX_MAT3x2(mat4In) mat3x2(mat4In[0].xy,mat4In[1].xy,mat4In[3].xy)
#define TEX_MAT4x3(mat4In) mat4x3(mat4In[0].xyw,mat4In[1].xyw,mat4In[2].xyw,mat4In[3].xyw)
void main(){
#ifdef CC_a_color
@ -148,8 +149,8 @@ void main(){
texPos.y = dot(texSrc[textureGen_M.y], textureGenT_V);
texPos.z = dot(texSrc[textureGen_M.z], textureGenR_V);
texPos.w = dot(texSrc[textureGen_M.w], textureGenQ_V);
texPos = matrix_t * texPos;
color *= texture(tex0, texPos.xy / texPos.w).bgra;
texPos.xyz = TEX_MAT4x3(matrix_t) * texPos;
color *= texture(tex0, texPos.xy / texPos.z).bgra;
#ifdef CC_alphatest
if(color.a < alphaTestF){
discard;
@ -160,18 +161,18 @@ void main(){
#ifdef CC_a_texture0
#ifdef CC_patch_anisotropic
vec2 uv = (TEX_MAT3(matrix_t) * vec3(v_texture0, 1.0)).xy;
vec2 uv = TEX_MAT3x2(matrix_t) * vec3(v_texture0, 1.0);
/* https://bugs.chromium.org/p/angleproject/issues/detail?id=4994 */
uv = ((uv * anisotropic_fix) - fract(uv * anisotropic_fix) + 0.5) / anisotropic_fix;
vec4 texColor = texture(tex0, uv);
#else
vec4 texColor = texture(tex0, (TEX_MAT3(matrix_t) * vec3(v_texture0, 1.0)).xy);
vec4 texColor = texture(tex0, TEX_MAT3x2(matrix_t) * vec3(v_texture0, 1.0));
#endif
#else
vec4 texColor = texture(tex0, (TEX_MAT3(matrix_t) * vec3(texCoordV0, 1.0)).xy);
vec4 texColor = texture(tex0, TEX_MAT3x2(matrix_t) * vec3(texCoordV0, 1.0));
#endif
#ifdef CC_swap_rb

View File

@ -6,7 +6,7 @@ public class ConfigConstants {
public static boolean profanity = false;
public static final String version = "1.5.2-sp1";
public static final String version = "1.5.2-sp1.01";
public static final String mainMenuString = "eaglercraft " + version;
public static final String forkMe = null;

View File

@ -1,129 +0,0 @@
package net.lax1dude.eaglercraft;
public class GuiScreenChangeWorldTimeout {
/*
* 'license' screen text, this is encoded to stop skids from
* easily modifying it via find/replace in a text editor
*/
static final byte[] line00 = new byte[] {
(byte)85,(byte)115,(byte)101,(byte)32,(byte)121,(byte)111,(byte)117,(byte)114,(byte)32,(byte)98,
(byte)114,(byte)97,(byte)105,(byte)110,(byte)32,(byte)97,(byte)110,(byte)100,(byte)32,(byte)114,
(byte)101,(byte)97,(byte)100,(byte)58
};
static final byte[] line10 = new byte[] {
(byte)69,(byte)97,(byte)103,(byte)108,(byte)101,(byte)114,(byte)99,(byte)114,(byte)97,(byte)102,
(byte)116,(byte)32,(byte)105,(byte)115,(byte)32,(byte)194,(byte)167,(byte)100,(byte)102,(byte)114,
(byte)101,(byte)101,(byte)32,(byte)115,(byte)111,(byte)102,(byte)116,(byte)119,(byte)97,(byte)114,
(byte)101,(byte)44,(byte)194,(byte)167,(byte)114,(byte)32,(byte)105,(byte)102,(byte)32,(byte)115,
(byte)111,(byte)109,(byte)101,(byte)111,(byte)110,(byte)101,(byte)32,(byte)105,(byte)110,(byte)116,
(byte)101,(byte)110,(byte)116,(byte)105,(byte)111,(byte)110,(byte)97,(byte)108,(byte)108,(byte)121,
(byte)32,(byte)99,(byte)104,(byte)97,(byte)114,(byte)103,(byte)101,(byte)100
};
static final byte[] line11 = new byte[] {(byte)121,(byte)111,(byte)117,(byte)32,(byte)97,(byte)110,
(byte)121,(byte)32,(byte)115,(byte)117,(byte)109,(byte)32,(byte)111,(byte)102,(byte)32,(byte)109,
(byte)111,(byte)110,(byte)101,(byte)121,(byte)32,(byte)116,(byte)111,(byte)32,(byte)103,(byte)97,
(byte)105,(byte)110,(byte)32,(byte)97,(byte)99,(byte)99,(byte)101,(byte)115,(byte)115,(byte)32,
(byte)116,(byte)111,(byte)32,(byte)116,(byte)104,(byte)105,(byte)115,(byte)32,(byte)102,(byte)105,
(byte)108,(byte)101,(byte)44,(byte)32,(byte)121,(byte)111,(byte)117,(byte)32,(byte)97,(byte)114,
(byte)101,(byte)32,(byte)97,(byte)110
};
static final byte[] line12 = new byte[] {(byte)105,(byte)100,(byte)105,(byte)111,(byte)116,(byte)32,
(byte)97,(byte)110,(byte)100,(byte)32,(byte)97,(byte)32,(byte)118,(byte)105,(byte)99,(byte)116,
(byte)105,(byte)109,(byte)32,(byte)111,(byte)102,(byte)32,(byte)112,(byte)105,(byte)114,(byte)97,
(byte)99,(byte)121,(byte)46,(byte)32,(byte)83,(byte)116,(byte)111,(byte)112,(byte)32,(byte)112,
(byte)108,(byte)97,(byte)121,(byte)105,(byte)110,(byte)103,(byte)32,(byte)121,(byte)111,(byte)117,
(byte)114,(byte)115,(byte)101,(byte)108,(byte)102,(byte)46
};
static final byte[] line20 = new byte[] {
(byte)67,(byte)108,(byte)105,(byte)99,(byte)107,(byte)32,(byte)39,(byte)70,(byte)111,(byte)114,
(byte)107,(byte)32,(byte)111,(byte)110,(byte)32,(byte)71,(byte)105,(byte)116,(byte)104,(byte)117,
(byte)98,(byte)39,(byte)32,(byte)111,(byte)110,(byte)32,(byte)116,(byte)104,(byte)101,(byte)32,
(byte)109,(byte)97,(byte)105,(byte)110,(byte)32,(byte)109,(byte)101,(byte)110,(byte)117,(byte)32,
(byte)116,(byte)111,(byte)32,(byte)97,(byte)99,(byte)99,(byte)101,(byte)115,(byte)115,(byte)32,
(byte)116,(byte)104,(byte)101,(byte)32,(byte)111,(byte)102,(byte)102,(byte)105,(byte)99,(byte)97,(byte)108
};
static final byte[] line21 = new byte[] {
(byte)115,(byte)111,(byte)117,(byte)114,(byte)99,(byte)101,(byte)32,(byte)99,(byte)111,(byte)100,
(byte)101,(byte)32,(byte)116,(byte)111,(byte)32,(byte)100,(byte)111,(byte)119,(byte)110,(byte)108,
(byte)111,(byte)97,(byte)100,(byte)32,(byte)116,(byte)104,(byte)105,(byte)115,(byte)32,(byte)101,
(byte)100,(byte)117,(byte)99,(byte)97,(byte)116,(byte)105,(byte)111,(byte)110,(byte)97,(byte)108,
(byte)32,(byte)112,(byte)114,(byte)111,(byte)106,(byte)101,(byte)99,(byte)116,(byte)32,(byte)108,
(byte)101,(byte)103,(byte)105,(byte)116,(byte)105,(byte)109,(byte)97,(byte)116,(byte)101,(byte)108,(byte)121
};
static final byte[] line30 = new byte[] {
(byte)73,(byte)32,(byte)97,(byte)109,(byte)32,(byte)97,(byte)119,(byte)97,(byte)114,(byte)101,
(byte)32,(byte)116,(byte)104,(byte)97,(byte)116,(byte)32,(byte)116,(byte)104,(byte)105,(byte)115,
(byte)32,(byte)112,(byte)114,(byte)111,(byte)106,(byte)101,(byte)99,(byte)116,(byte)32,(byte)118,
(byte)105,(byte)111,(byte)108,(byte)97,(byte)116,(byte)101,(byte)100,(byte)32,(byte)77,(byte)111,
(byte)106,(byte)97,(byte)110,(byte)103,(byte)39,(byte)115,(byte)32,(byte)84,(byte)101,(byte)114,
(byte)109,(byte)115,(byte)32,(byte)111,(byte)102,(byte)32,(byte)83,(byte)101,(byte)114,(byte)118,
(byte)105,(byte)99,(byte)101
};
static final byte[] line31 = new byte[] {
(byte)84,(byte)104,(byte)105,(byte)115,(byte)32,(byte)105,(byte)115,(byte)32,(byte)103,(byte)111,
(byte)105,(byte)110,(byte)103,(byte)32,(byte)116,(byte)111,(byte)32,(byte)99,(byte)104,(byte)97,
(byte)110,(byte)103,(byte)101,(byte)32,(byte)105,(byte)110,(byte)32,(byte)97,(byte)32,(byte)102,
(byte)101,(byte)119,(byte)32,(byte)119,(byte)101,(byte)101,(byte)107,(byte)115,(byte)44,(byte)32,
(byte)119,(byte)104,(byte)101,(byte)110,(byte)32,(byte)73,(byte)32,(byte)99,(byte)111,(byte)110,
(byte)118,(byte)101,(byte)114,(byte)116,(byte)32,(byte)116,(byte)104,(byte)105,(byte)115,(byte)32,
(byte)103,(byte)97,(byte)109,(byte)101
};
static final byte[] line32 = new byte[] {
(byte)105,(byte)110,(byte)116,(byte)111,(byte)32,(byte)97,(byte)110,(byte)32,(byte)111,(byte)110,
(byte)108,(byte)105,(byte)110,(byte)101,(byte)45,(byte)109,(byte)111,(byte)100,(byte)101,(byte)32,
(byte)112,(byte)108,(byte)117,(byte)103,(byte)105,(byte)110,(byte)32,(byte)116,(byte)104,(byte)97,
(byte)116,(byte)32,(byte)114,(byte)101,(byte)113,(byte)117,(byte)105,(byte)114,(byte)101,(byte)115,
(byte)32,(byte)97,(byte)32,(byte)109,(byte)105,(byte)99,(byte)114,(byte)111,(byte)115,(byte)111,
(byte)102,(byte)116,(byte)32,(byte)97,(byte)99,(byte)99,(byte)111,(byte)117,(byte)110,(byte)116,(byte)46
};
static final byte[] line40 = new byte[] {
(byte)85,(byte)110,(byte)116,(byte)105,(byte)108,(byte)32,(byte)116,(byte)104,(byte)101,(byte)110,
(byte)44,(byte)32,(byte)68,(byte)79,(byte)32,(byte)78,(byte)79,(byte)84,(byte)32,(byte)66,(byte)85,
(byte)89,(byte)32,(byte)79,(byte)82,(byte)32,(byte)83,(byte)69,(byte)76,(byte)76,(byte)32,(byte)65,
(byte)67,(byte)67,(byte)69,(byte)83,(byte)83,(byte)32,(byte)84,(byte)79,(byte)32,(byte)84,(byte)72,
(byte)73,(byte)83,(byte)32,(byte)80,(byte)82,(byte)79,(byte)74,(byte)69,(byte)67,(byte)84
};
static final byte[] line50 = new byte[] {
(byte)73,(byte)32,(byte)117,(byte)110,(byte)100,(byte)101,(byte)114,(byte)115,(byte)116,(byte)97,
(byte)110,(byte)100,(byte)32,(byte)97,(byte)110,(byte)100,(byte)32,(byte)107,(byte)110,(byte)111,
(byte)119,(byte)32,(byte)104,(byte)111,(byte)119,(byte)32,(byte)116,(byte)111,(byte)32,(byte)114,
(byte)101,(byte)97,(byte)100
};
static final byte[] line60 = new byte[] {(byte)65,(byte)99,(byte)99,(byte)101,(byte)112,(byte)116};
static final byte[] line61 = new byte[] {(byte)68,(byte)101,(byte)99,(byte)108,(byte)105,(byte)110,(byte)101};
static final byte[] line70 = new byte[] {
(byte)84,(byte)101,(byte)114,(byte)109,(byte)115,(byte)32,(byte)111,(byte)102,(byte)32,(byte)83,
(byte)101,(byte)114,(byte)118,(byte)105,(byte)99,(byte)101,(byte)32,(byte)68,(byte)101,(byte)99,
(byte)108,(byte)105,(byte)110,(byte)101,(byte)100
};
static final byte[] line71 = new byte[] {
(byte)121,(byte)111,(byte)117,(byte)32,(byte)99,(byte)97,(byte)110,(byte)110,(byte)111,(byte)116,
(byte)32,(byte)117,(byte)115,(byte)101,(byte)32,(byte)116,(byte)104,(byte)105,(byte)115,(byte)32,
(byte)115,(byte)111,(byte)102,(byte)116,(byte)119,(byte)97,(byte)114,(byte)101,(byte)32,(byte)105,
(byte)102,(byte)32,(byte)121,(byte)111,(byte)117,(byte)32,(byte)100,(byte)111,(byte)32,(byte)110,
(byte)111,(byte)116,(byte)32,(byte)97,(byte)99,(byte)99,(byte)101,(byte)112,(byte)116
};
static final byte[] line72 = new byte[] {
(byte)114,(byte)101,(byte)102,(byte)114,(byte)101,(byte)115,(byte)104,(byte)32,(byte)116,(byte)104,
(byte)101,(byte)32,(byte)112,(byte)97,(byte)103,(byte)101,(byte)32,(byte)116,(byte)111,(byte)32,
(byte)116,(byte)114,(byte)121,(byte)32,(byte)97,(byte)103,(byte)97,(byte)105,(byte)110
};
}

View File

@ -1,101 +0,0 @@
package net.lax1dude.eaglercraft;
import net.minecraft.src.GuiButton;
import net.minecraft.src.GuiScreen;
public class GuiScreenLicense extends GuiScreen {
private final GuiScreen continueScreen;
private boolean hasCheckedBox = false;
private int beginOffset = 0;
private GuiButton acceptButton;
public GuiScreenLicense(GuiScreen scr) {
continueScreen = scr;
}
public void initGui() {
beginOffset = this.height / 2 - 100;
if(beginOffset < 5) {
beginOffset = 5;
}
this.buttonList.add(new GuiButton(1, this.width / 2 - 120, beginOffset + 180, 115, 20, new String(GuiScreenChangeWorldTimeout.line61)));
this.buttonList.add(acceptButton = new GuiButton(2, this.width / 2 + 5, beginOffset + 180, 115, 20, new String(GuiScreenChangeWorldTimeout.line60)));
acceptButton.enabled = false;
}
protected void actionPerformed(GuiButton par1GuiButton) {
if(par1GuiButton.id == 2) {
LocalStorageManager.profileSettingsStorage.setBoolean("acceptLicense", true);
LocalStorageManager.saveStorageP();
mc.displayGuiScreen(continueScreen);
}else if(par1GuiButton.id == 1) {
mc.displayGuiScreen(new GuiScreenLicenseDeclined());
}
}
private static final TextureLocation beaconx = new TextureLocation("/gui/beacon.png");
public void drawScreen(int mx, int my, float par3) {
drawDefaultBackground();
acceptButton.enabled = hasCheckedBox;
super.drawScreen(mx, my, par3);
EaglerAdapter.glPushMatrix();
EaglerAdapter.glScalef(1.33f, 1.33f, 1.33f);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line00), width * 3 / 8, beginOffset * 3 / 4, 0xDDDD55);
EaglerAdapter.glPopMatrix();
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line10), width / 2, beginOffset + 22, 0xFF7777);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line11), width / 2, beginOffset + 33, 0xFF7777);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line12), width / 2, beginOffset + 44, 0xFF7777);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line20), width / 2, beginOffset + 62, 0x448844);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line21), width / 2, beginOffset + 71, 0x448844);
EaglerAdapter.glPushMatrix();
EaglerAdapter.glScalef(0.75f, 0.75f, 0.75f);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line30), width * 4 / 6, (beginOffset + 89) * 4 / 3, 0x666666);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line31), width * 4 / 6, (beginOffset + 97) * 4 / 3, 0x999999);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line32), width * 4 / 6, (beginOffset + 105) * 4 / 3, 0x999999);
EaglerAdapter.glPopMatrix();
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line40), width / 2, beginOffset + 120, 0xFF7777);
boolean mouseOverCheck = width / 2 - 100 < mx && width / 2 - 83 > mx && beginOffset + 142 < my && beginOffset + 159 > my;
if(mouseOverCheck) {
EaglerAdapter.glColor4f(0.7f, 0.7f, 1.0f, 1.0f);
}else {
EaglerAdapter.glColor4f(0.6f, 0.6f, 0.6f, 1.0f);
}
beaconx.bindTexture();
EaglerAdapter.glPushMatrix();
EaglerAdapter.glScalef(0.75f, 0.75f, 0.75f);
drawTexturedModalRect((width / 2 - 100) * 4 / 3, (beginOffset + 142) * 4 / 3, 22, 219, 22, 22);
EaglerAdapter.glPopMatrix();
if(hasCheckedBox) {
EaglerAdapter.glPushMatrix();
EaglerAdapter.glColor4f(1.1f, 1.1f, 1.1f, 1.0f);
EaglerAdapter.glTranslatef(0.5f, 0.5f, 0.0f);
drawTexturedModalRect((width / 2 - 100), (beginOffset + 142), 90, 222, 16, 16);
EaglerAdapter.glPopMatrix();
}
EaglerAdapter.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
drawString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line50), width / 2 - 75, beginOffset + 147, 0xEEEEEE);
}
protected void mouseClicked(int par1, int par2, int par3) {
super.mouseClicked(par1, par2, par3);
if(width / 2 - 100 < par1 && width / 2 - 83 > par1 && beginOffset + 142 < par2 && beginOffset + 159 > par2) {
this.mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
hasCheckedBox = !hasCheckedBox;
}
}
}

View File

@ -1,13 +0,0 @@
package net.lax1dude.eaglercraft;
import net.minecraft.src.GuiScreen;
public class GuiScreenLicenseDeclined extends GuiScreen {
public void drawScreen(int mx, int my, float par3) {
this.drawDefaultBackground();
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line70), width / 2, height / 3 - 10, 0xFFFFFF);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line71), width / 2, height / 3 + 18, 0xFF7777);
drawCenteredString(fontRenderer, new String(GuiScreenChangeWorldTimeout.line72), width / 2, height / 3 + 35, 0x666666);
}
}

View File

@ -102,7 +102,7 @@ public class EffectPipelineFXAA {
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_MIN_FILTER, _wGL_NEAREST);
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_WRAP_S, _wGL_CLAMP);
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_WRAP_T, _wGL_CLAMP);
_wglTexImage2D(_wGL_TEXTURE_2D, 0, _wGL_RGB8, width, height, 0, _wGL_RGB, _wGL_UNSIGNED_BYTE, (ByteBuffer)null);
_wglTexImage2D(_wGL_TEXTURE_2D, 0, _wGL_RGBA8, width, height, 0, _wGL_RGBA, _wGL_UNSIGNED_BYTE, (ByteBuffer)null);
framebuffer_depth = _wglCreateRenderBuffer();
@ -122,7 +122,7 @@ public class EffectPipelineFXAA {
framebuffer_depth = _wglCreateRenderBuffer();
_wglBindFramebuffer(_wGL_FRAMEBUFFER, framebuffer);
_wglBindRenderbuffer(framebuffer_color);
_wglRenderbufferStorageMultisample(state == 2 ? 4 : 8, _wGL_RGB8, width, height);
_wglRenderbufferStorageMultisample(state == 2 ? 4 : 8, _wGL_RGBA8, width, height);
_wglBindRenderbuffer(framebuffer_depth);
_wglRenderbufferStorageMultisample(state == 2 ? 4 : 8, _wGL_DEPTH_COMPONENT32F, width, height);
_wglFramebufferRenderbuffer(_wGL_COLOR_ATTACHMENT0, framebuffer_color);
@ -174,7 +174,7 @@ public class EffectPipelineFXAA {
initFXAA();
}else {
glBindTexture(_wGL_TEXTURE_2D, fxaaSourceTexture);
_wglTexImage2D(_wGL_TEXTURE_2D, 0, _wGL_RGB8, width, height, 0, _wGL_RGB, _wGL_UNSIGNED_BYTE, (ByteBuffer)null);
_wglTexImage2D(_wGL_TEXTURE_2D, 0, _wGL_RGBA8, width, height, 0, _wGL_RGBA, _wGL_UNSIGNED_BYTE, (ByteBuffer)null);
_wglBindRenderbuffer(framebuffer_depth);
_wglRenderbufferStorage(_wGL_DEPTH_COMPONENT32F, width, height);
}
@ -183,7 +183,7 @@ public class EffectPipelineFXAA {
initMSAA();
}else {
_wglBindRenderbuffer(framebuffer_color);
_wglRenderbufferStorageMultisample(state == 2 ? 4 : 8, _wGL_RGB8, width, height);
_wglRenderbufferStorageMultisample(state == 2 ? 4 : 8, _wGL_RGBA8, width, height);
_wglBindRenderbuffer(framebuffer_depth);
_wglRenderbufferStorageMultisample(state == 2 ? 4 : 8, _wGL_DEPTH_COMPONENT32F, width, height);
}
@ -224,7 +224,7 @@ public class EffectPipelineFXAA {
_wglViewport(originalViewport[0], originalViewport[1], originalViewport[2], originalViewport[3]);
_wglBindFramebuffer(_wGL_READ_FRAMEBUFFER, framebuffer);
_wglBindFramebuffer(_wGL_DRAW_FRAMEBUFFER, null);
_wglDrawBuffer(_wGL_BACK);
_wglDrawBuffer(_wGL_COLOR_ATTACHMENT0);
_wglBlitFramebuffer(0, 0, width, height, 0, 0, width, height, _wGL_COLOR_BUFFER_BIT, _wGL_NEAREST);
_wglBindFramebuffer(_wGL_READ_FRAMEBUFFER, null);
}

View File

@ -11,13 +11,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.GuiVoiceOverlay;
import net.lax1dude.eaglercraft.IntegratedServer;
import net.lax1dude.eaglercraft.IntegratedServerLAN;
import net.lax1dude.eaglercraft.LocalStorageManager;
import net.lax1dude.eaglercraft.Voice;
import net.lax1dude.eaglercraft.WorkerNetworkManager;
import net.lax1dude.eaglercraft.adapter.SimpleStorage;
@ -354,10 +352,6 @@ public class Minecraft implements Runnable {
scr = new GuiScreenEditProfile(new GuiMainMenu());
}
if(!LocalStorageManager.profileSettingsStorage.getBoolean("acceptLicense")) {
scr = new GuiScreenLicense(scr);
}
displayGuiScreen(scr);
this.loadingScreen = new LoadingScreenRenderer(this);

View File

@ -117,24 +117,26 @@ public class Gui {
public void drawTexturedModalRect(int par1, int par2, int par3, int par4, int par5, int par6) {
float var7 = 0.00390625F;
float var8 = 0.00390625F;
float fuck = 0.0001953125F;
Tessellator var9 = Tessellator.instance;
var9.startDrawingQuads();
var9.addVertexWithUV((double) (par1 + 0), (double) (par2 + par6), (double) this.zLevel, (double) ((float) (par3 + 0) * var7), (double) ((float) (par4 + par6) * var8));
var9.addVertexWithUV((double) (par1 + par5), (double) (par2 + par6), (double) this.zLevel, (double) ((float) (par3 + par5) * var7), (double) ((float) (par4 + par6) * var8));
var9.addVertexWithUV((double) (par1 + par5), (double) (par2 + 0), (double) this.zLevel, (double) ((float) (par3 + par5) * var7), (double) ((float) (par4 + 0) * var8));
var9.addVertexWithUV((double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) ((float) (par3 + 0) * var7), (double) ((float) (par4 + 0) * var8));
var9.addVertexWithUV((double) (par1 + 0 + fuck), (double) (par2 + par6 - fuck), (double) this.zLevel, (double) ((float) (par3 + 0 + fuck) * var7), (double) ((float) (par4 + par6 - fuck) * var8));
var9.addVertexWithUV((double) (par1 + par5 - fuck), (double) (par2 + par6 - fuck), (double) this.zLevel, (double) ((float) (par3 + par5 - fuck) * var7), (double) ((float) (par4 + par6 - fuck) * var8));
var9.addVertexWithUV((double) (par1 + par5 - fuck), (double) (par2 + 0 + fuck), (double) this.zLevel, (double) ((float) (par3 + par5 - fuck) * var7), (double) ((float) (par4 + 0 + fuck) * var8));
var9.addVertexWithUV((double) (par1 + 0 + fuck), (double) (par2 + 0 + fuck), (double) this.zLevel, (double) ((float) (par3 + 0 + fuck) * var7), (double) ((float) (par4 + 0 + fuck) * var8));
var9.draw();
}
public static void static_drawTexturedModalRect(int par1, int par2, int par3, int par4, int par5, int par6) {
float var7 = 0.00390625F;
float var8 = 0.00390625F;
float fuck = 0.0001953125F;
Tessellator var9 = Tessellator.instance;
var9.startDrawingQuads();
var9.addVertexWithUV((double) (par1 + 0), (double) (par2 + par6), 0.0D, (double) ((float) (par3 + 0) * var7), (double) ((float) (par4 + par6) * var8));
var9.addVertexWithUV((double) (par1 + par5), (double) (par2 + par6), 0.0D, (double) ((float) (par3 + par5) * var7), (double) ((float) (par4 + par6) * var8));
var9.addVertexWithUV((double) (par1 + par5), (double) (par2 + 0), 0.0D, (double) ((float) (par3 + par5) * var7), (double) ((float) (par4 + 0) * var8));
var9.addVertexWithUV((double) (par1 + 0), (double) (par2 + 0), 0.0D, (double) ((float) (par3 + 0) * var7), (double) ((float) (par4 + 0) * var8));
var9.addVertexWithUV((double) (par1 + 0 + fuck), (double) (par2 + par6 - fuck), (double) 0.0D, (double) ((float) (par3 + 0 + fuck) * var7), (double) ((float) (par4 + par6 - fuck) * var8));
var9.addVertexWithUV((double) (par1 + par5 - fuck), (double) (par2 + par6 - fuck), (double) 0.0D, (double) ((float) (par3 + par5 - fuck) * var7), (double) ((float) (par4 + par6 - fuck) * var8));
var9.addVertexWithUV((double) (par1 + par5 - fuck), (double) (par2 + 0 + fuck), (double) 0.0D, (double) ((float) (par3 + par5 - fuck) * var7), (double) ((float) (par4 + 0 + fuck) * var8));
var9.addVertexWithUV((double) (par1 + 0 + fuck), (double) (par2 + 0 + fuck), (double) 0.0D, (double) ((float) (par3 + 0 + fuck) * var7), (double) ((float) (par4 + 0 + fuck) * var8));
var9.draw();
}

File diff suppressed because one or more lines are too long

Binary file not shown.

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

@ -15,9 +15,7 @@ To correctly download this file on google drive, press the download button at th
<!--
Visit this link to check for newer versions of this file:
https://github.com/LAX1DUDE/eaglercraft/blob/main/stable-download/Offline_Download_Version.html
Eaglercraft 1.5.2 is no longer under development
This version of eaglercraft you are using right now is from ${date}
@ -164,7 +162,7 @@ function countdown() {
<body style="margin:0px;width:100vw;height:100vh;font-family:sans-serif;" id="game_frame">
<div id="locally" style="text-align:center;">
<div style="height:5vh;"></div>
<h2>you are running eaglercraft locally, check <a href="https://github.com/LAX1DUDE/eaglercraft/blob/main/stable-download/Offline_Download_Version.html" target="_blank">this link</a> regularly for an updated version</h2>
<h2>Eaglercraft 1.5.2 Service Pack #1</h2>
<h3>the version you are currently using is from <span style="color:#cc0000;font-size:larger;">${date}</span></h3>
<p id="countdown" style="text-align:center;">(Game will launch in 5)</p>
</div>