Merge pull request #16 from StrangeOne101/master

Updated to PK 1.10.0

Author: Simplicitee

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.simplicitee</groupId>
   <artifactId>projectaddons</artifactId>
-  <version>1.2.2</version>
+  <version>1.2.4</version>
   <name>ProjectAddons</name>
 
   <repositories>
@@ -23,7 +23,7 @@
 	<dependency>
 	  <groupId>com.projectkorra</groupId>
 	  <artifactId>projectkorra</artifactId>
-	  <version>1.9.3</version>
+	  <version>1.10.2</version>
 	  <scope>provided</scope>
 	</dependency>
   </dependencies>

src/me/simplicitee/project/addons/ProjectAddons.java

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.Arrays;
 
+import com.projectkorra.projectkorra.configuration.ConfigManager;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.EntityType;
@@ -38,13 +39,7 @@ public void onEnable() {
 
 		this.config = new Config(new File("project_addons.yml"));
 		this.setupConfig();
-		soundElement = new SubElement("Sound", Element.AIR, ElementType.BENDING, this) {
-			@Override
-			public ChatColor getColor() {
-				return Element.AIR.getSubColor();
-			}
-		};
-		
+		soundElement = new SubElement("Sound", Element.AIR, ElementType.BENDING, this);
 		CoreAbility.registerPluginAbilities(this, "me.simplicitee.project.addons.ability");
 
 		this.setupCollisions();
@@ -89,7 +84,9 @@ public Config config() {
 	private void setupConfig() {
 		FileConfiguration c = config.get();
 
-		c.addDefault("Properties.MetallicBlocks", Arrays.asList("GOLD_BLOCK", "IRON_BLOCK"));
+		c.addDefault("Chat.Colors.Sound", "#3e4d52"); //Make soundbending have a color
+
+		c.addDefault("Properties.MetallicBlocks", Arrays.asList("GOLD_BLOCK", "IRON_BLOCK", "NETHERITE_BLOCK"));
 
 		// ---- Avatar ----
 		// EnergyBeam

src/me/simplicitee/project/addons/ability/water/LeafStorm.java

@@ -176,9 +176,9 @@ public Object createNewComboInstance(Player player) {
 	public ArrayList<AbilityInformation> getCombination() {
 		ArrayList<AbilityInformation> combo = new ArrayList<>();
 
-		combo.add(new AbilityInformation(Element.WATER.getSubColor() + "RazorLeaf", ClickType.LEFT_CLICK));
-		combo.add(new AbilityInformation(Element.WATER.getSubColor() + "RazorLeaf", ClickType.LEFT_CLICK));
-		combo.add(new AbilityInformation(Element.WATER.getSubColor() + "VineWhip", ClickType.SHIFT_DOWN));
+		combo.add(new AbilityInformation(Element.PLANT.getColor() + "RazorLeaf", ClickType.LEFT_CLICK));
+		combo.add(new AbilityInformation(Element.PLANT.getColor() + "RazorLeaf", ClickType.LEFT_CLICK));
+		combo.add(new AbilityInformation(Element.PLANT.getColor() + "VineWhip", ClickType.SHIFT_DOWN));
 
 		return combo;
 	}

src/plugin.yml

@@ -1,7 +1,7 @@
 name: ProjectAddons
 author: Simplicitee
 api-version: 1.16
-version: 1.2.3
+version: 1.2.4
 main: me.simplicitee.project.addons.ProjectAddons
 depend: [ProjectKorra]
 commands: