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

Merge branch 'main' of https://github.com/lax1dude/eaglercraft-nope-lol

Browse Source
This commit is contained in:
lax1dude 2024-12-13 19:59:00 -08:00
commit 5918b23f14
12 changed files with 168 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2010,4 +2010,16 @@ public class EaglerAdapterImpl2 {
}
}
public static final boolean immediateContinueSupported() {
return false;
}
public static final void immediateContinue() {
//
}
public static final List<LANPeerEvent> serverLANGetAllEvent(String clientId) {
return null;
}
}

80
src/lwjgl/java/net/lax1dude/eaglercraft/adapter/vfs/VFile.java Normal file
View File

@ -0,0 +1,80 @@
package net.lax1dude.eaglercraft.adapter.vfs;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Comparator;
import java.util.stream.Stream;
public class VFile extends File {
public VFile(String pathname) {
super(pathname);
}
public VFile(String parent, String child) {
super(parent, child);
}
public VFile(File parent, String child) {
super(parent, child);
}
public VFile(String parent, String child, String child2) {
super(new VFile(parent, child), child2);
}
public InputStream getInputStream() {
try {
return Files.newInputStream(this.toPath());
} catch (IOException e) {
return null;
}
}
public String[] getAllLines() {
try {
return Files.readAllLines(this.toPath(), StandardCharsets.UTF_8).toArray(new String[0]);
} catch (IOException e) {
return null;
}
}
public String getAllChars() {
try {
return Files.readString(this.toPath(), StandardCharsets.UTF_8);
} catch (IOException e) {
return null;
}
}
public boolean setAllChars(String chars) {
return setAllBytes(chars.getBytes(StandardCharsets.UTF_8));
}
public boolean setAllBytes(byte[] bytes) {
try {
if (this.getParentFile() != null) {
this.getParentFile().mkdirs();
}
Files.write(this.toPath(), bytes);
return true;
} catch (IOException e) {
return false;
}
}
public int deleteAll() {
try (Stream<Path> pathStream = Files.walk(this.toPath())) {
pathStream.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
return 1;
} catch (IOException e) {
return 0;
}
}
}

32
src/main/java/net/minecraft/src/GuiTexturePacks.java
View File

