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

Commit d4e19ad

Browse files
StrangeOne101StrangeOne101
committed
Made combos not changeable per request of Simp
- And made plugin version 1.2.4
1 parent aec5c13 commit d4e19ad

12 files changed

Lines changed: 48 additions & 29 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
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.3</version>
5+
<version>1.2.4</version>
66
<name>ProjectAddons</name>
77

88
<repositories>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ private void setupConfig() {
143143
c.addDefault("Combos.Air.Tailwind.Cooldown", 7000);
144144
c.addDefault("Combos.Air.Tailwind.Duration", 22000);
145145
c.addDefault("Combos.Air.Tailwind.Speed", 9);
146-
c.addDefault("Combos.Air.Tailwind.Combination", Arrays.asList("AirBurst:SNEAK_DOWN", "AirBurst:SNEAK_UP"));
147146

148147
// ---- Earthbending ----
149148
// LandLaunch
@@ -233,7 +232,6 @@ private void setupConfig() {
233232
c.addDefault("Combos.Earth.RockSlide.RequiredRockCount", 6);
234233
c.addDefault("Combos.Earth.RockSlide.TurningSpeed", 0.086);
235234
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"));
237235

238236
// ---- Firebending ----
239237
// ArcSpark
@@ -319,13 +317,11 @@ private void setupConfig() {
319317
c.addDefault("Combos.Fire.FlameBreath.Burn.Ground", true);
320318
c.addDefault("Combos.Fire.FlameBreath.Burn.Entities", true);
321319
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"));
323320

324321
// TurboJet
325322
c.addDefault("Combos.Fire.TurboJet.Enabled", true);
326323
c.addDefault("Combos.Fire.TurboJet.Cooldown", 12000);
327324
c.addDefault("Combos.Fire.TurboJet.Speed", 1.95);
328-
c.addDefault("Combos.Fire.TurboJet.Combination", Arrays.asList("HeatControl:SNEAK_DOWN", "Jets:SNEAK_UP"));
329325

330326
// ---- Waterbending ----
331327
// Hydrojet
@@ -416,15 +412,13 @@ private void setupConfig() {
416412
c.addDefault("Combos.Water.LeafStorm.LeafSpeed", 14);
417413
c.addDefault("Combos.Water.LeafStorm.Damage", 0.5);
418414
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"));
420415

421416
// MistShards
422417
c.addDefault("Combos.Water.MistShards.Enabled", true);
423418
c.addDefault("Combos.Water.MistShards.Cooldown", 7000);
424419
c.addDefault("Combos.Water.MistShards.Damage", 1);
425420
c.addDefault("Combos.Water.MistShards.Range", 20);
426421
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"));
428422

429423
// ---- Chiblocking ----
430424
// Dodging
@@ -453,21 +447,18 @@ private void setupConfig() {
453447
c.addDefault("Combos.Chi.ChiblockJab.Enabled", true);
454448
c.addDefault("Combos.Chi.ChiblockJab.Cooldown", 5000);
455449
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"));
457450

458451
// FlyingKick
459452
c.addDefault("Combos.Chi.FlyingKick.Enabled", true);
460453
c.addDefault("Combos.Chi.FlyingKick.Cooldown", 4000);
461454
c.addDefault("Combos.Chi.FlyingKick.Damage", 2.0);
462455
c.addDefault("Combos.Chi.FlyingKick.LaunchPower", 1.85);
463-
c.addDefault("Combos.Chi.FlyingKick.Combination", Arrays.asList("SwiftKick:SNEAK_DOWN", "SwiftKick:LEFT_CLICK"));
464456

465457
// WeakeningJab
466458
c.addDefault("Combos.Chi.WeakeningJab.Enabled", true);
467459
c.addDefault("Combos.Chi.WeakeningJab.Cooldown", 6000);
468460
c.addDefault("Combos.Chi.WeakeningJab.Duration", 4000);
469461
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"));
471462

472463
config.save();
473464
}

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

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

33
import java.util.ArrayList;
44

5-
import com.projectkorra.projectkorra.ability.util.ComboUtil;
65
import org.bukkit.Location;
76
import org.bukkit.entity.Player;
87
import org.bukkit.potion.PotionEffect;
@@ -118,7 +117,12 @@ public Object createNewComboInstance(Player player) {
118117

119118
@Override
120119
public ArrayList<AbilityInformation> getCombination() {
121-
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Air.Tailwind.Combination"));
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;
122126
}
123127

124128
@Override

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

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

33
import java.util.ArrayList;
44

5-
import com.projectkorra.projectkorra.ability.util.ComboUtil;
65
import org.bukkit.Location;
76
import org.bukkit.entity.Entity;
87
import org.bukkit.entity.Player;
@@ -100,7 +99,11 @@ public Object createNewComboInstance(Player player) {
10099

101100
@Override
102101
public ArrayList<AbilityInformation> getCombination() {
103-
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Chi.ChiblockJab.Combination"));
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;
104107
}
105108

106109
@Override

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

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

6-
import com.projectkorra.projectkorra.ability.util.ComboUtil;
76
import org.bukkit.Location;
87
import org.bukkit.Material;
98
import org.bukkit.entity.Entity;
@@ -127,7 +126,10 @@ public Object createNewComboInstance(Player player) {
127126

128127
@Override
129128
public ArrayList<AbilityInformation> getCombination() {
130-
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Chi.FlyingKick.Combination"));
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;
131133
}
132134

133135
@Override

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

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

7-
import com.projectkorra.projectkorra.ability.util.ComboUtil;
87
import org.bukkit.Location;
98
import org.bukkit.entity.Entity;
109
import org.bukkit.entity.LivingEntity;
@@ -114,7 +113,11 @@ public Object createNewComboInstance(Player player) {
114113

115114
@Override
116115
public ArrayList<AbilityInformation> getCombination() {
117-
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Chi.WeakeningJab.Combination"));
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;
118121
}
119122

120123
@Override

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

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

8-
import com.projectkorra.projectkorra.ability.util.ComboUtil;
98
import org.bukkit.Location;
109
import org.bukkit.block.Block;
1110
import org.bukkit.block.BlockFace;
@@ -238,7 +237,11 @@ public Object createNewComboInstance(Player player) {
238237

239238
@Override
240239
public ArrayList<AbilityInformation> getCombination() {
241-
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Earth.RockSlide.Combination"));
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;
242245
}
243246

244247
@Override

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
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;
1312
import com.projectkorra.projectkorra.attribute.Attribute;
1413
import com.projectkorra.projectkorra.util.ClickType;
1514
import com.projectkorra.projectkorra.util.DamageHandler;
@@ -201,7 +200,11 @@ public Object createNewComboInstance(Player player) {
201200

202201
@Override
203202
public ArrayList<AbilityInformation> getCombination() {
204-
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Fire.FlameBreath.Combination"));
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;
205208
}
206209

207210
@Override

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

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

33
import java.util.ArrayList;
44

5-
import com.projectkorra.projectkorra.ability.util.ComboUtil;
65
import org.bukkit.Location;
76
import org.bukkit.entity.Player;
87

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

9695
@Override
9796
public ArrayList<AbilityInformation> getCombination() {
98-
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Fire.TurboJet.Combination"));
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;
99101
}
100102

101103
@Override

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

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

8-
import com.projectkorra.projectkorra.ability.util.ComboUtil;
98
import org.bukkit.Location;
109
import org.bukkit.entity.Entity;
1110
import org.bukkit.entity.LivingEntity;
@@ -175,7 +174,13 @@ public Object createNewComboInstance(Player player) {
175174

176175
@Override
177176
public ArrayList<AbilityInformation> getCombination() {
178-
return ComboUtil.generateCombinationFromList(this, ProjectAddons.instance.getConfig().getStringList("Combos.Water.LeafStorm.Combination"));
177+
ArrayList<AbilityInformation> combo = new ArrayList<>();
178+
179+
combo.add(new AbilityInformation(Element.PLANT.getColor() + "RazorLeaf", ClickType.LEFT_CLICK));
180+
combo.add(new AbilityInformation(Element.PLANT.getColor() + "RazorLeaf", ClickType.LEFT_CLICK));
181+
combo.add(new AbilityInformation(Element.PLANT.getColor() + "VineWhip", ClickType.SHIFT_DOWN));
182+
183+
return combo;
179184
}
180185

181186
@Override

0 commit comments

Comments
 (0)