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

make it build on desktop + allow websocket urls to work even when using a proxy

Browse Source
This commit is contained in:
ayunami2000 2022-01-24 18:37:20 -05:00
parent 51edb68a01
commit 16cffaeeec
7 changed files with 24826 additions and 24709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49504
javascript/classes.js
View File

File diff suppressed because it is too large Load Diff

BIN
lwjgl-rundir/_eagstorage.g.dat
View File

Binary file not shown.

5
src/lwjgl/java/net/lax1dude/eaglercraft/WebsocketNetworkManager.java
View File

@ -46,11 +46,8 @@ public class WebsocketNetworkManager implements INetworkManager {
this.isOutputEncrypted = false;
String proxyUrl=Minecraft.getMinecraft().gameSettings.proxy;
boolean stillConnect=true;
if(!proxyUrl.equals("")){
if(!proxyUrl.equals("")&&!uri.contains("/")){
stillConnect=false;
if(uri.startsWith("ws://"))uri=uri.substring(5);
if(uri.startsWith("wss://"))uri=uri.substring(6);
if(uri.contains("/"))uri=uri.split("/",2)[0];
if (ipPattern.matcher(proxyUrl).matches()&&ipPattern.matcher(uri).matches()) {
String ip = uri;
String port = "25565";

15
src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java
View File

@ -64,6 +64,21 @@ import paulscode.sound.SoundSystemConfig;
import paulscode.sound.libraries.LibraryLWJGLOpenAL;
public class EaglerAdapterImpl2 {
public static final void startTitleMusic(float volume){
}
public static final void stopTitleMusic(){
}
public static final void volumeTitleMusic(float volume){
}
public static final boolean playingTitleMusic(){
return false;
}
public static final boolean _wisWebGL() {
return false;

2
src/main/java/net/minecraft/src/GuiConnecting.java
View File

@ -68,7 +68,7 @@ public class GuiConnecting extends GuiScreen {
}
}
this.clientHandler = new NetClientHandler(this.mc, uri, 0);
this.clientHandler = new NetClientHandler(this.mc, this.mc.gameSettings.proxy==""?uri:uria, 0);
if(this.mc.gameSettings.useDefaultProtocol) {
this.clientHandler.addToSendQueue(new Packet2ClientProtocol(61, EaglerProfile.username, uria, port));
}else{

4
src/main/java/net/minecraft/src/SoundManager.java
View File

@ -324,7 +324,7 @@ public class SoundManager {
private float titleMusicVol = 0.5F;
public void playTheTitleMusic() {
if(EaglerAdapter._wisWebGL()){
if(EaglerAdapter.isWebGL){
if(titleMusic == -1 || !EaglerAdapter.playingTitleMusic()) {
titleMusic = 1;
EaglerAdapter.startTitleMusic(this.options.musicVolume);
@ -340,7 +340,7 @@ public class SoundManager {
}
public void stopTheTitleMusic() {
if(EaglerAdapter._wisWebGL()) {
if(EaglerAdapter.isWebGL) {
if (EaglerAdapter.playingTitleMusic()) {
EaglerAdapter.stopTitleMusic();
}

5
src/teavm/java/net/lax1dude/eaglercraft/WebsocketNetworkManager.java
View File

@ -47,11 +47,8 @@ public class WebsocketNetworkManager implements INetworkManager {
this.isOutputEncrypted = false;
String proxyUrl=Minecraft.getMinecraft().gameSettings.proxy;
boolean stillConnect=true;
if(!proxyUrl.equals("")){
if(!proxyUrl.equals("")&&!uri.contains("/")){
stillConnect=false;
if(uri.startsWith("ws://"))uri=uri.substring(5);
if(uri.startsWith("wss://"))uri=uri.substring(6);
if(uri.contains("/"))uri=uri.split("/",2)[0];
if (ipPattern.matcher(proxyUrl).matches()&&ipPattern.matcher(uri).matches()) {
String ip = uri;
String port = "25565";