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

Commit b4052e9

Browse files
LibrazyLibrazy
committed
update nc and use unified maven repo
1 parent a54f466 commit b4052e9

File tree

4 files changed

+22
-28
lines changed

4 files changed

+22
-28
lines changed

‎build.gradle

+2-7
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,8 @@ repositories {
3838
}
3939

4040
maven {
41-
name 'NyaaCore'
42-
url 'https://raw.githubusercontent.com/NyaaCat/NyaaCore/maven-repo'
43-
}
44-
45-
maven {
46-
name 'nu-langchecker'
47-
url 'https://raw.githubusercontent.com/Librazy/NyaaUtilsLangChecker/maven-repo'
41+
name 'NyaaCentral'
42+
url 'https://raw.githubusercontent.com/NyaaCat/NyaaCentral/maven-repo'
4843
}
4944

5045
maven {

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

+16-17
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import cat.nyaa.HamsterEcoHelper.signshop.ShopMode;
55
import cat.nyaa.nyaacore.database.DatabaseUtils;
66
import cat.nyaa.nyaacore.database.relational.RelationalDB;
7-
import cat.nyaa.nyaacore.database.relational.SynchronizedQuery;
7+
import cat.nyaa.nyaacore.database.relational.Query;
88
import org.bukkit.OfflinePlayer;
99
import org.bukkit.block.Block;
1010
import org.bukkit.configuration.InvalidConfigurationException;
@@ -32,7 +32,7 @@ public Database(HamsterEcoHelper plugin) {
3232
}
3333

3434
public List<ItemStack> getTemporaryStorage(OfflinePlayer player) {
35-
try (SynchronizedQuery<TempStorageRepo> result = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
35+
try (Query<TempStorageRepo> result = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
3636
if (result.count() == 0) return Collections.emptyList();
3737
YamlConfiguration cfg = new YamlConfiguration();
3838
try {
@@ -51,7 +51,7 @@ public List<ItemStack> getTemporaryStorage(OfflinePlayer player) {
5151
}
5252

5353
public void addTemporaryStorage(OfflinePlayer player, ItemStack item) {
54-
try (SynchronizedQuery<TempStorageRepo> result = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
54+
try (Query<TempStorageRepo> result = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
5555
YamlConfiguration cfg = new YamlConfiguration();
5656
boolean update;
5757
if (result.count() == 0) {
@@ -91,7 +91,7 @@ public void addTemporaryStorage(OfflinePlayer player, ItemStack item) {
9191
}
9292

9393
public void clearTemporaryStorage(OfflinePlayer player) {
94-
try (SynchronizedQuery<TempStorageRepo> query = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
94+
try (Query<TempStorageRepo> query = database.queryTransactional(TempStorageRepo.class).whereEq("player_id", player.getUniqueId().toString())) {
9595
if (query.count() != 0) {
9696
query.delete();
9797
query.commit();
@@ -101,7 +101,7 @@ public void clearTemporaryStorage(OfflinePlayer player) {
101101

102102
public List<MarketItem> getMarketItems(int offset, int limit, UUID seller) {
103103
ArrayList<MarketItem> list = new ArrayList<>();
104-
try (SynchronizedQuery<MarketItem> result =
104+
try (Query<MarketItem> result =
105105
seller == null ?
106106
database.queryTransactional(MarketItem.class).where("amount", ">", 0) :
107107
database.queryTransactional(MarketItem.class).where("amount", ">", 0).whereEq("player_id", seller.toString())) {
@@ -129,7 +129,7 @@ public long marketOffer(Player player, ItemStack itemStack, double unit_price) {
129129
item.playerId = player.getUniqueId();
130130
item.unitPrice = unit_price;
131131
long id = 1;
132-
try (SynchronizedQuery<MarketItem> query = database.queryTransactional(MarketItem.class)) {
132+
try (Query<MarketItem> query = database.queryTransactional(MarketItem.class)) {
133133
for (MarketItem marketItem : query.select()) {
134134
if (marketItem.id >= id) {
135135
id = marketItem.id + 1;
@@ -143,7 +143,7 @@ public long marketOffer(Player player, ItemStack itemStack, double unit_price) {
143143
}
144144

145145
public void marketBuy(Player player, long itemId, int amount) {
146-
try (SynchronizedQuery<MarketItem> query = database.queryTransactional(MarketItem.class).whereEq("id", itemId)) {
146+
try (Query<MarketItem> query = database.queryTransactional(MarketItem.class).whereEq("id", itemId)) {
147147
if (query.count() != 0) {
148148
MarketItem mItem = query.selectUnique();
149149
mItem.amount = mItem.amount - amount;
@@ -180,7 +180,7 @@ public long addItemLog(OfflinePlayer player, ItemStack item, double price, int a
180180
i.price = price;
181181
i.amount = amount;
182182
long id = 1;
183-
try (SynchronizedQuery<ItemLog> query = database.queryTransactional(ItemLog.class)) {
183+
try (Query<ItemLog> query = database.queryTransactional(ItemLog.class)) {
184184
for (ItemLog log : query.select()) {
185185
if (log.id >= id) {
186186
id = log.id + 1;
@@ -202,7 +202,7 @@ public Sign createShopSign(OfflinePlayer player, Block block, ShopMode mode) {
202202
shopLocation.owner = player.getUniqueId();
203203
shopLocation.setLocation(block.getLocation());
204204
shopLocation.shopMode = mode;
205-
try (SynchronizedQuery<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
205+
try (Query<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
206206
sign.delete();
207207
sign.insert(shopLocation);
208208
sign.commit();
@@ -216,7 +216,7 @@ public Sign createLottoSign(OfflinePlayer player, Block block, ShopMode mode, do
216216
shopLocation.setLocation(block.getLocation());
217217
shopLocation.shopMode = mode;
218218
shopLocation.lotto_price = price;
219-
try (SynchronizedQuery<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
219+
try (Query<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
220220
if (sign != null) {
221221
sign.delete();
222222
sign.insert(shopLocation);
@@ -229,7 +229,7 @@ public Sign createLottoSign(OfflinePlayer player, Block block, ShopMode mode, do
229229
public boolean removeShopSign(Block block) {
230230
Sign shopLocation = new Sign();
231231
shopLocation.setLocation(block.getLocation());
232-
try (SynchronizedQuery<Sign> sign = database.query(Sign.class).whereEq("id", shopLocation.id)) {
232+
try (Query<Sign> sign = database.query(Sign.class).whereEq("id", shopLocation.id)) {
233233
if (sign != null) {
234234
sign.delete();
235235
sign.commit();
@@ -242,7 +242,7 @@ public boolean removeShopSign(Block block) {
242242
public boolean removeShopSign(String world, int x, int y, int z) {
243243
Sign shopLocation = new Sign();
244244
shopLocation.setLocation(world, x, y, z);
245-
try (SynchronizedQuery<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
245+
try (Query<Sign> sign = database.queryTransactional(Sign.class).whereEq("id", shopLocation.id)) {
246246
if (sign != null) {
247247
sign.delete();
248248
sign.commit();
@@ -257,7 +257,7 @@ public List<SignShop> getSignShops() {
257257
}
258258

259259
public SignShop getSignShop(UUID owner) {
260-
try (SynchronizedQuery<SignShop> shop = database.queryTransactional(SignShop.class).whereEq("id", owner.toString())) {
260+
try (Query<SignShop> shop = database.queryTransactional(SignShop.class).whereEq("id", owner.toString())) {
261261
if (shop != null && shop.count() == 1) {
262262
return shop.selectUnique();
263263
}
@@ -268,7 +268,7 @@ public SignShop getSignShop(UUID owner) {
268268
}
269269

270270
public void setSignShop(UUID owner, SignShop shop) {
271-
try (SynchronizedQuery<SignShop> s = database.queryTransactional(SignShop.class).whereEq("id", owner.toString())) {
271+
try (Query<SignShop> s = database.queryTransactional(SignShop.class).whereEq("id", owner.toString())) {
272272
s.delete();
273273
s.insert(shop);
274274
s.commit();
@@ -280,20 +280,19 @@ public ShopStorageLocation getChestLocation(UUID owner) {
280280
}
281281

282282
public void setChestLocation(UUID owner, ShopStorageLocation location) {
283-
try (SynchronizedQuery<ShopStorageLocation> s = database.queryTransactional(ShopStorageLocation.class).whereEq("owner", owner.toString())) {
283+
try (Query<ShopStorageLocation> s = database.queryTransactional(ShopStorageLocation.class).whereEq("owner", owner.toString())) {
284284
s.delete();
285285
s.insert(location);
286286
s.commit();
287287
}
288-
289288
}
290289

291290
public LottoStorageLocation getLottoStorageLocation(UUID owner) {
292291
return database.query(LottoStorageLocation.class).whereEq("owner", owner.toString()).selectUniqueUnchecked();
293292
}
294293

295294
public void setLottoStorageLocation(UUID owner, LottoStorageLocation location) {
296-
try (SynchronizedQuery<LottoStorageLocation> s = database.queryTransactional(LottoStorageLocation.class).whereEq("owner", owner.toString())) {
295+
try (Query<LottoStorageLocation> s = database.queryTransactional(LottoStorageLocation.class).whereEq("owner", owner.toString())) {
297296
s.delete();
298297
s.insert(location);
299298
s.commit();

‎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.relational.SynchronizedQuery;
3+
import cat.nyaa.nyaacore.database.relational.Query;
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 (SynchronizedQuery<ItemLog> transaction = db.database.queryTransactional(ItemLog.class)) {
38+
try (Query<ItemLog> transaction = db.database.queryTransactional(ItemLog.class)) {
3939
total = transaction.count();
4040
for (ItemLog record : transaction.select()) {
4141
if (((++counter) % 100) == 0)
@@ -51,7 +51,7 @@ public static void updateVersion0To1(Database db) {
5151
transaction.commit();
5252
}
5353

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

‎src/main/java/cat/nyaa/HamsterEcoHelper/requisition/RequisitionCommands.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public void Requisition(CommandSender sender, Arguments args) {
159159
if (material != null) {
160160
item = new ItemStack(material);
161161
}
162-
if (item == null || !ReflectionUtils.isValidItem(item)) {
162+
if (item == null || !material.isItem()) {
163163
msg(sender, "user.error.unknown_item", itemName);
164164
return;
165165
}

0 commit comments

Comments
 (0)