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

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
* fix earthkick bug
* fix plantarmor bug
* add new flight passive
  • Loading branch information
Simplicitee committed Aug 26, 2020
1 parent 1b71802 commit 187a95b
Show file tree
Hide file tree
Showing 7 changed files with 204 additions and 10 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>me.simplicitee</groupId>
<artifactId>projectaddons</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
<name>ProjectAddons</name>

<repositories>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>com.projectkorra</groupId>
<artifactId>projectkorra</artifactId>
<version>1.8.9</version>
<version>1.9.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
34 changes: 33 additions & 1 deletion src/me/simplicitee/project/addons/MainListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Map;

import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.Sound;
import org.bukkit.entity.Entity;
import org.bukkit.entity.FallingBlock;
Expand All @@ -27,6 +28,7 @@
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerSwapHandItemsEvent;
import org.bukkit.event.player.PlayerToggleFlightEvent;
import org.bukkit.event.player.PlayerToggleSneakEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.potion.PotionEffectType;
Expand All @@ -50,6 +52,7 @@
import com.projectkorra.projectkorra.util.ClickType;

import me.simplicitee.project.addons.ability.air.Deafen;
import me.simplicitee.project.addons.ability.air.FlightPassive;
import me.simplicitee.project.addons.ability.air.GaleGust;
import me.simplicitee.project.addons.ability.air.SonicWave;
import me.simplicitee.project.addons.ability.air.VocalMimicry;
Expand Down Expand Up @@ -276,7 +279,9 @@ public void onSneak(PlayerToggleSneakEvent event) {
@EventHandler
public void onAbilityStart(AbilityStartEvent event) {
if (BloodGrip.isBloodbent(event.getAbility().getPlayer())) {
event.setCancelled(ProjectAddons.instance.getConfig().getStringList("Abilities.Water.BloodGrip.BasicAbilities").contains(event.getAbility().getName()));
event.setCancelled(!ProjectAddons.instance.getConfig().getStringList("Abilities.Water.BloodGrip.BasicAbilities").contains(event.getAbility().getName()));
} else if (CoreAbility.hasAbility(event.getAbility().getPlayer(), FlightPassive.class)) {
event.setCancelled(ProjectAddons.instance.getConfig().getStringList("Passives.Air.Flying.AbilityBlacklist").contains(event.getAbility().getName()));
}
}

Expand Down Expand Up @@ -634,6 +639,25 @@ public void onSlotChangeEvent(PlayerItemHeldEvent event) {
plugin.getBoardManager().update(player, event.getNewSlot());
}

@EventHandler
public void onFlightToggle(PlayerToggleFlightEvent event) {
Player player = event.getPlayer();
if (!CoreAbility.hasAbility(player, FlightPassive.class)) {
return;
}

FlightPassive passive = CoreAbility.getAbility(player, FlightPassive.class);

if (player.getGameMode() == GameMode.CREATIVE && player.getGameMode() == GameMode.SPECTATOR) {
return;
} else if (player.getInventory().getContents().length != 0) {
event.setCancelled(true);
return;
}

passive.fly(event.isFlying());
}

@EventHandler
public void onOffhandToggle(PlayerSwapHandItemsEvent event) {
if (event.isCancelled()) {
Expand All @@ -647,6 +671,14 @@ public void onOffhandToggle(PlayerSwapHandItemsEvent event) {
return;
}

if (CoreAbility.hasAbility(player, FlightPassive.class)) {
FlightPassive passive = CoreAbility.getAbility(player, FlightPassive.class);
if (passive.isActive()) {
passive.toggleGlide();
return;
}
}

if (player.hasPermission("bending.offhandswap")) {
if (MultiAbilityManager.hasMultiAbilityBound(player)) {
return;
Expand Down
6 changes: 6 additions & 0 deletions src/me/simplicitee/project/addons/ProjectAddons.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ private void setupConfig() {
c.addDefault("Abilities.Avatar.EnergyBeam.EasterEgg", true);

// ---- Airbending ----
// Flying
c.addDefault("Passives.Air.Flying.Enabled", true);
c.addDefault("Passives.Air.Flying.FlySpeed", 0.05);
c.addDefault("Passives.Air.Flying.Glide.StartSpeed", 0.8);
c.addDefault("Passives.Air.Flying.Glide.MaxSpeed", 1.6);
c.addDefault("Passives.Air.Flying.Acceleration", 0.001);

// Deafen
c.addDefault("Abilities.Air.Deafen.Enabled", true);
Expand Down
152 changes: 152 additions & 0 deletions src/me/simplicitee/project/addons/ability/air/FlightPassive.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
package me.simplicitee.project.addons.ability.air;

import org.bukkit.Location;
import org.bukkit.entity.Player;

import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.FlightAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;

import me.simplicitee.project.addons.ProjectAddons;

public class FlightPassive extends FlightAbility implements AddonAbility, PassiveAbility {

private boolean toggled = false, active = false;
private float original = 0.8f, speed, flySpeed, startSpeed, maxSpeed, acceleration;

public FlightPassive(Player player) {
super(player);

flySpeed = (float) ProjectAddons.instance.getConfig().getDouble("Passives.Air.Flying.FlySpeed");
speed = startSpeed = (float) ProjectAddons.instance.getConfig().getDouble("Passives.Air.Flying.Glide.StartSpeed");
maxSpeed = (float) ProjectAddons.instance.getConfig().getDouble("Passives.Air.Flying.Glide.MaxSpeed");
acceleration = (float) ProjectAddons.instance.getConfig().getDouble("Passives.Air.Flying.Acceleration");
}

@Override
public void progress() {
if (player.getLocation().getBlock().isLiquid()) {
clear();
return;
}

player.setAllowFlight(true);

if (active && toggled) {
player.setGliding(true);

if (player.isSneaking() && player.getFlySpeed() < maxSpeed) {
speed = speed + (float) acceleration;
if (speed > maxSpeed) {
speed = (float) maxSpeed;
}
}

player.setVelocity(player.getEyeLocation().getDirection().multiply(speed));
}
}

private void clear() {
active = false;
toggled = false;
player.setFlying(false);
player.setGliding(false);
}

@Override
public boolean isSneakAbility() {
return false;
}

@Override
public boolean isHarmlessAbility() {
return true;
}

@Override
public long getCooldown() {
return 0;
}

@Override
public String getName() {
return "Flying";
}

@Override
public Location getLocation() {
return player.getLocation();
}

@Override
public boolean isInstantiable() {
return isEnabled();
}

@Override
public boolean isProgressable() {
return true;
}

@Override
public void load() {}

@Override
public void stop() {}

@Override
public String getAuthor() {
return "Simplicitee";
}

@Override
public String getVersion() {
return ProjectAddons.instance.version();
}

public void toggleGlide() {
this.toggled = !toggled;
if (!toggled) {
player.setGliding(false);
player.setFlying(true);
speed = startSpeed;
} else {
player.setGliding(true);
player.setFlying(false);
}
}

public void fly(boolean flying) {
if (flying) {
active = true;
original = player.getFlySpeed();
player.setFlySpeed(flySpeed);
} else {
player.setFlySpeed(original);
active = false;
}
}

public boolean isActive() {
return active;
}

public boolean isGliding() {
return toggled;
}

@Override
public boolean isEnabled() {
return ProjectAddons.instance.getConfig().getBoolean("Passives.Air.Flying.Enabled");
}

@Override
public String getDescription() {
return "A very rare ability for airbenders is being able to fly freely, without the need of any glider. The only airbenders known to have this ability were Guru Laghima and Zaheer";
}

@Override
public String getInstructions() {
return "Use double jump to toggle flight, offhand swap to toggle between gliding and creative flight, and sneak while gliding to accelerate!";
}
}
10 changes: 6 additions & 4 deletions src/me/simplicitee/project/addons/ability/earth/EarthKick.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ public void progress() {
while (iter.hasNext()) {
FallingBlock fb = iter.next();

if (!BLOCKS.contains(fb)) {
if (fb == null || fb.isDead()) {
BLOCKS.remove(fb);
iter.remove();
fb.remove();
continue;
}

if (fb == null || fb.isDead()) {
BLOCKS.remove(fb);
if (!BLOCKS.contains(fb)) {
iter.remove();
fb.remove();
continue;
}

Expand All @@ -133,6 +133,8 @@ public void progress() {
((LivingEntity) e).setNoDamageTicks(0);
iter.remove();
fb.remove();
BLOCKS.remove(fb);
break;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,9 @@ public void remove() {

this.sources.clear();
this.shield.clear();
this.bar.removeAll();
if (this.bar != null) {
this.bar.removeAll();
}
}

private void reset() {
Expand Down
4 changes: 2 additions & 2 deletions src/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ProjectAddons
author: Simplicitee
api-version: 1.15
version: 1.1.0
api-version: 1.16
version: 1.1.1
main: me.simplicitee.project.addons.ProjectAddons
depend: [ProjectKorra]
commands:
Expand Down

0 comments on commit 187a95b

Please sign in to comment.