diff --git a/.gitignore b/.gitignore index 63c3fb2..a27ed08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .gradle/ build/ lwjgl-rundir/*.log -/lwjgl-rundir/filesystem/ \ No newline at end of file +lwjgl-rundir/filesystem/ \ No newline at end of file diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin index 57f6e24..336172f 100644 Binary files a/.gradle/8.0/executionHistory/executionHistory.bin and b/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock index dd3233d..b76f26f 100644 Binary files a/.gradle/8.0/executionHistory/executionHistory.lock and b/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin index b38f556..e6bbdc5 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.bin and b/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock index c3f6363..9976f80 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.lock and b/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin index c0cc857..9b8a17e 100644 Binary files a/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 31a96b2..3008355 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index da3c3a6..1e46b04 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index 49d7cea..e51a8d6 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/lwjgl-rundir/filesystem/worlds/minecraft/saves/New World/level.dat b/lwjgl-rundir/filesystem/worlds/minecraft/saves/New World/level.dat deleted file mode 100644 index e79975e..0000000 Binary files a/lwjgl-rundir/filesystem/worlds/minecraft/saves/New World/level.dat and /dev/null differ diff --git a/lwjgl-rundir/filesystem/worlds/minecraft/saves/New World/level.dat_old b/lwjgl-rundir/filesystem/worlds/minecraft/saves/New World/level.dat_old deleted file mode 100644 index 9bef0ca..0000000 Binary files a/lwjgl-rundir/filesystem/worlds/minecraft/saves/New World/level.dat_old and /dev/null differ diff --git a/lwjgl-rundir/r.-1.-1.mcr b/lwjgl-rundir/r.-1.-1.mcr deleted file mode 100644 index 476a064..0000000 Binary files a/lwjgl-rundir/r.-1.-1.mcr and /dev/null differ diff --git a/lwjgl-rundir/r.-1.0.mcr b/lwjgl-rundir/r.-1.0.mcr deleted file mode 100644 index 244ab0d..0000000 Binary files a/lwjgl-rundir/r.-1.0.mcr and /dev/null differ diff --git a/lwjgl-rundir/r.0.-1.mcr b/lwjgl-rundir/r.0.-1.mcr deleted file mode 100644 index 428802e..0000000 Binary files a/lwjgl-rundir/r.0.-1.mcr and /dev/null differ diff --git a/lwjgl-rundir/r.0.0.mcr b/lwjgl-rundir/r.0.0.mcr deleted file mode 100644 index f629741..0000000 Binary files a/lwjgl-rundir/r.0.0.mcr and /dev/null differ diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java index 38bad15..f05da07 100644 --- a/src/main/java/net/minecraft/client/Minecraft.java +++ b/src/main/java/net/minecraft/client/Minecraft.java @@ -203,7 +203,7 @@ public class Minecraft { RenderManager.instance.itemRenderer = new ItemRenderer(this); this.mcDataDir = getMinecraftDir(); - this.saveLoader = new SaveConverterMcRegion(new VFile2(this.mcDataDir, "saves")); + this.saveLoader = new SaveConverterMcRegion(new VFile2("saves")); this.gameSettings = new GameSettings(this, this.mcDataDir); this.scaledResolution = new ScaledResolution(this.gameSettings, this.displayWidth, this.displayHeight); this.texturePackList = new TexturePackList(this, this.mcDataDir); diff --git a/src/main/java/net/minecraft/src/GuiCreateWorld.java b/src/main/java/net/minecraft/src/GuiCreateWorld.java index 91fbacb..ec2a900 100644 --- a/src/main/java/net/minecraft/src/GuiCreateWorld.java +++ b/src/main/java/net/minecraft/src/GuiCreateWorld.java @@ -86,6 +86,7 @@ public class GuiCreateWorld extends GuiScreen { } this.mc.playerController = new PlayerControllerSP(this.mc); + this.mc.getSaveLoader().setFilename(this.folderName); this.mc.startWorld(this.folderName, this.textboxWorldName.getText(), var2); this.mc.displayGuiScreen(null); } diff --git a/src/main/java/net/minecraft/src/GuiSelectWorld.java b/src/main/java/net/minecraft/src/GuiSelectWorld.java index 65e257b..25851f8 100644 --- a/src/main/java/net/minecraft/src/GuiSelectWorld.java +++ b/src/main/java/net/minecraft/src/GuiSelectWorld.java @@ -107,6 +107,7 @@ public class GuiSelectWorld extends GuiScreen { var2 = "World" + var1; } + this.mc.getSaveLoader().setFilename(var2); this.mc.startWorld(var2, this.getSaveName(var1), 0L); this.mc.displayGuiScreen((GuiScreen)null); } diff --git a/src/main/java/net/minecraft/src/GuiTexturePacks.java b/src/main/java/net/minecraft/src/GuiTexturePacks.java index b7d7365..fbde7e8 100644 --- a/src/main/java/net/minecraft/src/GuiTexturePacks.java +++ b/src/main/java/net/minecraft/src/GuiTexturePacks.java @@ -18,7 +18,7 @@ public class GuiTexturePacks extends GuiScreen { this.controlList.add(new GuiSmallButton(5, this.width / 2 - 154, this.height - 48, var1.translateKey("texturePack.openFolder"))); this.controlList.add(new GuiSmallButton(6, this.width / 2 + 4, this.height - 48, var1.translateKey("gui.done"))); this.mc.texturePackList.updateAvaliableTexturePacks(); - this.fileLocation = (new VFile2(Minecraft.getMinecraftDir(), "texturepacks")).getPath(); + this.fileLocation = (new VFile2("texturepacks")).getPath(); this.guiTexturePackSlot = new GuiTexturePackSlot(this); this.guiTexturePackSlot.registerScrollButtons(this.controlList, 7, 8); } diff --git a/src/main/java/net/minecraft/src/ISaveFormat.java b/src/main/java/net/minecraft/src/ISaveFormat.java index e47f3ce..29081c1 100644 --- a/src/main/java/net/minecraft/src/ISaveFormat.java +++ b/src/main/java/net/minecraft/src/ISaveFormat.java @@ -5,6 +5,8 @@ import java.util.List; public interface ISaveFormat { String formatName(); + void setFilename(String name); + ISaveHandler getSaveLoader(String var1, boolean var2); List getWorldList(); diff --git a/src/main/java/net/minecraft/src/SaveConverterMcRegion.java b/src/main/java/net/minecraft/src/SaveConverterMcRegion.java index 67add7b..b094ff8 100644 --- a/src/main/java/net/minecraft/src/SaveConverterMcRegion.java +++ b/src/main/java/net/minecraft/src/SaveConverterMcRegion.java @@ -20,14 +20,17 @@ public class SaveConverterMcRegion extends SaveFormatOld { return "Scaevolus' McRegion"; } + public void setFilename(String name){ + super.setFilename(name); + } + public List getWorldList() { ArrayList arraylist = new ArrayList(); - List files = field_22180_a.listFiles(true); - VFile2 afile[] =files.toArray(new VFile2[0]); - VFile2 afile1[] = afile; - int i = afile1.length; + List files = worldFile.listFiles(true); + VFile2 afile[] = files.toArray(new VFile2[0]); + int i = afile.length; for (int j = 0; j < i; j++) { - VFile2 file = afile1[j]; + VFile2 file = afile[j]; if (!file.dirExists()) { continue; } @@ -52,7 +55,7 @@ public class SaveConverterMcRegion extends SaveFormatOld { } public ISaveHandler getSaveLoader(String var1, boolean var2) { - return new SaveOldDir(this.field_22180_a, var1, var2); + return new SaveOldDir(this.worldFile, var1, var2); } public boolean isOldMapFormat(String var1) { @@ -66,7 +69,7 @@ public class SaveConverterMcRegion extends SaveFormatOld { ArrayList var4 = new ArrayList(); ArrayList var5 = new ArrayList(); ArrayList var6 = new ArrayList(); - VFile2 var7 = new VFile2(this.field_22180_a, var1); + VFile2 var7 = new VFile2(this.worldFile, var1); VFile2 var8 = new VFile2(var7, "DIM-1"); System.out.println("Scanning folders..."); this.func_22183_a(var7, var3, var4); diff --git a/src/main/java/net/minecraft/src/SaveFormatOld.java b/src/main/java/net/minecraft/src/SaveFormatOld.java index d8e0258..de6348c 100644 --- a/src/main/java/net/minecraft/src/SaveFormatOld.java +++ b/src/main/java/net/minecraft/src/SaveFormatOld.java @@ -6,14 +6,19 @@ import java.util.ArrayList; import java.util.List; public class SaveFormatOld implements ISaveFormat { - protected final VFile2 field_22180_a; + protected final VFile2 worldFile; + private String filename = null; public SaveFormatOld(VFile2 var1) { if(!var1.exists()) { //var1.mkdirs(); } - this.field_22180_a = var1; + this.worldFile = var1; + } + + public void setFilename(String name){ + this.filename = name; } public String formatName() { @@ -38,10 +43,9 @@ public class SaveFormatOld implements ISaveFormat { } public WorldInfo getWorldInfoForWorld(String var1) { - VFile2 var2 = new VFile2(this.field_22180_a, var1); + VFile2 var2 = new VFile2(this.worldFile + "/" + filename, var1); System.out.println(var2.getPath()); if (var2 != null) { - System.out.println("shit"); try { NBTTagCompound var4 = CompressedStreamTools.readCompressed(var2.getInputStream()); NBTTagCompound var5 = var4.getCompoundTag("Data"); @@ -55,7 +59,7 @@ public class SaveFormatOld implements ISaveFormat { } public void renameWorldData(String var1, String var2) { - VFile2 var3 = new VFile2(this.field_22180_a, var1); + VFile2 var3 = new VFile2(this.worldFile, var1); if(var3.exists()) { VFile2 var4 = new VFile2(var3, "level.dat"); if(var4.exists()) { @@ -73,7 +77,7 @@ public class SaveFormatOld implements ISaveFormat { } public void deleteWorldByDirectory(String var1) { - VFile2 var2 = new VFile2(this.field_22180_a, var1); + VFile2 var2 = new VFile2(this.worldFile, var1); if(var2.exists()) { //func_22179_a(var2.listFiles()); var2.delete(); @@ -92,7 +96,7 @@ public class SaveFormatOld implements ISaveFormat { } public ISaveHandler getSaveLoader(String var1, boolean var2) { - return new SaveHandler(this.field_22180_a, var1, var2); + return new SaveHandler(this.worldFile, var1, var2); } public boolean isOldMapFormat(String var1) {