forked from Upstream/mmocore
Removed Automatic Skill Trees.
This commit is contained in:
Ka0rX
parent
6dd27017ed
commit
e2ec78ff8d
@ -9,7 +9,6 @@ import net.Indyuce.mmocore.experience.ExperienceObject;
|
|||||||
import net.Indyuce.mmocore.experience.droptable.ExperienceTable;
|
import net.Indyuce.mmocore.experience.droptable.ExperienceTable;
|
||||||
import net.Indyuce.mmocore.gui.api.item.Placeholders;
|
import net.Indyuce.mmocore.gui.api.item.Placeholders;
|
||||||
import net.Indyuce.mmocore.player.Unlockable;
|
import net.Indyuce.mmocore.player.Unlockable;
|
||||||
import net.Indyuce.mmocore.tree.skilltree.AutomaticSkillTree;
|
|
||||||
import net.Indyuce.mmocore.tree.skilltree.SkillTree;
|
import net.Indyuce.mmocore.tree.skilltree.SkillTree;
|
||||||
import org.apache.commons.lang.Validate;
|
import org.apache.commons.lang.Validate;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@ -69,15 +68,15 @@ public class SkillTreeNode implements Unlockable, ExperienceObject {
|
|||||||
|
|
||||||
maxLevel = config.contains("max-level") ? config.getInt("max-level") : 1;
|
maxLevel = config.contains("max-level") ? config.getInt("max-level") : 1;
|
||||||
maxChildren = config.contains("max-children") ? config.getInt("max-children") : 1;
|
maxChildren = config.contains("max-children") ? config.getInt("max-children") : 1;
|
||||||
//If coordinates are precised adn we are not with an automaticTree we set them up
|
//If coordinates are precised and we are not with an automaticTree we set them up
|
||||||
if ((!(tree instanceof AutomaticSkillTree))) {
|
|
||||||
Validate.isTrue(config.contains("coordinates.x") && config.contains("coordinates.y"), "No coordinates specified");
|
Validate.isTrue(config.contains("coordinates.x") && config.contains("coordinates.y"), "No coordinates specified");
|
||||||
coordinates = new IntegerCoordinates(config.getInt("coordinates.x"), config.getInt("coordinates.y"));
|
coordinates = new IntegerCoordinates(config.getInt("coordinates.x"), config.getInt("coordinates.y"));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prefix used in the key
|
* Prefix used in the key
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static String getPrefix() {
|
public static String getPrefix() {
|
||||||
|
|||||||
@ -1,212 +0,0 @@
|
|||||||
package net.Indyuce.mmocore.tree.skilltree;
|
|
||||||
|
|
||||||
import net.Indyuce.mmocore.tree.IntegerCoordinates;
|
|
||||||
import net.Indyuce.mmocore.tree.ParentType;
|
|
||||||
import net.Indyuce.mmocore.tree.SkillTreeNode;
|
|
||||||
import org.apache.commons.lang.Validate;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Skill Trees where you only need to fill the strong and soft
|
|
||||||
*/
|
|
||||||
public class AutomaticSkillTree extends SkillTree {
|
|
||||||
|
|
||||||
//Hash map to store the number of left and right branches of each node
|
|
||||||
private final HashMap<SkillTreeNode, Branches> nodeBranches = new HashMap<>();
|
|
||||||
|
|
||||||
public AutomaticSkillTree(ConfigurationSection config) {
|
|
||||||
super(config);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void whenPostLoaded(ConfigurationSection config) {
|
|
||||||
|
|
||||||
|
|
||||||
//We setup the children and parents for each node.
|
|
||||||
for (SkillTreeNode node : nodes.values()) {
|
|
||||||
ConfigurationSection section = config.getConfigurationSection("nodes." + node.getId() + ".parents.soft");
|
|
||||||
if (section != null) {
|
|
||||||
for (String parent : section.getKeys(false)) {
|
|
||||||
node.addParent(getNode(parent),section.getInt(parent),ParentType.SOFT);
|
|
||||||
getNode(parent).addChild(node);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
section = config.getConfigurationSection("nodes." + node.getId() + ".parents.strong");
|
|
||||||
|
|
||||||
if (section != null) {
|
|
||||||
for (String parent : section.getKeys(false)) {
|
|
||||||
node.addParent(getNode(parent),section.getInt(parent),ParentType.STRONG);
|
|
||||||
getNode(parent).addChild(node);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
//We find the root of the tree which is
|
|
||||||
for (SkillTreeNode node : nodes.values()) {
|
|
||||||
if (node.getSoftParents().size() == 0 && node.getStrongParents().size() == 0) {
|
|
||||||
Validate.isTrue(roots.size() == 0, "You can't have 2 roots on one automatic skill tree. You have " + (roots.size() != 0 ? roots.get(0).getName() : "") + " and " + node.getName() + ".");
|
|
||||||
//We mark the node as a root also
|
|
||||||
roots.add(node);
|
|
||||||
node.setIsRoot();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//We setup the width of all the nodes recursively
|
|
||||||
setupTreeWidth(roots.get(0));
|
|
||||||
//We recursively setup all the coordinates of the tree nodes
|
|
||||||
roots.get(0).setCoordinates(new IntegerCoordinates(0, 0));
|
|
||||||
setupCoordinates(roots.get(0));
|
|
||||||
|
|
||||||
//We get and cache the values of minX,minY,maxX and maxY
|
|
||||||
minX = nodeBranches.get(roots.get(0)).getLeftBranches();
|
|
||||||
minY = 0;
|
|
||||||
maxX = nodeBranches.get(roots.get(0)).getRightBranches();
|
|
||||||
|
|
||||||
for (SkillTreeNode node : nodes.values()) {
|
|
||||||
if (node.getCoordinates().getY() > maxY)
|
|
||||||
maxY = node.getCoordinates().getY();
|
|
||||||
}
|
|
||||||
|
|
||||||
//Eventually we setup the skill tree info related to coordinates
|
|
||||||
super.coordinatesSetup();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recursive algorithm to automatically calculate the integercoordinates each node should have to have a good display.
|
|
||||||
* It also fills the list pathToParents representing all the coordinates corresponding to a path between 2 nodes (for the GUI)
|
|
||||||
*
|
|
||||||
* @param node the root
|
|
||||||
*/
|
|
||||||
private void setupCoordinates(SkillTreeNode node) {
|
|
||||||
if (node.isRoot()) {
|
|
||||||
node.setCoordinates(new IntegerCoordinates(0, 2));
|
|
||||||
}
|
|
||||||
int childrenSize = node.getChildren().size();
|
|
||||||
|
|
||||||
int x = node.getCoordinates().getX();
|
|
||||||
int y = node.getCoordinates().getY();
|
|
||||||
|
|
||||||
int leftOffset = 0;
|
|
||||||
int rightOffset = 0;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < childrenSize; i++) {
|
|
||||||
SkillTreeNode child = node.getChildren().get(i);
|
|
||||||
int yOffset = childrenSize == 1 || child.getChildren().size()== 1 ? 1 : 2;
|
|
||||||
|
|
||||||
if (childrenSize % 2 == 1 && i == 0) {
|
|
||||||
child.setCoordinates(new IntegerCoordinates(x, y - yOffset));
|
|
||||||
leftOffset += 2 + nodeBranches.get(child).getLeftBranches();
|
|
||||||
rightOffset += 2 + nodeBranches.get(child).getRightBranches();
|
|
||||||
} else if (i % 2 == 0) {
|
|
||||||
child.setCoordinates(new IntegerCoordinates(x - leftOffset - 2 - nodeBranches.get(child).getWidth(), y - yOffset));
|
|
||||||
leftOffset += 2 + nodeBranches.get(child).getWidth();
|
|
||||||
} else {
|
|
||||||
child.setCoordinates(new IntegerCoordinates(x + rightOffset + 2 + nodeBranches.get(child).getWidth(), y - yOffset));
|
|
||||||
rightOffset += 2 + nodeBranches.get(child).getWidth();
|
|
||||||
}
|
|
||||||
|
|
||||||
//We setup the path to parent variable (Used for the GUI)
|
|
||||||
int childX = child.getCoordinates().getX();
|
|
||||||
int childY = child.getCoordinates().getY();
|
|
||||||
|
|
||||||
int parentX = node.getCoordinates().getX();
|
|
||||||
int parentY = node.getCoordinates().getY();
|
|
||||||
int offset = childX > parentX ? -1 : 1;
|
|
||||||
while (childY + 1 != parentY) {
|
|
||||||
paths.add(new IntegerCoordinates(childX, childY + 1));
|
|
||||||
childY++;
|
|
||||||
|
|
||||||
}
|
|
||||||
while (childX != parentX) {
|
|
||||||
paths.add(new IntegerCoordinates(childX, childY + 1));
|
|
||||||
childX += offset;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//We setup the coordinates for the associated child
|
|
||||||
setupCoordinates(child);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public Branches getBranches(SkillTreeNode node) {
|
|
||||||
return nodeBranches.get(node);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recursively sed to setup all the right and left branches of the node to later determine its coordinates for GUI display
|
|
||||||
*/
|
|
||||||
public void setupTreeWidth(SkillTreeNode node) {
|
|
||||||
|
|
||||||
int childrenSize = node.getChildren().size();
|
|
||||||
int leftBranches = 0;
|
|
||||||
int rightBranches = 0;
|
|
||||||
for (int i = 0; i < childrenSize; i++) {
|
|
||||||
SkillTreeNode child = node.getChildren().get(i);
|
|
||||||
setupTreeWidth(child);
|
|
||||||
//If there is an odd number ob branches the first one will be at the center so we add to the left and to the right
|
|
||||||
if (childrenSize % 2 == 1 && i == 0) {
|
|
||||||
|
|
||||||
leftBranches += nodeBranches.get(child).getLeftBranches();
|
|
||||||
rightBranches += nodeBranches.get(child).getRightBranches();
|
|
||||||
} else if (i % 2 == 0) {
|
|
||||||
leftBranches += nodeBranches.get(child).getWidth();
|
|
||||||
} else {
|
|
||||||
rightBranches += nodeBranches.get(child).getWidth();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
nodeBranches.put(node, new Branches(leftBranches, rightBranches));
|
|
||||||
}
|
|
||||||
|
|
||||||
private class Branches {
|
|
||||||
private final int leftBranches, rightBranches;
|
|
||||||
|
|
||||||
public Branches(int leftBranches, int rightBranches) {
|
|
||||||
this.leftBranches = leftBranches;
|
|
||||||
this.rightBranches = rightBranches;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getLeftBranches() {
|
|
||||||
return leftBranches;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getRightBranches() {
|
|
||||||
return rightBranches;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getWidth() {
|
|
||||||
return leftBranches + rightBranches;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object o) {
|
|
||||||
if (this == o) return true;
|
|
||||||
if (o == null || getClass() != o.getClass()) return false;
|
|
||||||
Branches branches = (Branches) o;
|
|
||||||
return leftBranches == branches.leftBranches && rightBranches == branches.rightBranches;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "Branches{" +
|
|
||||||
"leftBranches=" + leftBranches +
|
|
||||||
", rightBranches=" + rightBranches +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return Objects.hash(leftBranches, rightBranches);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -157,12 +157,9 @@ public abstract class SkillTree extends PostLoadObject implements RegisteredObje
|
|||||||
try {
|
try {
|
||||||
String string = config.getString("type");
|
String string = config.getString("type");
|
||||||
Validate.notNull(string, "You must precise a type for the skill tree.");
|
Validate.notNull(string, "You must precise a type for the skill tree.");
|
||||||
Validate.isTrue(string.equals("automatic") || string.equals("linked") || string.equals("custom"), "You must precise the type of the skill tree in the yml!" +
|
Validate.isTrue(string.equals("linked") || string.equals("custom"), "You must precise the type of the skill tree in the yml!" +
|
||||||
"\nAllowed values: 'automatic','linked','custom'");
|
"\nAllowed values: 'linked','custom'");
|
||||||
if (string.equals("automatic")) {
|
|
||||||
skillTree = new AutomaticSkillTree(config);
|
|
||||||
skillTree.postLoad();
|
|
||||||
}
|
|
||||||
if (string.equals("linked")) {
|
if (string.equals("linked")) {
|
||||||
skillTree = new LinkedSkillTree(config);
|
skillTree = new LinkedSkillTree(config);
|
||||||
skillTree.postLoad();
|
skillTree.postLoad();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user