Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit aec5c13

Browse files
StrangeOne101StrangeOne101
committed
Updated to PK 1.10.0
- Added hex color for Soundbending - Made the color of soundbending configurable - Made all combo combinations configurable to be in line with PK 1.10.0 - Updated to PK 1.10.0
1 parent 81df9fb commit aec5c13

11 files changed

Lines changed: 34 additions & 56 deletions

File tree

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>me.simplicitee</groupId>
44
<artifactId>projectaddons</artifactId>
5-
<version>1.2.2</version>
5+
<version>1.2.3</version>
66
<name>ProjectAddons</name>
77

88
<repositories>
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.projectkorra</groupId>
2525
<artifactId>projectkorra</artifactId>
26-
<version>1.9.3</version>
26+
<version>1.10.2</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
</dependencies>

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.File;
44
import java.util.Arrays;
55

6+
import com.projectkorra.projectkorra.configuration.ConfigManager;
67
import org.bukkit.ChatColor;
78
import org.bukkit.configuration.file.FileConfiguration;
89
import org.bukkit.entity.EntityType;
@@ -38,13 +39,7 @@ public void onEnable() {
3839

3940
this.config = new Config(new File("project_addons.yml"));
4041
this.setupConfig();
41-
soundElement = new SubElement("Sound", Element.AIR, ElementType.BENDING, this) {
42-
@Override
43-
public ChatColor getColor() {
44-
return Element.AIR.getSubColor();
45-
}
46-
};
47-
42+
soundElement = new SubElement("Sound", Element.AIR, ElementType.BENDING, this);
4843
CoreAbility.registerPluginAbilities(this, "me.simplicitee.project.addons.ability");
4944

5045
this.setupCollisions();
@@ -89,7 +84,9 @@ public Config config() {
8984
private void setupConfig() {
9085
FileConfiguration c = config.get();
9186

92-
c.addDefault("Properties.MetallicBlocks", Arrays.asList("GOLD_BLOCK", "IRON_BLOCK"));
87+
c.addDefault("Chat.Colors.Sound", "#3e4d52"); //Make soundbending have a color
88+
89+
c.addDefault("Properties.MetallicBlocks", Arrays.asList("GOLD_BLOCK", "IRON_BLOCK", "NETHERITE_BLOCK"));
9390

9491
// ---- Avatar ----
9592
// EnergyBeam
@@ -146,6 +143,7 @@ private void setupConfig() {
146143
c.addDefault("Combos.Air.Tailwind.Cooldown", 7000);
147144
c.addDefault("Combos.Air.Tailwind.Duration", 22000);
148145
c.addDefault("Combos.Air.Tailwind.Speed", 9);
146+
c.addDefault("Combos.Air.Tailwind.Combination", Arrays.asList("AirBurst:SNEAK_DOWN", "AirBurst:SNEAK_UP"));
149147

150148
// ---- Earthbending ----
151149
// LandLaunch
@@ -235,6 +233,7 @@ private void setupConfig() {
235233
c.addDefault("Combos.Earth.RockSlide.RequiredRockCount", 6);
236234
c.addDefault("Combos.Earth.RockSlide.TurningSpeed", 0.086);
237235
c.addDefault("Combos.Earth.RockSlide.Duration", -1);
236+
c.addDefault("Combos.Earth.RockSlide.Combination", Arrays.asList("Shockwave:SNEAK_DOWN", "Shockwave:RIGHT_CLICK_BLOCK", "EarthSmash:SNEAK_UP"));
238237

239238
// ---- Firebending ----
240239
// ArcSpark
@@ -320,11 +319,13 @@ private void setupConfig() {
320319
c.addDefault("Combos.Fire.FlameBreath.Burn.Ground", true);
321320
c.addDefault("Combos.Fire.FlameBreath.Burn.Entities", true);
322321
c.addDefault("Combos.Fire.FlameBreath.Rainbow", true);
322+
c.addDefault("Combos.Fire.FlameBreath.Combination", Arrays.asList("FireBlast:SNEAK_DOWN", "FireBlast:SNEAK_UP", "HeatControl:SNEAK_DOWN"));
323323

324324
// TurboJet
325325
c.addDefault("Combos.Fire.TurboJet.Enabled", true);
326326
c.addDefault("Combos.Fire.TurboJet.Cooldown", 12000);
327327
c.addDefault("Combos.Fire.TurboJet.Speed", 1.95);
328+
c.addDefault("Combos.Fire.TurboJet.Combination", Arrays.asList("HeatControl:SNEAK_DOWN", "Jets:SNEAK_UP"));
328329

329330
// ---- Waterbending ----
330331
// Hydrojet
@@ -415,13 +416,15 @@ private void setupConfig() {
415416
c.addDefault("Combos.Water.LeafStorm.LeafSpeed", 14);
416417
c.addDefault("Combos.Water.LeafStorm.Damage", 0.5);
417418
c.addDefault("Combos.Water.LeafStorm.Radius", 6);
419+
c.addDefault("Combos.Water.LeafStorm.Combination", Arrays.asList("RazorLeaf:LEFT_CLICK", "RazorLeaf:LEFT_CLICK", "VineWhip:SNEAK_DOWN"));
418420

419421
// MistShards
420422
c.addDefault("Combos.Water.MistShards.Enabled", true);
421423
c.addDefault("Combos.Water.MistShards.Cooldown", 7000);
422424
c.addDefault("Combos.Water.MistShards.Damage", 1);
423425
c.addDefault("Combos.Water.MistShards.Range", 20);
424426
c.addDefault("Combos.Water.MistShards.IcicleCount", 8);
427+
c.addDefault("Combos.Water.MistShards.Combination", Arrays.asList("WaterManipulation:SNEAK_DOWN", "PhaseChange:SNEAK_UP", "IceBlast:SNEAK_DOWN"));
425428

426429
// ---- Chiblocking ----
427430
// Dodging
@@ -450,18 +453,21 @@ private void setupConfig() {
450453
c.addDefault("Combos.Chi.ChiblockJab.Enabled", true);
451454
c.addDefault("Combos.Chi.ChiblockJab.Cooldown", 5000);
452455
c.addDefault("Combos.Chi.ChiblockJab.Duration", 2000);
456+
c.addDefault("Combos.Chi.ChiblockJab.Combination", Arrays.asList("Jab:RIGHT_CLICK_ENTITY", "Jab:LEFT_CLICK_ENTITY", "Jab:RIGHT_CLICK_ENTITY"));
453457

454458
// FlyingKick
455459
c.addDefault("Combos.Chi.FlyingKick.Enabled", true);
456460
c.addDefault("Combos.Chi.FlyingKick.Cooldown", 4000);
457461
c.addDefault("Combos.Chi.FlyingKick.Damage", 2.0);
458462
c.addDefault("Combos.Chi.FlyingKick.LaunchPower", 1.85);
463+
c.addDefault("Combos.Chi.FlyingKick.Combination", Arrays.asList("SwiftKick:SNEAK_DOWN", "SwiftKick:LEFT_CLICK"));
459464

460465
// WeakeningJab
461466
c.addDefault("Combos.Chi.WeakeningJab.Enabled", true);
462467
c.addDefault("Combos.Chi.WeakeningJab.Cooldown", 6000);
463468
c.addDefault("Combos.Chi.WeakeningJab.Duration", 4000);
464469
c.addDefault("Combos.Chi.WeakeningJab.Modifier", 1.5);
470+
c.addDefault("Combos.Chi.WeakeningJab.Combination", Arrays.asList("Jab:LEFT_CLICK_ENTITY", "Jab:LEFT_CLICK_ENTITY", "Jab:RIGHT_CLICK_ENTITY"));
465471

466472
config.save();
467473
}

‎src/me/simplicitee/project/addons/ability/air/Tailwind.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44

5+
import com.projectkorra.projectkorra.ability.util.ComboUtil;
56
import org.bukkit.Location;
67
import org.bukkit.entity.Player;
78
import org.bukkit.potion.PotionEffect;
@@ -117,12 +118,7 @@ public Object createNewComboInstance(Player player) {
117118

118119
@Override
119120
public ArrayList<AbilityInformation> getCombination() {
120-
ArrayList<AbilityInformation> combo = new ArrayList<>();
121-
122-
combo.add(new AbilityInformation("AirBlast", ClickType.SHIFT_DOWN));
123-
combo.add(new AbilityInformation("AirBurst", ClickType.SHIFT_UP));
124-
125-
return combo;
121+
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Air.Tailwind.Combination"));
126122
}
127123

128124
@Override

‎src/me/simplicitee/project/addons/ability/chi/ChiblockJab.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44

5+
import com.projectkorra.projectkorra.ability.util.ComboUtil;
56
import org.bukkit.Location;
67
import org.bukkit.entity.Entity;
78
import org.bukkit.entity.Player;
@@ -99,11 +100,7 @@ public Object createNewComboInstance(Player player) {
99100

100101
@Override
101102
public ArrayList<AbilityInformation> getCombination() {
102-
ArrayList<AbilityInformation> combo = new ArrayList<>();
103-
combo.add(new AbilityInformation("Jab", ClickType.RIGHT_CLICK_ENTITY));
104-
combo.add(new AbilityInformation("Jab", ClickType.LEFT_CLICK_ENTITY));
105-
combo.add(new AbilityInformation("Jab", ClickType.RIGHT_CLICK_ENTITY));
106-
return combo;
103+
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Chi.ChiblockJab.Combination"));
107104
}
108105

109106
@Override

‎src/me/simplicitee/project/addons/ability/chi/FlyingKick.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6+
import com.projectkorra.projectkorra.ability.util.ComboUtil;
67
import org.bukkit.Location;
78
import org.bukkit.Material;
89
import org.bukkit.entity.Entity;
@@ -126,10 +127,7 @@ public Object createNewComboInstance(Player player) {
126127

127128
@Override
128129
public ArrayList<AbilityInformation> getCombination() {
129-
ArrayList<AbilityInformation> combo = new ArrayList<>();
130-
combo.add(new AbilityInformation("SwiftKick", ClickType.SHIFT_DOWN));
131-
combo.add(new AbilityInformation("SwiftKick", ClickType.LEFT_CLICK));
132-
return combo;
130+
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Chi.FlyingKick.Combination"));
133131
}
134132

135133
@Override

‎src/me/simplicitee/project/addons/ability/chi/WeakeningJab.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.HashSet;
55
import java.util.Set;
66

7+
import com.projectkorra.projectkorra.ability.util.ComboUtil;
78
import org.bukkit.Location;
89
import org.bukkit.entity.Entity;
910
import org.bukkit.entity.LivingEntity;
@@ -113,11 +114,7 @@ public Object createNewComboInstance(Player player) {
113114

114115
@Override
115116
public ArrayList<AbilityInformation> getCombination() {
116-
ArrayList<AbilityInformation> combo = new ArrayList<>();
117-
combo.add(new AbilityInformation("Jab", ClickType.LEFT_CLICK_ENTITY));
118-
combo.add(new AbilityInformation("Jab", ClickType.LEFT_CLICK_ENTITY));
119-
combo.add(new AbilityInformation("Jab", ClickType.RIGHT_CLICK_ENTITY));
120-
return combo;
117+
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Chi.WeakeningJab.Combination"));
121118
}
122119

123120
@Override

‎src/me/simplicitee/project/addons/ability/earth/RockSlide.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Set;
66
import java.util.concurrent.ThreadLocalRandom;
77

8+
import com.projectkorra.projectkorra.ability.util.ComboUtil;
89
import org.bukkit.Location;
910
import org.bukkit.block.Block;
1011
import org.bukkit.block.BlockFace;
@@ -237,11 +238,7 @@ public Object createNewComboInstance(Player player) {
237238

238239
@Override
239240
public ArrayList<AbilityInformation> getCombination() {
240-
ArrayList<AbilityInformation> combo = new ArrayList<>();
241-
combo.add(new AbilityInformation("Shockwave", ClickType.SHIFT_DOWN));
242-
combo.add(new AbilityInformation("Shockwave", ClickType.RIGHT_CLICK_BLOCK));
243-
combo.add(new AbilityInformation("EarthSmash", ClickType.SHIFT_UP));
244-
return combo;
241+
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Earth.RockSlide.Combination"));
245242
}
246243

247244
@Override

‎src/me/simplicitee/project/addons/ability/fire/FlameBreath.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.projectkorra.projectkorra.ability.ComboAbility;
1010
import com.projectkorra.projectkorra.ability.FireAbility;
1111
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
12+
import com.projectkorra.projectkorra.ability.util.ComboUtil;
1213
import com.projectkorra.projectkorra.attribute.Attribute;
1314
import com.projectkorra.projectkorra.util.ClickType;
1415
import com.projectkorra.projectkorra.util.DamageHandler;
@@ -200,11 +201,7 @@ public Object createNewComboInstance(Player player) {
200201

201202
@Override
202203
public ArrayList<AbilityInformation> getCombination() {
203-
ArrayList<AbilityInformation> combo = new ArrayList<>();
204-
combo.add(new AbilityInformation("FireBlast", ClickType.SHIFT_DOWN));
205-
combo.add(new AbilityInformation("FireBlast", ClickType.SHIFT_UP));
206-
combo.add(new AbilityInformation("HeatControl", ClickType.SHIFT_DOWN));
207-
return combo;
204+
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Fire.FlameBreath.Combination"));
208205
}
209206

210207
@Override

‎src/me/simplicitee/project/addons/ability/fire/TurboJet.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44

5+
import com.projectkorra.projectkorra.ability.util.ComboUtil;
56
import org.bukkit.Location;
67
import org.bukkit.entity.Player;
78

@@ -94,10 +95,7 @@ public Object createNewComboInstance(Player player) {
9495

9596
@Override
9697
public ArrayList<AbilityInformation> getCombination() {
97-
ArrayList<AbilityInformation> combo = new ArrayList<>();
98-
combo.add(new AbilityInformation("HeatControl", ClickType.SHIFT_DOWN));
99-
combo.add(new AbilityInformation("Jets", ClickType.SHIFT_UP));
100-
return combo;
98+
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Fire.TurboJet.Combination"));
10199
}
102100

103101
@Override

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Random;
66
import java.util.Set;
77

8+
import com.projectkorra.projectkorra.ability.util.ComboUtil;
89
import org.bukkit.Location;
910
import org.bukkit.entity.Entity;
1011
import org.bukkit.entity.LivingEntity;
@@ -174,13 +175,7 @@ public Object createNewComboInstance(Player player) {
174175

175176
@Override
176177
public ArrayList<AbilityInformation> getCombination() {
177-
ArrayList<AbilityInformation> combo = new ArrayList<>();
178-
179-
combo.add(new AbilityInformation(Element.WATER.getSubColor() + "RazorLeaf", ClickType.LEFT_CLICK));
180-
combo.add(new AbilityInformation(Element.WATER.getSubColor() + "RazorLeaf", ClickType.LEFT_CLICK));
181-
combo.add(new AbilityInformation(Element.WATER.getSubColor() + "VineWhip", ClickType.SHIFT_DOWN));
182-
183-
return combo;
178+
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Water.LeafStorm.Combination"));
184179
}
185180

186181
@Override

0 commit comments

Comments
 (0)