Skip to content

Commit beebdb4

Browse files
MobiusDevelopmentMobiusDevelopment
committed
Structure and minor java comment changes.
1 parent 381fe47 commit beebdb4

File tree

7 files changed

+40
-13
lines changed

7 files changed

+40
-13
lines changed

‎dist/data/structure/43_shinemaker.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
<link pattern="PledgeLevelDesc-[\w]+\.dat" file="pledgeleveldesc" version="Salvation" />
162162
<link pattern="PledgeMasteryInfo-[\w]+\.dat" file="pledgemasteryinfo" version="Salvation" />
163163
<link pattern="PledgeMission-[\w]+\.dat" file="pledgemission" version="Salvation" />
164-
<link pattern="PledgeShopProduct(_Classic(Aden)?)?-[\w]+\.dat" file="pledgeshopproduct" version="ReturnOfTheQueenAnt2" />
164+
<link pattern="PledgeShopProduct(_Classic(Aden)?)?-[\w]+\.dat" file="pledgeshopproduct" version="Shinemaker" />
165165
<link pattern="posteffectdata.dat" file="posteffectdata" version="Helios" />
166166
<link pattern="PrisonData.dat" file="prisondata" version="MasterClass3" />
167167
<link pattern="ProductName(_Classic(Aden)?)?-[\w]+\.dat" file="productname" version="Helios" />
@@ -176,8 +176,8 @@
176176
<link pattern="Recipe(_Classic(Aden)?)?.dat" file="recipe" version="Ertheia" />
177177
<link pattern="recipe-c.dat" file="recipe-c" version="Lindvior" />
178178
<link pattern="relics_collection(_Classic(Aden)?)?-[\w]+\.dat" file="relicscollection" version="Shinemaker" />
179-
<link pattern="relics_main.dat" file="relicsmain" version="Shinemaker" />
180-
<link pattern="relics_playdata.dat" file="relicsplaydata" version="Shinemaker" />
179+
<link pattern="relics_main(_Classic(Aden)?)?.dat" file="relicsmain" version="Shinemaker" />
180+
<link pattern="relics_playdata(_Classic(Aden)?)?.dat" file="relicsplaydata" version="Shinemaker" />
181181
<link pattern="ReplaceSkillIcon(_Classic(Aden)?)?.dat" file="replaceskillicon" version="AgeOfMagic" />
182182
<link pattern="RideData(_Classic(Aden)?)?.dat" file="ridedata" version="ReturnOfTheQueenAnt" />
183183
<link pattern="sceneplayerdata.dat" file="sceneplayerdata" version="Helios" />

‎dist/data/structure/44_path_of_rogue.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<link pattern="PledgeLevelDesc-[\w]+\.dat" file="pledgeleveldesc" version="Salvation" />
167167
<link pattern="PledgeMasteryInfo-[\w]+\.dat" file="pledgemasteryinfo" version="Salvation" />
168168
<link pattern="PledgeMission-[\w]+\.dat" file="pledgemission" version="Salvation" />
169-
<link pattern="PledgeShopProduct(_Classic(Aden)?)?-[\w]+\.dat" file="pledgeshopproduct" version="ReturnOfTheQueenAnt2" />
169+
<link pattern="PledgeShopProduct(_Classic(Aden)?)?-[\w]+\.dat" file="pledgeshopproduct" version="Shinemaker" />
170170
<link pattern="PopupEvent(_Classic(Aden)?)?.dat" file="popupevent" version="PathOfRogue" />
171171
<link pattern="posteffectdata.dat" file="posteffectdata" version="Helios" />
172172
<link pattern="PrisonData.dat" file="prisondata" version="MasterClass3" />
@@ -182,8 +182,8 @@
182182
<link pattern="Recipe(_Classic(Aden)?)?.dat" file="recipe" version="Ertheia" />
183183
<link pattern="recipe-c.dat" file="recipe-c" version="Lindvior" />
184184
<link pattern="relics_collection(_Classic(Aden)?)?-[\w]+\.dat" file="relicscollection" version="Shinemaker" />
185-
<link pattern="relics_main.dat" file="relicsmain" version="PathOfRogue" />
186-
<link pattern="relics_playdata.dat" file="relicsplaydata" version="Shinemaker" />
185+
<link pattern="relics_main(_Classic(Aden)?)?.dat" file="relicsmain" version="PathOfRogue" />
186+
<link pattern="relics_playdata(_Classic(Aden)?)?.dat" file="relicsplaydata" version="Shinemaker" />
187187
<link pattern="ReplaceSkillIcon(_Classic(Aden)?)?.dat" file="replaceskillicon" version="AgeOfMagic" />
188188
<link pattern="RideData(_Classic(Aden)?)?.dat" file="ridedata" version="PathOfRogue" />
189189
<link pattern="sceneplayerdata.dat" file="sceneplayerdata" version="Helios" />

