Skip to content
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.

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

Add spell casting system #9

Merged
merged 13 commits into from
Jul 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/epicspellsplugin/EpicSpellsPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.bukkit.scheduler.BukkitScheduler;
import tabExecutors.MageTabExecutor;
import tabExecutors.SpellTabExecutor;
import epicspellsplugin.spellcasting.Spellcaster;

/**
*
Expand All @@ -39,13 +40,15 @@ public class EpicSpellsPlugin extends JavaPlugin{
private BukkitScheduler scheduler;
private SpellManager spellManager;
private MageManager mageManager;
private Spellcaster spellcaster;

@Override
public void onEnable(){
log = this.getLogger();

mageManager = new MageManager();
spellManager = new SpellManager(log, mageManager);
spellcaster = new Spellcaster(spellManager, mageManager, log);

scheduler = Bukkit.getScheduler();
PluginManager pluginManager = Bukkit.getPluginManager();
Expand Down Expand Up @@ -131,7 +134,9 @@ public SpellManager getSpellManager(){
public MageManager getMageManager(){
return mageManager;
}


public Spellcaster getSpellcaster() { return spellcaster; }

public void setup(){
for(Player player: Bukkit.getOnlinePlayers()){
mageManager.addPlayer(player);
Expand All @@ -141,6 +146,7 @@ public void setup(){
public void run() {
mageManager.tick();
spellManager.tick();
spellcaster.tick();
}
}, 1, 1);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/epicspellsplugin/Mage.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package epicspellsplugin;

import java.util.HashMap;
import java.util.*;

import epicspellsplugin.exceptions.NotEnoughManaException;
import epicspellsplugin.exceptions.SpellCooldownException;
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/epicspellsplugin/SpellManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@
import epicspellsplugin.spells.Explosion;
import epicspellsplugin.spells.Fireball;
import epicspellsplugin.spells.PowerStrike;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Set;

import java.util.*;
import java.util.logging.Logger;
import org.bukkit.FluidCollisionMode;
import org.bukkit.Location;
Expand Down Expand Up @@ -75,13 +73,13 @@ public void registerSpell(SpellWrapper wrapper){
if(!spells.containsKey(spellName)){
spells.put(spellName, wrapper);
} else {
log.warning(String.format("Faild to register spell %s as there already is one with the same name!", spellName));
log.warning(String.format("Failed to register spell %s as there already is one with the same name!", spellName));
}
}

public String[] getSpellNames(){
public List<String> getSpellNames(){
Set<String> set = spells.keySet();
return set.toArray(new String[set.size()]);
return new ArrayList<>(set);
}

public Integer[] getActiveSpellIDs(){
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package epicspellsplugin.spellcasting;

import epicspellsplugin.utils.Utils;

import java.util.*;

public class SpellcastPatternMapping {

public static SpellcastPatternMapping DEFAULT;
static {
DEFAULT = new SpellcastPatternMapping();
DEFAULT.bindPattern(Arrays.asList(8, 1, 6), "Fireball");
DEFAULT.bindPattern(Arrays.asList(5, 0, 7, 0), "PowerStrike");
DEFAULT.bindPattern(Arrays.asList(5, 6, 1, 8), "ArrowStorm");
DEFAULT.bindPattern(Arrays.asList(8, 2, 3), "Explosion");
}
private Map<List<Integer>, String> patternMap;

public SpellcastPatternMapping(){
patternMap = new HashMap<>();
}

public void bindPattern(List<Integer> pattern, String spellName){
patternMap.put(pattern, spellName);
}

public void unbindPattern(List<Integer> pattern){
patternMap.remove(pattern);
}

public String mapPattern(List<Integer> pattern){
List<Integer> extendedPattern = new ArrayList<>(pattern);
extendedPattern.addAll(pattern);
for(List<Integer> temp: patternMap.keySet()) {
boolean same = false;
if (!Utils.arraysEqual(pattern.toArray(new Integer[]{}), temp.toArray(new Integer[]{}))) {
continue;
}
for (int i = 0; i < temp.size(); i++) {
for (int j = 0; j < temp.size(); j++) {
if ((i + j) <= extendedPattern.size()) {
same = extendedPattern.get(i + j).equals(temp.get(j));
if(!same){
break;
}
}
}
if (same) {
return patternMap.get(temp);
}
}
}
return null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package epicspellsplugin.spellcasting;

import org.bukkit.Location;
import org.bukkit.util.Vector;

import java.util.ArrayList;
import java.util.List;

public class SpellcastPatternRecord {

private Vector normalPlane;
private List<Location> castingPoints;

public SpellcastPatternRecord(Vector normalPlane){
this.normalPlane = normalPlane;
castingPoints = new ArrayList<>();
}

public Vector getNormalPlane() {
return normalPlane;
}

public List<Location> getCastingPoints() {
return castingPoints;
}

public void addCastingPoint(Location point){
castingPoints.add(point);
}
}