@ -3,8 +3,7 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.EPKDecompiler;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglerInputStream;
import net.lax1dude.eaglercraft.EaglerMisc;
import net.lax1dude.eaglercraft.adapter.teavm.vfs.VFile;
import net.lax1dude.eaglercraft.adapter.vfs.VFile;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@ -28,6 +27,8 @@ public class GuiTexturePacks extends GuiScreen {
private GuiTexturePackSlot guiTexturePackSlot;
private GameSettings field_96146_n;
protected static final VFile texturePackListFile = new VFile("__LIST__");
public GuiTexturePacks(GuiScreen par1, GameSettings par2) {
this.guiScreen = par1;
this.field_96146_n = par2;
@ -107,6 +108,11 @@ public class GuiTexturePacks extends GuiScreen {
isSelectingPack = false;
String name = EaglerAdapter.getFileChooserResultName();
String safeName = name.replaceAll("[^A-Za-z0-9_]", "_");
if (texturePackListFile.exists()) {
texturePackListFile.setAllChars(texturePackListFile.getAllChars() + "\n" + safeName);
} else {
texturePackListFile.setAllChars(safeName);
}
try {
if (name.toLowerCase().endsWith(".zip")) {
try(ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(EaglerAdapter.getFileChooserResult()))) {
@ -138,10 +144,19 @@ public class GuiTexturePacks extends GuiScreen {
List var3 = this.mc.texturePackList.availableTexturePacks();
if (par1) {
new VFile(fileLocation, ((ITexturePack) var3.get(par2)).getTexturePackFileName()).deleteAll();
this.mc.texturePackList.setTexturePack((ITexturePack) var3.get(0));
this.mc.renderEngine.refreshTextures();
this.mc.renderGlobal.loadRenderers();
String safeName = ((ITexturePack) var3.get(par2)).getTexturePackFileName();
new VFile(fileLocation, safeName).deleteAll();
if (texturePackListFile.exists()) {
String res = texturePackListFile.getAllChars().replaceFirst(safeName, "").replace("\n\n", "\n");
if (res.isEmpty()) {
texturePackListFile.delete();
} else {
texturePackListFile.setAllChars(res);
}
}
} else {
try {
this.mc.texturePackList.setTexturePack((ITexturePack) var3.get(par2));
@ -152,7 +167,16 @@ public class GuiTexturePacks extends GuiScreen {
this.mc.texturePackList.setTexturePack((ITexturePack) var3.get(0));
this.mc.renderEngine.refreshTextures();
this.mc.renderGlobal.loadRenderers();
new VFile(fileLocation, ((ITexturePack) var3.get(par2)).getTexturePackFileName()).deleteAll();
String safeName = ((ITexturePack) var3.get(par2)).getTexturePackFileName();
new VFile(fileLocation, safeName).deleteAll();
if (texturePackListFile.exists()) {
String res = texturePackListFile.getAllChars().replaceFirst(safeName, "").replace("\n\n", "\n");
if (res.isEmpty()) {
texturePackListFile.delete();
} else {
texturePackListFile.setAllChars(res);
}
}
}
}
}

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

@ -1,6 +1,6 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.teavm.vfs.VFile;
import net.lax1dude.eaglercraft.adapter.vfs.VFile;
import java.io.IOException;
import java.io.InputStream;

3
src/main/java/net/minecraft/src/TexturePackImplementation.java
View File

@ -8,8 +8,7 @@ import java.io.InputStreamReader;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglerImage;
import net.lax1dude.eaglercraft.EaglerInputStream;
import net.lax1dude.eaglercraft.EaglerMisc;
import net.lax1dude.eaglercraft.adapter.teavm.vfs.VFile;
import net.lax1dude.eaglercraft.adapter.vfs.VFile;
public abstract class TexturePackImplementation implements ITexturePack
{

66
src/main/java/net/minecraft/src/TexturePackList.java
View File

@ -1,14 +1,20 @@
package net.minecraft.src;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import net.lax1dude.eaglercraft.EaglerProfile;
import net.lax1dude.eaglercraft.adapter.teavm.vfs.VFile;
import net.lax1dude.eaglercraft.EPKDecompiler;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglerInputStream;
import net.lax1dude.eaglercraft.adapter.vfs.VFile;
import net.minecraft.client.Minecraft;
public class TexturePackList
@ -47,6 +53,7 @@ public class TexturePackList
this.mc = par2Minecraft;
this.texturePackDir = new VFile("texturepacks");
this.mpTexturePackFolder = new VFile("texturepacks-mp-cache");
this.mpTexturePackFolder.deleteAll();
this.updateAvaliableTexturePacks();
}
@ -81,26 +88,41 @@ public class TexturePackList
var2 = var2.substring(0, var2.indexOf("?"));
}
if (var2.endsWith(".zip"))
if (var2.toLowerCase().endsWith(".zip") || var2.toLowerCase().endsWith(".epk"))
{
VFile var3 = new VFile(this.mpTexturePackFolder, var2);
VFile var3 = new VFile(this.mpTexturePackFolder, var2.replaceAll("[^A-Za-z0-9_]", "_"));
this.downloadTexture(par1Str, var3);
}
}
private void downloadTexture(String par1Str, VFile par2File)
{
HashMap var3 = new HashMap();
GuiProgress var4 = new GuiProgress();
var3.put("X-Minecraft-Username", EaglerProfile.username);
var3.put("X-Minecraft-Version", "1.5.2");
var3.put("X-Minecraft-Supported-Resolutions", "16");
this.isDownloading = true;
this.mc.displayGuiScreen(var4);
// todo: extract epk/zip to VFS, activate, and signal success
onDownloadFinished(); // temp
// SimpleStorage.set(par2File.replaceAll("[^A-Za-z0-9_]", "_"), par2File.toLowerCase().endsWith(".zip") ? zipToEpk(EaglerAdapter.downloadURL(par1Str)) : EaglerAdapter.downloadURL(par1Str));
// HttpUtil.downloadTexturePack(par2File, par1Str, new TexturePackDownloadSuccess(this), var3, 10000000, var4);
try {
byte[] data = EaglerAdapter.downloadURL(par1Str);
if (data == null) throw new IOException("Unable to download texture pack!");
if (par2File.getName().toLowerCase().endsWith(".epk")) {
EPKDecompiler epkDecompiler = new EPKDecompiler(data);
EPKDecompiler.FileEntry file;
while ((file = epkDecompiler.readFile()) != null) {
new VFile(par2File, file.name).setAllBytes(file.data);
}
} else {
try(ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(data))) {
ZipEntry entry;
while ((entry = zipInputStream.getNextEntry()) != null) {
if (entry.isDirectory()) continue;
new VFile(par2File, entry.getName()).setAllBytes(EaglerInputStream.inputStreamToBytesNoClose(zipInputStream));
}
}
}
} catch (IOException e) {
e.printStackTrace();
}
if (this.isDownloading) {
setSelectedTexturePack(this, new TexturePackFolder(TexturePackList.generateTexturePackID(this, par2File), par2File, defaultTexturePack));
this.mc.scheduleTexturePackRefresh();
}
}
/**
@ -183,20 +205,12 @@ public class TexturePackList
*/
private List getTexturePackDirContents()
{
// TODO: MAKE THIS MORE EFFICIENT!! THIS IS A TEMPORARY FIX BC IM TIRED
List<String> strings = this.texturePackDir.list();
List<String> strings2 = new ArrayList<>();
if (!GuiTexturePacks.texturePackListFile.exists()) return Collections.emptyList();
String[] lines = GuiTexturePacks.texturePackListFile.getAllLines();
List<VFile> files = new ArrayList<>();
for (String name : strings) {
name = name.substring(this.texturePackDir.getPath().length() + 1);
name = name.substring(0, name.indexOf('/'));
name = this.texturePackDir.getPath() + "/" + name;
if (strings2.contains(name)) continue;
strings2.add(name);
files.add(new VFile(name));
for (String line : lines) {
files.add(new VFile(this.texturePackDir, line));
}
strings2.clear();
strings.clear();
return files;
}

2
src/teavm/java/net/lax1dude/eaglercraft/adapter/teavm/vfs/BooleanResult.java → src/teavm/java/net/lax1dude/eaglercraft/adapter/vfs/BooleanResult.java
View File

@ -1,4 +1,4 @@
package net.lax1dude.eaglercraft.adapter.teavm.vfs;
package net.lax1dude.eaglercraft.adapter.vfs;
public class BooleanResult {

2
src/teavm/java/net/lax1dude/eaglercraft/adapter/teavm/vfs/SYS.java → src/teavm/java/net/lax1dude/eaglercraft/adapter/vfs/SYS.java
View File

@ -1,4 +1,4 @@
package net.lax1dude.eaglercraft.adapter.teavm.vfs;
package net.lax1dude.eaglercraft.adapter.vfs;
public class SYS {

2
src/teavm/java/net/lax1dude/eaglercraft/adapter/teavm/vfs/VFSIterator.java → src/teavm/java/net/lax1dude/eaglercraft/adapter/vfs/VFSIterator.java
View File

@ -1,4 +1,4 @@
package net.lax1dude.eaglercraft.adapter.teavm.vfs;
package net.lax1dude.eaglercraft.adapter.vfs;
public interface VFSIterator {

2
src/teavm/java/net/lax1dude/eaglercraft/adapter/teavm/vfs/VFile.java → src/teavm/java/net/lax1dude/eaglercraft/adapter/vfs/VFile.java
View File

@ -1,4 +1,4 @@
package net.lax1dude.eaglercraft.adapter.teavm.vfs;
package net.lax1dude.eaglercraft.adapter.vfs;
import java.io.InputStream;
import java.io.OutputStream;

2
src/teavm/java/net/lax1dude/eaglercraft/adapter/teavm/vfs/VIteratorFile.java → src/teavm/java/net/lax1dude/eaglercraft/adapter/vfs/VIteratorFile.java
View File

@ -1,4 +1,4 @@
package net.lax1dude.eaglercraft.adapter.teavm.vfs;
package net.lax1dude.eaglercraft.adapter.vfs;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

3
src/teavm/java/net/lax1dude/eaglercraft/adapter/teavm/vfs/VirtualFilesystem.java → src/teavm/java/net/lax1dude/eaglercraft/adapter/vfs/VirtualFilesystem.java
View File

@ -1,6 +1,5 @@
package net.lax1dude.eaglercraft.adapter.teavm.vfs;
package net.lax1dude.eaglercraft.adapter.vfs;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;