Merge pull request #634 from ArikSquad/feat/passive-abilities

Swofty-Developments · web-flow · commit 63f37b8b2d93 · 2026-01-04T02:22:46.000+11:00
Passive Abilities
diff --git a/commons/src/main/java/net/swofty/commons/skyblock/item/attribute/attributes/ItemAttributeStoredPotential.java b/commons/src/main/java/net/swofty/commons/skyblock/item/attribute/attributes/ItemAttributeStoredPotential.java
@@ -0,0 +1,32 @@
+package net.swofty.commons.skyblock.item.attribute.attributes;
+
+import net.swofty.commons.skyblock.item.attribute.ItemAttribute;
+import net.swofty.commons.skyblock.statistics.ItemStatistics;
+import org.jetbrains.annotations.Nullable;
+
+public class ItemAttributeStoredPotential extends ItemAttribute<Integer> {
+	@Override
+	public String getKey() {
+		return "stored_potential";
+	}
+
+	@Override
+	public Integer getDefaultValue(@Nullable ItemStatistics defaultStatistics) {
+		return 0;
+	}
+
+	@Override
+	public Integer loadFromString(String string) {
+		try {
+			return Integer.parseInt(string);
+		} catch (NumberFormatException e) {
+			return 0;
+		}
+	}
+
+	@Override
+	public String saveIntoString() {
+		return String.valueOf(getValue());
+	}
+
+}
diff --git a/configuration/skyblock/items/mining/pickaxe.yml b/configuration/skyblock/items/mining/pickaxe.yml
@@ -2,10 +2,13 @@ items:
   - id: PROMISING_PICKAXE
     rarity: UNCOMMON
     default_statistics:
-      damage: 30.0
-      mining_speed: 1500.0
+      damage: 20.0
+      mining_speed: 50.0
       breaking_power: 3.0
     components:
+      - id: ABILITY
+        abilities:
+          - STORED_POTENTIAL
       - id: PICKAXE
       - id: SELLABLE
         value: 10.0
diff --git a/type.crimsonisle/src/main/java/net/swofty/type/crimsonisle/events/ActionPlayerJoin.java b/type.crimsonisle/src/main/java/net/swofty/type/crimsonisle/events/ActionPlayerJoin.java
@@ -23,4 +23,5 @@ public void run(AsyncPlayerConfigurationEvent event) {
                 .apply(player.getOriginServer())
         );
     }
+
 }
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/SkyBlockGenericLoader.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/SkyBlockGenericLoader.java
@@ -11,6 +11,7 @@
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.coordinate.CoordConversion;
 import net.minestom.server.coordinate.Pos;
+import net.minestom.server.event.Event;
 import net.minestom.server.event.server.ServerTickMonitorEvent;
 import net.minestom.server.instance.Chunk;
 import net.minestom.server.monitoring.BenchmarkManager;
@@ -28,7 +29,7 @@
 import net.swofty.type.generic.HypixelGenericLoader;
 import net.swofty.type.generic.HypixelTypeLoader;
 import net.swofty.type.generic.data.mongodb.*;
-import net.swofty.type.generic.entity.npc.HypixelNPC;
+import net.swofty.type.generic.event.HypixelEvent;
 import net.swofty.type.generic.packet.HypixelPacketClientListener;
 import net.swofty.type.generic.packet.HypixelPacketServerListener;
 import net.swofty.type.skyblockgeneric.abiphone.AbiphoneNPC;
@@ -57,6 +58,8 @@
 import net.swofty.type.skyblockgeneric.item.components.MuseumComponent;
 import net.swofty.type.skyblockgeneric.item.components.ServerOrbComponent;
 import net.swofty.type.skyblockgeneric.item.crafting.SkyBlockRecipe;
+import net.swofty.type.skyblockgeneric.item.handlers.ability.AbilityRegistry;
+import net.swofty.type.skyblockgeneric.item.handlers.ability.RegisteredPassiveAbility;
 import net.swofty.type.skyblockgeneric.item.set.impl.SetRepeatable;
 import net.swofty.type.skyblockgeneric.item.updater.PlayerItemUpdater;
 import net.swofty.type.skyblockgeneric.levels.CustomLevelAward;
@@ -93,6 +96,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -408,6 +412,12 @@ public void initialize(MinecraftServer server) {
         CustomEventCaller.start(); // Value events are SkyBlock-specific
         HypixelEventHandler.register(HypixelConst.getEventHandler());
 
+        AbilityRegistry.getRegisteredAbilities().forEach(((_, registeredAbility) -> {
+            if (registeredAbility instanceof RegisteredPassiveAbility passiveAbility) {
+                passiveAbility.getPassiveAction().forEach(RegisteredPassiveAbility.Action::register);
+            }
+        }));
+
         /**
          * Cache SkyBlock levels
          */
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityLeftUse.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityLeftUse.java
@@ -29,7 +29,7 @@ public void run(PlayerHandAnimationEvent event) {
                 ability = abilityComponent.getAbility(RegisteredAbility.AbilityActivation.SNEAK_LEFT_CLICK);
             }
             if (ability == null) {
-                abilityComponent.getAbility(RegisteredAbility.AbilityActivation.LEFT_CLICK);
+                ability = abilityComponent.getAbility(RegisteredAbility.AbilityActivation.LEFT_CLICK);
             }
 
             if (ability != null) {
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityRightUse.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityRightUse.java
@@ -30,11 +30,11 @@ public void run(PlayerUseItemEvent event) {
             AbilityComponent abilityComponent = item.getComponent(AbilityComponent.class);
 
             RegisteredAbility ability = null;
-            if(player.isSneaking()) {
+            if (player.isSneaking()) {
                 ability = abilityComponent.getAbility(RegisteredAbility.AbilityActivation.SNEAK_RIGHT_CLICK);
             }
             if (ability == null) {
-                abilityComponent.getAbility(RegisteredAbility.AbilityActivation.RIGHT_CLICK);
+                ability = abilityComponent.getAbility(RegisteredAbility.AbilityActivation.RIGHT_CLICK);
             }
 
             if (ability != null) {
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemAttributeHandler.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemAttributeHandler.java
@@ -422,6 +422,14 @@ public boolean hasAbiphoneNPC(AbiphoneNPC npc) {
         return ids.contains(npc.getId());
     }
 
+    public void setStoredPotential(int storedPotential) {
+        ((ItemAttributeStoredPotential) item.getAttribute("stored_potential")).setValue(storedPotential);
+    }
+
+    public int getStoredPotential() {
+        return ((ItemAttributeStoredPotential) item.getAttribute("stored_potential")).getValue();
+    }
+
     public SkyBlockItem asSkyBlockItem() {
         return item;
     }
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemLore.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemLore.java
@@ -293,7 +293,7 @@ public void updateLore(@Nullable SkyBlockPlayer player) {
 			abilityComponent.getAbilities().forEach(ability -> {
 				addLoreLine("§6Ability: " + ability.getName() + "  §e§l" +
 						ability.getActivation().getDisplay());
-				for (String line : StringUtility.splitByWordAndLength(ability.getDescription(), 34))
+				for (String line : StringUtility.splitByWordAndLength(ability.getDescription().apply(player, item), 40))
 					addLoreLine("§7" + line);
 
 				String costDisplay = ability.getCost().getLoreDisplay();
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/AbilityComponent.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/AbilityComponent.java
@@ -1,5 +1,6 @@
 package net.swofty.type.skyblockgeneric.item.components;
 
+import lombok.Getter;
 import net.swofty.type.skyblockgeneric.item.SkyBlockItemComponent;
 import net.swofty.type.skyblockgeneric.item.handlers.ability.AbilityRegistry;
 import net.swofty.type.skyblockgeneric.item.handlers.ability.RegisteredAbility;
@@ -8,6 +9,7 @@
 import java.util.Objects;
 
 public class AbilityComponent extends SkyBlockItemComponent {
+    @Getter
     private final List<String> abilityIds;
 
     public AbilityComponent(List<String> abilityIds) {
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/AbilityRegistry.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/AbilityRegistry.java
@@ -7,10 +7,14 @@
 import net.minestom.server.coordinate.Pos;
 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.user.SkyBlockPlayer;
 import net.swofty.type.skyblockgeneric.user.statistics.TemporaryStatistic;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class AbilityRegistry {
@@ -20,7 +24,7 @@ public class AbilityRegistry {
 		register(new RegisteredAbility(
 				"WITHER_IMPACT",
 				"Wither Impact",
-				"§7Teleports §a10 Blocks §7ahead of you. Then implode dealing §c10000 §7damage to nearby enemies. Also applies the wither shield scroll ability reducing mobdamage taken and granting an absorption shield for §e5 §7seconds.",
+				(player, item) -> "§7Teleports §a10 Blocks §7ahead of you. Then implode dealing §c10000 §7damage to nearby enemies. Also applies the wither shield scroll ability reducing mobdamage taken and granting an absorption shield for §e5 §7seconds.",
 				RegisteredAbility.AbilityActivation.RIGHT_CLICK,
 				50,
 				new RegisteredAbility.AbilityManaCost(25),
@@ -33,7 +37,7 @@ public class AbilityRegistry {
 		register(new RegisteredAbility(
 				"INSTANT_TRANSMISSION",
 				"Instant Transmission",
-				"§7Teleports §a8 Blocks §7ahead of you and gain §a+50 §fSpeed for §a3 seconds§7.",
+				(player, item) -> "§7Teleports §a8 Blocks §7ahead of you and gain §a+50 §fSpeed for §a3 seconds§7.",
 				RegisteredAbility.AbilityActivation.RIGHT_CLICK,
 				5,
 				new RegisteredAbility.AbilityManaCost(50),
@@ -48,7 +52,7 @@ public class AbilityRegistry {
 		register(new RegisteredAbility(
 				"ETHER_TRANSMISSION",
 				"Ether Transmission",
-				"§7Teleport to your targeted block up to §a57 §7blocks away.",
+				(player, item) -> "§7Teleport to your targeted block up to §a57 §7blocks away.",
 				RegisteredAbility.AbilityActivation.SNEAK_RIGHT_CLICK,
 				5,
 				new RegisteredAbility.AbilityManaSoulflowCost(180, 1),
@@ -64,7 +68,7 @@ public class AbilityRegistry {
 		register(new RegisteredAbility(
 				"TRUE_DWARTH",
 						"True Dwarth",
-				"§7Shows the way towards the nearest §6Emissary §7while in the §2Dwarven Mines§7.",
+				(player, item) -> "§7Shows the way towards the nearest §6Emissary §7while in the §2Dwarven Mines§7.",
 				RegisteredAbility.AbilityActivation.RIGHT_CLICK,
 				20 * 3,
 				new RegisteredAbility.NoAbilityCost(),
@@ -77,7 +81,7 @@ public class AbilityRegistry {
 		register(new RegisteredAbility(
 				"SPEED_BOOST",
 				"Speed Boost",
-				"§7Grants §7+100 Speed",
+				(player, item) -> "§7Grants §7+100 Speed",
 				RegisteredAbility.AbilityActivation.RIGHT_CLICK,
 				20 * 5,
 				new RegisteredAbility.AbilityManaCost(50),
@@ -88,7 +92,36 @@ public class AbilityRegistry {
 				}
 		));
 
-//		register(new RegisteredAbility( // TODO: Figure out how to implement passive abiltiies
+		register(new RegisteredPassiveAbility(
+				"STORED_POTENTIAL",
+				"Stored Potential",
+				(player, item) -> {
+					StringBuilder description = new StringBuilder();
+					description.append("§7Grants §6+10⸕ Mining Speed §7for every\n100 blocks mined.\n§8(Max +250⸕ Mining Speed)\n\n");
+					description.append("§7Blocks Mined: §a").append(item.getAttributeHandler().getStoredPotential()).append("\n");
+					int miningSpeed = Math.min((item.getAttributeHandler().getStoredPotential() / 100) * 10, 250);
+					description.append("§7Current Bonus: §a").append(miningSpeed);
+					return description.toString();
+				},
+				List.of(new RegisteredPassiveAbility.Action<>(
+						CustomBlockBreakEvent.class,
+						EventNodes.CUSTOM,
+						event -> {
+							SkyBlockPlayer player = event.getPlayer();
+							player.updateItemInSlot(player.getHeldSlot(), (item) -> {
+								item.getAttributeHandler().setStoredPotential(item.getAttributeHandler().getStoredPotential() + 1);
+								item.getAttributeHandler().setExtraDynamicStatistics(
+										ItemStatistics.builder().withAdditive(
+												ItemStatistic.MINING_SPEED, (double) Math.min((item.getAttributeHandler().getStoredPotential() / 100) * 10, 250)
+										).build()
+								);
+							});
+						},
+						RegisteredPassiveAbility.Action.createDefaultCondition("STORED_POTENTIAL")
+				))
+		));
+
+//		register(new RegisteredAbility( // TODO: Figure out how to implement passive abilities
 //				"BEJEWELED_BLADE",
 //				"Bejeweled Blade",
 //				"§7Deals §a+150% §7damage to mobs on §bMining Islands.",
@@ -105,4 +138,9 @@ public static void register(RegisteredAbility ability) {
 	public static RegisteredAbility getAbility(String id) {
 		return REGISTERED_ABILITIES.get(id);
 	}
+
+	public static Map<String, RegisteredAbility> getRegisteredAbilities() {
+		return REGISTERED_ABILITIES;
+	}
+
 }
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/RegisteredAbility.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/RegisteredAbility.java
@@ -12,17 +12,19 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.BiFunction;
+
 @Getter
 public class RegisteredAbility {
     private final String id;
     private final String name;
-    private final String description;
+    private final BiFunction<SkyBlockPlayer, SkyBlockItem, String> description;
     private final AbilityActivation activation;
     private final int cooldownTicks;
     private final AbilityCost cost;
     private final AbilityAction action;
 
-    public RegisteredAbility(String id, String name, String description,
+    public RegisteredAbility(String id, String name, BiFunction<SkyBlockPlayer, SkyBlockItem, String> description,
                              AbilityActivation activation, int cooldownTicks,
                              AbilityCost cost, AbilityAction action) {
         this.id = id;
@@ -48,6 +50,11 @@ public void execute(SkyBlockPlayer player, SkyBlockItem item, Point targetedBloc
         action.execute(player, item, targetedBlock, blockFace);
     }
 
+    @FunctionalInterface
+    public interface Description {
+        void execute(SkyBlockPlayer player, SkyBlockItem item, Point targetedBlock, BlockFace blockFace);
+    }
+
     @FunctionalInterface
     public interface AbilityAction {
         void execute(SkyBlockPlayer player, SkyBlockItem item, Point targetedBlock, BlockFace blockFace);
@@ -60,7 +67,8 @@ public enum AbilityActivation {
         LEFT_CLICK_BLOCK("LEFT CLICK"),
         RIGHT_CLICK_BLOCK("RIGHT CLICK"),
         SNEAK_RIGHT_CLICK("SNEAK RIGHT CLICK"),
-        SNEAK_LEFT_CLICK("SNEAK LEFT CLICK")
+        SNEAK_LEFT_CLICK("SNEAK LEFT CLICK"),
+        NEVER("")
         ;
 
         private final @NonNull String display;
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/RegisteredPassiveAbility.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/RegisteredPassiveAbility.java
@@ -0,0 +1,74 @@
+package net.swofty.type.skyblockgeneric.item.handlers.ability;
+
+import lombok.Getter;
+import net.minestom.server.event.Event;
+import net.minestom.server.event.EventNode;
+import net.swofty.type.generic.event.EventNodes;
+import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
+import net.swofty.type.skyblockgeneric.item.components.AbilityComponent;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
+import org.tinylog.Logger;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+@Getter
+public class RegisteredPassiveAbility extends RegisteredAbility {
+
+	private final List<Action<?>> passiveAction;
+
+	public RegisteredPassiveAbility(String id, String name, BiFunction<SkyBlockPlayer, SkyBlockItem, String> description, List<Action<?>> action) {
+		super(id, name, description, AbilityActivation.NEVER, 0, new NoAbilityCost(), ((_, _, _, _) -> {}));
+		this.passiveAction = action;
+	}
+
+	public static final class Action<E extends Event> {
+		private final Consumer<E> action;
+		private final Class<E> eventClass;
+		private final EventNode<?> eventNode;
+		private final Predicate<E> filter;
+
+		public static <E extends Event> Predicate<E> createDefaultCondition(String abilityId) {
+			return event -> {
+				try {
+					Method getPlayer = event.getClass().getMethod("getPlayer");
+					Object playerObj = getPlayer.invoke(event);
+					if (!(playerObj instanceof SkyBlockPlayer player)) {
+						return false;
+					}
+					SkyBlockItem item = new SkyBlockItem(player.getItemInMainHand());
+					return item.hasComponent(AbilityComponent.class) &&
+							item.getComponent(AbilityComponent.class).getAbilityIds().contains(abilityId);
+				} catch (Exception e) {
+					Logger.warn("Failed to evaluate default condition for Action", e);
+					return false;
+				}
+			};
+		}
+
+		public Action(Class<E> eventClass, EventNodes eventNode, Consumer<E> action, Predicate<E> filter) {
+			this.action = action;
+			this.eventClass = eventClass;
+			this.eventNode = eventNode.eventNode;
+			this.filter = filter;
+		}
+
+		public void register() {
+			@SuppressWarnings("unchecked")
+			EventNode<E> castedEventNode = (EventNode<E>) eventNode;
+			castedEventNode.addListener(eventClass, event -> {
+				try {
+					if (filter.test(event)) {
+						action.accept(event);
+					}
+				} catch (Exception e) {
+					Logger.error("Error executing passive ability event action for event " + eventClass.getSimpleName(), e);
+				}
+			});
+		}
+	}
+
+}
diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/abilities/BuildersWandAbility.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/abilities/BuildersWandAbility.java

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,5 @@ public void run(AsyncPlayerConfigurationEvent event) {`
`23`	`23`	`.apply(player.getOriginServer())`
`24`	`24`	`);`
`25`	`25`	`}`
	`26`	`+`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void run(PlayerHandAnimationEvent event) {`
`29`	`29`	`ability = abilityComponent.getAbility(RegisteredAbility.AbilityActivation.SNEAK_LEFT_CLICK);`
`30`	`30`	`}`
`31`	`31`	`if (ability == null) {`
`32`		`- abilityComponent.getAbility(RegisteredAbility.AbilityActivation.LEFT_CLICK);`
	`32`	`+ ability = abilityComponent.getAbility(RegisteredAbility.AbilityActivation.LEFT_CLICK);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (ability != null) {`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ public void run(PlayerUseItemEvent event) {`
`30`	`30`	`AbilityComponent abilityComponent = item.getComponent(AbilityComponent.class);`
`31`	`31`
`32`	`32`	`RegisteredAbility ability = null;`
`33`		`- if(player.isSneaking()) {`
	`33`	`+ if (player.isSneaking()) {`
`34`	`34`	`ability = abilityComponent.getAbility(RegisteredAbility.AbilityActivation.SNEAK_RIGHT_CLICK);`
`35`	`35`	`}`
`36`	`36`	`if (ability == null) {`
`37`		`- abilityComponent.getAbility(RegisteredAbility.AbilityActivation.RIGHT_CLICK);`
	`37`	`+ ability = abilityComponent.getAbility(RegisteredAbility.AbilityActivation.RIGHT_CLICK);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if (ability != null) {`
Original file line number	Diff line number	Diff line change
`@@ -422,6 +422,14 @@ public boolean hasAbiphoneNPC(AbiphoneNPC npc) {`
`422`	`422`	`return ids.contains(npc.getId());`
`423`	`423`	`}`
`424`	`424`
	`425`	`+ public void setStoredPotential(int storedPotential) {`
	`426`	`+ ((ItemAttributeStoredPotential) item.getAttribute("stored_potential")).setValue(storedPotential);`
	`427`	`+ }`
	`428`	`+`
	`429`	`+ public int getStoredPotential() {`
	`430`	`+ return ((ItemAttributeStoredPotential) item.getAttribute("stored_potential")).getValue();`
	`431`	`+ }`
	`432`	`+`
`425`	`433`	`public SkyBlockItem asSkyBlockItem() {`
`426`	`434`	`return item;`
`427`	`435`	`}`