Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix WorldEditWrapper21

Browse Source
This commit is contained in:
YoyoNow
2026-03-29 11:55:16 +02:00
parent 1dbcb122c2
commit 612254296c
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SpigotCore/SpigotCore_21/src/de/steamwar/core/WorldEditWrapper21.java
+29 -14
View File
@@ -20,6 +20,7 @@
package de.steamwar.core; package de.steamwar.core;
import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReaderV3; import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReaderV3;
import com.fastasyncworldedit.core.jnbt.NBTException;
import com.sk89q.jnbt.NBTInputStream; import com.sk89q.jnbt.NBTInputStream;
import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extent.clipboard.Clipboard; import com.sk89q.worldedit.extent.clipboard.Clipboard;
@@ -71,26 +72,40 @@ public class WorldEditWrapper21 implements WorldEditWrapper {
} }
@Override @Override
@SuppressWarnings("removal") public Clipboard getClipboard(InputStream is, NodeData.SchematicFormat directFormat) throws IOException {
public Clipboard getClipboard(InputStream is, NodeData.SchematicFormat ignored) throws IOException {
ResetableInputStream ris = new ResetableInputStream(is); ResetableInputStream ris = new ResetableInputStream(is);
for (NodeData.SchematicFormat schemFormat : NodeData.SchematicFormat.values()) { try {
try { return loadSchematic(ris, directFormat);
Clipboard clipboard = switch (schemFormat) { } catch (Exception e) {
case MCEDIT -> new MCEditSchematicReader(new NBTInputStream(ris)).read();
case SPONGE_V2 -> new SpongeSchematicV2Reader(LinBinaryIO.read(new DataInputStream(ris))).read();
case SPONGE_V3 -> new FastSchematicReaderV3(ris).read();
};
ris.close();
return clipboard;
} catch (Exception e) {
// Ignore
}
ris.reset(); ris.reset();
} }
for (NodeData.SchematicFormat schemFormat : NodeData.SchematicFormat.values()) {
if (schemFormat == directFormat) continue;
try {
return loadSchematic(ris, schemFormat);
} catch (Exception e) {
ris.reset();
}
}
try {
return new SpongeSchematicV3Reader(LinBinaryIO.read(new DataInputStream(ris))).read();
} catch (Exception e) {
ris.close();
}
throw new IOException("No clipboard found"); throw new IOException("No clipboard found");
} }
@SuppressWarnings("removal")
private Clipboard loadSchematic(ResetableInputStream ris, NodeData.SchematicFormat format) throws IOException {
Clipboard clipboard = switch (format) {
case MCEDIT -> new MCEditSchematicReader(new NBTInputStream(ris)).read();
case SPONGE_V2 -> new SpongeSchematicV2Reader(LinBinaryIO.read(new DataInputStream(ris))).read();
case SPONGE_V3 -> new FastSchematicReaderV3(ris).read();
};
ris.close();
return clipboard;
}
private class ResetableInputStream extends InputStream { private class ResetableInputStream extends InputStream {
private InputStream inputStream; private InputStream inputStream;