Upstream/CompatNoCheatPlus
1
0
Fork 0
mirror of https://github.com/asofold/CompatNoCheatPlus.git synced 2025-02-24 02:41:58 +01:00
Code Issues Projects Releases Wiki Activity

[EXPERIMENTAL] Add in MagicSpells hook, untested.

Browse Source 
This only works for spells that are processed in the same tick.
This commit is contained in:
asofold 2013-03-03 16:26:14 +01:00
parent ec30333545
commit 13e2554e24
3 changed files with 77 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CompatNoCheatPlus/cncp_lists.txt
View File

@ -62,3 +62,5 @@ support for instant spells ? [internalName or name ? <- guess: name]
! Smarter way to enable / disable PlayerClassHoook (disable by default for now).
! if SpoutPlugin is present: add blocks to ignorepassable automatically / adjust flags ? [generic block setup]
? add info command: show all hooks and so on.

9
CompatNoCheatPlus/src/me/asofold/bpl/cncp/CompatNoCheatPlus.java
View File

@ -179,7 +179,11 @@ public class CompatNoCheatPlus extends JavaPlugin implements Listener {
builtinHooks.add(new me.asofold.bpl.cncp.hooks.mcmmo.HookmcMMO());
}
catch (Throwable t){}
// MagicSpells
try{
builtinHooks.add(new me.asofold.bpl.cncp.hooks.magicspells.HookMagicSpells());
}
catch (Throwable t){}
// Simple generic hooks
for (Hook hook : new Hook[]{
new HookPlayerClass(),
@ -237,6 +241,9 @@ public class CompatNoCheatPlus extends JavaPlugin implements Listener {
// Start ticktask 2
getServer().getScheduler().scheduleSyncRepeatingTask(this, new TickTask2(), 1, 1);
// Finished.
getLogger().info(getDescription().getFullName() + " is enabled. Some hooks might get registered with NoCheatPlus later on.");
}
public boolean loadSettings() {

71
CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/magicspells/HookMagicSpells.java
View File

@ -1,8 +1,18 @@
package me.asofold.bpl.cncp.hooks.magicspells;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import me.asofold.bpl.cncp.config.compatlayer.CompatConfig;
import me.asofold.bpl.cncp.config.compatlayer.CompatConfigFactory;
import me.asofold.bpl.cncp.config.compatlayer.ConfigUtil;
import me.asofold.bpl.cncp.hooks.AbstractConfigurableHook;
import me.asofold.bpl.cncp.utils.TickTask2;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@ -18,8 +28,10 @@ import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager;
public class HookMagicSpells extends AbstractConfigurableHook implements Listener{
protected final Map<String, CheckType[]> spellMap = new HashMap<String, CheckType[]>();
public HookMagicSpells(){
super("MagicSpells(default)", "0.0", "magicspells.");
super("MagicSpells(default)", "1.0", "magicspells.");
assertPluginPresent("MagicSpells");
}
@ -61,8 +73,59 @@ public class HookMagicSpells extends AbstractConfigurableHook implements Listene
}
protected CheckType[] getCheckTypes(final Spell spell){
// TODO: Find checktypes according to spell (config ?)
// TODO: Use config !
return null;
return spellMap.get(spell.getName());
}
/* (non-Javadoc)
* @see me.asofold.bpl.cncp.hooks.AbstractConfigurableHook#applyConfig(me.asofold.bpl.cncp.config.compatlayer.CompatConfig, java.lang.String)
*/
@Override
public void applyConfig(CompatConfig cfg, String prefix) {
super.applyConfig(cfg, prefix);
prefix += this.configPrefix;
List<String> keys = cfg.getStringKeys(prefix + "exempt-spells");
for (String key : keys){
String fullKey = ConfigUtil.bestPath(cfg, prefix + "exempt-spells." + key);
String types = cfg.getString(fullKey);
if (types == null) continue;
String[] split = types.split(",");
Set<CheckType> checkTypes = new HashSet<CheckType>();
for (String input : split){
input = input.trim().toUpperCase().replace('-', '_').replace(' ', '_').replace('.', '_');
CheckType type = null;
try{
type = CheckType.valueOf(input);
}
catch(Throwable t){
}
if (type == null){
Bukkit.getLogger().warning("[cncp] HookMagicSpells: Bad check type at " + fullKey + ": " + input);
}
else checkTypes.add(type);
}
if (checkTypes.isEmpty()){
Bukkit.getLogger().warning("[cncp] HookMagicSpells: No CheckType entries at: " + fullKey);
}
else{
CheckType[] a = new CheckType[checkTypes.size()];
checkTypes.toArray(a);
spellMap.put(key, a);
}
}
}
/* (non-Javadoc)
* @see me.asofold.bpl.cncp.hooks.AbstractConfigurableHook#updateConfig(me.asofold.bpl.cncp.config.compatlayer.CompatConfig, java.lang.String)
*/
@Override
public boolean updateConfig(CompatConfig cfg, String prefix) {
super.updateConfig(cfg, prefix);
CompatConfig defaults = CompatConfigFactory.getConfig(null);
prefix += this.configPrefix;
// TODO: Write default section.
defaults.set(prefix + "NOTE", "MagicSpells support is experimental, only instant spells can be added here.");
defaults.set(prefix + "exempt-spells.NameOfExampleSpell", "COMBINED_MUNCHHAUSEN, UNKNOWN, BLOCKPLACE_NOSWING");
return ConfigUtil.forceDefaults(defaults, cfg);
}
}