AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-11-27 07:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize getTagSize method in NbtUtility (#15)

Browse Source 
The getAsString method which was used before uses StringTagVisitor,
which takes way too long.
This commit is contained in:
Luna 2022-05-02 20:39:35 -03:00 committed by GitHub
parent 61fd911106
commit 9e244f52c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
patches/server/0031-Make-the-maximum-tag-size-a-constant-add-a-method-fo.patch
View File

@ -6,18 +6,51 @@ Subject: [PATCH] Make the maximum tag size a constant & add a method for
diff --git a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java diff --git a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
index 058203440fd071ce5edbe18391ea60f0a5fbee3a..dc09fe007247e832aacc323ddeb3541cfb447069 100644 index 058203440fd071ce5edbe18391ea60f0a5fbee3a..978cb98c81195640fb3704d2077148f2be0dca36 100644
--- a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java --- a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
+++ b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java +++ b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
@@ -7,11 +7,17 @@ import java.nio.charset.StandardCharsets; @@ -1,17 +1,49 @@
package com.github.atlasmediagroup.scissors;
-import net.minecraft.nbt.CompoundTag;
+import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
+import net.minecraft.nbt.*;
import javax.annotation.Nullable;
import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
public class NbtUtility public class NbtUtility
{ {
+ public static final long MAXIMUM_SIZE = (256 * 1024); + public static final long MAXIMUM_SIZE = (256 * 1024);
+ +
+ public static long getTagSize(@Nullable CompoundTag tag) { + public static long getTagSize(@Nullable Tag tag, int depth) {
+ if(depth > 512) return 0;
+ if(tag == null) return 0; + if(tag == null) return 0;
+ return tag.toString().getBytes(StandardCharsets.UTF_8).length; +
+ long size = 0;
+
+ if(tag.getType() == CompoundTag.TYPE) {
+ CompoundTag compoundTag = (CompoundTag) tag;
+ for(String key : compoundTag.getAllKeys()) {
+ size += getTagSize(compoundTag.get(key), depth + 1);
+ }
+ } else if(tag.getType() == ListTag.TYPE) {
+ ListTag listTag = (ListTag) tag;
+ for (Tag tag1 : listTag) {
+ size += getTagSize(tag1, depth + 1);
+ }
+ } else {
+ size += tag.getAsString().getBytes(StandardCharsets.UTF_8).length;
+ }
+
+ return size;
+ }
+
+ public static long getTagSize(@Nullable CompoundTag tag) {
+ return getTagSize(tag, 0);
+ } + }
public static boolean isTooLarge(@Nullable CompoundTag tag) public static boolean isTooLarge(@Nullable CompoundTag tag)