add check for mojang crash translations

ds58 · May 6, 2019 · d5df3d7 · d5df3d7
1 parent a038cbd
commit d5df3d7
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 10 deletions.
diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/INbtTagList.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/INbtTagList.java
@@ -2,7 +2,9 @@
 
 public interface INbtTagList {
 
-    INbtTagCompound get(int index);
+    INbtTagCompound getCompound(int index);
+
+    String getString(int index);
 
     int size();
 

diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_BlockEntityTag.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_BlockEntityTag.java
@@ -58,7 +58,7 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons
     private static boolean checkItems(INbtTagList items, String nmsItemClassName,
                                       IProtocolConstants protocolConstants, PConfig config) {
         for (int i = 0; i < items.size(); i++) {
-            INbtTagCompound item = items.get(i);
+            INbtTagCompound item = items.getCompound(i);
 
             if (item.hasKey("tag")) {
                 String failedNbt = NbtChecks.checkAll(item.getCompound("tag"), nmsItemClassName, protocolConstants, config);

diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_EntityTag.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_EntityTag.java
@@ -60,7 +60,7 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons
 
     private static boolean checkItems(INbtTagList items, String nmsItemClassName, IProtocolConstants protocolConstants, PConfig config) {
         for (int i = 0; i < items.size(); i++) {
-            INbtTagCompound item = items.get(i);
+            INbtTagCompound item = items.getCompound(i);
 
             if (item.hasKey("tag")) {
                 String failedNbt = NbtChecks.checkAll(item.getCompound("tag"), nmsItemClassName, protocolConstants, config);

diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_ench.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_ench.java
@@ -33,14 +33,14 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons
         INbtTagList enchantments = tag.getList(using, NbtDataType.COMPOUND);
 
         for (int i = 0; i < enchantments.size(); i++) {
-            INbtTagCompound enchantment = enchantments.get(i);
+            INbtTagCompound enchantment = enchantments.getCompound(i);
             Enchantment bukkitEnchantment = getEnchantment(enchantment);
 
             if (bukkitEnchantment == null) {
                 continue;
             }
 
-            int lvl = 0xFFFF & enchantments.get(i).getShort("lvl");
+            int lvl = 0xFFFF & enchantments.getCompound(i).getShort("lvl");
 
             if (lvl > bukkitEnchantment.getMaxLevel()) {
                 return false;
@@ -51,7 +51,7 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons
             }
 
             for (int j = 0; j < enchantments.size(); j++) {
-                INbtTagCompound otherEnchantment = enchantments.get(j);
+                INbtTagCompound otherEnchantment = enchantments.getCompound(j);
                 Enchantment otherBukkitEnchantment = getEnchantment(otherEnchantment);
 
                 if (bukkitEnchantment != otherBukkitEnchantment

diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_pages.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_pages.java
@@ -4,15 +4,42 @@
 import com.ruinscraft.panilla.api.config.PConfig;
 import com.ruinscraft.panilla.api.config.PStrictness;
 import com.ruinscraft.panilla.api.nbt.INbtTagCompound;
+import com.ruinscraft.panilla.api.nbt.INbtTagList;
+import com.ruinscraft.panilla.api.nbt.NbtDataType;
 
 public class NbtCheck_pages extends NbtCheck {
 
+    // translations in the game which (intentionally) crash the user
+    private static final String[] MOJANG_CRASH_TRANSLATIONS = new String[] {
+            "translation.test.invalid",
+            "translation.test.invalid2"
+    };
+
     public NbtCheck_pages() {
-        super("pages", PStrictness.AVERAGE);
+        super("pages", PStrictness.LENIENT);
     }
 
     @Override
     public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolConstants protocolConstants, PConfig config) {
+        INbtTagList pages = tag.getList("pages", NbtDataType.STRING);
+
+        for (int i = 0; i < pages.size(); i++) {
+            final String page = pages.getString(i);
+            final String noSpaces = page.replace(" ", "");
+
+            if (!noSpaces.startsWith("{\"translate\"")) {
+                continue;
+            }
+
+            for (String crashTranslation : MOJANG_CRASH_TRANSLATIONS) {
+                String check = String.format("{\"translate\":\"%s\"}", crashTranslation);
+
+                if (page.equalsIgnoreCase(check)) {
+                    return false;
+                }
+            }
+        }
+
         return true;
     }
 

diff --git a/v1_12_R1/src/main/java/com/ruinscraft/panilla/v1_12_R1/nbt/NbtTagList.java b/v1_12_R1/src/main/java/com/ruinscraft/panilla/v1_12_R1/nbt/NbtTagList.java
@@ -13,10 +13,15 @@ public NbtTagList(NBTTagList handle) {
     }
 
     @Override
-    public INbtTagCompound get(int index) {
+    public INbtTagCompound getCompound(int index) {
         return new NbtTagCompound(handle.get(index));
     }
 
+    @Override
+    public String getString(int index) {
+        return handle.getString(index);
+    }
+
     @Override
     public int size() {
         return handle.size();

diff --git a/v1_13_R2/src/main/java/com/ruinscraft/panilla/v1_13_R2/nbt/NbtTagList.java b/v1_13_R2/src/main/java/com/ruinscraft/panilla/v1_13_R2/nbt/NbtTagList.java
@@ -13,10 +13,15 @@ public NbtTagList(NBTTagList handle) {
     }
 
     @Override
-    public INbtTagCompound get(int index) {
+    public INbtTagCompound getCompound(int index) {
         return new NbtTagCompound(handle.getCompound(index));
     }
 
+    @Override
+    public String getString(int index) {
+        return handle.getString(index);
+    }
+
     @Override
     public int size() {
         return handle.size();

diff --git a/v1_14_R1/src/main/java/com/ruinscraft/panilla/v1_14_R1/nbt/NbtTagList.java b/v1_14_R1/src/main/java/com/ruinscraft/panilla/v1_14_R1/nbt/NbtTagList.java
@@ -13,10 +13,15 @@ public NbtTagList(NBTTagList handle) {
     }
 
     @Override
-    public INbtTagCompound get(int index) {
+    public INbtTagCompound getCompound(int index) {
         return new NbtTagCompound(handle.getCompound(index));
     }
 
+    @Override
+    public String getString(int index) {
+        return handle.getString(index);
+    }
+
     @Override
     public int size() {
         return handle.size();