Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2025-02-17 19:31:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

project wide refactor(import cleanup & code format), close #14 (see previous commit)

Browse Source 
Took 1 minute
This commit is contained in:
Kiran Hart 2022-10-18 19:08:35 -04:00
parent d4a4cd5f5d
commit 73596a49c4
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
10 changed files with 88 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.editorconfig
View File

@ -111,7 +111,7 @@ ij_java_for_statement_wrap = off
ij_java_generate_final_locals = false
ij_java_generate_final_parameters = false
ij_java_if_brace_force = never
ij_java_imports_layout = *,|,javax.**,java.**,|,$*
ij_java_imports_layout = *, |, javax.**, java.**, |, $*
ij_java_indent_case_from_switch = true
ij_java_insert_inner_class_imports = false
ij_java_insert_override_annotation = true
@ -147,7 +147,7 @@ ij_java_multi_catch_types_wrap = normal
ij_java_names_count_to_use_import_on_demand = 3
ij_java_new_line_after_lparen_in_annotation = false
ij_java_new_line_after_lparen_in_record_header = false
ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
ij_java_parameter_annotation_wrap = off
ij_java_parentheses_expression_new_line_after_left_paren = false
ij_java_parentheses_expression_right_paren_on_new_line = false

2
.github/ISSUE_TEMPLATE/report-a-bug.md vendored
View File

@ -11,6 +11,7 @@ assignees: ''
Describe the bug in as much detail as possible, the more detailed, the chances of it being fixed is faster
**To Reproduce**
- Describe how to reproduce this bug: EX.
1. Open the main menu
@ -24,6 +25,7 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.
**Server Information (please complete the following information):**
- Provide the server version
- Provide the server jar (ex. paper/spigot)
- Plugin Version

1
.github/ISSUE_TEMPLATE/request-a-feature.md vendored
View File

@ -11,5 +11,6 @@ assignees: ''
Describe how this feature will work
**Additional Information**
- You can provide image links
- You can provide video links

3
src/main/java/ca/tweetzy/auctionhouse/auction/enums/AuctionStackType.java
View File

@ -10,7 +10,6 @@ public enum AuctionStackType {
MAIN_AUCTION_HOUSE,
ACTIVE_AUCTIONS_LIST,
LISTING_PREVIEW
;
LISTING_PREVIEW;
}

3
src/main/java/ca/tweetzy/auctionhouse/commands/CommandAdmin.java
View File

@ -146,7 +146,8 @@ public class CommandAdmin extends AbstractCommand {
protected List<String> onTab(CommandSender sender, String... args) {
if (args.length == 1) return Arrays.asList("endall", "relistall", "logs", "viewexpired", "open");
if (args.length == 2 && args[0].equalsIgnoreCase("relistAll")) return Arrays.asList("1", "2", "3", "4", "5");
if (args.length == 2 && (args[0].equalsIgnoreCase("viewexpired") || args[0].equalsIgnoreCase("open"))) return Bukkit.getOnlinePlayers().stream().map(OfflinePlayer::getName).collect(Collectors.toList());
if (args.length == 2 && (args[0].equalsIgnoreCase("viewexpired") || args[0].equalsIgnoreCase("open")))
return Bukkit.getOnlinePlayers().stream().map(OfflinePlayer::getName).collect(Collectors.toList());
return null;
}

9
src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java
View File

@ -117,10 +117,10 @@ public class Settings {
public static final ConfigSetting CURRENCY_FORMAT = new ConfigSetting(config, "auction setting.currency format", "%,.2f");
public static final ConfigSetting STRIP_ZEROS_ON_WHOLE_NUMBERS = new ConfigSetting(config, "auction setting.strip zeros on whole numbers", false, "If the price / amount is a whole number (ex. 40.00) it will drop the .00");
public static final ConfigSetting ADMIN_OPTION_SHOW_RETURN_ITEM = new ConfigSetting(config, "auction setting.admin option.show return to player", true );
public static final ConfigSetting ADMIN_OPTION_SHOW_CLAIM_ITEM = new ConfigSetting(config, "auction setting.admin option.show claim item", true );
public static final ConfigSetting ADMIN_OPTION_SHOW_DELETE_ITEM = new ConfigSetting(config, "auction setting.admin option.show delete item", true );
public static final ConfigSetting ADMIN_OPTION_SHOW_COPY_ITEM = new ConfigSetting(config, "auction setting.admin option.show copy item", true );
public static final ConfigSetting ADMIN_OPTION_SHOW_RETURN_ITEM = new ConfigSetting(config, "auction setting.admin option.show return to player", true);
public static final ConfigSetting ADMIN_OPTION_SHOW_CLAIM_ITEM = new ConfigSetting(config, "auction setting.admin option.show claim item", true);
public static final ConfigSetting ADMIN_OPTION_SHOW_DELETE_ITEM = new ConfigSetting(config, "auction setting.admin option.show delete item", true);
public static final ConfigSetting ADMIN_OPTION_SHOW_COPY_ITEM = new ConfigSetting(config, "auction setting.admin option.show copy item", true);
public static final ConfigSetting USE_ALTERNATE_CURRENCY_FORMAT = new ConfigSetting(config, "auction setting.use alternate currency format", false, "If true, $123,456.78 will become $123.456,78");
public static final ConfigSetting USE_FLAT_NUMBER_FORMAT = new ConfigSetting(config, "auction setting.use flat number format", false, "If true, $123,456.78 will become $12345678");
@ -932,7 +932,6 @@ public class Settings {
public static final ConfigSetting GUI_STATS_SEARCH_ITEMS_MONEY_SPENT_LORE = new ConfigSetting(config, "gui.stat view other.items.money spent.lore", Collections.singletonList("&7They spent &c$%money_spent%"));
/* ===============================
* EXPIRED ITEMS ADMIN GUI
* ===============================*/