From b45130b0ecde3f75c4227589911fd4805dd3d1c1 Mon Sep 17 00:00:00 2001
From: Pedro <pedro2007.prrr@gmail.com>
Date: Tue, 23 Jan 2024 23:58:58 -0300
Subject: [PATCH] Fixed double parsing in NBT helper

---
 .../pedroricardo/commander/Commander.class    | Bin 2348 -> 3366 bytes
 .../net/pedroricardo/commander/Commander.java |  11 +++++++++++
 .../net/pedroricardo/commander/NbtHelper.java |  12 ++++++++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/output/production/commander-bta.main/net/pedroricardo/commander/Commander.class b/output/production/commander-bta.main/net/pedroricardo/commander/Commander.class
index a42c9cd6ac99555f8091c4acc02e8818ac64aa3b..fc5775e17d28010808921cbce2e9b717e84d8023 100644
GIT binary patch
delta 1578
zcma)6&2Jl35dS@Y+i{_|gfyYRHVvd{jqTmFqj-Iybwg5|wBWR)gwU>&wc~W{b-n8n
z)21eTmG7_R8w%|O4&;(rN&-my0Z2$(xN+mk9f<>C_BkOra6l`~%$u1v^ZU&k?P}!f
zzR*v9fBz$ZB)(b;opHB<IDt_=9t~p*;|zNj)yryJSF5FXzG+%og~4q!EQanJkCcu0
z>3X?p<*mA=Rx$xR#&G;fR<%@75r?CWAu0U}nywrD{3I(g*^C%VNzrsN5tE|wNKBsP
zk)$$nEVExML`A7EyBxv<CjB@S#%VmxFkl~a-`g`;u*NjKrqvk&HMMSP<X}kHE1vGw
zoKcBaj70}&wP3}M8<m>TsLoHRrA!EUO!;vpjI(%>Vc&lsXYkh?9(t9i9qw@BtWOmd
zwK*#@bT)u<3?iqNUoh&HBFQGlJzljGIo*=v1V7Rw%GHw6Pe66!VE=LeGYlL2-Z8__
zr|Jz&u}JV_$1|$xrlu4f+3__kO_8KRRB)!pdkKn=63vdoX_u7bl-N1u3~DAw>6V;K
zNMbrE<~sgS-B2w>kYi#}Or@paV#l2|8U<aW3sNkVl;?LlCyjigSS&9&)sj*yDNE@D
zp`T?iJLn15BlWu4blz#0KT}jn7G?#Gy2XKR#q&Z&kP@a46_Q*I%cekioKOeBR$|sk
zBq(xJkmNM=Bt(wR&Qj;|3_ZMau54P$%&wNpey9w?yPmu-SudB=`Lb4zYfE!l%_<vJ
z(^-OwTAj}~tCqTSV%s0W1<Zvpk3oh|NwX$2(^N~Evn54mMeYt@!7jLe>sw?9QV*wu
zRu4f(#gA$j25R=SC-19=VZyT4JiWflVLXc^`xnnZ_j9yLTGc9B%~%itTn%Fx*X*Eo
z$oG60D|o>k@gDcR6voSV#a{8I9(Z+oAsbd%kMp@Wd_%Ynw;ylVzj_DQTlQbxKXOcC
z7|HD>{r@><8202Xb?)MXTANY}y8XLvto1tHgde?l8`r?_4*dmODATzMVX}h`JFbZu
z*F=PCf=;>@2XG(VdzWk%-h+p1FMK55Cr_L-Bkeu10k+0dY?4kG*oO~D9tw9d@F6~;
zBg4nrw^;^mstK&xKl_WV+sH;vZX&miCmeHn$9!tXe0s-xrel7CJ93nNbRC6tXlvA<
zh#R;`ukVI~<s>2``w_w+?7;xhc@RhO5EKkz9EUNDA)Ln%w2Fx05+24?#OPJx#4kaG
zWGW@%79@O2e@}<dJ%srdmHPyra%QVr%s!)75UxLQ(~k=w3Vps!6luEROr+~J{E^ak
zxYLE5VTJe%Mp{%d%^P$E*0ohOfG_^7ljo_xV5Gc>i*5M#hT6E~X`>NowsB<>tu|i#
r0oTuM;I%gToF0r1p^r)c-L$DaG=%-Q3w^}n0DbpU#tn+OT=?=Iz6gX^

delta 594
zcmYL`%~BIl5QV>+z|3Sa{>8$A6qY{(5iH|I7rL_)6#pfn{D>GyGDc0JBq&&AvGf7%
zJFs$tQx>RIK7h}_Be-?r!t%^ug-xHnw@;tbx9>*&Q_lbS_uCKPJZqc&bUN)ZZa+FZ
z`D=#EQmfG@H!Ia;pGj`G+zhzIZTrD34c`s8$9=>8MtQZg5{A`wr`~F|4Q4WfM=9U|
z)AqMp=zC;vtIbZmvsR2NvjKC=+oCt>ECf7Z(JpvboN~Z3mh6Ui!Bp*z*Y8wFyF9ml
zyn=aQk7a(@Ie&aTq>jq~FPX>iN>itp&^b$>JQGippsW*=QG${d4lu}3^)-~IXwsv+
z7e}$Bn{z@V>>b;}Y$lY~ig6hZ@kVhd*k!OxTSr5u+x>-fQVZ?nY;Aq7eGFgB<BBKP
z$4N~v#2E@)VpuCZ#S9}Xa+(^WiN&r%*mYRxI$YGu@hI8PxVfueIgnz{##a%}%BCop
z_h=sp_rH$E+pbP2p~6URVw>v`?m<7|PEW*C?qS5tHjg8oey1|KMJ*y9dl=$P<Rt-z
Y^@V+U$`S3PUoo#I4T|wjwG^xW0Qo#vk^lez

diff --git a/src/main/java/net/pedroricardo/commander/Commander.java b/src/main/java/net/pedroricardo/commander/Commander.java
index f40a7f5..c8ebb52 100644
--- a/src/main/java/net/pedroricardo/commander/Commander.java
+++ b/src/main/java/net/pedroricardo/commander/Commander.java
@@ -1,6 +1,7 @@
 package net.pedroricardo.commander;
 
 import com.google.gson.JsonObject;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.fabricmc.api.DedicatedServerModInitializer;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.core.net.command.TextFormatting;
@@ -11,6 +12,7 @@
 import turniplabs.halplibe.helper.NetworkHelper;
 import turniplabs.halplibe.util.GameStartEntrypoint;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,6 +40,15 @@ public void onInitialize() {
         ARGUMENT_STYLES.add(TextFormatting.ORANGE.toString());
         NetworkHelper.register(CommandManagerPacket.class, false, true);
         NetworkHelper.register(RequestCommandManagerPacket.class, true, false);
+//        try {
+//            System.out.println(NbtHelper.parseNbt("{Data1:16,Data2:\"hello\",Data3:[D;1.52,940.2,38.3],Data4:[B;1b,12b]}"));
+//            System.out.println(NbtHelper.parseNbt("{DataShort:23s,DataInt:39230,DataString:\"Hello!\"}"));
+//            System.out.println(NbtHelper.parseNbt("{DataBoolTrue:true,DataBoolFalse:false,DataByte:22b, DataShort : 51s, DataInt:42351, DataLong: 2934021941L, DataFloat: 3.1415926f, DataDouble: 22.543d, DataDoubleNoSuffix: 2942.43290}"));
+//            System.out.println(NbtHelper.parseNbt("{DataByteArray:[B;6b,12b,24b] ,DataShortArray:[S ; 20s , 40s , 63s ] , DataDoubleArray:[D ; 22.53, 239.43d, 39.4D]}"));
+//            System.out.println(NbtHelper.parseNbt("{DataList:[6b,12b,24b]}"));
+//        } catch (CommandSyntaxException e) {
+//            System.out.println(e.getMessage());
+//        }
     }
 
     @Override
diff --git a/src/main/java/net/pedroricardo/commander/NbtHelper.java b/src/main/java/net/pedroricardo/commander/NbtHelper.java
index 8561bf3..f379838 100644
--- a/src/main/java/net/pedroricardo/commander/NbtHelper.java
+++ b/src/main/java/net/pedroricardo/commander/NbtHelper.java
@@ -4,7 +4,6 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.nbt.*;
 import net.pedroricardo.commander.content.exceptions.CommanderExceptions;
-import net.pedroricardo.commander.content.helpers.ArgumentParser;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -136,8 +135,13 @@ private static Tag<?> collection(StringReader reader) throws CommandSyntaxExcept
                 while (reader.canRead() && reader.peek() != ']') {
                     reader.skipWhitespace();
                     String doubleAsString = reader.readString();
-                    if (!SHORT_PATTERN.matcher(doubleAsString).matches()) throw CommandSyntaxException.BUILT_IN_EXCEPTIONS.readerExpectedSymbol().create("short");
-                    double parsedDouble = Double.parseDouble(doubleAsString.substring(0, doubleAsString.length() - 1));
+                    double parsedDouble;
+                    if (DOUBLE_PATTERN.matcher(doubleAsString).matches()) {
+                        parsedDouble = Double.parseDouble(doubleAsString.substring(0, doubleAsString.length() - 1));
+                    } else if (DOUBLE_PATTERN_NO_SUFFIX.matcher(doubleAsString).matches()) {
+                        parsedDouble = Double.parseDouble(doubleAsString);
+                    }
+                    else throw CommandSyntaxException.BUILT_IN_EXCEPTIONS.readerExpectedDouble().create();
                     doubles.add(parsedDouble);
                     reader.skipWhitespace();
                     if (!reader.canRead() || reader.peek() != ',') break;
@@ -222,4 +226,4 @@ private static Tag<?> type(String string) {
         }
         return new StringTag(string);
     }
-}
+}
\ No newline at end of file