Merge branch 'master' into new-rankups.yml

Author: NicBOMB

.github/workflows/ci_test.yml

@@ -0,0 +1,18 @@
+name: CI Test
+on:
+  push:
+    paths:
+      - 'src/**'
+
+jobs:
+  ci_test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: 'adopt'
+      - name: Gradle Test
+        run: ./gradlew test --no-daemon

LICENSE.md

@@ -370,6 +370,21 @@ private List<RankSerialized> loadRankupConfig(String name) {
     return YamlDeserializer.deserialize(YamlConfiguration.loadConfiguration(ymlFile));
   }
 
+  private List<RankSerialized> loadRankupConfig(String name) {
+    File ymlFile = new File(getDataFolder(), name + ".yml");
+    File tomlFile = new File(getDataFolder(), name + ".toml");
+    if (tomlFile.exists()) {
+      try {
+        return ShadowDeserializer.deserialize(TomlFormat.instance().createParser().parse(new FileReader(tomlFile)));
+      } catch (FileNotFoundException ignored) {
+      }
+    }
+    if (!ymlFile.exists()) {
+      saveResource(ymlFile.getName(), false);
+    }
+    return YamlDeserializer.deserialize(YamlConfiguration.loadConfiguration(ymlFile));
+  }
+
   private FileConfiguration loadConfig(String name) {
     File file = new File(getDataFolder(), name);
     if (!file.exists()) {

LICENSE.txt

@@ -21,7 +21,16 @@ protected MobKillsRequirement(Requirement clone) {
   @SuppressWarnings("deprecation")
   @Override
   public double getProgress(Player player) {
-    EntityType entity = Objects.requireNonNull(EntityType.fromName(getSub()), "Invalid entity type '" + getSub() + "' in mob-kills requirement.");
+    EntityType entity = EntityType.fromName(getSub());
+    if (entity == null) {
+      EntityType entityFromId;
+      try {
+        entityFromId = EntityType.valueOf(getSub().toUpperCase());
+      } catch (IllegalArgumentException e) {
+        entityFromId = null;
+      }
+      entity = Objects.requireNonNull(entityFromId, "Invalid entity type '" + getSub() + "' in mob-kills requirement.");
+    }
     return player.getStatistic(Statistic.KILL_ENTITY, entity);
   }
 

src/main/java/sh/okx/rankup/RankupPlugin.java

@@ -1,4 +1,4 @@
-# the messages in this section can be customised for each rankup in rankups.yml.
+# the messages in this section can be customised for each rankup in rankups.yml.
 rankup:
   requirements-not-met: "&cNo satisfaces los requisitos para seguir al siguiente rango."
   no-rankup: "&eEstás en el último rango."

src/main/java/sh/okx/rankup/requirements/requirement/MobKillsRequirement.java

@@ -82,4 +82,4 @@ ExampleD:
       &cYou need:
       &c- {{ rank.req('money').total | simple }} money 
       &c- {{ rank.req('xp-level').total | simple }} XP levels
-      &cTo rank up to {{next.rank}}!
+      &cTo rank up to {{next.rank}}!

src/main/resources/locale/es.yml

@@ -0,0 +1,30 @@
+package sh.okx.rankup.requirements;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import be.seeseemelk.mockbukkit.entity.PlayerMock;
+import org.bukkit.Statistic;
+import org.bukkit.entity.EntityType;
+import org.junit.jupiter.api.Test;
+import sh.okx.rankup.RankupTest;
+import sh.okx.rankup.ranks.Rank;
+
+public class MobKillsRequirementsTest extends RankupTest {
+
+  public MobKillsRequirementsTest() {
+    super("mobkillsrequirements");
+  }
+
+  @Test
+  public void testPrestigeRequirements() {
+    PlayerMock player = server.addPlayer();
+
+    player.setStatistic(Statistic.KILL_ENTITY, EntityType.SNOWMAN, 2);
+    player.setStatistic(Statistic.KILL_ENTITY, EntityType.MUSHROOM_COW, 1);
+
+    Rank rank = plugin.getRankups().getFirst();
+
+    assertEquals(3 - 2, rank.getRequirement(player, "mob-kills#snow_golem").getRemaining(player));
+    assertEquals(3 - 1, rank.getRequirement(player, "mob-kills#mushroom_cow").getRemaining(player));
+  }
+}

src/main/resources/rankups.yml

@@ -0,0 +1,6 @@
+a:
+  rank: 'A'
+  next: 'B'
+  requirements:
+    - 'mob-kills snow_golem 3' # entity name
+    - 'mob-kills mushroom_cow 3' # entity enum value