mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 22:43:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Limit schematic memory usage

Browse Source
This commit is contained in:
Paul Fulham 2020-11-21 22:13:50 -08:00
parent 18b768b32f
commit bc6513a098
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java
View File

@ -1,12 +1,14 @@
package com.simibubi.create.content.schematics.item; package com.simibubi.create.content.schematics.item;
import java.io.BufferedInputStream;
import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.util.List; import java.util.List;
import java.util.zip.GZIPInputStream;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -27,6 +29,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext; import net.minecraft.item.ItemUseContext;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTSizeTracker;
import net.minecraft.nbt.NBTUtil; import net.minecraft.nbt.NBTUtil;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.ActionResultType; import net.minecraft.util.ActionResultType;
@ -128,8 +131,9 @@ public class SchematicItem extends Item {
if (!path.startsWith(dir)) if (!path.startsWith(dir))
return t; return t;
try (InputStream stream = Files.newInputStream(path, StandardOpenOption.READ)) { try (DataInputStream stream = new DataInputStream(new BufferedInputStream(
CompoundNBT nbt = CompressedStreamTools.readCompressed(stream); new GZIPInputStream(Files.newInputStream(path, StandardOpenOption.READ))))) {
CompoundNBT nbt = CompressedStreamTools.read(stream, new NBTSizeTracker(0x20000000L));
t.read(nbt); t.read(nbt);
} catch (IOException e) { } catch (IOException e) {
LOGGER.warn("Failed to read schematic", e); LOGGER.warn("Failed to read schematic", e);