Skip to content

Commit 5259267

Browse files
JobsonMarinhoclaude
andcommitted
refactor: convert TriggerProfile to record and cleanup imports
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 9bc76cf commit 5259267

6 files changed

Lines changed: 23 additions & 43 deletions

File tree

src/main/java/me/byteful/plugin/leveltools/api/trigger/TriggerRegistry.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
package me.byteful.plugin.leveltools.api.trigger;
22

3-
import me.byteful.plugin.leveltools.api.trigger.impl.BlockBreakTrigger;
4-
import me.byteful.plugin.leveltools.api.trigger.impl.ConsumeTrigger;
5-
import me.byteful.plugin.leveltools.api.trigger.impl.EntityKillTrigger;
6-
import me.byteful.plugin.leveltools.api.trigger.impl.FarmingTrigger;
7-
import me.byteful.plugin.leveltools.api.trigger.impl.FishingTrigger;
8-
import me.byteful.plugin.leveltools.api.trigger.impl.ArmorDurabilityTrigger;
9-
import me.byteful.plugin.leveltools.api.trigger.impl.LeftClickTrigger;
10-
import me.byteful.plugin.leveltools.api.trigger.impl.RightClickTrigger;
3+
import me.byteful.plugin.leveltools.api.trigger.impl.*;
114
import org.jetbrains.annotations.NotNull;
125
import org.jetbrains.annotations.Nullable;
136

@@ -19,7 +12,7 @@ public final class TriggerRegistry {
1912

2013
public void register(@NotNull Trigger trigger) {
2114
String id = TriggerIds.normalize(trigger.getTriggerId());
22-
if (id.isEmpty()) {
15+
if (id == null || id.isEmpty()) {
2316
throw new IllegalArgumentException("Trigger ID cannot be null or empty");
2417
}
2518
triggers.put(id, trigger);

src/main/java/me/byteful/plugin/leveltools/api/trigger/impl/LeftClickTrigger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public String getTriggerId() {
1919
@Override
2020
public boolean canHandle(@NotNull TriggerContext context) {
2121
TriggerProfile profile = context.getTriggerProfile();
22-
TriggerSettings settings = profile.getSettings();
22+
TriggerSettings settings = profile.settings();
2323
TriggerSettings.ClickMode clickMode = settings.getClickMode();
2424

2525
if (clickMode == null || clickMode == TriggerSettings.ClickMode.ANY) {

src/main/java/me/byteful/plugin/leveltools/api/trigger/impl/RightClickTrigger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public String getTriggerId() {
1919
@Override
2020
public boolean canHandle(@NotNull TriggerContext context) {
2121
TriggerProfile profile = context.getTriggerProfile();
22-
TriggerSettings settings = profile.getSettings();
22+
TriggerSettings settings = profile.settings();
2323
TriggerSettings.ClickMode clickMode = settings.getClickMode();
2424

2525
if (clickMode == null || clickMode == TriggerSettings.ClickMode.ANY) {

src/main/java/me/byteful/plugin/leveltools/listeners/TriggerListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ private void handleTrigger(
192192

193193
double totalModifier = 0.0;
194194
for (TriggerProfile triggerProfile : triggerProfiles) {
195-
if (!triggerId.equals(triggerProfile.getTriggerId())) {
195+
if (!triggerId.equals(triggerProfile.triggerId())) {
196196
continue;
197197
}
198198

199-
if (!triggerProfile.getSlotFilter().matches(slot)) {
199+
if (!triggerProfile.slotFilter().matches(slot)) {
200200
continue;
201201
}
202202

src/main/java/me/byteful/plugin/leveltools/profile/ProfileManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void clear() {
134134

135135
@NotNull
136136
public RegistrationResult registerTriggerProfile(@NotNull TriggerProfile profile) {
137-
String id = profile.getId();
137+
String id = profile.id();
138138
if (triggerProfiles.containsKey(id)) {
139139
return RegistrationResult.alreadyExists(id, "trigger");
140140
}

src/main/java/me/byteful/plugin/leveltools/profile/trigger/TriggerProfile.java

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,13 @@
33
import me.byteful.plugin.leveltools.api.trigger.TriggerIds;
44
import org.jetbrains.annotations.NotNull;
55

6-
public final class TriggerProfile {
7-
private final String id;
8-
private final String triggerId;
9-
private final XpModifierConfig xpModifier;
10-
private final TriggerFilter filter;
11-
private final TriggerSlotFilter slotFilter;
12-
private final TriggerSettings settings;
13-
14-
public TriggerProfile(
15-
@NotNull String id,
16-
@NotNull String triggerId,
17-
@NotNull XpModifierConfig xpModifier,
18-
@NotNull TriggerFilter filter,
19-
@NotNull TriggerSettings settings
20-
) {
6+
public record TriggerProfile(String id, String triggerId, XpModifierConfig xpModifier, TriggerFilter filter,
7+
TriggerSlotFilter slotFilter, TriggerSettings settings) {
8+
public TriggerProfile(@NotNull String id, @NotNull String triggerId, @NotNull XpModifierConfig xpModifier, @NotNull TriggerFilter filter, @NotNull TriggerSettings settings) {
219
this(id, triggerId, xpModifier, filter, TriggerSlotFilter.all(), settings);
2210
}
2311

24-
public TriggerProfile(
25-
@NotNull String id,
26-
@NotNull String triggerId,
27-
@NotNull XpModifierConfig xpModifier,
28-
@NotNull TriggerFilter filter,
29-
@NotNull TriggerSlotFilter slotFilter,
30-
@NotNull TriggerSettings settings
31-
) {
12+
public TriggerProfile(@NotNull String id, @NotNull String triggerId, @NotNull XpModifierConfig xpModifier, @NotNull TriggerFilter filter, @NotNull TriggerSlotFilter slotFilter, @NotNull TriggerSettings settings) {
3213
this.id = id;
3314
this.triggerId = TriggerIds.normalize(triggerId);
3415
this.xpModifier = xpModifier;
@@ -41,33 +22,39 @@ public static Builder builder(@NotNull String id) {
4122
return new Builder(id);
4223
}
4324

25+
@Override
4426
@NotNull
45-
public String getId() {
27+
public String id() {
4628
return id;
4729
}
4830

31+
@Override
4932
@NotNull
50-
public String getTriggerId() {
33+
public String triggerId() {
5134
return triggerId;
5235
}
5336

37+
@Override
5438
@NotNull
55-
public XpModifierConfig getXpModifier() {
39+
public XpModifierConfig xpModifier() {
5640
return xpModifier;
5741
}
5842

43+
@Override
5944
@NotNull
60-
public TriggerFilter getFilter() {
45+
public TriggerFilter filter() {
6146
return filter;
6247
}
6348

49+
@Override
6450
@NotNull
65-
public TriggerSlotFilter getSlotFilter() {
51+
public TriggerSlotFilter slotFilter() {
6652
return slotFilter;
6753
}
6854

55+
@Override
6956
@NotNull
70-
public TriggerSettings getSettings() {
57+
public TriggerSettings settings() {
7158
return settings;
7259
}
7360

0 commit comments

Comments
 (0)