Skip to content

Commit d7931f1

Browse files
Ghost-chuGhost-chu
committed
format code
1 parent 42dd4b3 commit d7931f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+201
-181
lines changed

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,17 @@ To compile the QuickShop and debug it by yourself, please follow these steps:
7070
## Maven
7171

7272
```XML
73+
7374
<repository>
7475
<id>quickshop-repo</id>
7576
<url>https://repo.codemc.io/repository/maven-public/</url>
7677
</repository>
7778

7879
<dependency>
79-
<groupId>org.maxgamer</groupId>
80-
<artifactId>QuickShop</artifactId>
81-
<version>{VERSION}</version>
82-
<scope>provided</scope>
80+
<groupId>org.maxgamer</groupId>
81+
<artifactId>QuickShop</artifactId>
82+
<version>{VERSION}</version>
83+
<scope>provided</scope>
8384
</dependency>
8485
```
8586

‎pom.xml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@
214214
</relocation>
215215

216216

217-
218217
<!-- <relocation>-->
219218
<!-- <pattern>de.leonhard</pattern>-->
220219
<!-- <shadedPattern>org.maxgamer.quickshop.shade.de.leonhard.storage</shadedPattern>-->
@@ -848,18 +847,18 @@
848847
<version>4.9.2</version>
849848
<systemPath>${project.basedir}/lib/TNE.jar</systemPath>
850849
</dependency>
851-
<!-- <dependency>-->
852-
<!-- <groupId>com.songoda</groupId>-->
853-
<!-- <artifactId>skyblock</artifactId>-->
854-
<!-- <version>2.2.13</version>-->
855-
<!-- <scope>provided</scope>-->
856-
<!-- <exclusions>-->
857-
<!-- <exclusion>-->
858-
<!-- <artifactId>MVdWPlaceholderAPI</artifactId>-->
859-
<!-- <groupId>be.maximvdw</groupId>-->
860-
<!-- </exclusion>-->
861-
<!-- </exclusions>-->
862-
<!-- </dependency>-->
850+
<!-- <dependency>-->
851+
<!-- <groupId>com.songoda</groupId>-->
852+
<!-- <artifactId>skyblock</artifactId>-->
853+
<!-- <version>2.2.13</version>-->
854+
<!-- <scope>provided</scope>-->
855+
<!-- <exclusions>-->
856+
<!-- <exclusion>-->
857+
<!-- <artifactId>MVdWPlaceholderAPI</artifactId>-->
858+
<!-- <groupId>be.maximvdw</groupId>-->
859+
<!-- </exclusion>-->
860+
<!-- </exclusions>-->
861+
<!-- </dependency>-->
863862
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
864863
<dependency>
865864
<groupId>commons-codec</groupId>

‎src/integration/plotsquared/5/src/main/java/org/maxgamer/quickshop/integration/plotsquared/PlotSquaredIntegrationV5.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ protected void loadConfiguration() {
6363
}
6464

