Merge remote-tracking branch 'origin/master'

Server/build.gradle

@@ -25,7 +25,6 @@ dependencies {
     implementation "org.jetbrains:markdown-jvm:0.2.0.pre-55"
     implementation 'com.google.guava:guava:29.0-jre'
     implementation 'mysql:mysql-connector-java:8.0.21'
-    implementation 'com.googlecode.json-simple:json-simple:1.1.1'
     implementation 'io.github.classgraph:classgraph:4.8.98'
     implementation 'org.jetbrains.kotlin:kotlin-reflect'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'

Server/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.s

@@ -1 +0,0 @@
-ÙE×CÊ?ÑCò3Ú

Server/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.s

@@ -1 +0,0 @@
-<EFBFBD>B薤綫

Server/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.s

@@ -1 +0,0 @@
-짐
秉
澹
凋
樣
踵
栗
夢
할
回
潞
缺
瀟
촁
駒
祺
拜
璨
恨
蠱

Server/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.s

@@ -1 +0,0 @@
-и2в-В*Ш

Server/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s

@@ -1 +0,0 @@
-ξΓ
ιµ
Ξέ
ϊΕ
<EFBFBD><EFBFBD>
ϋ¨
ά±
χxόxφxχxψxχxψxάκ
Ϋα
Ας
ο„ζρ
ωθ
Θχ
ώς
οφ
γΜ
ΩΖ
π¤
ι¶
σKΐBκLΜCψNζ-ύ6Φ8Μ8

Server/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.s

@@ -1 +0,0 @@
-в}м┼

Server/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at

@@ -1 +0,0 @@
-eractionPacket%ñÙ
$core.cache.def.impl.ObjectDefinition%)$core.cache.def.impl.ObjectDefinition%w$core.net.packet.in.InteractionPacketrÅ;core.game.node.entity.skill.farming.CompostBinOptionHandler5core.game.node.entity.skill.farming.InspectionHandler6u5core.game.node.entity.skill.farming.InspectionHandler685core.game.node.entity.skill.farming.InspectionHandler7Ó	6core.game.node.entity.state.newsys.states.FarmingState6r5core.game.node.entity.skill.farming.InspectionHandler<Ûø
;core.game.node.entity.skill.farming.ToolLeprechaunInterface<@;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface<>;core.game.node.entity.skill.farming.ToolLeprechaunInterface

Server/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.s

@@ -1 +0,0 @@
-<EFBFBD><EFBFBD>

Server/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab

@@ -1,2 +0,0 @@
-486
-109

Server/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.s

@@ -1 +0,0 @@
-綉

