Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Refactor /typo

Browse Source
This commit is contained in:
Ka0rX 2023-04-22 11:39:40 +01:00
parent 523f910113
commit a37287cf0c
6 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -318,7 +318,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
nodeStates.put(node, nodeStatus); nodeStates.put(node, nodeStatus);
} }
public NodeStatus getNodeState(SkillTreeNode node) { public NodeStatus getNodeStatus(SkillTreeNode node) {
return nodeStates.get(node); return nodeStates.get(node);
} }

11
MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/skilltree/SkillTreeViewer.java
View File

@ -271,7 +271,7 @@ public class SkillTreeViewer extends EditableInventory {
if (inv.getSkillTree().isNode(inv.getCoordinates(n))) { if (inv.getSkillTree().isNode(inv.getCoordinates(n))) {
SkillTreeNode node = inv.getNode(n); SkillTreeNode node = inv.getNode(n);
holders.register("current-level", inv.getPlayerData().getNodeLevel(node)); holders.register("current-level", inv.getPlayerData().getNodeLevel(node));
holders.register("current-state", inv.getPlayerData().getNodeState(node)); holders.register("current-state", inv.getPlayerData().getNodeStatus(node));
holders.register("max-level", node.getMaxLevel()); holders.register("max-level", node.getMaxLevel());
holders.register("max-children", node.getMaxChildren()); holders.register("max-children", node.getMaxChildren());
holders.register("size", node.getSize()); holders.register("size", node.getSize());
@ -345,12 +345,13 @@ public class SkillTreeViewer extends EditableInventory {
if (skillTree.isNode(coordinates)) { if (skillTree.isNode(coordinates)) {
SkillTreeNode node = skillTree.getNode(coordinates); SkillTreeNode node = skillTree.getNode(coordinates);
NodeStatus nodeStatus =playerData.getNodeStatus(node);
//If the node has its own display, it will be shown. //If the node has its own display, it will be shown.
if(node.getItem()!=null) if(node.hasIcon(nodeStatus))
return new Icon(node.getItem(),node.getCustomModelData()); return node.getIcon(nodeStatus);
NodeType nodeType = NodeType.getNodeType(hasUpPath, hasRightPath, hasDownPath, hasLeftPath); NodeType nodeType = NodeType.getNodeType(hasUpPath, hasRightPath, hasDownPath, hasLeftPath);
return icons.get(new NodeDisplayInfo(nodeType, playerData.getNodeState(node))); return icons.get(new NodeDisplayInfo(nodeType, nodeStatus));
} else { } else {
PathType pathType = PathType.getPathType(hasUpPath, hasRightPath, hasDownPath, hasLeftPath); PathType pathType = PathType.getPathType(hasUpPath, hasRightPath, hasDownPath, hasLeftPath);
SkillTreePath path = skillTree.getPath(coordinates); SkillTreePath path = skillTree.getPath(coordinates);
@ -479,7 +480,7 @@ public class SkillTreeViewer extends EditableInventory {
MMOCore.plugin.soundManager.getSound(SoundEvent.LEVEL_UP).playTo(getPlayer()); MMOCore.plugin.soundManager.getSound(SoundEvent.LEVEL_UP).playTo(getPlayer());
open(); open();
event.setCancelled(true); event.setCancelled(true);
} else if (playerData.getNodeState(node) == NodeStatus.LOCKED || playerData.getNodeState(node) == NodeStatus.FULLY_LOCKED) { } else if (playerData.getNodeStatus(node) == NodeStatus.LOCKED || playerData.getNodeStatus(node) == NodeStatus.FULLY_LOCKED) {
MMOCore.plugin.configManager.getSimpleMessage("locked-node").send(player); MMOCore.plugin.configManager.getSimpleMessage("locked-node").send(player);
MMOCore.plugin.soundManager.getSound(SoundEvent.NOT_ENOUGH_POINTS).playTo(getPlayer()); MMOCore.plugin.soundManager.getSound(SoundEvent.NOT_ENOUGH_POINTS).playTo(getPlayer());
event.setCancelled(true); event.setCancelled(true);

3
MMOCore-API/src/main/java/net/Indyuce/mmocore/skilltree/SkillTreeNode.java
View File

@ -12,7 +12,6 @@ import net.Indyuce.mmocore.gui.skilltree.display.Icon;
import net.Indyuce.mmocore.skilltree.tree.SkillTree; import net.Indyuce.mmocore.skilltree.tree.SkillTree;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -227,7 +226,7 @@ public class SkillTreeNode implements ExperienceObject {
public Placeholders getPlaceholders(PlayerData playerData) { public Placeholders getPlaceholders(PlayerData playerData) {
Placeholders holders = new Placeholders(); Placeholders holders = new Placeholders();
holders.register("name", getName()); holders.register("name", getName());
holders.register("node-state", playerData.getNodeState(this)); holders.register("node-state", playerData.getNodeStatus(this));
holders.register("size", getSize()); holders.register("size", getSize());
holders.register("level", playerData.getNodeLevel(this)); holders.register("level", playerData.getNodeLevel(this));
holders.register("max-level", getMaxLevel()); holders.register("max-level", getMaxLevel());

2
MMOCore-API/src/main/java/net/Indyuce/mmocore/skilltree/SkillTreePath.java
View File

@ -7,7 +7,7 @@ import net.Indyuce.mmocore.skilltree.tree.SkillTree;
public record SkillTreePath(SkillTree tree, IntegerCoordinates coordinates, SkillTreeNode from, SkillTreeNode to) { public record SkillTreePath(SkillTree tree, IntegerCoordinates coordinates, SkillTreeNode from, SkillTreeNode to) {
public PathStatus getStatus(PlayerData playerData) { public PathStatus getStatus(PlayerData playerData) {
if (playerData.getNodeState(from) == NodeStatus.UNLOCKED && playerData.getNodeState(to) == NodeStatus.UNLOCKED) { if (playerData.getNodeStatus(from) == NodeStatus.UNLOCKED && playerData.getNodeStatus(to) == NodeStatus.UNLOCKED) {
return PathStatus.UNLOCKED; return PathStatus.UNLOCKED;
} }
return PathStatus.LOCKED; return PathStatus.LOCKED;

4
MMOCore-API/src/main/java/net/Indyuce/mmocore/skilltree/tree/LinkedSkillTree.java
View File

@ -84,7 +84,7 @@ public class LinkedSkillTree extends SkillTree {
* We recursively label all the locked nodes who are connected to an unlockable node. * We recursively label all the locked nodes who are connected to an unlockable node.
**/ **/
private void labelLockedNodes(PlayerData playerData) { private void labelLockedNodes(PlayerData playerData) {
List<SkillTreeNode> unlockableNodes = nodes.values().stream().filter(node -> playerData.getNodeState(node) == NodeStatus.UNLOCKABLE).toList(); List<SkillTreeNode> unlockableNodes = nodes.values().stream().filter(node -> playerData.getNodeStatus(node) == NodeStatus.UNLOCKABLE).toList();
for (SkillTreeNode node : unlockableNodes) { for (SkillTreeNode node : unlockableNodes) {
labelLockedNodesFrom(playerData, node); labelLockedNodesFrom(playerData, node);
} }
@ -109,7 +109,7 @@ public class LinkedSkillTree extends SkillTree {
boolean isUnlockable = false; boolean isUnlockable = false;
for (IntegerCoordinates coordinates : getCheckCoordinates(node.getCoordinates())) { for (IntegerCoordinates coordinates : getCheckCoordinates(node.getCoordinates())) {
if (isNode(coordinates)) if (isNode(coordinates))
if (isNode(coordinates) && playerData.getNodeState(getNode(coordinates)) == NodeStatus.UNLOCKED && countUnlockedNeighbours(coordinates, playerData) <= getNode(coordinates).getMaxChildren()) if (isNode(coordinates) && playerData.getNodeStatus(getNode(coordinates)) == NodeStatus.UNLOCKED && countUnlockedNeighbours(coordinates, playerData) <= getNode(coordinates).getMaxChildren())
isUnlockable = true; isUnlockable = true;
} }
return isUnlockable; return isUnlockable;

9
MMOCore-API/src/main/java/net/Indyuce/mmocore/skilltree/tree/SkillTree.java
View File

@ -5,10 +5,6 @@ import io.lumine.mythic.lib.UtilityMethods;
import io.lumine.mythic.lib.api.util.PostLoadObject; import io.lumine.mythic.lib.api.util.PostLoadObject;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.gui.skilltree.display.DisplayInfo;
import net.Indyuce.mmocore.gui.skilltree.display.Icon;
import net.Indyuce.mmocore.gui.skilltree.display.NodeDisplayInfo;
import net.Indyuce.mmocore.gui.skilltree.display.NodeType;
import net.Indyuce.mmocore.manager.registry.RegisteredObject; import net.Indyuce.mmocore.manager.registry.RegisteredObject;
import net.Indyuce.mmocore.skilltree.IntegerCoordinates; import net.Indyuce.mmocore.skilltree.IntegerCoordinates;
import net.Indyuce.mmocore.skilltree.NodeStatus; import net.Indyuce.mmocore.skilltree.NodeStatus;
@ -21,7 +17,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.*; import java.util.*;
import java.util.logging.Level;
/** /**
* A passive skill tree that features nodes, or passive skills. * A passive skill tree that features nodes, or passive skills.
@ -228,7 +223,7 @@ public abstract class SkillTree extends PostLoadObject implements RegisteredObje
numberChildren++; numberChildren++;
//We must check if the parent is Fully Locked or not and if it can unlock a new node(with its max children constraint) //We must check if the parent is Fully Locked or not and if it can unlock a new node(with its max children constraint)
if (numberChildren >= strongParent.getMaxChildren() || playerData.getNodeState(strongParent) == NodeStatus.FULLY_LOCKED) if (numberChildren >= strongParent.getMaxChildren() || playerData.getNodeStatus(strongParent) == NodeStatus.FULLY_LOCKED)
isFullyLockedFromStrongParent = true; isFullyLockedFromStrongParent = true;
} }
@ -242,7 +237,7 @@ public abstract class SkillTree extends PostLoadObject implements RegisteredObje
for (SkillTreeNode child : softParent.getChildren()) for (SkillTreeNode child : softParent.getChildren())
if (playerData.getNodeLevel(child) > 0) if (playerData.getNodeLevel(child) > 0)
numberChildren++; numberChildren++;
if (numberChildren < softParent.getMaxChildren() && playerData.getNodeState(softParent) != NodeStatus.FULLY_LOCKED) if (numberChildren < softParent.getMaxChildren() && playerData.getNodeStatus(softParent) != NodeStatus.FULLY_LOCKED)
isFullyLockedFromSoftParent = false; isFullyLockedFromSoftParent = false;
} }