Skip to content

Implement Bejeweled Blade I guess #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aunncodes wants to merge 1 commit into from
Closed

Implement Bejeweled Blade I guess #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions .../src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/AbilityRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
import net.minestom.server.coordinate.BlockVec;
import net.minestom.server.coordinate.Point;
import net.minestom.server.coordinate.Pos;
import net.minestom.server.event.player.PlayerMoveEvent;
import net.swofty.commons.skyblock.statistics.ItemStatistic;
import net.swofty.commons.skyblock.statistics.ItemStatistics;
import net.swofty.type.generic.event.EventNodes;
import net.swofty.type.skyblockgeneric.event.custom.CustomBlockBreakEvent;
import net.swofty.type.skyblockgeneric.item.handlers.ability.abilities.BuildersWandAbility;
import net.swofty.type.skyblockgeneric.region.RegionType;
import net.swofty.type.skyblockgeneric.region.SkyBlockRegion;
import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
import net.swofty.type.skyblockgeneric.user.statistics.TemporaryStatistic;
import net.swofty.type.skyblockgeneric.utility.groups.Groups;

import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -130,14 +134,23 @@ public class AbilityRegistry {
))
));

// register(new RegisteredPassiveAbility(
// "BEJEWELED_BLADE",
// "Bejeweled Blade",
// "§7Deals §a+150% §7damage to mobs on §bMining Islands.",
// List.of(new RegisteredPassiveAbility.Action<>(
//
// ))
// ));
register(new RegisteredPassiveAbility(
"BEJEWELED_BLADE",
"Bejeweled Blade",
"§7Deals §a+150% §7damage to mobs on §bMining Islands.",
List.of(new RegisteredPassiveAbility.Action<>(
PlayerMoveEvent.class,
EventNodes.PLAYER,
event -> {
SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
RegionType region = player.getRegion().getType();
if (Groups.MINING_REGIONS.contains(region)) {

}
},
RegisteredPassiveAbility.Action.createDefaultCondition("BEJEWELED_BLADE")
))
));

register(new BuildersWandAbility());
}
Expand Down
3 changes: 3 additions & 0 deletions .../java/net/swofty/type/skyblockgeneric/item/handlers/ability/RegisteredPassiveAbility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
public class RegisteredPassiveAbility extends RegisteredAbility {

private final List<Action<?>> passiveAction;
public RegisteredPassiveAbility(String id, String name, String description, List<Action<?>> action) {
this(id, name, (player, item) -> description, action);
}

public RegisteredPassiveAbility(String id, String name, BiFunction<SkyBlockPlayer, SkyBlockItem, String> description, List<Action<?>> action) {
super(id, name, description, AbilityActivation.NEVER, 0, new NoAbilityCost(), ((_, _, _, _) -> {
Expand Down