Skip to content
This repository was archived by the owner on Mar 8, 2022. It is now read-only.

Commit 4eed39a

Browse files
LibrazyLibrazy
committed
update to nc 6.1
1 parent e086576 commit 4eed39a

File tree

6 files changed

+37
-64
lines changed

6 files changed

+37
-64
lines changed

‎build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ configurations.all {
99
// Version strings used for CI
1010
// Note the spaces before and after the equals sign
1111
ext.majorVersion = 6
12-
ext.minorVersion = 0
12+
ext.minorVersion = 1
1313
ext.minecraftVersion = "1.13"
1414

1515
sourceCompatibility = 1.8
@@ -56,12 +56,12 @@ repositories {
5656
dependencies {
5757
compile 'org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT'
5858
compile 'net.milkbowl.vault:VaultAPI:1.6'
59-
compile 'cat.nyaa:nyaacore:6.0-SNAPSHOT'
59+
compile 'cat.nyaa:nyaacore:6.1-SNAPSHOT'
6060
compile('net.ess3:Essentials:2.13-SNAPSHOT') {
6161
transitive = false
6262
}
6363
compile files('lib/LocketteProAPI.jar')
64-
compile ('org.librazy:NyaaUtilsLangChecker:1.0-SNAPSHOT') {
64+
compile ('org.librazy:NyaaUtilsLangChecker:2.0-SNAPSHOT') {
6565
transitive = false
6666
}
6767
compile('com.meowj:LangUtils:1.9') {

‎src/main/java/cat/nyaa/HamsterEcoHelper/CommandHandler.java

-26
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import cat.nyaa.HamsterEcoHelper.ads.AdsCommands;
44
import cat.nyaa.HamsterEcoHelper.auction.AuctionCommands;
55
import cat.nyaa.HamsterEcoHelper.balance.BalanceCommands;
6-
import cat.nyaa.HamsterEcoHelper.database.*;
76
import cat.nyaa.HamsterEcoHelper.market.MarketCommands;
87
import cat.nyaa.HamsterEcoHelper.requisition.RequisitionCommands;
98
import cat.nyaa.HamsterEcoHelper.signshop.SearchCommands;
@@ -12,18 +11,12 @@
1211
import cat.nyaa.nyaacore.CommandReceiver;
1312
import cat.nyaa.nyaacore.LanguageRepository;
1413
import cat.nyaa.nyaacore.Message;
15-
import cat.nyaa.nyaacore.database.Database;
16-
import cat.nyaa.nyaacore.database.DatabaseUtils;
17-
import cat.nyaa.nyaacore.database.RelationalDB;
18-
import org.bukkit.Bukkit;
1914
import org.bukkit.Material;
2015
import org.bukkit.command.Command;
2116
import org.bukkit.command.CommandSender;
2217
import org.bukkit.configuration.file.YamlConfiguration;
2318
import org.bukkit.entity.Player;
2419
import org.bukkit.inventory.ItemStack;
25-
import org.bukkit.scheduler.BukkitTask;
26-
import org.librazy.nyaautils_lang_checker.LangKey;
2720

2821
import java.util.ArrayList;
2922
import java.util.List;
@@ -154,23 +147,4 @@ public void userRetrieve(CommandSender sender, Arguments args) {
154147
}
155148
plugin.database.clearTemporaryStorage(p);
156149
}
157-
158-
@SubCommand(value = "dump", permission = "heh.admin")
159-
public void databaseDump(CommandSender sender, Arguments args) {
160-
String to = args.next();
161-
RelationalDB todb = DatabaseUtils.get(to).connect();
162-
RelationalDB fromdb = plugin.database.database;
163-
DatabaseUtils.dumpDatabaseAsync(plugin, fromdb, todb, (cls, r) -> {
164-
if (cls != null) {
165-
msg(sender, "internal.info.dump.ing", cls.getName(), to, r);
166-
} else {
167-
fromdb.close();
168-
if(r == 0){
169-
msg(sender, "internal.info.dump.finished", to);
170-
} else {
171-
msg(sender, "internal.error.command_exception");
172-
}
173-
}
174-
});
175-
}
176150
}

‎src/main/java/cat/nyaa/HamsterEcoHelper/I18n.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import cat.nyaa.nyaacore.LanguageRepository;
44
import org.bukkit.plugin.java.JavaPlugin;
5-
import org.librazy.nyaautils_lang_checker.LangKey;
5+
import org.librazy.nclangchecker.LangKey;
66

77
public class I18n extends LanguageRepository {
88
public static I18n instance = null;

‎src/main/java/cat/nyaa/HamsterEcoHelper/database/Database.java

+28-29
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import cat.nyaa.HamsterEcoHelper.HamsterEcoHelper;
44
import cat.nyaa.HamsterEcoHelper.signshop.ShopMode;
55
import cat.nyaa.nyaacore.database.DatabaseUtils;
6-
import cat.nyaa.nyaacore.database.RelationalDB;
7-
import cat.nyaa.nyaacore.database.TransactionalQuery;
6+
import cat.nyaa.nyaacore.database.relational.RelationalDB;
7+
import cat.nyaa.nyaacore.database.relational.SynchronizedQuery;
88
import org.bukkit.OfflinePlayer;
99
import org.bukkit.block.Block;
1010
import org.bukkit.configuration.InvalidConfigurationException;
@@ -22,9 +22,8 @@ public class Database implements Cloneable {
2222
private final HamsterEcoHelper plugin;
2323

2424
public Database(HamsterEcoHelper plugin) {
25-
database = DatabaseUtils.get();
25+
database = DatabaseUtils.get(RelationalDB.class);
2626
this.plugin = plugin;
27-
database.connect();
2827
int newDatabaseVersion = DatabaseUpdater.updateDatabase(Database.this, plugin.config.database_version);
2928
if (newDatabaseVersion != plugin.config.database_version) {
3029
plugin.config.database_version = newDatabaseVersion;
@@ -33,7 +32,7 @@ public Database(HamsterEcoHelper plugin) {
3332
}
3433

3534
public List<ItemStack> getTemporaryStorage(OfflinePlayer player) {
36-
try (TransactionalQuery<TempStorageRepo> result = database.transaction(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
35+
try (SynchronizedQuery<TempStorageRepo> result = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
3736
if (result.count() == 0) return Collections.emptyList();
3837
YamlConfiguration cfg = new YamlConfiguration();
3938
try {
@@ -51,7 +50,7 @@ public List<ItemStack> getTemporaryStorage(OfflinePlayer player) {
5150
}
5251

5352
public void addTemporaryStorage(OfflinePlayer player, ItemStack item) {
54-
try (TransactionalQuery<TempStorageRepo> result = database.transaction(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
53+
try (SynchronizedQuery<TempStorageRepo> result = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
5554
YamlConfiguration cfg = new YamlConfiguration();
5655
boolean update;
5756
if (result.count() == 0) {
@@ -90,7 +89,7 @@ public void addTemporaryStorage(OfflinePlayer player, ItemStack item) {
9089
}
9190

9291
public void clearTemporaryStorage(OfflinePlayer player) {
93-
try (TransactionalQuery<TempStorageRepo> query = database.transaction(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
92+
try (SynchronizedQuery<TempStorageRepo> query = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
9493
if (query.count() != 0) {
9594
query.delete();
9695
}
@@ -99,10 +98,10 @@ public void clearTemporaryStorage(OfflinePlayer player) {
9998

10099
public List<MarketItem> getMarketItems(int offset, int limit, UUID seller) {
101100
ArrayList<MarketItem> list = new ArrayList<>();
102-
try (TransactionalQuery<MarketItem> result =
101+
try (SynchronizedQuery<MarketItem> result =
103102
seller == null ?
104-
database.transaction(MarketItem.class).where("amount", ">", 0) :
105-
database.transaction(MarketItem.class).where("amount", ">", 0).whereEq("player_id", seller.toString())) {
103+
database.queryTransactional(MarketItem.class).where("amount", ">", 0) :
104+
database.queryTransactional(MarketItem.class).where("amount", ">", 0).whereEq("player_id", seller.toString())) {
106105
if (result.count() > 0) {
107106
List<MarketItem> tmp = result.select();
108107
Collections.reverse(tmp);
@@ -126,7 +125,7 @@ public long marketOffer(Player player, ItemStack itemStack, double unit_price) {
126125
item.playerId = player.getUniqueId();
127126
item.unitPrice = unit_price;
128127
long id = 1;
129-
try (TransactionalQuery<MarketItem> query = database.transaction(MarketItem.class)) {
128+
try (SynchronizedQuery<MarketItem> query = database.queryTransactional(MarketItem.class)) {
130129
for (MarketItem marketItem : query.select()) {
131130
if (marketItem.id >= id) {
132131
id = marketItem.id + 1;
@@ -139,7 +138,7 @@ public long marketOffer(Player player, ItemStack itemStack, double unit_price) {
139138
}
140139

141140
public void marketBuy(Player player, long itemId, int amount) {
142-
try (TransactionalQuery<MarketItem> query = database.transaction(MarketItem.class).whereEq("id", itemId)) {
141+
try (SynchronizedQuery<MarketItem> query = database.queryTransactional(MarketItem.class).whereEq("id", itemId)) {
143142
if (query.count() != 0) {
144143
MarketItem mItem = query.selectUnique();
145144
mItem.amount = mItem.amount - amount;
@@ -150,7 +149,7 @@ public void marketBuy(Player player, long itemId, int amount) {
150149
}
151150

152151
public int getMarketPlayerItemCount(OfflinePlayer player) {
153-
try (TransactionalQuery<MarketItem> query = database.transaction(MarketItem.class).whereEq("player_id", player.getUniqueId().toString()).where("amount", ">", 0)) {
152+
try (SynchronizedQuery<MarketItem> query = database.queryTransactional(MarketItem.class).whereEq("player_id", player.getUniqueId().toString()).where("amount", ">", 0)) {
154153
if (query.count() > 0) {
155154
return query.count();
156155
}
@@ -159,7 +158,7 @@ public int getMarketPlayerItemCount(OfflinePlayer player) {
159158
}
160159

161160
public int getMarketItemCount() {
162-
try (TransactionalQuery<MarketItem> query = database.transaction(MarketItem.class).where("amount", ">", 0)) {
161+
try (SynchronizedQuery<MarketItem> query = database.queryTransactional(MarketItem.class).where("amount", ">", 0)) {
163162
if (query.count() != 0) {
164163
return query.count();
165164
}
@@ -168,7 +167,7 @@ public int getMarketItemCount() {
168167
}
169168

170169
public MarketItem getMarketItem(long id) {
171-
try (TransactionalQuery<MarketItem> query = database.transaction(MarketItem.class).whereEq("id", id)) {
170+
try (SynchronizedQuery<MarketItem> query = database.queryTransactional(MarketItem.class).whereEq("id", id)) {
172171
if (query.count() != 0) {
173172
return query.selectUnique();
174173
}
@@ -178,7 +177,7 @@ public MarketItem getMarketItem(long id) {
178177

179178

180179
public ItemLog getItemLog(long id) {
181-
try (TransactionalQuery<ItemLog> log = database.transaction(ItemLog.class).whereEq("id", id)) {
180+
try (SynchronizedQuery<ItemLog> log = database.queryTransactional(ItemLog.class).whereEq("id", id)) {
182181
if (log != null && log.count() != 0) {
183182
return log.selectUnique();
184183
}
@@ -193,7 +192,7 @@ public long addItemLog(OfflinePlayer player, ItemStack item, double price, int a
193192
i.price = price;
194193
i.amount = amount;
195194
long id = 1;
196-
try (TransactionalQuery<ItemLog> query = database.transaction(ItemLog.class)) {
195+
try (SynchronizedQuery<ItemLog> query = database.queryTransactional(ItemLog.class)) {
197196
for (ItemLog log : query.select()) {
198197
if (log.id >= id) {
199198
id = log.id + 1;
@@ -206,15 +205,15 @@ public long addItemLog(OfflinePlayer player, ItemStack item, double price, int a
206205
}
207206

208207
public List<Sign> getShopSigns() {
209-
return database.auto(Sign.class).select();
208+
return database.query(Sign.class).select();
210209
}
211210

212211
public Sign createShopSign(OfflinePlayer player, Block block, ShopMode mode) {
213212
Sign shopLocation = new Sign();
214213
shopLocation.owner = player.getUniqueId();
215214
shopLocation.setLocation(block.getLocation());
216215
shopLocation.shopMode = mode;
217-
try (TransactionalQuery<Sign> sign = database.transaction(Sign.class).whereEq("id", shopLocation.id)) {
216+
try (SynchronizedQuery<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
218217
sign.delete();
219218
sign.insert(shopLocation);
220219
}
@@ -227,7 +226,7 @@ public Sign createLottoSign(OfflinePlayer player, Block block, ShopMode mode, do
227226
shopLocation.setLocation(block.getLocation());
228227
shopLocation.shopMode = mode;
229228
shopLocation.lotto_price = price;
230-
try (TransactionalQuery<Sign> sign = database.transaction(Sign.class).whereEq("id", shopLocation.id)) {
229+
try (SynchronizedQuery<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
231230
if (sign != null) {
232231
sign.delete();
233232
sign.insert(shopLocation);
@@ -239,7 +238,7 @@ public Sign createLottoSign(OfflinePlayer player, Block block, ShopMode mode, do
239238
public boolean removeShopSign(Block block) {
240239
Sign shopLocation = new Sign();
241240
shopLocation.setLocation(block.getLocation());
242-
try (TransactionalQuery<Sign> sign = database.transaction(Sign.class).whereEq("id", shopLocation.id)) {
241+
try (SynchronizedQuery<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
243242
if (sign != null) {
244243
sign.delete();
245244
return true;
@@ -251,7 +250,7 @@ public boolean removeShopSign(Block block) {
251250
public boolean removeShopSign(String world, int x, int y, int z) {
252251
Sign shopLocation = new Sign();
253252
shopLocation.setLocation(world, x, y, z);
254-
try (TransactionalQuery<Sign> sign = database.transaction(Sign.class).whereEq("id", shopLocation.id)) {
253+
try (SynchronizedQuery<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
255254
if (sign != null) {
256255
sign.delete();
257256
return true;
@@ -261,11 +260,11 @@ public boolean removeShopSign(String world, int x, int y, int z) {
261260
}
262261

263262
public List<SignShop> getSignShops() {
264-
return database.auto(SignShop.class).select();
263+
return database.query(SignShop.class).select();
265264
}
266265

267266
public SignShop getSignShop(UUID owner) {
268-
try (TransactionalQuery<SignShop> shop = database.transaction(SignShop.class).whereEq("id", owner.toString())) {
267+
try (SynchronizedQuery<SignShop> shop = database.queryTransactional(SignShop.class).whereEq("id", owner.toString())) {
269268
if (shop != null && shop.count() == 1) {
270269
return shop.selectUnique();
271270
}
@@ -276,30 +275,30 @@ public SignShop getSignShop(UUID owner) {
276275
}
277276

278277
public void setSignShop(UUID owner, SignShop shop) {
279-
try (TransactionalQuery<SignShop> s = database.transaction(SignShop.class).whereEq("id", owner.toString())) {
278+
try (SynchronizedQuery<SignShop> s = database.queryTransactional(SignShop.class).whereEq("id", owner.toString())) {
280279
s.delete();
281280
s.insert(shop);
282281
}
283282
}
284283

285284
public ShopStorageLocation getChestLocation(UUID owner) {
286-
return database.auto(ShopStorageLocation.class).whereEq("owner", owner.toString()).selectUniqueUnchecked();
285+
return database.query(ShopStorageLocation.class).whereEq("owner", owner.toString()).selectUniqueUnchecked();
287286
}
288287

289288
public void setChestLocation(UUID owner, ShopStorageLocation location) {
290-
try (TransactionalQuery<ShopStorageLocation> s = database.transaction(ShopStorageLocation.class).whereEq("owner", owner.toString())) {
289+
try (SynchronizedQuery<ShopStorageLocation> s = database.queryTransactional(ShopStorageLocation.class).whereEq("owner", owner.toString())) {
291290
s.delete();
292291
s.insert(location);
293292
}
294293

295294
}
296295

297296
public LottoStorageLocation getLottoStorageLocation(UUID owner) {
298-
return database.auto(LottoStorageLocation.class).whereEq("owner", owner.toString()).selectUniqueUnchecked();
297+
return database.query(LottoStorageLocation.class).whereEq("owner", owner.toString()).selectUniqueUnchecked();
299298
}
300299

301300
public void setLottoStorageLocation(UUID owner, LottoStorageLocation location) {
302-
try (TransactionalQuery<LottoStorageLocation> s = database.transaction(LottoStorageLocation.class).whereEq("owner", owner.toString())) {
301+
try (SynchronizedQuery<LottoStorageLocation> s = database.queryTransactional(LottoStorageLocation.class).whereEq("owner", owner.toString())) {
303302
s.delete();
304303
s.insert(location);
305304
}

‎src/main/java/cat/nyaa/HamsterEcoHelper/database/DatabaseUpdater.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package cat.nyaa.HamsterEcoHelper.database;
22

3-
import cat.nyaa.nyaacore.database.TransactionalQuery;
3+
import cat.nyaa.nyaacore.database.relational.SynchronizedQuery;
44
import cat.nyaa.nyaacore.utils.ItemStackUtils;
55
import org.bukkit.configuration.InvalidConfigurationException;
66
import org.bukkit.configuration.file.YamlConfiguration;
@@ -35,7 +35,7 @@ public static String convertYamlItemStackToNbtItemStack(String base64dYaml) {
3535
*/
3636
public static void updateVersion0To1(Database db) {
3737
int total, counter = 0;
38-
try (TransactionalQuery<ItemLog> transaction = db.database.transaction(ItemLog.class)) {
38+
try (SynchronizedQuery<ItemLog> transaction = db.database.queryTransactional(ItemLog.class)) {
3939
total = transaction.count();
4040
for (ItemLog record : transaction.select()) {
4141
if (((++counter) % 100) == 0)
@@ -50,7 +50,7 @@ public static void updateVersion0To1(Database db) {
5050
}
5151
}
5252

53-
try (TransactionalQuery<MarketItem> transaction = db.database.transaction(MarketItem.class)) {
53+
try (SynchronizedQuery<MarketItem> transaction = db.database.queryTransactional(MarketItem.class)) {
5454
counter = 0;
5555
total = transaction.count();
5656
for (MarketItem record : transaction.select()) {

‎src/main/java/cat/nyaa/HamsterEcoHelper/utils/MiscUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import org.bukkit.command.CommandSender;
1010
import org.bukkit.entity.Player;
1111
import org.bukkit.inventory.ItemStack;
12-
import org.librazy.nyaautils_lang_checker.LangKey;
13-
import org.librazy.nyaautils_lang_checker.LangKeyType;
12+
import org.librazy.nclangchecker.LangKey;
13+
import org.librazy.nclangchecker.LangKeyType;
1414

1515
import java.util.List;
1616
import java.util.Random;

0 commit comments

Comments
 (0)