Skip to content

Commit

Permalink
fix: Renamed RankPermissionStorage to RankPermissionSource
Browse files Browse the repository at this point in the history
  • Loading branch information
phinner committed Apr 5, 2024
1 parent 77e3f35 commit cba7ea8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ public void onInit() {

services.register(this, RankProvider.class, Priority.LOW, new MindustryRankProvider());

final var storage = new YamlRankPermissionStorage(this.getDirectory().resolve("permissions.yaml"));
this.addListener(storage);
services.register(this, RankPermissionStorage.class, Priority.LOW, storage);
final var source = new YamlRankPermissionSource(this.getDirectory().resolve("permissions.yaml"));
this.addListener(source);
services.register(this, RankPermissionSource.class, Priority.LOW, source);

services.register(this, PermissionManager.class, Priority.HIGH, new RankPermissionManager());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ final class RankPermissionManager implements PermissionManager {
@Override
public TriState getPermission(final Player player, final String permission) {
final var services = DistributorProvider.get().getServiceManager();
final var storages = services.getProviders(RankPermissionStorage.class);
final var sources = services.getProviders(RankPermissionSource.class);
for (final var provider : services.getProviders(RankProvider.class)) {
for (final var node : provider.getInstance().getRanks(player)) {
final var visited = new HashSet<RankNode>();
for (final var storage : storages) {
for (final var source : sources) {
RankNode current = node;
while (current != null && visited.add(current)) {
final var state = storage.getInstance()
final var state = source.getInstance()
.getRankPermissions(current)
.getPermission(permission);
if (state != TriState.UNDEFINED) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import com.xpdustry.distributor.permission.PermissionTree;

public interface RankPermissionStorage {
public interface RankPermissionSource {

PermissionTree getRankPermissions(final RankNode node);
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
import org.spongepowered.configurate.yaml.NodeStyle;
import org.spongepowered.configurate.yaml.YamlConfigurationLoader;

final class YamlRankPermissionStorage implements RankPermissionStorage, PluginListener {
final class YamlRankPermissionSource implements RankPermissionSource, PluginListener {

private static final Logger LOGGER = LoggerFactory.getLogger(YamlRankPermissionStorage.class);
private static final Logger LOGGER = LoggerFactory.getLogger(YamlRankPermissionSource.class);

private Map<String, PermissionTree> permissions = Collections.emptyMap();
private final Object lock = new Object();
private final YamlConfigurationLoader loader;

YamlRankPermissionStorage(final Path file) {
YamlRankPermissionSource(final Path file) {
this.loader = YamlConfigurationLoader.builder()
.path(file)
.nodeStyle(NodeStyle.BLOCK)
Expand Down

0 comments on commit cba7ea8

Please sign in to comment.