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

3.5-beta.2

Browse Source
This commit is contained in:
okx-code
2019-04-05 18:35:33 +01:00
parent 606cf024e0
commit 6ee799609c
29 changed files with 255 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsAchievementRequirement.java
+1 -14
View File
@@ -17,21 +17,8 @@ public class AdvancedAchievementsAchievementRequirement extends Requirement {
@Override
public boolean check(Player player) {
return getRemaining(player) < 1;
}
@Override
public double getRemaining(Player player) {
AdvancedAchievementsAPI api = AdvancedAchievementsAPIFetcher.fetchInstance().get();
int total = 0;
String[] achievements = getValueString().split(" ");
for (String achievement : achievements) {
if (api.hasPlayerReceivedAchievement(player.getUniqueId(), achievement)) {
total++;
}
}
return achievements.length - total;
return api.hasPlayerReceivedAchievement(player.getUniqueId(), getValueString());
}
@Override
src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsTotalRequirement.java
+4 -10
View File
@@ -1,12 +1,12 @@
package sh.okx.rankup.requirements.requirement.advancedachievements;
import com.hm.achievement.api.AdvancedAchievementsAPI;
import com.hm.achievement.api.AdvancedAchievementsAPIFetcher;
import org.bukkit.entity.Player;
import sh.okx.rankup.Rankup;
import sh.okx.rankup.requirements.Requirement;
import sh.okx.rankup.requirements.ProgressiveRequirement;
public class AdvancedAchievementsTotalRequirement extends Requirement {
public class AdvancedAchievementsTotalRequirement extends ProgressiveRequirement {
public AdvancedAchievementsTotalRequirement(Rankup plugin) {
super(plugin, "advancedachievements-total");
}
@@ -16,14 +16,8 @@ public class AdvancedAchievementsTotalRequirement extends Requirement {
}
@Override
public boolean check(Player player) {
return getRemaining(player) < 1;
}
@Override
public double getRemaining(Player player) {
AdvancedAchievementsAPI api = AdvancedAchievementsAPIFetcher.fetchInstance().get();
return getValueInt() - api.getPlayerTotalAchievements(player.getUniqueId());
public double getProgress(Player player) {
return AdvancedAchievementsAPIFetcher.fetchInstance().get().getPlayerTotalAchievements(player.getUniqueId());
}
@Override