From 1e15cd6b96791765a3c4cea23d8b278151c9714e Mon Sep 17 00:00:00 2001 From: Daniel Naylor Date: Thu, 22 Apr 2021 17:04:20 +0100 Subject: [PATCH] Add "find" to some methods --- SpongeAPI | 2 +- .../common/scheduler/SpongeScheduler.java | 6 +++--- .../common/scoreboard/SpongeObjective.java | 6 +++--- .../spongepowered/common/user/ServerUserProvider.java | 2 +- .../common/mixin/api/mcp/block/BlockMixin_API.java | 2 +- .../api/mcp/server/ServerScoreboardMixin_API.java | 4 ++-- .../mcp/server/players/GameProfileCacheMixin_API.java | 10 +++++----- .../world/level/block/state/StateHolderMixin_API.java | 2 +- .../api/mcp/world/level/material/FluidMixin_API.java | 2 +- .../mixin/core/server/ServerScoreboardMixin.java | 4 ++-- .../mixin/tracker/CreatorTrackedMixin_Tracker.java | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/SpongeAPI b/SpongeAPI index 57fa4b40b2d..31c174a2220 160000 --- a/SpongeAPI +++ b/SpongeAPI @@ -1 +1 @@ -Subproject commit 57fa4b40b2d8f10cc683b9ce423212ee52b2c2e1 +Subproject commit 31c174a22209feb22b3d4fba74f82c2ca8a329bb diff --git a/src/main/java/org/spongepowered/common/scheduler/SpongeScheduler.java b/src/main/java/org/spongepowered/common/scheduler/SpongeScheduler.java index 14cffcd8257..1b5f9add077 100644 --- a/src/main/java/org/spongepowered/common/scheduler/SpongeScheduler.java +++ b/src/main/java/org/spongepowered/common/scheduler/SpongeScheduler.java @@ -101,7 +101,7 @@ private void removeTask(final SpongeScheduledTask task) { } @Override - public Optional taskById(final UUID id) { + public Optional findTask(final UUID id) { Objects.requireNonNull(id, "id"); synchronized (this.taskMap) { return Optional.ofNullable(this.taskMap.get(id)); @@ -109,7 +109,7 @@ public Optional taskById(final UUID id) { } @Override - public Set tasksByName(final String pattern) { + public Set findTasks(final String pattern) { Objects.requireNonNull(pattern, "pattern"); final Pattern searchPattern = Pattern.compile(pattern); final Set matchingTasks = this.tasks(); @@ -133,7 +133,7 @@ public Set tasks() { } @Override - public Set tasksByPlugin(final PluginContainer plugin) { + public Set tasks(final PluginContainer plugin) { Objects.requireNonNull(plugin, "plugin"); final String testOwnerId = plugin.getMetadata().getId(); diff --git a/src/main/java/org/spongepowered/common/scoreboard/SpongeObjective.java b/src/main/java/org/spongepowered/common/scoreboard/SpongeObjective.java index 2e67b48c29a..247e1783e27 100644 --- a/src/main/java/org/spongepowered/common/scoreboard/SpongeObjective.java +++ b/src/main/java/org/spongepowered/common/scoreboard/SpongeObjective.java @@ -127,12 +127,12 @@ public void addScore(final Score score) throws IllegalArgumentException { } @Override - public Optional score(final Component name) { + public Optional findScore(final Component name) { return Optional.ofNullable(this.scores.get(name)); } @Override - public Score scoreOrCreate(final Component name) { + public Score findOrCreateScore(final Component name) { if (this.scores.containsKey(name)) { return this.scores.get(name); } @@ -179,7 +179,7 @@ public boolean removeScore(final Score spongeScore) { @Override public boolean removeScore(final Component name) { - final Optional score = this.score(name); + final Optional score = this.findScore(name); return score.filter(this::removeScore).isPresent(); } diff --git a/src/main/java/org/spongepowered/common/user/ServerUserProvider.java b/src/main/java/org/spongepowered/common/user/ServerUserProvider.java index f4a0098f2da..86dfc94ae5d 100644 --- a/src/main/java/org/spongepowered/common/user/ServerUserProvider.java +++ b/src/main/java/org/spongepowered/common/user/ServerUserProvider.java @@ -215,7 +215,7 @@ Stream matchKnownProfiles(final String lowercaseName) { Stream streamAll() { final GameProfileCache cache = ((Server) this.server).gameProfileManager().cache(); - return this.knownUUIDs.stream().map(x -> cache.byId(x).orElseGet(() -> GameProfile.of(x))); + return this.knownUUIDs.stream().map(x -> cache.findById(x).orElseGet(() -> GameProfile.of(x))); } private Path getPlayerDataFile(final UUID uniqueId) { diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/block/BlockMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/block/BlockMixin_API.java index aa828572ddd..9d2fb063ffb 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/block/BlockMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/block/BlockMixin_API.java @@ -78,7 +78,7 @@ public Collection> stateProperties() { } @Override - public Optional> statePropertyByName(final String name) { + public Optional> findStateProperty(final String name) { return Optional.ofNullable((StateProperty) this.stateDefinition.getProperty(name)); } diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/server/ServerScoreboardMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/server/ServerScoreboardMixin_API.java index 454866a8e0a..145d8f02b73 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/server/ServerScoreboardMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/server/ServerScoreboardMixin_API.java @@ -125,7 +125,7 @@ public Set scores(final Component name) final Set scores = new HashSet<>(); for (final net.minecraft.world.scores.Objective objective: ((ScoreboardAccessor) this).accessor$objectivesByName().values()) { - ((ObjectiveBridge) objective).bridge$getSpongeObjective().score(name).ifPresent(scores::add); + ((ObjectiveBridge) objective).bridge$getSpongeObjective().findScore(name).ifPresent(scores::add); } return scores; } @@ -136,7 +136,7 @@ public void removeScores(final Component name) { for (final net.minecraft.world.scores.Objective objective: ((ScoreboardAccessor) this).accessor$objectivesByName().values()) { final SpongeObjective spongeObjective = ((ObjectiveBridge) objective).bridge$getSpongeObjective(); - spongeObjective.score(name).ifPresent(spongeObjective::removeScore); + spongeObjective.findScore(name).ifPresent(spongeObjective::removeScore); } } diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/server/players/GameProfileCacheMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/server/players/GameProfileCacheMixin_API.java index 78888f3c30e..9b590661380 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/server/players/GameProfileCacheMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/server/players/GameProfileCacheMixin_API.java @@ -116,13 +116,13 @@ public void clear() { } @Override - public Optional byId(final UUID uniqueId) { + public Optional findById(final UUID uniqueId) { Objects.requireNonNull(uniqueId, "uniqueId"); return Optional.ofNullable(this.shadow$get(uniqueId)).map(SpongeGameProfile::of); } @Override - public Map> byIds(final Iterable uniqueIds) { + public Map> findByIds(final Iterable uniqueIds) { Objects.requireNonNull(uniqueIds, "uniqueIds"); final Map> result = new HashMap<>(); for (final UUID uniqueId : uniqueIds) { @@ -132,7 +132,7 @@ public Map> byIds(final Iterable uniqueIds) { } @Override - public Optional byName(final String name) { + public Optional findByName(final String name) { Objects.requireNonNull(name, "name"); @Nullable GameProfileCache_GameProfileInfoAccessor entry = this.profilesByName.get(name.toLowerCase(Locale.ROOT)); @@ -147,11 +147,11 @@ public Optional byName(final String name) { } @Override - public Map> byNames(final Iterable names) { + public Map> findByNames(final Iterable names) { Objects.requireNonNull(names, "names"); final Map> result = Maps.newHashMap(); for (final String name : names) { - result.put(name, this.byName(name)); + result.put(name, this.findByName(name)); } return ImmutableMap.copyOf(result); } diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/block/state/StateHolderMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/block/state/StateHolderMixin_API.java index 8e7dde07c70..4dd39bba2c4 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/block/state/StateHolderMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/block/state/StateHolderMixin_API.java @@ -61,7 +61,7 @@ public > Optional stateProperty(StateProperty stat } @Override - public Optional> statePropertyByName(String name) { + public Optional> findStateProperty(String name) { return this.stateProperties().stream().filter(p -> p.name().equals(name)).findFirst(); } diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/material/FluidMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/material/FluidMixin_API.java index 5baae4334df..9b941bb87bf 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/material/FluidMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/material/FluidMixin_API.java @@ -59,7 +59,7 @@ public Collection> stateProperties() { } @Override - public Optional> statePropertyByName(final String name) { + public Optional> findStateProperty(final String name) { return Optional.ofNullable((StateProperty) this.shadow$getStateDefinition().getProperty(name)); } } diff --git a/src/mixins/java/org/spongepowered/common/mixin/core/server/ServerScoreboardMixin.java b/src/mixins/java/org/spongepowered/common/mixin/core/server/ServerScoreboardMixin.java index af059930bf8..f5f2f387692 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/core/server/ServerScoreboardMixin.java +++ b/src/mixins/java/org/spongepowered/common/mixin/core/server/ServerScoreboardMixin.java @@ -264,7 +264,7 @@ public void removePlayerTeam(final PlayerTeam team) { @Override public Score getOrCreatePlayerScore(final String name, final net.minecraft.world.scores.Objective objective) { - return ((SpongeScore) ((ObjectiveBridge) objective).bridge$getSpongeObjective().scoreOrCreate(SpongeAdventure.legacySection(name))) + return ((SpongeScore) ((ObjectiveBridge) objective).bridge$getSpongeObjective().findOrCreateScore(SpongeAdventure.legacySection(name))) .getScoreFor(objective); } @@ -272,7 +272,7 @@ public Score getOrCreatePlayerScore(final String name, final net.minecraft.world public void resetPlayerScore(final String name, final net.minecraft.world.scores.Objective objective) { if (objective != null) { final SpongeObjective spongeObjective = ((ObjectiveBridge) objective).bridge$getSpongeObjective(); - final Optional score = spongeObjective.score(SpongeAdventure.legacySection(name)); + final Optional score = spongeObjective.findScore(SpongeAdventure.legacySection(name)); if (score.isPresent()) { spongeObjective.removeScore(score.get()); } else { diff --git a/src/mixins/java/org/spongepowered/common/mixin/tracker/CreatorTrackedMixin_Tracker.java b/src/mixins/java/org/spongepowered/common/mixin/tracker/CreatorTrackedMixin_Tracker.java index 8edba80e392..b4d588727c0 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/tracker/CreatorTrackedMixin_Tracker.java +++ b/src/mixins/java/org/spongepowered/common/mixin/tracker/CreatorTrackedMixin_Tracker.java @@ -122,7 +122,7 @@ public abstract class CreatorTrackedMixin_Tracker implements CreatorTrackedBridg } // check mojang cache - final GameProfile profile = Sponge.server().gameProfileManager().cache().byId(uuid).orElse(null); + final GameProfile profile = Sponge.server().gameProfileManager().cache().findById(uuid).orElse(null); if (profile != null) { return Sponge.server().userManager().find(profile); }