Skip to content

Commit c343efc

Browse files
Ghost-chuGhost-chu
committed
spilt api interface (part 4)
1 parent abfb0fe commit c343efc

File tree

10 files changed

+41
-26
lines changed

10 files changed

+41
-26
lines changed

‎src/main/java/org/maxgamer/quickshop/QuickShop.java‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
import org.maxgamer.quickshop.api.QuickShopAPI;
4747
import org.maxgamer.quickshop.api.chat.QuickChat;
4848
import org.maxgamer.quickshop.api.compatibility.CompatibilityManager;
49-
import org.maxgamer.quickshop.api.shop.AbstractDisplayItem;
50-
import org.maxgamer.quickshop.database.AbstractDatabaseCore;
5149
import org.maxgamer.quickshop.api.economy.EconomyCore;
5250
import org.maxgamer.quickshop.api.integration.IntegrateStage;
5351
import org.maxgamer.quickshop.api.integration.IntegrationManager;
52+
import org.maxgamer.quickshop.api.localization.text.TextManager;
53+
import org.maxgamer.quickshop.api.shop.AbstractDisplayItem;
5454
import org.maxgamer.quickshop.api.shop.Shop;
5555
import org.maxgamer.quickshop.api.shop.ShopManager;
5656
import org.maxgamer.quickshop.chat.platform.minedown.BungeeQuickChat;
@@ -62,6 +62,7 @@
6262
import org.maxgamer.quickshop.integration.worldguard.WorldGuardIntegration;
6363
import org.maxgamer.quickshop.listener.*;
6464
import org.maxgamer.quickshop.listener.worldedit.WorldEditAdapter;
65+
import org.maxgamer.quickshop.localization.text.JavaTextManager;
6566
import org.maxgamer.quickshop.nonquickshopstuff.com.rylinaux.plugman.util.PluginUtil;
6667
import org.maxgamer.quickshop.permission.PermissionManager;
6768
import org.maxgamer.quickshop.shop.*;
@@ -71,9 +72,8 @@
7172
import org.maxgamer.quickshop.util.config.ConfigProvider;
7273
import org.maxgamer.quickshop.util.config.ConfigurationFixer;
7374
import org.maxgamer.quickshop.util.envcheck.*;
74-
import org.maxgamer.quickshop.localization.text.JavaTextManager;
7575
import org.maxgamer.quickshop.util.matcher.item.BukkitItemMatcherImpl;
76-
import org.maxgamer.quickshop.util.matcher.item.ItemMatcher;
76+
import org.maxgamer.quickshop.api.shop.ItemMatcher;
7777
import org.maxgamer.quickshop.util.matcher.item.QuickShopItemMatcherImpl;
7878
import org.maxgamer.quickshop.util.reload.ReloadManager;
7979
import org.maxgamer.quickshop.util.reporter.error.RollbarErrorReporter;
@@ -171,7 +171,7 @@ public class QuickShop extends JavaPlugin implements QuickShopAPI {
171171
*/
172172
@Getter
173173
private Economy economy;
174-
@Getter
174+
175175
private ItemMatcher itemMatcher;
176176
/**
177177
* Whether or not to limit players shop amounts
@@ -265,8 +265,9 @@ public class QuickShop extends JavaPlugin implements QuickShopAPI {
265265
private Plugin worldEditPlugin;
266266
@Getter
267267
private WorldEditAdapter worldEditAdapter;
268-
@Getter
268+
// Interfaced
269269
private JavaTextManager textManager;
270+
// Not included API
270271
@Getter
271272
private ShopPurger shopPurger;
272273

@@ -1977,8 +1978,8 @@ public void registerCustomCommands() {
19771978
Util.debugLog("Command alias successfully registered.");
19781979
}
19791980

1980-
public @NotNull JavaTextManager text() {
1981-
return textManager;
1981+
public @NotNull TextManager text() {
1982+
return this.textManager;
19821983
}
19831984

19841985
@Override
@@ -2000,4 +2001,14 @@ public boolean isDisplayEnabled() {
20002001
public boolean isLimit() {
20012002
return this.limit;
20022003
}
2004+
2005+
@Override
2006+
public TextManager getTextManager() {
2007+
return this.textManager;
2008+
}
2009+
2010+
@Override
2011+
public ItemMatcher getItemMatcher() {
2012+
return this.itemMatcher;
2013+
}
20032014
}

‎src/main/java/org/maxgamer/quickshop/ServiceInjector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.maxgamer.quickshop.database.AbstractDatabaseCore;
2727
import org.maxgamer.quickshop.api.economy.EconomyCore;
2828
import org.maxgamer.quickshop.localization.game.game.GameLanguage;
29-
import org.maxgamer.quickshop.util.matcher.item.ItemMatcher;
29+
import org.maxgamer.quickshop.api.shop.ItemMatcher;
3030

3131
/**
3232
* ServiceInjector used for "Replaceable Modules" features that allow 3rd party QuickShop addon

‎src/main/java/org/maxgamer/quickshop/api/QuickShopAPI.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import org.maxgamer.quickshop.api.compatibility.CompatibilityManager;
44
import org.maxgamer.quickshop.api.database.DatabaseHelper;
5+
import org.maxgamer.quickshop.api.localization.text.TextManager;
6+
import org.maxgamer.quickshop.api.shop.ItemMatcher;
57
import org.maxgamer.quickshop.api.shop.ShopManager;
68

79
public interface QuickShopAPI {
@@ -18,9 +20,8 @@ public interface QuickShopAPI {
1820

1921
DatabaseHelper getDatabaseHelper();
2022

23+
TextManager getTextManager();
2124

22-
default void a(){
23-
24-
}
25+
ItemMatcher getItemMatcher();
2526

2627
}

src/main/java/org/maxgamer/quickshop/util/matcher/item/ItemMatcher.java renamed to src/main/java/org/maxgamer/quickshop/api/shop/ItemMatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
*/
1919

20-
package org.maxgamer.quickshop.util.matcher.item;
20+
package org.maxgamer.quickshop.api.shop;
2121

2222
import org.bukkit.inventory.ItemStack;
2323
import org.bukkit.plugin.Plugin;

‎src/main/java/org/maxgamer/quickshop/event/ShopModeratorChangedEvent.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222
import org.jetbrains.annotations.NotNull;
2323
import org.maxgamer.quickshop.api.shop.Shop;
24-
import org.maxgamer.quickshop.shop.JavaShopModerator;
24+
import org.maxgamer.quickshop.api.shop.ShopModerator;
2525

2626
/**
2727
* Calling when moderator was changed, Can't cancel
2828
*/
2929
public class ShopModeratorChangedEvent extends AbstractQSEvent {
3030

3131
@NotNull
32-
private final JavaShopModerator moderator;
32+
private final ShopModerator moderator;
3333

3434
@NotNull
3535
private final Shop shop;
@@ -41,7 +41,7 @@ public class ShopModeratorChangedEvent extends AbstractQSEvent {
4141
* @param shop Target shop
4242
* @param shopModerator The shop moderator
4343
*/
44-
public ShopModeratorChangedEvent(@NotNull Shop shop, @NotNull JavaShopModerator shopModerator) {
44+
public ShopModeratorChangedEvent(@NotNull Shop shop, @NotNull ShopModerator shopModerator) {
4545
this.shop = shop;
4646
this.moderator = shopModerator;
4747
}
@@ -51,7 +51,7 @@ public ShopModeratorChangedEvent(@NotNull Shop shop, @NotNull JavaShopModerator
5151
*
5252
* @return the shop
5353
*/
54-
public @NotNull JavaShopModerator getModerator() {
54+
public @NotNull ShopModerator getModerator() {
5555
return this.moderator;
5656
}
5757

‎src/main/java/org/maxgamer/quickshop/localization/text/JavaTextManager.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.jetbrains.annotations.NotNull;
1111
import org.jetbrains.annotations.Nullable;
1212
import org.maxgamer.quickshop.QuickShop;
13+
import org.maxgamer.quickshop.api.localization.text.TextManager;
1314
import org.maxgamer.quickshop.util.MsgUtil;
1415
import org.maxgamer.quickshop.util.Util;
1516
import org.maxgamer.quickshop.localization.text.distributions.Distribution;
@@ -31,7 +32,7 @@
3132
import java.util.regex.Pattern;
3233
import java.util.regex.PatternSyntaxException;
3334

34-
public class JavaTextManager implements Reloadable {
35+
public class JavaTextManager implements TextManager,Reloadable {
3536
private final QuickShop plugin;
3637
private final Distribution distribution;
3738
// <File <Locale, Section>>
@@ -283,7 +284,7 @@ public TextList ofList(@Nullable CommandSender sender, @NotNull String path, Str
283284
return new TextList(this, sender, mapper.getDistribution(CROWDIN_LANGUAGE_FILE), mapper.getBundled(CROWDIN_LANGUAGE_FILE), path, args);
284285
}
285286

286-
public static class TextList {
287+
public static class TextList implements org.maxgamer.quickshop.api.localization.text.TextList{
287288
private final JavaTextManager manager;
288289
private final String path;
289290
private final QuickShop plugin;
@@ -399,7 +400,7 @@ public void send() {
399400
}
400401
}
401402

402-
public static class Text {
403+
public static class Text implements org.maxgamer.quickshop.api.localization.text.Text{
403404
private final JavaTextManager manager;
404405
private final String path;
405406
private final QuickShop plugin;

‎src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class ContainerShop implements Shop {
7272
private final QuickShop plugin;
7373
@EqualsAndHashCode.Exclude
7474
private final UUID runtimeRandomUniqueId = UUID.randomUUID();
75-
private JavaShopModerator moderator;
75+
private ShopModerator moderator;
7676
private double price;
7777
private ShopType shopType;
7878
private boolean unlimited;
@@ -973,12 +973,12 @@ public void onLoad() {
973973
}
974974

975975
@Override
976-
public @NotNull JavaShopModerator getModerator() {
976+
public @NotNull ShopModerator getModerator() {
977977
return this.moderator;
978978
}
979979

980980
@Override
981-
public void setModerator(@NotNull JavaShopModerator shopModerator) {
981+
public void setModerator(@NotNull ShopModerator shopModerator) {
982982
Util.ensureThread(false);
983983
setDirty();
984984
this.moderator = shopModerator;

‎src/main/java/org/maxgamer/quickshop/shop/JavaShopModerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ public JavaShopModerator(@NotNull UUID owner, @NotNull List<UUID> staffs) {
6969
this.staffs = staffs;
7070
}
7171

72-
public static JavaShopModerator deserialize(@NotNull String serilized) throws JsonSyntaxException {
72+
public static ShopModerator deserialize(@NotNull String serilized) throws JsonSyntaxException {
7373
// Use Gson deserialize data
7474
Gson gson = JsonUtil.getGson();
75-
return gson.fromJson(serilized, JavaShopModerator.class);
75+
return gson.fromJson(serilized, ShopModerator.class);
7676
}
7777

78-
public static String serialize(@NotNull JavaShopModerator shopModerator) {
78+
public static String serialize(@NotNull ShopModerator shopModerator) {
7979
Gson gson = JsonUtil.getGson();
8080
return gson.toJson(shopModerator); // Use Gson serialize this class
8181
}

‎src/main/java/org/maxgamer/quickshop/util/matcher/item/BukkitItemMatcherImpl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.jetbrains.annotations.NotNull;
2626
import org.jetbrains.annotations.Nullable;
2727
import org.maxgamer.quickshop.QuickShop;
28+
import org.maxgamer.quickshop.api.shop.ItemMatcher;
2829

2930
import java.util.Objects;
3031

‎src/main/java/org/maxgamer/quickshop/util/matcher/item/QuickShopItemMatcherImpl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.jetbrains.annotations.NotNull;
3232
import org.jetbrains.annotations.Nullable;
3333
import org.maxgamer.quickshop.QuickShop;
34+
import org.maxgamer.quickshop.api.shop.ItemMatcher;
3435
import org.maxgamer.quickshop.util.Util;
3536
import org.maxgamer.quickshop.util.reload.ReloadResult;
3637
import org.maxgamer.quickshop.util.reload.ReloadStatus;

0 commit comments

Comments
 (0)