6565
@Override
66-
public @NotNull String getName() {
66+
public @NotNull
67+
String getName() {
6768
return "PlotSquared";
6869
}
6970

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ public void run() {
951951
}
952952
calendarWatcher = new CalendarWatcher(this);
953953
calendarWatcher.start();
954-
this.shopPurger = new ShopPurger(this,false);
954+
this.shopPurger = new ShopPurger(this, false);
955955
shopPurger.runTaskAsynchronously(this);
956956
Util.debugLog("Now using display-type: " + DisplayItem.getNowUsing().name());
957957
getLogger().info("QuickShop Loaded! " + enableTimer.stopAndGetTimePassed() + " ms.");

‎src/main/java/org/maxgamer/quickshop/chat/platform/minedown/BungeeQuickChat.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void send(@NotNull CommandSender receiver, @Nullable QuickComponent compo
7676

7777
@Override
7878
public void sendItemHologramChat(@NotNull Player player, @NotNull String text, @NotNull ItemStack itemStack) {
79-
TextComponent errorComponent = new TextComponent(QuickShop.getInstance().text().of(player,"menu.item-holochat-error").forLocale());
79+
TextComponent errorComponent = new TextComponent(QuickShop.getInstance().text().of(player, "menu.item-holochat-error").forLocale());
8080
try {
8181
String json = ReflectFactory.convertBukkitItemStackToJson(itemStack);
8282
TextComponent centerItem = new TextComponent(text);
@@ -91,14 +91,14 @@ public void sendItemHologramChat(@NotNull Player player, @NotNull String text, @
9191

9292
@Override
9393
public @NotNull QuickComponent getItemHologramChat(@NotNull Shop shop, @NotNull ItemStack itemStack, @NotNull Player player, @NotNull String message) {
94-
TextComponent errorComponent = new TextComponent(QuickShop.getInstance().text().of(player,"menu.item-holochat-error").forLocale());
94+
TextComponent errorComponent = new TextComponent(QuickShop.getInstance().text().of(player, "menu.item-holochat-error").forLocale());
9595
try {
9696

9797
String json = ReflectFactory.convertBukkitItemStackToJson(itemStack);
9898
if (json == null) {
9999
return new QuickComponentImpl(errorComponent);
100100
}
101-
TextComponent normalmessage = new TextComponent(message + " " + QuickShop.getInstance().text().of(player,"menu.preview").forLocale());
101+
TextComponent normalmessage = new TextComponent(message + " " + QuickShop.getInstance().text().of(player, "menu.preview").forLocale());
102102
ComponentBuilder cBuilder = new ComponentBuilder(json);
103103
if (QuickShop.getPermissionManager().hasPermission(player, "quickshop.preview")) {
104104
normalmessage.setClickEvent(new ClickEvent(
@@ -117,7 +117,7 @@ public void sendItemHologramChat(@NotNull Player player, @NotNull String text, @
117117

118118
@Override
119119
public @NotNull QuickComponent getItemTextComponent(@NotNull Player player, @NotNull ItemStack itemStack, @NotNull String normalText) {
120-
TextComponent errorComponent = new TextComponent(QuickShop.getInstance().text().of(player,"menu.item-holochat-error").forLocale());
120+
TextComponent errorComponent = new TextComponent(QuickShop.getInstance().text().of(player, "menu.item-holochat-error").forLocale());
121121

122122
String json;
123123
try {
@@ -130,7 +130,7 @@ public void sendItemHologramChat(@NotNull Player player, @NotNull String text, @
130130
return new QuickComponentImpl(errorComponent);
131131
}
132132

133-
TextComponent component = new TextComponent(normalText + " " +QuickShop.getInstance().text().of(player,"menu.preview").forLocale());
133+
TextComponent component = new TextComponent(normalText + " " + QuickShop.getInstance().text().of(player, "menu.preview").forLocale());
134134
ComponentBuilder cBuilder = new ComponentBuilder(json);
135135
component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_ITEM, cBuilder.create()));
136136
return new QuickComponentImpl(component);
@@ -140,7 +140,7 @@ public void sendItemHologramChat(@NotNull Player player, @NotNull String text, @
140140
@Override
141141
public void sendExecutableChat(@NotNull CommandSender receiver, @NotNull String message, @NotNull String hoverText, @NotNull String command) {
142142
TextComponent component =
143-
new TextComponent(ChatColor.DARK_PURPLE + plugin.text().of(receiver,"tableformat.left_begin").forLocale() + message);
143+
new TextComponent(ChatColor.DARK_PURPLE + plugin.text().of(receiver, "tableformat.left_begin").forLocale() + message);
144144
component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
145145
component.setHoverEvent(
146146
new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(hoverText).create())); //FIXME: Update this when drop 1.15 supports
@@ -150,7 +150,7 @@ public void sendExecutableChat(@NotNull CommandSender receiver, @NotNull String
150150
@Override
151151
public void sendSuggestedChat(@NotNull CommandSender receiver, @NotNull String message, @NotNull String hoverText, @NotNull String command) {
152152
TextComponent component =
153-
new TextComponent(ChatColor.DARK_PURPLE + plugin.text().of(receiver,"tableformat.left_begin").forLocale() + message);
153+
new TextComponent(ChatColor.DARK_PURPLE + plugin.text().of(receiver, "tableformat.left_begin").forLocale() + message);
154154
component.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command));
155155
component.setHoverEvent(
156156
new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(hoverText).create())); //FIXME: Update this when drop 1.15 supports

‎src/main/java/org/maxgamer/quickshop/command/CommandContainer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void bakeExecutorType() {
8787
} else if (StringUtils.isNotEmpty(this.getDisablePlaceholder())) {
8888
return this.getDisablePlaceholder();
8989
} else {
90-
return QuickShop.getInstance().text().of(sender,"command.feature-not-enabled").forLocale();
90+
return QuickShop.getInstance().text().of(sender, "command.feature-not-enabled").forLocale();
9191
}
9292
}
9393
}

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_About.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,23 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String commandLabe
5050
+ ChatColor.YELLOW
5151
+ ">> "
5252
+ ChatColor.GREEN
53-
+plugin.text().of(sender,"updatenotify.label.lts").forLocale());
53+
+ plugin.text().of(sender, "updatenotify.label.lts").forLocale());
5454
} else if (QuickShop.getInstance().getBuildInfo().getGitBranch().toUpperCase().contains("RELEASE")) {
5555
MsgUtil.sendDirectMessage(sender,
5656
ChatColor.AQUA
5757
+ "Release "
5858
+ ChatColor.YELLOW
5959
+ ">> "
6060
+ ChatColor.GREEN
61-
+plugin.text().of(sender,"updatenotify.label.stable").forLocale());
61+
+ plugin.text().of(sender, "updatenotify.label.stable").forLocale());
6262
} else {
6363
MsgUtil.sendDirectMessage(sender,
6464
ChatColor.AQUA
6565
+ "Release "
6666
+ ChatColor.YELLOW
6767
+ ">> "
6868
+ ChatColor.GREEN
69-
+ plugin.text().of(sender,"updatenotify.label.unstable").forLocale());
69+
+ plugin.text().of(sender, "updatenotify.label.unstable").forLocale());
7070
}
7171
MsgUtil.sendDirectMessage(sender,
7272
ChatColor.AQUA

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Amount.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
5252
@Override
5353
public List<String> onTabComplete(
5454
@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
55-
return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender,"tabcomplete.amount").forLocale()) : Collections.emptyList();
55+
return cmdArg.length == 1 ? Collections.singletonList(QuickShop.getInstance().text().of(sender, "tabcomplete.amount").forLocale()) : Collections.emptyList();
5656
}
5757

5858
}

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Create.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
160160
public List<String> onTabComplete(
161161
@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
162162
if (cmdArg.length == 1) {
163-
return Collections.singletonList(plugin.text().of(sender,"tabcomplete.price").forLocale());
163+
return Collections.singletonList(plugin.text().of(sender, "tabcomplete.price").forLocale());
164164
}
165165
if (sender.getInventory().getItemInMainHand().getType().isAir()) {
166166
if (cmdArg.length == 2) {
167-
return Collections.singletonList(plugin.text().of(sender,"tabcomplete.item").forLocale());
167+
return Collections.singletonList(plugin.text().of(sender, "tabcomplete.item").forLocale());
168168
}
169169
if (cmdArg.length == 3) {
170-
return Collections.singletonList(plugin.text().of(sender,"tabcomplete.amount").forLocale());
170+
return Collections.singletonList(plugin.text().of(sender, "tabcomplete.amount").forLocale());
171171
}
172172
}
173173
return Collections.emptyList();

‎src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Find.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
132132
Location location = shop.getLocation();
133133
// "nearby-shop-entry": "&a- Info:{0} &aPrice:&b{1} &ax:&b{2} &ay:&b{3} &az:&b{4} &adistance: &b{5} &ablock(s)"
134134
stringBuilder.append(plugin.text().of(sender, "nearby-shop-entry",
135-
shop.getSignText()[1],
135+
shop.getSignText()[1],
136136
shop.getSignText()[3],
137137
String.valueOf(location.getBlockX()),
138138
String.valueOf(location.getBlockY()),

0 commit comments

Comments
 (0)