Skip to content

Commit 74cb89d

Browse files
DevlrxxhDevlrxxh
committed
Reformat
1 parent b2c2c0a commit 74cb89d

91 files changed

Lines changed: 883 additions & 669 deletions

File tree

Some content is hidden

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

‎Plugin/src/main/java/com/jonahseguin/drink/argument/ArgumentParser.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,24 @@ public List<String> combineMultiWordArguments(List<String> args) {
6363

6464
@Nonnull
6565
public Object[] parseArguments(@Nonnull CommandExecution execution, @Nonnull DrinkCommand command,
66-
@Nonnull CommandArgs args) throws CommandExitMessage, CommandArgumentException {
66+
@Nonnull CommandArgs args) throws CommandExitMessage, CommandArgumentException {
6767

6868
Preconditions.checkNotNull(command, "DrinkCommand cannot be null");
6969
Preconditions.checkNotNull(args, "CommandArgs cannot be null");
7070

7171
Object[] arguments = new Object[command.getMethod().getParameterCount()];
7272

73-
for (int i = 0; i < command.getParameters().getParameters().length; i++) {
73+
for (int i = 0; i < command.getParameters().parameters().length; i++) {
7474

75-
CommandParameter parameter = command.getParameters().getParameters()[i];
75+
CommandParameter parameter = command.getParameters().parameters()[i];
7676
DrinkProvider<?> provider = command.getProviders()[i];
7777
String value = null;
7878

7979
if (parameter.isFlag()) {
8080

8181
Flag flag = parameter.getFlag();
8282
CommandFlag commandFlag = args.getFlags().get(flag.value());
83-
value = commandFlag != null ? commandFlag.getValue() : null;
83+
value = commandFlag != null ? commandFlag.value() : null;
8484

8585
if (parameter.isFlag() && value == null
8686
&& !parameter.getType().isAssignableFrom(Boolean.class)

‎Plugin/src/main/java/com/jonahseguin/drink/command/CommandFlag.java‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,14 @@
22

33
import javax.annotation.Nullable;
44

5-
public class CommandFlag {
5+
public record CommandFlag(char character, @Nullable String value) {
66

77
public static final char FLAG_PREFIX = '-';
8-
private final char character;
9-
@Nullable
10-
private final String value;
118

129
public CommandFlag(char character) {
1310
this(character, null);
1411
}
1512

16-
public CommandFlag(char character, @Nullable String value) {
17-
this.character = character;
18-
this.value = value;
19-
}
20-
21-
public char getCharacter() {
22-
return character;
23-
}
24-
25-
@Nullable
26-
public String getValue() {
27-
return value;
28-
}
29-
3013
public String flagPrefixToString() {
3114
return String.valueOf(new char[]{FLAG_PREFIX, character});
3215
}

‎Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.jonahseguin.drink.command;
22

3+
import dev.lrxh.neptune.configs.impl.MessagesLocale;
4+
import dev.lrxh.neptune.utils.CC;
35
import lombok.Getter;
46
import lombok.Setter;
57
import org.bukkit.command.CommandSender;
68

7-
import dev.lrxh.neptune.configs.impl.MessagesLocale;
8-
import dev.lrxh.neptune.utils.CC;
9-
109
import javax.annotation.Nonnull;
1110

1211
@Getter

‎Plugin/src/main/java/com/jonahseguin/drink/command/DrinkCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public String getShortDescription() {
7272

7373
private String generateUsage() {
7474
StringBuilder sb = new StringBuilder();
75-
for (int i = 0; i < parameters.getParameters().length; i++) {
76-
CommandParameter parameter = parameters.getParameters()[i];
75+
for (int i = 0; i < parameters.parameters().length; i++) {
76+
CommandParameter parameter = parameters.parameters()[i];
7777
DrinkProvider provider = providers[i];
7878
String description = parameter.getParameter().getName(); // provider.argumentDescription()
7979
if (parameter.isFlag()) {
@@ -136,8 +136,8 @@ private int calculateConsumingArgCount() {
136136

137137
private int calculateRequiredArgCount() {
138138
int count = 0;
139-
for (int i = 0; i < parameters.getParameters().length; i++) {
140-
CommandParameter parameter = parameters.getParameters()[i];
139+
for (int i = 0; i < parameters.parameters().length; i++) {
140+
CommandParameter parameter = parameters.parameters()[i];
141141
if (!parameter.isFlag() && !parameter.isOptional()) {
142142
DrinkProvider provider = providers[i];
143143
if (provider.doesConsumeArgument()) {

‎Plugin/src/main/java/com/jonahseguin/drink/command/DrinkCommandService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public <T> void bindProvider(@Nonnull Class<T> type, @Nonnull Set<Class<? extend
233233
bindings.put(type, container);
234234
}
235235
DrinkBinding<T> binding = new DrinkBinding<>(type, annotations, provider);
236-
container.getBindings().add(binding);
236+
container.bindings().add(binding);
237237
}
238238

239239
}

‎Plugin/src/main/java/com/jonahseguin/drink/parametric/BindingContainer.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
package com.jonahseguin.drink.parametric;
22

3-
import lombok.Getter;
4-
53
import java.util.HashSet;
64
import java.util.Set;
75

8-
@Getter
9-
public class BindingContainer<T> {
10-
11-
private final Class<T> type;
12-
private final Set<DrinkBinding<T>> bindings;
6+
public record BindingContainer<T>(Class<T> type, Set<DrinkBinding<T>> bindings) {
137

148
public BindingContainer(Class<T> type) {
15-
this.type = type;
16-
this.bindings = new HashSet<>();
17-
}
18-
19-
public BindingContainer(Class<T> type, Set<DrinkBinding<T>> bindings) {
20-
this.type = type;
21-
this.bindings = bindings;
9+
this(type, new HashSet<>());
2210
}
2311

2412
}

‎Plugin/src/main/java/com/jonahseguin/drink/parametric/CommandParameters.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,17 @@
11
package com.jonahseguin.drink.parametric;
22

3-
import lombok.Getter;
4-
53
import java.lang.reflect.Method;
64
import java.lang.reflect.Parameter;
75

8-
@Getter
9-
public class CommandParameters {
10-
11-
private final int count;
12-
private final CommandParameter[] parameters;
13-
14-
public CommandParameters(int count, CommandParameter[] parameters) {
15-
this.count = count;
16-
this.parameters = parameters;
17-
}
6+
public record CommandParameters(int count, CommandParameter[] parameters) {
187

198
public CommandParameters(Method method) {
209
CommandParameter[] parameters = new CommandParameter[method.getParameters().length];
2110
for (int i = 0; i < method.getParameters().length; i++) {
2211
Parameter param = method.getParameters()[i];
2312
parameters[i] = new CommandParameter(param.getType(), param, method.getParameterAnnotations()[i]);
2413
}
25-
this.parameters = parameters;
26-
this.count = method.getParameterCount();
14+
this(method.getParameterCount(), parameters);
2715
}
2816

2917
public boolean isLastArgument(int index) {

‎Plugin/src/main/java/com/jonahseguin/drink/parametric/DrinkBinding.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
package com.jonahseguin.drink.parametric;
22

33
import com.google.common.base.Preconditions;
4-
import lombok.Getter;
54

65
import javax.annotation.Nonnull;
76
import java.lang.annotation.Annotation;
87
import java.util.Set;
98

10-
@Getter
11-
public class DrinkBinding<T> {
12-
13-
private final Class<T> type;
14-
private final Set<Class<? extends Annotation>> annotations;
15-
private final DrinkProvider<T> provider;
16-
17-
public DrinkBinding(Class<T> type, Set<Class<? extends Annotation>> annotations, DrinkProvider<T> provider) {
18-
this.type = type;
19-
this.annotations = annotations;
20-
this.provider = provider;
21-
}
9+
public record DrinkBinding<T>(Class<T> type, Set<Class<? extends Annotation>> annotations, DrinkProvider<T> provider) {
2210

2311
public boolean canProvideFor(@Nonnull CommandParameter parameter) {
2412
Preconditions.checkNotNull(parameter, "Parameter cannot be null");

‎Plugin/src/main/java/com/jonahseguin/drink/parametric/ProviderAssigner.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ public ProviderAssigner(DrinkCommandService commandService) {
1515

1616
public DrinkProvider<?>[] assignProvidersFor(DrinkCommand drinkCommand) throws MissingProviderException, CommandStructureException {
1717
CommandParameters parameters = drinkCommand.getParameters();
18-
DrinkProvider<?>[] providers = new DrinkProvider<?>[parameters.getParameters().length];
19-
for (int i = 0; i < parameters.getParameters().length; i++) {
18+
DrinkProvider<?>[] providers = new DrinkProvider<?>[parameters.parameters().length];
19+
for (int i = 0; i < parameters.parameters().length; i++) {
2020

21-
CommandParameter param = parameters.getParameters()[i];
21+
CommandParameter param = parameters.parameters()[i];
2222
if (param.isRequireLastArg() && !parameters.isLastArgument(i)) {
2323
throw new CommandStructureException("Parameter " + param.getParameter().getName() + " [argument " + i + "] (" + param.getParameter().getType().getSimpleName() + ") in method '" + drinkCommand.getMethod().getName() + "' must be the last argument in the method.");
2424
}
2525

2626
BindingContainer<?> bindings = commandService.getBindingsFor(param.getType());
2727
if (bindings != null) {
2828
DrinkProvider<?> provider = null;
29-
for (DrinkBinding<?> binding : bindings.getBindings()) {
29+
for (DrinkBinding<?> binding : bindings.bindings()) {
3030
if (binding.canProvideFor(param)) {
31-
provider = binding.getProvider();
31+
provider = binding.provider();
3232
break;
3333
}
3434
}

‎Plugin/src/main/java/dev/lrxh/neptune/Neptune.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
import dev.lrxh.neptune.configs.ConfigService;
1616
import dev.lrxh.neptune.configs.impl.ScoreboardLocale;
1717
import dev.lrxh.neptune.configs.impl.SettingsLocale;
18-
import dev.lrxh.neptune.feature.event.EventService;
19-
import dev.lrxh.neptune.feature.event.command.EventCommand;
20-
import dev.lrxh.neptune.feature.event.listener.EventListener;
21-
import dev.lrxh.neptune.feature.event.task.EventScheduleTask;
2218
import dev.lrxh.neptune.feature.cosmetics.CosmeticService;
2319
import dev.lrxh.neptune.feature.cosmetics.command.CosmeticsCommand;
2420
import dev.lrxh.neptune.feature.customkit.command.CustomKitCommand;
2521
import dev.lrxh.neptune.feature.customkit.listener.CustomKitListener;
2622
import dev.lrxh.neptune.feature.divisions.DivisionService;
23+
import dev.lrxh.neptune.feature.event.command.EventCommand;
24+
import dev.lrxh.neptune.feature.event.listener.EventListener;
25+
import dev.lrxh.neptune.feature.event.task.EventScheduleTask;
2726
import dev.lrxh.neptune.feature.hotbar.HotbarService;
2827
import dev.lrxh.neptune.feature.hotbar.listener.ItemListener;
2928
import dev.lrxh.neptune.feature.itembrowser.ItemBrowserService;
@@ -97,14 +96,15 @@ public final class Neptune extends JavaPlugin {
9796
private boolean duplicatesEnabled;
9897

9998
private boolean errored;
100-
public void setErrored() {
101-
errored = true;
102-
}
10399

104100
public static Neptune get() {
105101
return instance;
106102
}
107103

104+
public void setErrored() {
105+
errored = true;
106+
}
107+
108108
@Override
109109
public void onEnable() {
110110
instance = this;

0 commit comments

Comments
 (0)