Skip to content

Commit 92740e3

Browse files
authored
Merge pull request #1063 from Ghost-chu/hikari
Fix space
2 parents f3ec6e3 + 599e869 commit 92740e3

File tree

28 files changed

+103
-103
lines changed

28 files changed

+103
-103
lines changed

.github/ISSUE_TEMPLATE/performance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ body:
5858
required: true
5959
- type: 'input'
6060
attributes:
61-
label: '`/quickshop paste` URL'
61+
label: '`/quickshop paste` URL'
6262
description: |-
63-
Please execute `/quickshop paste` in-game or `qs paste` in your server console.
63+
Please execute `/quickshop paste` in-game or `qs paste` in your server console.
6464
The plugin will generate a URL that you can then post in the field below.
6565
6666
If you can't create a paste, should you upload other files such as the `latest.log` file to https://paste.helpch.at and share the URL.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ You can download optional modules [here][optional_modules] for compatibility wit
154154

155155
### [OpenInv][openinv]
156156

157-
- Allow the usage of a Player's Ender Chest as Shop inventory by using `/quickshop echest`.
157+
- Allow the usage of a Player's Ender Chest as Shop inventory by using `/quickshop echest`.
158158

159159
### [Worldedit][worldedit]
160160

addon/discordsrv/src/main/java/com/ghostchu/quickshop/addon/discordsrv/command/SubCommand_Discord.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public SubCommand_Discord(QuickShop qs, Main plugin) {
3131
@Override
3232
public void onCommand(Player sender, @NotNull String commandLabel, @NotNull CommandParser parser) {
3333
if (parser.getArgs().size() < 2) {
34-
qs.text().of(sender, "command-incorrect", "/quickshop discord <features> <enable/disable>").send();
34+
qs.text().of(sender, "command-incorrect", "/quickshop discord <features> <enable/disable>").send();
3535
return;
3636
}
3737
NotificationFeature feature = getFeatureByName(parser.getArgs().get(0));
3838
if (feature == null) {
39-
qs.text().of(sender, "command-incorrect", "/quickshop discord <features> <enable/disable>").send();
39+
qs.text().of(sender, "command-incorrect", "/quickshop discord <features> <enable/disable>").send();
4040
return;
4141
}
4242
boolean ops = parser.getArgs().get(1).equalsIgnoreCase("enable");

addon/discount/src/main/java/com/ghostchu/quickshop/addon/discount/command/DiscountCommand.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public DiscountCommand(Main main, QuickShop quickshop) {
3434
@Override
3535
public void onCommand(CommandSender sender, @NotNull String commandLabel, @NotNull CommandParser parser) {
3636
if (parser.getArgs().isEmpty()) {
37-
quickshop.text().of(sender, "command-incorrect", "/quickshop discount <install/uninstall/create/remove/list/config/query>").send();
37+
quickshop.text().of(sender, "command-incorrect", "/quickshop discount <install/uninstall/create/remove/list/config/query>").send();
3838
return;
3939
}
4040
String[] passThroughArgs = new String[parser.getArgs().size() - 1];
@@ -48,7 +48,7 @@ public void onCommand(CommandSender sender, @NotNull String commandLabel, @NotNu
4848
case "config" -> config(sender, passThroughArgs);
4949
case "list" -> list(sender, passThroughArgs);
5050
default ->
51-
quickshop.text().of(sender, "command-incorrect", "/quickshop discount <install/uninstall/create/remove/config/query>").send();
51+
quickshop.text().of(sender, "command-incorrect", "/quickshop discount <install/uninstall/create/remove/config/query>").send();
5252
}
5353
}
5454

@@ -58,7 +58,7 @@ private void install(CommandSender sender, String[] passThroughArgs) {
5858
return;
5959
}
6060
if (passThroughArgs.length < 1) {
61-
quickshop.text().of(sender, "command-incorrect", "/quickshop discount install <code>").send();
61+
quickshop.text().of(sender, "command-incorrect", "/quickshop discount install <code>").send();
6262
return;
6363
}
6464
String codeStr = passThroughArgs[0];
@@ -86,12 +86,12 @@ private void create(CommandSender sender, String[] passThroughArgs) {
8686
return;
8787
}
8888
if (passThroughArgs.length < 1) {
89-
quickshop.text().of(sender, "command-incorrect", "/quickshop discount create <code> <code-type> <rate> [max-usage] [threshold] [expired-time]").send();
89+
quickshop.text().of(sender, "command-incorrect", "/quickshop discount create <code> <code-type> <rate> [max-usage] [threshold] [expired-time]").send();
9090
return;
9191
}
9292
// code, code-type, rate, max-usage, threshold, expired-time
9393
if (passThroughArgs.length < 3) {
94-
quickshop.text().of(sender, "command-incorrect", "/quickshop discount create <code> <code-type> <rate> [max-usage] [threshold] [expired-time]").send();
94+
quickshop.text().of(sender, "command-incorrect", "/quickshop discount create <code> <code-type> <rate> [max-usage] [threshold] [expired-time]").send();
9595
return;
9696
}
9797
String code = passThroughArgs[0];
@@ -148,14 +148,14 @@ private void create(CommandSender sender, String[] passThroughArgs) {
148148
case SUCCESS -> quickshop.text().of(sender, "addon.discount.discount-code-created-successfully",
149149
code,
150150
CommonUtil.prettifyText(codeType.name()),
151-
"/quickshop discount install " + code,
152-
"/quickshop discount config " + code + " addshop").send();
151+
"/quickshop discount install " + code,
152+
"/quickshop discount config " + code + " addshop").send();
153153
}
154154
}
155155

156156
private void remove(CommandSender sender, String[] passThroughArgs) {
157157
if (passThroughArgs.length < 1) {
158-
quickshop.text().of(sender, "command-incorrect", "/quickshop discount remove <code>").send();
158+
quickshop.text().of(sender, "command-incorrect", "/quickshop discount remove <code>").send();
159159
return;
160160
}
161161
String codeStr = passThroughArgs[0];
@@ -214,7 +214,7 @@ private void config(CommandSender sender, String[] passThroughArgs) {
214214
return;
215215
}
216216
if (passThroughArgs.length < 2) {
217-
quickshop.text().of(sender, "command-incorrect", "/quickshop discount config <code> <addshop/removeshop/scope> [args]").send();
217+
quickshop.text().of(sender, "command-incorrect", "/quickshop discount config <code> <addshop/removeshop/scope> [args]").send();
218218
return;
219219
}
220220
DiscountCode code = main.getCodeManager().getCode(passThroughArgs[0]);
@@ -261,7 +261,7 @@ private void config(CommandSender sender, String[] passThroughArgs) {
261261
if (passThroughArgs.length < 3) {
262262
// StringJoiner joiner = new StringJoiner("<", "/", ">");
263263
// Arrays.stream(CodeType.values()).forEach(t -> joiner.add(t.name()));
264-
quickshop.text().of(sender, "command-incorrect", "/quickshop discount config <code> scope <scope>").send();
264+
quickshop.text().of(sender, "command-incorrect", "/quickshop discount config <code> scope <scope>").send();
265265
return;
266266
}
267267
if (!code.getOwner().equals(((Player) sender).getUniqueId()) && !quickshop.perm().hasPermission(sender, "quickshopaddon.discount.bypass")) {

addon/displaycontrol/src/main/java/com/ghostchu/quickshop/addon/displaycontrol/command/SubCommand_DisplayControl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public SubCommand_DisplayControl(QuickShop qs, Main plugin) {
2828
@Override
2929
public void onCommand(Player sender, @NotNull String commandLabel, @NotNull CommandParser parser) {
3030
if (parser.getArgs().isEmpty()) {
31-
qs.text().of(sender, "command-incorrect", "/quickshop displaycontrol <auto/enable/disable>").send();
31+
qs.text().of(sender, "command-incorrect", "/quickshop displaycontrol <auto/enable/disable>").send();
3232
return;
3333
}
3434
DisplayOption option = DisplayOption.AUTO;

addon/limited/src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ depend:
77
authors: [ Ghost_chu ]
88
permissions:
99
quickshopaddon.limit.use:
10-
description: Allow player to use /quickshop limit
10+
description: Allow player to use /quickshop limit
1111
default: op

addon/list/src/main/java/com/ghostchu/quickshop/addon/list/command/SubCommand_List.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private void lookup(@NotNull Player sender, @NotNull UUID lookupUser) {
7676
shopTypeComponent = quickshop.text().of(sender, "menu.this-shop-is-selling").forLocale();
7777
}
7878
Component component = quickshop.text().of(sender, "addon.list.entry", counter, shopNameComponent, location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ(), quickshop.getEconomy().format(shop.getPrice(), shop.getLocation().getWorld(), shop.getCurrency()), shop.getShopStackingAmount(), Util.getItemStackName(shop.getItem()), shopTypeComponent).forLocale();
79-
component = component.clickEvent(ClickEvent.runCommand("/quickshop silentpreview " + shop.getRuntimeRandomUniqueId()));
79+
component = component.clickEvent(ClickEvent.runCommand("/quickshop silentpreview " + shop.getRuntimeRandomUniqueId()));
8080
printer.printLine(component);
8181
counter++;
8282
}

addon/list/src/main/resources/plugin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ depend:
77
authors: [ Ghost_chu ]
88
permissions:
99
quickshopaddon.list.self:
10-
description: Allow player to use /quickshop list to query self
10+
description: Allow player to use /quickshop list to query self
1111
default: true
1212
quickshopaddon.list.other:
13-
description: Allow player to use /quickshop list <player> to query other
13+
description: Allow player to use /quickshop list <player> to query other
1414
default: op

compatibility/openinv/src/main/java/com/ghostchu/quickshop/compatibility/openinv/OpenInvCommand.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public OpenInvCommand(Main openinv) {
2424
* Calling while command executed by specified sender
2525
*
2626
* @param sender The command sender but will automatically convert to specified instance
27-
* @param commandLabel The command prefix (/quickshop = qs, /shop = shop)
28-
* @param cmdArg The arguments (/quickshop create stone will receive stone)
27+
* @param commandLabel The command prefix (/quickshop = qs, /shop = shop)
28+
* @param cmdArg The arguments (/quickshop create stone will receive stone)
2929
*/
3030
@Override
3131
public void onCommand(Player sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
@@ -51,8 +51,8 @@ public void onCommand(Player sender, @NotNull String commandLabel, @NotNull Stri
5151
* Calling while sender trying to tab-complete
5252
*
5353
* @param sender The command sender but will automatically convert to specified instance
54-
* @param commandLabel The command prefix (/quickshop = qs, /shop = shop)
55-
* @param cmdArg The arguments (/quickshop create stone [TAB] will receive stone)
54+
* @param commandLabel The command prefix (/quickshop = qs, /shop = shop)
55+
* @param cmdArg The arguments (/quickshop create stone [TAB] will receive stone)
5656
* @return Candidate list
5757
*/
5858
@Override

0 commit comments

Comments
 (0)