‎dist/data/structure/dats/pledgeshopproduct.xml

+27
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,31 @@
6161
<node name="product_desc" reader="ASCF" />
6262
</for>
6363
</file>
64+
<file pattern="Shinemaker" isSafePackage="true">
65+
<node name="data" reader="UINT" />
66+
<for name="product" size="#data" hidden="false">
67+
<node name="shop_index" reader="USHORT" />
68+
<node name="product_id" reader="USHORT" />
69+
<node name="product_name" reader="ASCF" />
70+
<node name="product_item" reader="UINT" />
71+
<node name="buy_item_count" reader="CNTR" />
72+
<for name="buy_item" size="#buy_item_count" hidden="true">
73+
<node name="item_id" reader="UINT" />
74+
<node name="item_count" reader="UINT" />
75+
<node name="item_chance" reader="FLOAT" />
76+
</for>
77+
<wrapper name="limit_lv">
78+
<node name="min_level" reader="USHORT" />
79+
<node name="max_level" reader="USHORT" />
80+
</wrapper>
81+
<wrapper name="pledge_limit_lv">
82+
<node name="pledge_min_level" reader="USHORT" />
83+
<node name="pledge_max_level" reader="USHORT" />
84+
</wrapper>
85+
<node name="buy_type" reader="UCHAR" />
86+
<node name="reset_type" reader="UCHAR" />
87+
<node name="max_buy_count" reader="UINT" />
88+
<node name="product_desc" reader="ASCF" />
89+
</for>
90+
</file>
6491
</list>

‎java/org/l2jmobius/actions/MassRecryptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected void action()
6363

6464
if (!encrypter.isEncrypt())
6565
{
66-
L2ClientDat.addLogConsole("Selected encryptor dont have encrypt RSA key.", true);
66+
L2ClientDat.addLogConsole("Selected encryptor does not have encrypt RSA key.", true);
6767
return;
6868
}
6969

‎java/org/l2jmobius/actions/MassTxtPacker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void action0() throws Exception
8282

8383
if (!encrypter.isEncrypt())
8484
{
85-
L2ClientDat.addLogConsole("Selected encryptor dont have encrypt RSA key.", true);
85+
L2ClientDat.addLogConsole("Selected encryptor does not have encrypt RSA key.", true);
8686
return;
8787
}
8888

‎java/org/l2jmobius/clientcryptor/crypt/RSADatCrypter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public ByteBuffer decryptResult()
7979
{
8080
if (!checkAquired())
8181
{
82-
throw new IllegalStateException("Dont even think about using a DatCrypter that you didnt aquired");
82+
throw new IllegalStateException("Do not even think about using a DatCrypter that you did not aquired");
8383
}
8484

8585
final byte[] compressed = _result.toByteArray();
@@ -106,7 +106,7 @@ public ByteBuffer decryptResult()
106106

107107
if (baos.size() != inflatedSize)
108108
{
109-
LOGGER.log(Level.WARNING, ("[RSADatCrypter] Hum inflated result doesnt have the expected length..(" + baos.size() + "!=" + inflatedSize + ")"));
109+
LOGGER.log(Level.WARNING, ("[RSADatCrypter] Hum inflated result does not have the expected length..(" + baos.size() + "!=" + inflatedSize + ")"));
110110
}
111111

112112
return ByteBuffer.wrap(baos.toByteArray());
@@ -117,7 +117,7 @@ public ByteBuffer encryptResult()
117117
{
118118
if (!checkAquired())
119119
{
120-
throw new IllegalStateException("Dont even think about using a DatCrypter that you didnt aquired");
120+
throw new IllegalStateException("Do not even think about using a DatCrypter that you did not aquired");
121121
}
122122

123123
final ByteArrayOutputStream result = new ByteArrayOutputStream();
@@ -151,7 +151,7 @@ public boolean update(byte[] b) throws Exception
151151
{
152152
if (!checkAquired())
153153
{
154-
throw new IllegalStateException("Dont even think about using a DatCrypter that you didnt aquired");
154+
throw new IllegalStateException("Do not even think about using a DatCrypter that you did not aquired");
155155
}
156156

157157
Exception exception = null;

‎java/org/l2jmobius/xml/DescriptorWriter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ private static void writeSize(File currentFile, DatCrypter crypter, List<WriteDa
490490
final byte[] bytes = parseNodeValue(currentFile, crypter, String.valueOf(cycleSize), iteratorNode, false, mass);
491491
if (bytes == null)
492492
{
493-
throw new PackDataException("Cant write size! Node value is null.\r\n-node: " + node);
493+
throw new PackDataException("Cannot write size! Node value is null.\r\n-node: " + node);
494494
}
495495

496496
writeData.add(index, new WriteBytes(iteratorNode, bytes));

0 commit comments

Comments
 (0)