cdanesi/Rankup3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make group changes world specific

Browse Source
This commit is contained in:
okx-code
2018-12-12 17:04:43 +00:00
parent 6ee60f7944
commit f22e42e22d
21 changed files with 102 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
}
group 'sh.okx'
version '3.3.2-beta'
version '3.3.2-beta.1'
repositories {
mavenCentral()
src/main/java/sh/okx/rankup/Rankup.java
+25 -18
View File
@@ -1,7 +1,6 @@
package sh.okx.rankup;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.google.common.base.Preconditions;
import lombok.Getter;
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission;
@@ -15,7 +14,11 @@ import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryView;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin;
import sh.okx.rankup.commands.*;
import sh.okx.rankup.commands.InfoCommand;
import sh.okx.rankup.commands.PrestigeCommand;
import sh.okx.rankup.commands.PrestigesCommand;
import sh.okx.rankup.commands.RanksCommand;
import sh.okx.rankup.commands.RankupCommand;
import sh.okx.rankup.gui.Gui;
import sh.okx.rankup.gui.GuiListener;
import sh.okx.rankup.messages.EmptyMessageBuilder;
@@ -30,22 +33,26 @@ import sh.okx.rankup.ranks.Rankups;
import sh.okx.rankup.requirements.OperationRegistry;
import sh.okx.rankup.requirements.Requirement;
import sh.okx.rankup.requirements.RequirementRegistry;
import sh.okx.rankup.requirements.operation.*;
import sh.okx.rankup.requirements.requirement.*;
import sh.okx.rankup.requirements.requirement.advancedachievements.*;
import sh.okx.rankup.requirements.requirement.mcmmo.*;
import sh.okx.rankup.requirements.operation.AllOperation;
import sh.okx.rankup.requirements.operation.AnyOperation;
import sh.okx.rankup.requirements.operation.NoneOperation;
import sh.okx.rankup.requirements.operation.OneOperation;
import sh.okx.rankup.requirements.requirement.GroupRequirement;
import sh.okx.rankup.requirements.requirement.MoneyRequirement;
import sh.okx.rankup.requirements.requirement.PermissionRequirement;
import sh.okx.rankup.requirements.requirement.PlaceholderRequirement;
import sh.okx.rankup.requirements.requirement.PlaytimeMinutesRequirement;
import sh.okx.rankup.requirements.requirement.XpLevelRequirement;
import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsAchievementRequirement;
import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsTotalRequirement;
import sh.okx.rankup.requirements.requirement.mcmmo.McMMOPowerLevelRequirement;
import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillRequirement;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
import java.util.WeakHashMap;
import java.util.function.Supplier;
@@ -318,8 +325,8 @@ public class Rankup extends JavaPlugin {
oldRank.applyRequirements(player);
permissions.playerRemoveGroup(null, player, oldRank.getRank());
permissions.playerAddGroup(null, player, rank.getRank());
permissions.playerRemoveGroup(player, oldRank.getRank());
permissions.playerAddGroup(player, rank.getRank());
getMessage(oldRank, Message.SUCCESS_PUBLIC)
.failIfEmpty()
@@ -393,12 +400,12 @@ public class Rankup extends JavaPlugin {
oldPrestige.applyRequirements(player);
permissions.playerRemoveGroup(null, player, oldPrestige.getFrom());
permissions.playerAddGroup(null, player, oldPrestige.getTo());
permissions.playerRemoveGroup(player, oldPrestige.getFrom());
permissions.playerAddGroup(player, oldPrestige.getTo());
if (oldPrestige.getRank() != null) {
permissions.playerRemoveGroup(null, player, oldPrestige.getRank());
permissions.playerRemoveGroup(player, oldPrestige.getRank());
}
permissions.playerAddGroup(null, player, prestige.getRank());
permissions.playerAddGroup(player, prestige.getRank());
getMessage(oldPrestige, Message.PRESTIGE_SUCCESS_PUBLIC)
.failIfEmpty()
src/main/java/sh/okx/rankup/RankupRegisterEvent.java
+4 -4
View File
@@ -21,6 +21,10 @@ public class RankupRegisterEvent extends Event {
@Getter
private final Rankup plugin;
public static HandlerList getHandlerList() {
return handlers;
}
public RequirementRegistry getRequirementRegistry() {
return plugin.getRequirementRegistry();
}
@@ -41,8 +45,4 @@ public class RankupRegisterEvent extends Event {
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
}
src/main/java/sh/okx/rankup/placeholders/Placeholders.java
+1 -9
View File
@@ -2,28 +2,20 @@ package sh.okx.rankup.placeholders;
import lombok.Getter;
import me.clip.placeholderapi.PlaceholderAPI;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import sh.okx.rankup.Rankup;
import sh.okx.rankup.prestige.Prestige;
import sh.okx.rankup.prestige.Prestiges;
import sh.okx.rankup.ranks.Rank;
import sh.okx.rankup.ranks.Rankups;
import sh.okx.rankup.requirements.Requirement;
import java.text.DecimalFormat;
import java.util.function.Function;
public class Placeholders {
private final Rankup plugin;
private boolean registered;
@Getter
private final DecimalFormat moneyFormat;
@Getter
private final DecimalFormat percentFormat;
@Getter
private final DecimalFormat simpleFormat;
private boolean registered;
public Placeholders(Rankup plugin) {
this.plugin = plugin;
src/main/java/sh/okx/rankup/prestige/Prestige.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class Prestige extends Rank {
}
public boolean isEligable(Player player) {
String[] groups = plugin.getPermissions().getPlayerGroups(null, player);
String[] groups = plugin.getPermissions().getPlayerGroups(player);
for (String group : groups) {
if (group.equalsIgnoreCase(from)) {
return true;
src/main/java/sh/okx/rankup/ranks/Rank.java
+1 -2
View File
@@ -11,7 +11,6 @@ import sh.okx.rankup.messages.MessageBuilder;
import sh.okx.rankup.requirements.DeductibleRequirement;
import sh.okx.rankup.requirements.Operation;
import sh.okx.rankup.requirements.Requirement;
import sh.okx.rankup.requirements.operation.AllOperation;
import java.util.HashSet;
import java.util.List;
@@ -61,7 +60,7 @@ public class Rank {
}
public boolean isIn(Player player) {
String[] groups = plugin.getPermissions().getPlayerGroups(null, player);
String[] groups = plugin.getPermissions().getPlayerGroups(player);
for (String group : groups) {
if (group.equalsIgnoreCase(rank)) {
return true;
src/main/java/sh/okx/rankup/requirements/RequirementRegistry.java
-1
View File
@@ -1,7 +1,6 @@
package sh.okx.rankup.requirements;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import java.util.HashSet;
import java.util.Map;
src/main/java/sh/okx/rankup/requirements/requirement/GroupRequirement.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class GroupRequirement extends Requirement {
int matched = 0;
String[] groups = getValueString().split(" ");
for (String requiredGroup : groups) {
for (String group : plugin.getPermissions().getPlayerGroups(null, player)) {
for (String group : plugin.getPermissions().getPlayerGroups(player)) {
if (group.equalsIgnoreCase(requiredGroup)) {
matched++;
break;
src/main/resources/plugin.yml
+1 -1
View File
@@ -1,5 +1,5 @@
name: Rankup
version: 3.3.2-beta
version: 3.3.2-beta.1
main: sh.okx.rankup.Rankup
author: Okx
depend: [Vault]
src/test/java/sh/okx/rankup/messages/MessageBuilderTest.java
+2 -2
View File
@@ -2,8 +2,8 @@ package sh.okx.rankup.messages;
import org.junit.Test;
import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
public class MessageBuilderTest {