Server/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +0,0 @@
-Яѓ
эyмЋ
Й‘
ЯuЪ—
Иь
Ьй
ч¦
рЈ
Бџ
Шџ
р°
уwЙZд 
и‰
Р@цjВAОhАeТNм|жhыMюyА]ЖNЪ\Ы_КNъ{пVжMыXйMГLиtп_вCхKчUДNдOЬKТ}о:Ы‘
И<оcИ\т|в=шCБ}м2УmЬ8оgн7щhЛ-сxм<ЯpЕ?Ш`Г<ыjп3ЗgЕљ
в{иGсdРDПjК:кkФ=БOМVЙpФ-ПsБTИAыwДQьЏ
эXдIкIШYВVЕUЬeгJШhш+йrоUь[ФOЗFрlКHцGвEМYЪGьIЧWоNАWИnФVдRсRуlрUМEмmщLхHЗlмRФL

Server/data/eco/bot_offers.json

@@ -1,656 +0,0 @@
-{
-  "offers": [
-    {
-      "item": 7936,
-      "qty": 2700
-    },
-    {
-      "item": 1281,
-      "qty": 2
-    },
-    {
-      "item": 2307,
-      "qty": 64
-    },
-    {
-      "item": 2309,
-      "qty": 52
-    },
-    {
-      "item": 1291,
-      "qty": 5
-    },
-    {
-      "item": 1293,
-      "qty": 3
-    },
-    {
-      "item": 526,
-      "qty": 8630
-    },
-    {
-      "item": 1295,
-      "qty": 3
-    },
-    {
-      "item": 530,
-      "qty": 3
-    },
-    {
-      "item": 532,
-      "qty": 1
-    },
-    {
-      "item": 2335,
-      "qty": 1
-    },
-    {
-      "item": 288,
-      "qty": 11
-    },
-    {
-      "item": 1313,
-      "qty": 2
-    },
-    {
-      "item": 1321,
-      "qty": 3
-    },
-    {
-      "item": 554,
-      "qty": 1640
-    },
-    {
-      "item": 2347,
-      "qty": 175
-    },
-    {
-      "item": 555,
-      "qty": 1330
-    },
-    {
-      "item": 2859,
-      "qty": 31
-    },
-    {
-      "item": 556,
-      "qty": 1799
-    },
-    {
-      "item": 9004,
-      "qty": 1
-    },
-    {
-      "item": 557,
-      "qty": 1626
-    },
-    {
-      "item": 2349,
-      "qty": 17
-    },
-    {
-      "item": 558,
-      "qty": 10450
-    },
-    {
-      "item": 559,
-      "qty": 903
-    },
-    {
-      "item": 2351,
-      "qty": 8
-    },
-    {
-      "item": 560,
-      "qty": 36
-    },
-    {
-      "item": 2353,
-      "qty": 24
-    },
-    {
-      "item": 561,
-      "qty": 56
-    },
-    {
-      "item": 562,
-      "qty": 193
-    },
-    {
-      "item": 563,
-      "qty": 126
-    },
-    {
-      "item": 564,
-      "qty": 62
-    },
-    {
-      "item": 565,
-      "qty": 148
-    },
-    {
-      "item": 2357,
-      "qty": 9
-    },
-    {
-      "item": 2359,
-      "qty": 1
-    },
-    {
-      "item": 1592,
-      "qty": 1
-    },
-    {
-      "item": 313,
-      "qty": 158
-    },
-    {
-      "item": 569,
-      "qty": 26
-    },
-    {
-      "item": 825,
-      "qty": 5
-    },
-    {
-      "item": 314,
-      "qty": 291
-    },
-    {
-      "item": 1339,
-      "qty": 21
-    },
-    {
-      "item": 1595,
-      "qty": 4
-    },
-    {
-      "item": 1601,
-      "qty": 34
-    },
-    {
-      "item": 579,
-      "qty": 13
-    },
-    {
-      "item": 581,
-      "qty": 1
-    },
-    {
-      "item": 1349,
-      "qty": 1
-    },
-    {
-      "item": 839,
-      "qty": 1
-    },
-    {
-      "item": 1351,
-      "qty": 1
-    },
-    {
-      "item": 1103,
-      "qty": 8
-    },
-    {
-      "item": 1615,
-      "qty": 3
-    },
-    {
-      "item": 592,
-      "qty": 1563
-    },
-    {
-      "item": 1617,
-      "qty": 4
-    },
-    {
-      "item": 1363,
-      "qty": 1
-    },
-    {
-      "item": 2132,
-      "qty": 339
-    },
-    {
-      "item": 1621,
-      "qty": 7
-    },
-    {
-      "item": 2134,
-      "qty": 117
-    },
-    {
-      "item": 1623,
-      "qty": 1
-    },
-    {
-      "item": 2136,
-      "qty": 27
-    },
-    {
-      "item": 2138,
-      "qty": 70
-    },
-    {
-      "item": 1115,
-      "qty": 16
-    },
-    {
-      "item": 1373,
-      "qty": 1
-    },
-    {
-      "item": 2142,
-      "qty": 13
-    },
-    {
-      "item": 1375,
-      "qty": 8
-    },
-    {
-      "item": 863,
-      "qty": 1
-    },
-    {
-      "item": 2146,
-      "qty": 51
-    },
-    {
-      "item": 1379,
-      "qty": 13
-    },
-    {
-      "item": 1381,
-      "qty": 36
-    },
-    {
-      "item": 1383,
-      "qty": 1
-    },
-    {
-      "item": 1129,
-      "qty": 1
-    },
-    {
-      "item": 877,
-      "qty": 1559
-    },
-    {
-      "item": 882,
-      "qty": 13542
-    },
-    {
-      "item": 1139,
-      "qty": 148
-    },
-    {
-      "item": 884,
-      "qty": 1978
-    },
-    {
-      "item": 1141,
-      "qty": 3
-    },
-    {
-      "item": 886,
-      "qty": 443
-    },
-    {
-      "item": 888,
-      "qty": 16
-    },
-    {
-      "item": 1913,
-      "qty": 1
-    },
-    {
-      "item": 1917,
-      "qty": 19
-    },
-    {
-      "item": 1153,
-      "qty": 5
-    },
-    {
-      "item": 2434,
-      "qty": 22
-    },
-    {
-      "item": 1155,
-      "qty": 8
-    },
-    {
-      "item": 1925,
-      "qty": 58
-    },
-    {
-      "item": 1927,
-      "qty": 7
-    },
-    {
-      "item": 1929,
-      "qty": 6
-    },
-    {
-      "item": 1931,
-      "qty": 11
-    },
-    {
-      "item": 1420,
-      "qty": 1
-    },
-    {
-      "item": 1933,
-      "qty": 10
-    },
-    {
-      "item": 1935,
-      "qty": 12
-    },
-    {
-      "item": 1937,
-      "qty": 9
-    },
-    {
-      "item": 1173,
-      "qty": 15
-    },
-    {
-      "item": 1944,
-      "qty": 39
-    },
-    {
-      "item": 2714,
-      "qty": 1
-    },
-    {
-      "item": 1947,
-      "qty": 66
-    },
-    {
-      "item": 1949,
-      "qty": 75
-    },
-    {
-      "item": 1438,
-      "qty": 133
-    },
-    {
-      "item": 1440,
-      "qty": 108
-    },
-    {
-      "item": 1442,
-      "qty": 25
-    },
-    {
-      "item": 1444,
-      "qty": 7
-    },
-    {
-      "item": 1189,
-      "qty": 7
-    },
-    {
-      "item": 1446,
-      "qty": 167
-    },
-    {
-      "item": 1448,
-      "qty": 59
-    },
-    {
-      "item": 1965,
-      "qty": 216
-    },
-    {
-      "item": 173,
-      "qty": 13
-    },
-    {
-      "item": 1458,
-      "qty": 94
-    },
-    {
-      "item": 946,
-      "qty": 29
-    },
-    {
-      "item": 5298,
-      "qty": 1
-    },
-    {
-      "item": 434,
-      "qty": 13
-    },
-    {
-      "item": 1203,
-      "qty": 301
-    },
-    {
-      "item": 436,
-      "qty": 208
-    },
-    {
-      "item": 9140,
-      "qty": 1485
-    },
-    {
-      "item": 948,
-      "qty": 30
-    },
-    {
-      "item": 2485,
-      "qty": 41
-    },
-    {
-      "item": 1205,
-      "qty": 7
-    },
-    {
-      "item": 438,
-      "qty": 118
-    },
-    {
-      "item": 440,
-      "qty": 409
-    },
-    {
-      "item": 442,
-      "qty": 24
-    },
-    {
-      "item": 954,
-      "qty": 60
-    },
-    {
-      "item": 444,
-      "qty": 206
-    },
-    {
-      "item": 1470,
-      "qty": 95
-    },
-    {
-      "item": 1472,
-      "qty": 91
-    },
-    {
-      "item": 1474,
-      "qty": 110
-    },
-    {
-      "item": 195,
-      "qty": 15
-    },
-    {
-      "item": 1987,
-      "qty": 3
-    },
-    {
-      "item": 1476,
-      "qty": 115
-    },
-    {
-      "item": 453,
-      "qty": 156
-    },
-    {
-      "item": 5318,
-      "qty": 893
-    },
-    {
-      "item": 454,
-      "qty": 18
-    },
-    {
-      "item": 199,
-      "qty": 265
-    },
-    {
-      "item": 5319,
-      "qty": 676
-    },
-    {
-      "item": 1735,
-      "qty": 48
-    },
-    {
-      "item": 5320,
-      "qty": 51
-    },
-    {
-      "item": 1993,
-      "qty": 41
-    },
-    {
-      "item": 201,
-      "qty": 149
-    },
-    {
-      "item": 5321,
-      "qty": 34
-    },
-    {
-      "item": 5322,
-      "qty": 285
-    },
-    {
-      "item": 1739,
-      "qty": 8877
-    },
-    {
-      "item": 203,
-      "qty": 161
-    },
-    {
-      "item": 5323,
-      "qty": 42
-    },
-    {
-      "item": 5324,
-      "qty": 300
-    },
-    {
-      "item": 205,
-      "qty": 151
-    },
-    {
-      "item": 207,
-      "qty": 118
-    },
-    {
-      "item": 209,
-      "qty": 138
-    },
-    {
-      "item": 211,
-      "qty": 136
-    },
-    {
-      "item": 213,
-      "qty": 112
-    },
-    {
-      "item": 1237,
-      "qty": 21
-    },
-    {
-      "item": 215,
-      "qty": 53
-    },
-    {
-      "item": 217,
-      "qty": 38
-    },
-    {
-      "item": 3801,
-      "qty": 1
-    },
-    {
-      "item": 1759,
-      "qty": 101
-    },
-    {
-      "item": 223,
-      "qty": 7
-    },
-    {
-      "item": 225,
-      "qty": 5
-    },
-    {
-      "item": 1249,
-      "qty": 1
-    },
-    {
-      "item": 9442,
-      "qty": 7
-    },
-    {
-      "item": 229,
-      "qty": 2
-    },
-    {
-      "item": 1511,
-      "qty": 8419
-    },
-    {
-      "item": 237,
-      "qty": 114
-    },
-    {
-      "item": 1519,
-      "qty": 24191
-    },
-    {
-      "item": 1521,
-      "qty": 35147
-    },
-    {
-      "item": 753,
-      "qty": 63
-    },
-    {
-      "item": 1777,
-      "qty": 19809
-    },
-    {
-      "item": 1009,
-      "qty": 7
-    },
-    {
-      "item": 1265,
-      "qty": 4
-    },
-    {
-      "item": 1277,
-      "qty": 12
-    },
-    {
-      "item": 1279,
-      "qty": 3
-    }
-  ]
-}

Server/data/eco/offer_dispatch.json

@@ -1,44 +0,0 @@
-{
-  "offers": [
-    {
-      "completedAmount": "0",
-      "timeStamp": "1613860415435",
-      "uid": "261",
-      "itemId": "9140",
-      "sale": true,
-      "amount": "2",
-      "withdrawItems": [],
-      "offeredValue": "2",
-      "playerUID": "3556498",
-      "offerState": "1",
-      "totalCoinExchange": "0"
-    },
-    {
-      "completedAmount": "0",
-      "timeStamp": "1613860473644",
-      "uid": "262",
-      "itemId": "807",
-      "sale": true,
-      "amount": "1",
-      "withdrawItems": [],
-      "offeredValue": "2",
-      "playerUID": "3556498",
-      "offerState": "1",
-      "totalCoinExchange": "0"
-    },
-    {
-      "completedAmount": "0",
-      "timeStamp": "1613860649519",
-      "uid": "269",
-      "itemId": "436",
-      "sale": true,
-      "amount": "1",
-      "withdrawItems": [],
-      "offeredValue": "20",
-      "playerUID": "3556498",
-      "offerState": "1",
-      "totalCoinExchange": "0"
-    }
-  ],
-  "offsetUID": "1043"
-}

Server/src/main/java/Server/core/game/system/mysql/SQLManager.java

@@ -3,7 +3,6 @@ package core.game.system.mysql;
 import core.ServerConstants;
 import core.game.system.SystemLogger;
 import core.game.system.SystemManager;
-import core.game.system.mysql.impl.*;
 
 import java.sql.Connection;
 import java.sql.DriverManager;