Fix AllAchievementsReceivedRewards option (#1088)

PyvesB · Oct 26, 2021 · 01ef298 · 01ef298
1 parent bb7ff6b
commit 01ef298
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/...nced-achievements-plugin/src/main/java/com/hm/achievement/config/ConfigurationParser.java b/...nced-achievements-plugin/src/main/java/com/hm/achievement/config/ConfigurationParser.java
@@ -306,6 +306,7 @@ private void parseAchievement(Category category, String subcategory, long thresh
 			throw new PluginLoadError(
 					"Achievement with path (" + path + ") is missing its Message parameter in config.yml.");
 		}
+		String rewardPath = mainConfig.isConfigurationSection(path + ".Reward") ? path + ".Reward" : path + ".Rewards";
 
 		Achievement achievement = new AchievementBuilder()
 				.name(section.getString("Name"))
@@ -316,7 +317,7 @@ private void parseAchievement(Category category, String subcategory, long thresh
 				.threshold(threshold)
 				.category(category)
 				.subcategory(subcategory)
-				.rewards(rewardParser.parseRewards(path))
+				.rewards(rewardParser.parseRewards(rewardPath))
 				.build();
 		achievementMap.put(achievement);
 	}

diff --git a/advanced-achievements-plugin/src/main/java/com/hm/achievement/config/RewardParser.java b/advanced-achievements-plugin/src/main/java/com/hm/achievement/config/RewardParser.java
@@ -75,10 +75,7 @@ public Economy getEconomy() {
 	}
 
 	public List<Reward> parseRewards(String path) {
-		ConfigurationSection configSection = mainConfig.getConfigurationSection(path + ".Reward");
-		if (configSection == null) {
-			configSection = mainConfig.getConfigurationSection(path + ".Rewards");
-		}
+		ConfigurationSection configSection = mainConfig.getConfigurationSection(path);
 		List<Reward> rewards = new ArrayList<>();
 		if (configSection != null) {
 			if (economy != null && configSection.contains("Money")) {

diff --git a/advanced-achievements-plugin/src/test/java/com/hm/achievement/config/RewardParserTest.java b/advanced-achievements-plugin/src/test/java/com/hm/achievement/config/RewardParserTest.java
@@ -64,7 +64,7 @@ void shouldParseMoneyRewardSingular() throws Exception {
 		mainConfig.load(Paths.get(getClass().getClassLoader().getResource("reward-parser/money-1.yml").toURI()).toFile());
 		when(economy.currencyNameSingular()).thenReturn("coin");
 
-		List<Reward> rewards = underTest.parseRewards("");
+		List<Reward> rewards = underTest.parseRewards("Reward");
 
 		assertEquals(1, rewards.size());
 		Reward reward = rewards.get(0);
@@ -79,7 +79,7 @@ void shouldParseMoneyRewardPlural() throws Exception {
 		mainConfig.load(Paths.get(getClass().getClassLoader().getResource("reward-parser/money-2.yml").toURI()).toFile());
 		when(economy.currencyNamePlural()).thenReturn("coins");
 
-		List<Reward> rewards = underTest.parseRewards("");
+		List<Reward> rewards = underTest.parseRewards("Reward");
 
 		assertEquals(1, rewards.size());
 		Reward reward = rewards.get(0);
@@ -93,7 +93,7 @@ void shouldParseMoneyRewardPlural() throws Exception {
 	void shouldParseItemReward() throws Exception {
 		mainConfig.load(Paths.get(getClass().getClassLoader().getResource("reward-parser/item.yml").toURI()).toFile());
 
-		List<Reward> rewards = underTest.parseRewards("");
+		List<Reward> rewards = underTest.parseRewards("Reward");
 
 		assertEquals(1, rewards.size());
 		Reward reward = rewards.get(0);
@@ -113,7 +113,7 @@ void shouldParseSingleCommandReward() throws Exception {
 		when(player.getWorld()).thenReturn(world);
 		when(world.getName()).thenReturn("Nether");
 
-		List<Reward> rewards = underTest.parseRewards("");
+		List<Reward> rewards = underTest.parseRewards("Reward");
 
 		assertEquals(1, rewards.size());
 		Reward reward = rewards.get(0);
@@ -132,7 +132,7 @@ void shouldParseMultipleCommandRewards() throws Exception {
 		when(player.getWorld()).thenReturn(world);
 		when(world.getName()).thenReturn("Nether");
 
-		List<Reward> rewards = underTest.parseRewards("");
+		List<Reward> rewards = underTest.parseRewards("Reward");
 
 		assertEquals(1, rewards.size());
 		Reward reward = rewards.get(0);
@@ -148,7 +148,7 @@ void shouldParseMultipleCommandRewards() throws Exception {
 	void shouldParseExperienceReward() throws Exception {
 		mainConfig.load(Paths.get(getClass().getClassLoader().getResource("reward-parser/experience.yml").toURI()).toFile());
 
-		List<Reward> rewards = underTest.parseRewards("");
+		List<Reward> rewards = underTest.parseRewards("Reward");
 
 		assertEquals(1, rewards.size());
 		Reward reward = rewards.get(0);
@@ -165,7 +165,7 @@ void shouldParseMaxHealthReward() throws Exception {
 		when(player.getAttribute(any())).thenReturn(healthAttribute);
 		when(healthAttribute.getBaseValue()).thenReturn(1.0);
 
-		List<Reward> rewards = underTest.parseRewards("");
+		List<Reward> rewards = underTest.parseRewards("Reward");
 
 		assertEquals(1, rewards.size());
 		Reward reward = rewards.get(0);
@@ -181,7 +181,7 @@ void shouldParseMaxOxygenReward() throws Exception {
 		mainConfig.load(Paths.get(getClass().getClassLoader().getResource("reward-parser/max-oxygen.yml").toURI()).toFile());
 		when(player.getMaximumAir()).thenReturn(5);
 
-		List<Reward> rewards = underTest.parseRewards("");
+		List<Reward> rewards = underTest.parseRewards("Reward");
 
 		assertEquals(1, rewards.size());
 		Reward reward = rewards.get(0);

diff --git a/advanced-achievements-plugin/src/test/resources/reward-parser/commands.yml b/advanced-achievements-plugin/src/test/resources/reward-parser/commands.yml
@@ -1,4 +1,4 @@
-Rewards:
+Reward:
   Commands:
     Display: 
       - 'display 1'