From 7394a38d7e6e6a6b95d50c08a5476b395026ee19 Mon Sep 17 00:00:00 2001 From: Luck Date: Tue, 1 Dec 2020 11:31:15 +0000 Subject: [PATCH] Remove gamemode and dimension contexts - these are now provided by LP itself --- README.md | 16 --------- .../extracontexts/ExtraContextsPlugin.java | 4 --- .../calculators/DimensionCalculator.java | 34 ------------------- .../calculators/GamemodeCalculator.java | 31 ----------------- src/main/resources/config.yml | 12 ------- 5 files changed, 97 deletions(-) delete mode 100644 src/main/java/me/lucko/extracontexts/calculators/DimensionCalculator.java delete mode 100644 src/main/java/me/lucko/extracontexts/calculators/GamemodeCalculator.java diff --git a/README.md b/README.md index 45a9de1..1fa0aef 100644 --- a/README.md +++ b/README.md @@ -42,14 +42,6 @@ e.g. > worldguard:flag-build=allow -___ -#### `gamemode` -Returns the players current gamemode - -e.g. - -> gamemode=creative - ___ #### `whitelisted` Returns if the player is whitelisted on the server or not @@ -58,14 +50,6 @@ e.g. > whitelisted=true -___ -#### `dimension` -Returns the type of the players current world - -e.g. - -> dimension=nether - ___ #### `team` Returns the name of the team the players is in diff --git a/src/main/java/me/lucko/extracontexts/ExtraContextsPlugin.java b/src/main/java/me/lucko/extracontexts/ExtraContextsPlugin.java index fd905df..c5fa578 100644 --- a/src/main/java/me/lucko/extracontexts/ExtraContextsPlugin.java +++ b/src/main/java/me/lucko/extracontexts/ExtraContextsPlugin.java @@ -1,7 +1,5 @@ package me.lucko.extracontexts; -import me.lucko.extracontexts.calculators.DimensionCalculator; -import me.lucko.extracontexts.calculators.GamemodeCalculator; import me.lucko.extracontexts.calculators.HasPlayedBeforeCalculator; import me.lucko.extracontexts.calculators.PlaceholderApiCalculator; import me.lucko.extracontexts.calculators.TeamCalculator; @@ -57,9 +55,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St private void setup() { register("worldguard-region", "WorldGuard", WorldGuardRegionCalculator::new); register("worldguard-flag", "WorldGuard", WorldGuardFlagCalculator::new); - register("gamemode", null, GamemodeCalculator::new); register("whitelisted", null, WhitelistedCalculator::new); - register("dimension", null, DimensionCalculator::new); register("team", null, TeamCalculator::new); register("has-played-before", null, HasPlayedBeforeCalculator::new); register("placeholderapi", "PlaceholderAPI", () -> new PlaceholderApiCalculator(getConfig().getConfigurationSection("placeholderapi-placeholders"))); diff --git a/src/main/java/me/lucko/extracontexts/calculators/DimensionCalculator.java b/src/main/java/me/lucko/extracontexts/calculators/DimensionCalculator.java deleted file mode 100644 index 1fa5f26..0000000 --- a/src/main/java/me/lucko/extracontexts/calculators/DimensionCalculator.java +++ /dev/null @@ -1,34 +0,0 @@ -package me.lucko.extracontexts.calculators; - -import net.luckperms.api.context.ContextCalculator; -import net.luckperms.api.context.ContextConsumer; -import net.luckperms.api.context.ContextSet; -import net.luckperms.api.context.ImmutableContextSet; - -import org.bukkit.World; -import org.bukkit.entity.Player; - -public class DimensionCalculator implements ContextCalculator { - private static final String KEY = "dimension"; - - @Override - public void calculate(Player target, ContextConsumer consumer) { - World world = target.getWorld(); - if (world != null) { - consumer.accept(KEY, world.getEnvironment().name().toLowerCase()); - } - } - - @Override - public ContextSet estimatePotentialContexts() { - ImmutableContextSet.Builder builder = ImmutableContextSet.builder(); - for (World.Environment dimension : World.Environment.values()) { - builder.add(KEY, dimension.name().toLowerCase()); - } - return builder.build(); - } - - // No need to add a signalContextUpdate listener here, LuckPerms already triggers this - // on world change. - -} diff --git a/src/main/java/me/lucko/extracontexts/calculators/GamemodeCalculator.java b/src/main/java/me/lucko/extracontexts/calculators/GamemodeCalculator.java deleted file mode 100644 index e2d1021..0000000 --- a/src/main/java/me/lucko/extracontexts/calculators/GamemodeCalculator.java +++ /dev/null @@ -1,31 +0,0 @@ -package me.lucko.extracontexts.calculators; - -import net.luckperms.api.context.ContextCalculator; -import net.luckperms.api.context.ContextConsumer; -import net.luckperms.api.context.ContextSet; -import net.luckperms.api.context.ImmutableContextSet; - -import org.bukkit.GameMode; -import org.bukkit.entity.Player; - -public class GamemodeCalculator implements ContextCalculator { - private static final String KEY = "gamemode"; - - @Override - public void calculate(Player target, ContextConsumer consumer) { - GameMode gm = target.getGameMode(); - if (gm != null) { - consumer.accept(KEY, gm.name().toLowerCase()); - } - } - - @Override - public ContextSet estimatePotentialContexts() { - ImmutableContextSet.Builder builder = ImmutableContextSet.builder(); - for (GameMode gameMode : GameMode.values()) { - builder.add(KEY, gameMode.name().toLowerCase()); - } - return builder.build(); - } - -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index e937259..1feb575 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -19,24 +19,12 @@ worldguard-region: false # e.g. worldguard:flag-build=allow worldguard-flag: false -# Provides the 'gamemode' context. -# Returns the players current gamemode. -# -# e.g. gamemode=creative -gamemode: false - # Provides the 'whitelisted' context. # Returns if the player is whitelisted on the server or not. # # e.g. whitelisted=true whitelisted: false -# Provides the 'dimension' context. -# Returns the type of the players current world. -# -# e.g. dimension=nether -dimension: false - # Provides the 'team' context. # Returns the name of the team the players is in. #